Included support for PiMX1 board with SJA1000 on MX_DIS1 expansion board.

[lincan.git] / lincan / src / ssv.c

diff --git a/lincan/src/ssv.c b/lincan/src/ssv.c
index 83fbba3115fc19409fdfb61b21807e18b3825f30..3cd003d1b45f64b0871baaeb4e109c124b769b48 100644 (file)
--- a/lincan/src/ssv.c
+++ b/lincan/src/ssv.c
@@ -2,7 +2,7 @@
  * Linux CAN-bus device driver.
  * Written by Arnaud Westenberg email:arnaud@casema.net
  * This software is released under the GPL-License.
- * Version 0.6  18 Sept 2000
+ * Version lincan-0.3  17 Jun 2004
  */ 
 
 #include "../include/can.h"
@@ -14,6 +14,8 @@
 int ssvcan_irq[2]={-1,-1};
 unsigned long ssvcan_base=0x0;
 
+static can_spinlock_t ssv_port_lock=SPIN_LOCK_UNLOCKED;
+
 /* IO_RANGE is the io-memory range that gets reserved, please adjust according
  * your hardware. Example: #define IO_RANGE 0x100 for i82527 chips or
  * #define IO_RANGE 0x20 for sja1000 chips.
@@ -131,11 +133,9 @@ int ssv_init_hw_data(struct candevice_t *candev)
  * argument supplied at module loading time.
  * The clock argument holds the chip clock value in Hz.
  */
-#define CHIP_TYPE "i82527"
-
 int ssv_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-    candev->chip[chipnr]->chip_type=CHIP_TYPE;
+    i82527_fill_chipspecops(candev->chip[chipnr]);
     candev->chip[chipnr]->chip_base_addr=
        candev->io_addr+0x100*chipnr;
     candev->chip[chipnr]->clock = 16000000;
@@ -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 char data, unsigned long address)
+void ssv_write_register(unsigned data, unsigned long address)
 {
     /* address is an absolute address */
 
@@ -209,21 +209,22 @@ unsigned ssv_read_register(unsigned long address)
        want to read in a first time. In a second time we read the
        data */
     unsigned char ret;
+    can_spin_irqflags_t flags;
     
 
     if((address-ssvcan_base)<0x100)
     {
-       can_disable_irq(ssvcan_irq[0]);
+       can_spin_lock_irqsave(&ssv_port_lock,flags);
        outb(address-ssvcan_base, ssvcan_base);
        ret=inb(ssvcan_base+1);
-       can_enable_irq(ssvcan_irq[0]);
+       can_spin_unlock_irqrestore(&ssv_port_lock,flags);
     }
     else
     {
-       can_disable_irq(ssvcan_irq[1]);
+       can_spin_lock_irqsave(&ssv_port_lock,flags);
        outb(address-ssvcan_base-0x100, ssvcan_base+0x02);
        ret=inb(ssvcan_base+1+0x02);
-       can_enable_irq(ssvcan_irq[1]);
+       can_spin_unlock_irqrestore(&ssv_port_lock,flags);
     }
 
     return ret;