X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/626f7414aee3ecd51ab35d093314919528f67b12..a412b1335a9906e768eeaf41473fe90193c435ab:/lincan/src/pcm3680.c

diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c
index 70cbb79..adc4293 100644
--- a/lincan/src/pcm3680.c
+++ b/lincan/src/pcm3680.c
@@ -4,14 +4,13 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */ 
 
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/pcm3680.h"
-#include "../include/i82527.h"
 #include "../include/sja1000p.h"
 
 /*
@@ -85,7 +84,7 @@ int pcm3680_release_io(struct candevice_t *candev)
 int pcm3680_reset(struct candevice_t *candev)
 {
 	int i=0;
-	struct chip_t *chip;
+	struct canchip_t *chip;
 	int chipnr;
 	
 	DEBUGMSG("Resetting pcm3680 hardware ...\n");
@@ -140,7 +139,6 @@ int pcm3680_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
-#define CHIP_TYPE "sja1000p"
 /**
  * template_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -172,7 +170,7 @@ int pcm3680_init_hw_data(struct candevice_t *candev)
  */
 int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-	candev->chip[chipnr]->chip_type=CHIP_TYPE;
+	sja1000p_fill_chipspecops(candev->chip[chipnr]);
 	candev->chip[chipnr]->chip_base_addr=
 			candev->io_addr + 0x200*chipnr;
 	candev->chip[chipnr]->clock = 16000000;
@@ -202,7 +200,7 @@ int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int pcm3680_init_obj_data(struct chip_t *chip, int objnr)
+int pcm3680_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;