LinCAN driver updated to work on Real-Time Preemption enabled kernel.

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

diff --git a/lincan/src/ssv.c b/lincan/src/ssv.c
index 6f1b585442b8579f8594b93714d03a3da99d3ba3..45aef4b91ae26225b5ddb6d1f08701dd1d3c9d37 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,7 +14,7 @@
 int ssvcan_irq[2]={-1,-1};
 unsigned long ssvcan_base=0x0;
 
-static can_spinlock_t ssv_port_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(ssv_port_lock);
 
 /* IO_RANGE is the io-memory range that gets reserved, please adjust according
  * your hardware. Example: #define IO_RANGE 0x100 for i82527 chips or
@@ -133,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;
@@ -161,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=