X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/6250b3805fb7e368adf1e3f7ca39c8cc617bccff..6234a9dc385e5a9258a84227b2eab09bbb099c27:/lincan/src/cc_can104.c

diff --git a/lincan/src/cc_can104.c b/lincan/src/cc_can104.c
index 2dafc3d..15819a3 100644
--- a/lincan/src/cc_can104.c
+++ b/lincan/src/cc_can104.c
@@ -140,7 +140,7 @@ int cc104_init_hw_data(struct candevice_t *candev)
 int cc104_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	sja1000_fill_chipspecops(candev->chip[chipnr]);
-	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
+	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 = sjaCDR_CBP | sjaCDR_CLK_OFF;
@@ -202,9 +202,9 @@ int cc104_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/template.c
  */
-void cc104_write_register(unsigned data, unsigned long address)
+void cc104_write_register(unsigned data, can_ioptr_t address)
 {
-	outb(data,address);
+	can_outb(data,address);
 }
 
 /**
@@ -217,9 +217,9 @@ void cc104_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/template.c
  */
-unsigned cc104_read_register(unsigned long address)
+unsigned cc104_read_register(can_ioptr_t address)
 {
-	return inb(address);
+	return can_inb(address);
 }
 
 /* !!! Don't change this function !!! */