To prevent future name collisions "chip_t" changed to "canchip_t"

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

diff --git a/lincan/src/smartcan.c b/lincan/src/smartcan.c
index 7f11d5c1b51ead9426c394d3f74baa8245d774d6..eddd13dd30f4f718f082d6bf4d8c31062003f5c5 100644 (file)
--- a/lincan/src/smartcan.c
+++ b/lincan/src/smartcan.c
@@ -4,7 +4,7 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */ 
 
 #include "../include/can.h"
@@ -16,6 +16,8 @@
 int smartcan_irq=-1;
 unsigned long smartcan_base=0x0;
 
+static can_spinlock_t smartcan_port_lock=SPIN_LOCK_UNLOCKED;
+
 int smartcan_request_io(struct candevice_t *candev)
 {
        if (!can_request_io_region(candev->io_addr,0x04,DEVICE_NAME)) {
@@ -76,7 +78,7 @@ int smartcan_init_hw_data(struct candevice_t *candev)
 
 int smartcan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-       candev->chip[chipnr]->chip_type="i82527";
+       i82527_fill_chipspecops(candev->chip[chipnr]);
        candev->chip[chipnr]->chip_base_addr=candev->io_addr;
        candev->chip[chipnr]->clock = 16000000;
        candev->chip[chipnr]->int_cpu_reg = iCPU_DSC;
@@ -90,30 +92,31 @@ int smartcan_init_chip_data(struct candevice_t *candev, int chipnr)
        return 0;
 }
 
-int smartcan_init_obj_data(struct chip_t *chip, int objnr)
+int smartcan_init_obj_data(struct canchip_t *chip, int objnr)
 {
        chip->msgobj[objnr]->obj_base_addr=(objnr+1)*0x10;
-       chip->msgobj[objnr]->flags=0;
 
        return 0;
 }
 
 
-void smartcan_write_register(unsigned char data, unsigned long address)
+void smartcan_write_register(unsigned data, unsigned long address)
 {
-       disable_irq(smartcan_irq);
+       can_spin_irqflags_t flags;
+       can_spin_lock_irqsave(&smartcan_port_lock,flags);
        outb(address-smartcan_base,smartcan_base);
        outb(data,smartcan_base+1);
-       enable_irq(smartcan_irq);
+       can_spin_unlock_irqrestore(&smartcan_port_lock,flags);
 }
 
 unsigned smartcan_read_register(unsigned long address)
 {
        unsigned ret;
-       disable_irq(smartcan_irq);
+       can_spin_irqflags_t flags;
+       can_spin_lock_irqsave(&smartcan_port_lock,flags);
        outb(address-smartcan_base,smartcan_base);
        ret=inb(smartcan_base+1);
-       enable_irq(smartcan_irq);
+       can_spin_unlock_irqrestore(&smartcan_port_lock,flags);
        return ret;
 }