X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/ac38874293eb5b28a54d8534f832a757a39c1230..a6d355f1cf48f39eecb2f1bdead51817d1fd5989:/lincan/src/bfadcan.c

diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c
index 78c7660..5270bd1 100644
--- a/lincan/src/bfadcan.c
+++ b/lincan/src/bfadcan.c
@@ -5,7 +5,7 @@
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
  * Version lincan-0.3  17 Jun 2004
- */ 
+ */
 
 /* This file is intended as a bfadcan file for currently unsupported hardware.
  * Once you've changed/added the functions specific to your hardware it is
@@ -24,11 +24,15 @@
 #include <linux/module.h>
 
 long clock_freq;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
 MODULE_PARM(clock_freq,"i");
+#else
+module_param(clock_freq,int,0);
+#endif
 
 /* cli and sti are not allowed in 2.5.5x SMP kernels */
 #ifdef WINDOWED_ACCESS
-static can_spinlock_t bfadcan_win_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(bfadcan_win_lock);
 #endif
 
 /*
@@ -53,7 +57,7 @@ void bfadcan_write_register(unsigned data, unsigned long address);
  *
  * The function bfadcan_request_io() is used to reserve the io-memory. If your
  * hardware uses a dedicated memory range as hardware control registers you
- * will have to add the code to reserve this memory as well. 
+ * will have to add the code to reserve this memory as well.
  * %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 in basic CAN mode.
@@ -94,8 +98,8 @@ int bfadcan_release_io(struct candevice_t *candev)
  * bfadcan_reset - hardware reset routine
  * @candev: Pointer to candevice/board structure
  *
- * The function bfadcan_reset() is used to give a hardware reset. This is 
- * rather hardware specific so I haven't included example code. Don't forget to 
+ * The function bfadcan_reset() is used to give a hardware reset. This is
+ * rather hardware specific so I haven't included example code. Don't forget to
  * check the reset status of the chip before returning.
  * Return Value: The function returns zero on success or %-ENODEV on failure
  * File: src/bfadcan.c
@@ -106,10 +110,10 @@ int bfadcan_reset(struct candevice_t *candev)
 	int i;
 	struct canchip_t *chip=candev->chip[0];
 	unsigned cdr;
-	
+
 	bfadcan_write_register(sjaMOD_RM, chip->chip_base_addr+SJAMOD);
 	udelay(1000);
-	
+
 	cdr=bfadcan_read_register(chip->chip_base_addr+SJACDR);
 	bfadcan_write_register(cdr|sjaCDR_PELICAN, chip->chip_base_addr+SJACDR);
 
@@ -127,7 +131,7 @@ int bfadcan_reset(struct candevice_t *candev)
 	bfadcan_write_register(cdr|sjaCDR_PELICAN, chip->chip_base_addr+SJACDR);
 
 	bfadcan_write_register(0, chip->chip_base_addr+SJAIER);
-	
+
 	return 0;
 }
 
@@ -149,7 +153,7 @@ int bfadcan_reset(struct candevice_t *candev)
  * Return Value: The function always returns zero
  * File: src/bfadcan.c
  */
-int bfadcan_init_hw_data(struct candevice_t *candev) 
+int bfadcan_init_hw_data(struct candevice_t *candev)
 {
 	candev->res_addr=RESET_ADDR;
 	candev->nr_82527_chips=NR_82527;
@@ -183,7 +187,7 @@ int bfadcan_init_hw_data(struct candevice_t *candev)
  * The entry @int_clk_reg holds hardware specific options for the Clock Out
  * register. Options defined in the %i82527.h file:
  * %iCLK_CD0, %iCLK_CD1, %iCLK_CD2, %iCLK_CD3, %iCLK_SL0, %iCLK_SL1.
- * The entry @int_bus_reg holds hardware specific options for the Bus 
+ * The entry @int_bus_reg holds hardware specific options for the Bus
  * Configuration register. Options defined in the %i82527.h file:
  * %iBUS_DR0, %iBUS_DR1, %iBUS_DT1, %iBUS_POL, %iBUS_CBY.
  * The entry @int_cpu_reg holds hardware specific options for the cpu interface
@@ -222,7 +226,7 @@ int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
  * CAN chip. In case of the sja1000 there's only one message object but on the
  * i82527 chip there are 15.
  * The code below is for a i82527 chip and initializes the object base addresses
- * The entry @obj_base_addr represents the first memory address of the message 
+ * The entry @obj_base_addr represents the first memory address of the message
  * object. In case of the sja1000 @obj_base_addr is taken the same as the chips
  * base address.
  * Unless the hardware uses a segmented memory map, flags can be set zero.
@@ -232,7 +236,7 @@ int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
 int bfadcan_init_obj_data(struct canchip_t *chip, int objnr)
 {
 	chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10;
-	
+
 	return 0;
 }
 
@@ -240,10 +244,10 @@ int bfadcan_init_obj_data(struct canchip_t *chip, int objnr)
  * bfadcan_program_irq - program interrupts
  * @candev: Pointer to candevice/board structure
  *
- * The function bfadcan_program_irq() is used for hardware that uses 
+ * The function bfadcan_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 %CANDEV_PROGRAMMABLE_IRQ and 
- * leave this function unedited. Again this function is hardware specific so 
+ * you should 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.
  * Return value: The function returns zero on success or %-ENODEV on failure
  * File: src/bfadcan.c