X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/626f7414aee3ecd51ab35d093314919528f67b12..a6d355f1cf48f39eecb2f1bdead51817d1fd5989:/lincan/src/pikronisa.c?ds=sidebyside

diff --git a/lincan/src/pikronisa.c b/lincan/src/pikronisa.c
index 93c2b29..fd0f340 100644
--- a/lincan/src/pikronisa.c
+++ b/lincan/src/pikronisa.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/pikronisa.h"
-#include "../include/i82527.h"
 #include "../include/sja1000p.h"
 
 /*
@@ -88,7 +87,7 @@ int pikronisa_release_io(struct candevice_t *candev)
 int pikronisa_reset(struct candevice_t *candev)
 {
 	int i;
-	struct chip_t *chip=candev->chip[0];
+	struct canchip_t *chip=candev->chip[0];
 	unsigned cdr;
 	
 	pikronisa_write_register(sjaMOD_RM, chip->chip_base_addr+SJAMOD);
@@ -144,9 +143,6 @@ int pikronisa_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
-#define CHIP_TYPE "sja1000p"
-/* #define CHIP_TYPE "sja1000" */
-
 /**
  * pikronisa_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -181,7 +177,9 @@ int pikronisa_init_hw_data(struct candevice_t *candev)
  */
 int pikronisa_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-	candev->chip[chipnr]->chip_type=CHIP_TYPE;
+	/*sja1000_fill_chipspecops(candev->chip[chipnr]);*/
+	sja1000p_fill_chipspecops(candev->chip[chipnr]);
+
 	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
 	candev->chip[chipnr]->clock = 24000000;
 	candev->chip[chipnr]->int_clk_reg = 0x0;
@@ -209,7 +207,7 @@ int pikronisa_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/pikronisa.c
  */
-int pikronisa_init_obj_data(struct chip_t *chip, int objnr)
+int pikronisa_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
 	return 0;