X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/a4c9ead4b64bd4de307f375c2ff313a7a07a06e0..831ccb1f14f7472962fc2d185f32e18105209bd7:/lincan/src/aim104.c?ds=sidebyside

diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c
index 8e0fe8f..015a793 100644
--- a/lincan/src/aim104.c
+++ b/lincan/src/aim104.c
@@ -129,7 +129,6 @@ int aim104_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
-#define CHIP_TYPE "sja1000"
 /**
  * template_init_chip_data - Initialize chips
  * @candev: Pointer to candevice/board structure
@@ -161,8 +160,8 @@ int aim104_init_hw_data(struct candevice_t *candev)
  */
 int aim104_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-	candev->chip[chipnr]->chip_type=CHIP_TYPE;
-	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
+	sja1000_fill_chipspecops(candev->chip[chipnr]);
+	candev->chip[chipnr]->chip_base_addr=can_ioport2ioptr(candev->io_addr);
 	candev->chip[chipnr]->clock = 16000000;
 	candev->chip[chipnr]->flags = 0;
 	candev->chip[chipnr]->sja_cdr_reg = 0x08;
@@ -188,7 +187,7 @@ int aim104_init_chip_data(struct candevice_t *candev, int chipnr)
  * Return Value: The function always returns zero
  * File: src/template.c
  */
-int aim104_init_obj_data(struct chip_t *chip, int objnr)
+int aim104_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr;
 	chip->msgobj[objnr]->obj_flags=0;
@@ -224,9 +223,9 @@ int aim104_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/template.c
  */
-void aim104_write_register(unsigned data, unsigned long address)
+void aim104_write_register(unsigned data, can_ioptr_t address)
 {
-	outb(data,address);
+	can_outb(data,address);
 }
 
 /**
@@ -239,9 +238,9 @@ void aim104_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/template.c
  */
-unsigned aim104_read_register(unsigned long address)
+unsigned aim104_read_register(can_ioptr_t address)
 {
-	return inb(address);
+	return can_inb(address);
 }
 
 /* !!! Don't change this function !!! */