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

diff --git a/lincan/src/pcccan.c b/lincan/src/pcccan.c
index 6f7b576..ebf315c 100644
--- a/lincan/src/pcccan.c
+++ b/lincan/src/pcccan.c
@@ -20,6 +20,8 @@
 int pcccan_irq=-1;
 unsigned long pcccan_base=0x0;
 
+static can_spinlock_t pcccan_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
@@ -219,7 +221,6 @@ int pcccan_init_chip_data(struct candevice_t *candev, int chipnr)
 int pcccan_init_obj_data(struct chip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;
-	chip->msgobj[objnr]->flags=0;
 	
 	return 0;
 }
@@ -254,10 +255,11 @@ int pcccan_program_irq(struct candevice_t *candev)
  */
 void pcccan_write_register(unsigned char data, unsigned long address)
 {
-	disable_irq(pcccan_irq);
+	can_spin_irqflags_t flags;
+	can_spin_lock_irqsave(&pcccan_port_lock,flags);
 	outb(address - pcccan_base, pcccan_base+1);
 	outb(data, pcccan_base+6);
-	enable_irq(pcccan_irq);
+	can_spin_unlock_irqrestore(&pcccan_port_lock,flags);
 }
 
 /**
@@ -273,10 +275,11 @@ void pcccan_write_register(unsigned char data, unsigned long address)
 unsigned pcccan_read_register(unsigned long address)
 {
 	unsigned ret;
-	disable_irq(pcccan_irq);
+	can_spin_irqflags_t flags;
+	can_spin_lock_irqsave(&pcccan_port_lock,flags);
 	outb(address - pcccan_base, pcccan_base+1);
 	ret=inb(pcccan_base+2);
-	enable_irq(pcccan_irq);
+	can_spin_unlock_irqrestore(&pcccan_port_lock,flags);
 	return ret;
 
 }