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

diff --git a/lincan/src/nsi.c b/lincan/src/nsi.c
index 289a1ed..03ba230 100644
--- a/lincan/src/nsi.c
+++ b/lincan/src/nsi.c
@@ -7,14 +7,8 @@
  * Version lincan-0.2  9 Jul 2003
  */ 
 
-#include <linux/autoconf.h>
-
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-
+#include "../include/can.h"
+#include "../include/can_sysdep.h"
 #include "../include/main.h"
 #include "../include/nsi.h"
 #include "../include/i82527.h"
@@ -22,6 +16,8 @@
 int nsican_irq=-1;
 unsigned long nsican_base=0x0;
 
+static can_spinlock_t nsican_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.
@@ -96,7 +92,7 @@ int nsi_reset(struct candevice_t *candev)
  * RESET_ADDR represents the io-address of the hardware reset register.
  * NR_82527 represents the number of intel 82527 chips on the board.
  * NR_SJA1000 represents the number of philips sja1000 chips on the board.
- * The flags entry can currently only be PROGRAMMABLE_IRQ to indicate that
+ * The flags entry can currently only be CANDEV_PROGRAMMABLE_IRQ to indicate that
  * the hardware uses programmable interrupts.
  */
 #define RESET_ADDR 0x02
@@ -109,7 +105,7 @@ int nsi_init_hw_data(struct candevice_t *candev)
 	candev->nr_82527_chips=1;
 	candev->nr_sja1000_chips=0;
         candev->nr_all_chips=1;
-	candev->flags |= PROGRAMMABLE_IRQ;
+	candev->flags |= CANDEV_PROGRAMMABLE_IRQ;
 
 	return 0;
 }
@@ -155,14 +151,13 @@ int nsi_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;
 }
 
 /* The function template_program_irq is used for hardware that uses programmable
  * interrupts. If your hardware doesn't use programmable interrupts you should
- * not set the candevices_t->flags entry to PROGRAMMABLE_IRQ and leave this
+ * not set the candevices_t->flags entry to CANDEV_PROGRAMMABLE_IRQ and leave this
  * function unedited. Again this function is hardware specific so there's no
  * example code.
  */
@@ -197,13 +192,14 @@ unsigned nsi_read_register(unsigned long address)
        We use the two register, we write the address where we 
        want to read in a first time. In a second time we read the
        data */
-    unsigned char ret;
+	unsigned char ret;
+	can_spin_irqflags_t flags;
     
-    disable_irq(nsican_irq); 
-    outb(address-nsican_base, nsican_base);
-    ret=inb(nsican_base+1);
-    enable_irq(nsican_irq); 
-    return ret;
+	can_spin_lock_irqsave(&nsican_port_lock,flags);
+	outb(address-nsican_base, nsican_base);
+	ret=inb(nsican_base+1);
+	can_spin_unlock_irqrestore(&nsican_port_lock,flags);
+	return ret;
 }