X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c6d6f58c34e1b6a4c03d1e86d1abf48eeb6f5624..2827b727d2910a3b48f9de7d67b3a67f59e256c7:/lincan/src/ssv.c

diff --git a/lincan/src/ssv.c b/lincan/src/ssv.c
index 793c67c..802aee7 100644
--- a/lincan/src/ssv.c
+++ b/lincan/src/ssv.c
@@ -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.
@@ -164,7 +166,6 @@ int ssv_init_obj_data(struct chip_t *chip, int objnr)
 
     chip->msgobj[objnr]->obj_base_addr=
         chip->chip_base_addr+(objnr+1)*0x10;
-    chip->msgobj[objnr]->flags=0;
 	
     return 0;
 }
@@ -210,21 +211,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)
     {
-	disable_irq(ssvcan_irq[0]);
+	can_spin_lock_irqsave(&ssv_port_lock,flags);
 	outb(address-ssvcan_base, ssvcan_base);
 	ret=inb(ssvcan_base+1);
-	enable_irq(ssvcan_irq[0]);
+	can_spin_unlock_irqrestore(&ssv_port_lock,flags);
     }
     else
     {
-	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);
-	enable_irq(ssvcan_irq[1]);
+	can_spin_unlock_irqrestore(&ssv_port_lock,flags);
     }
 
     return ret;