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

diff --git a/lincan/src/pccan.c b/lincan/src/pccan.c
index 49ec50b..4d877c6 100644
--- a/lincan/src/pccan.c
+++ b/lincan/src/pccan.c
@@ -4,7 +4,7 @@
  * 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"
@@ -248,7 +248,7 @@ int pccan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	if (!strcmp(candev->hwname,"pccan-q")) {
 		if (chipnr<2) {
-			candev->chip[chipnr]->chip_type="i82527";
+			i82527_fill_chipspecops(candev->chip[chipnr]);
 			candev->chip[chipnr]->flags = CHIP_SEGMENTED;
 			candev->chip[chipnr]->int_cpu_reg=iCPU_DSC;
 			candev->chip[chipnr]->int_clk_reg=iCLK_SL1;
@@ -257,7 +257,7 @@ int pccan_init_chip_data(struct candevice_t *candev, int chipnr)
 			candev->chip[chipnr]->sja_ocr_reg = 0;	
 		}
 		else{
-			candev->chip[chipnr]->chip_type="sja1000";
+			sja1000_fill_chipspecops(candev->chip[chipnr]);
 			candev->chip[chipnr]->flags = 0;
 			candev->chip[chipnr]->int_cpu_reg = 0;
 			candev->chip[chipnr]->int_clk_reg = 0;
@@ -270,7 +270,7 @@ int pccan_init_chip_data(struct candevice_t *candev, int chipnr)
 		candev->chip[chipnr]->chip_base_addr=0x1000*chipnr+0x2000+candev->io_addr;
 	}
 	else {
-		candev->chip[chipnr]->chip_type="sja1000";
+		sja1000_fill_chipspecops(candev->chip[chipnr]);
 		candev->chip[chipnr]->chip_base_addr=0x1000*chipnr+0x4000+candev->io_addr;
 		candev->chip[chipnr]->flags = 0;
 		candev->chip[chipnr]->int_cpu_reg = 0;
@@ -286,7 +286,7 @@ int pccan_init_chip_data(struct candevice_t *candev, int chipnr)
 	return 0;
 }	
 
-int pccan_init_obj_data(struct chip_t *chip, int objnr)
+int pccan_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	if (!strcmp(chip->chip_type,"sja1000")) {
 		chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;