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

diff --git a/lincan/src/pc_i03.c b/lincan/src/pc_i03.c
index 5340e93..def0546 100644
--- a/lincan/src/pc_i03.c
+++ b/lincan/src/pc_i03.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"
@@ -136,7 +136,6 @@ int pci03_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
-#define CHIP_TYPE "sja1000"
 /**
  * pci03_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -168,8 +167,8 @@ int pci03_init_hw_data(struct candevice_t *candev)
  */
 int pci03_init_chip_data(struct candevice_t *candev, int chipnr)
 {
+	sja1000_fill_chipspecops(candev->chip[chipnr]);
 	pci03_base_addr = candev->io_addr;
-	candev->chip[chipnr]->chip_type=CHIP_TYPE;
 	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
 	candev->chip[chipnr]->clock = 16000000;
 	candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF;
@@ -196,7 +195,7 @@ int pci03_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/pc-i03.c
  */
-int pci03_init_obj_data(struct chip_t *chip, int objnr)
+int pci03_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
 	
@@ -231,7 +230,7 @@ int pci03_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/pc-i03.c
  */
-void pci03_write_register(unsigned data, unsigned long address)
+void pci03_write_register(unsigned data, can_ioptr_t address)
 {
 	unsigned int *pci03_base_ptr;
 	unsigned short address_to_write;
@@ -256,7 +255,7 @@ void pci03_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/pc-i03.c
  */
-unsigned pci03_read_register(unsigned long address)
+unsigned pci03_read_register(can_ioptr_t address)
 {
 	unsigned int *pci03_base_ptr;
 	unsigned short address_to_read;