X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2a4663dd0b20d96d1ffe20993dd0c63ed2ca9f20..6234a9dc385e5a9258a84227b2eab09bbb099c27:/lincan/src/ssv.c

diff --git a/lincan/src/ssv.c b/lincan/src/ssv.c
index 7f147e1..17d60ef 100644
--- a/lincan/src/ssv.c
+++ b/lincan/src/ssv.c
@@ -12,9 +12,9 @@
 #include "../include/i82527.h"
 
 int ssvcan_irq[2]={-1,-1};
-unsigned long ssvcan_base=0x0;
+can_ioptr_t ssvcan_base=0x0;
 
-static can_spinlock_t ssv_port_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(ssv_port_lock);
 
 /* IO_RANGE is the io-memory range that gets reserved, please adjust according
  * your hardware. Example: #define IO_RANGE 0x100 for i82527 chips or
@@ -137,7 +137,7 @@ int ssv_init_chip_data(struct candevice_t *candev, int chipnr)
 {
     i82527_fill_chipspecops(candev->chip[chipnr]);
     candev->chip[chipnr]->chip_base_addr=
-	candev->io_addr+0x100*chipnr;
+	can_ioport2ioptr(candev->io_addr+0x100*chipnr);
     candev->chip[chipnr]->clock = 16000000;
     ssvcan_irq[chipnr]=candev->chip[chipnr]->chip_irq;
 
@@ -159,7 +159,7 @@ int ssv_init_chip_data(struct candevice_t *candev, int chipnr)
  * base address.
  * Unless the hardware uses a segmented memory map, flags can be set zero.
  */
-int ssv_init_obj_data(struct chip_t *chip, int objnr)
+int ssv_init_obj_data(struct canchip_t *chip, int objnr)
 {
 
     chip->msgobj[objnr]->obj_base_addr=
@@ -183,7 +183,7 @@ int ssv_program_irq(struct candevice_t *candev)
  * on the CAN chip. You should only have to edit this function if your hardware
  * uses some specific write process.
  */
-void ssv_write_register(unsigned data, unsigned long address)
+void ssv_write_register(unsigned data, can_ioptr_t address)
 {
     /* address is an absolute address */
 
@@ -193,16 +193,16 @@ void ssv_write_register(unsigned data, unsigned long address)
     /* write the relative address on the eight LSB bits 
      and the data on the eight MSB bits in one time */
     if((address-ssvcan_base)<0x100)
-	outw(address-ssvcan_base + (256 * data), ssvcan_base);
+	can_outw(address-ssvcan_base + (256 * data), ssvcan_base);
     else
-	outw(address-ssvcan_base-0x100 + (256 * data), ssvcan_base+0x02);
+	can_outw(address-ssvcan_base-0x100 + (256 * data), ssvcan_base+0x02);
 }
 
 /* The function template_read_register is used to read from hardware registers
  * on the CAN chip. You should only have to edit this function if your hardware
  * uses some specific read process.
  */
-unsigned ssv_read_register(unsigned long address)
+unsigned ssv_read_register(can_ioptr_t address)
 {
     /* this is the same thing that the function write_register.
        We use the two register, we write the address where we 
@@ -215,15 +215,15 @@ unsigned ssv_read_register(unsigned long address)
     if((address-ssvcan_base)<0x100)
     {
 	can_spin_lock_irqsave(&ssv_port_lock,flags);
-	outb(address-ssvcan_base, ssvcan_base);
-	ret=inb(ssvcan_base+1);
+	can_outb(address-ssvcan_base, ssvcan_base);
+	ret=can_inb(ssvcan_base+1);
 	can_spin_unlock_irqrestore(&ssv_port_lock,flags);
     }
     else
     {
 	can_spin_lock_irqsave(&ssv_port_lock,flags);
-	outb(address-ssvcan_base-0x100, ssvcan_base+0x02);
-	ret=inb(ssvcan_base+1+0x02);
+	can_outb(address-ssvcan_base-0x100, ssvcan_base+0x02);
+	ret=can_inb(ssvcan_base+1+0x02);
 	can_spin_unlock_irqrestore(&ssv_port_lock,flags);
     }