X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/ac38874293eb5b28a54d8534f832a757a39c1230..1d20caee804d28a792dcacbf8424dc23b80c6370:/lincan/src/bfadcan.c?ds=sidebyside

diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c
index 78c7660..75294ec 100644
--- a/lincan/src/bfadcan.c
+++ b/lincan/src/bfadcan.c
@@ -23,12 +23,11 @@
 #define __NO_VERSION__
 #include <linux/module.h>
 
-long clock_freq;
-MODULE_PARM(clock_freq,"i");
+#define CAN_BFAD_CLOCKFREQ 20000000
 
 /* 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
 
 /*
@@ -42,8 +41,8 @@ static can_spinlock_t bfadcan_win_lock=SPIN_LOCK_UNLOCKED;
 #define IO_RANGE 0x100
 #endif
 
-unsigned bfadcan_read_register(unsigned long address);
-void bfadcan_write_register(unsigned data, unsigned long address);
+unsigned bfadcan_read_register(can_ioptr_t address);
+void bfadcan_write_register(unsigned data, can_ioptr_t address);
 
 
 /**
@@ -196,17 +195,18 @@ int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	unsigned int id1, id2;
 	sja1000p_fill_chipspecops(candev->chip[chipnr]);
-	candev->chip[chipnr]->chip_base_addr=candev->io_addr;
-	candev->chip[chipnr]->clock = clock_freq;
+	candev->chip[chipnr]->chip_base_addr=can_ioport2ioptr(candev->io_addr);
+	if(candev->chip[chipnr]->clock<=0)
+		candev->chip[chipnr]->clock = CAN_BFAD_CLOCKFREQ;
 	candev->chip[chipnr]->sja_cdr_reg = sjaCDR_CBP | sjaCDR_CLK_OFF;
 	candev->chip[chipnr]->sja_ocr_reg = sjaOCR_MODE_NORMAL | sjaOCR_TX0_LH;
-	id1 = inb(0xe284);
-	id2 = inb(0xe285);
+	id1 = can_inb(0xe284);
+	id2 = can_inb(0xe285);
 
 
 	CANMSG("can driver ver lincan-0.3, at %04lx, CPLD v%d.%d.%d.%d\n",
-			                candev->chip[chipnr]->chip_base_addr,
-					                id1>>4, id1&0x0f, id2>>4, id2&0x0f);
+			can_ioptr2ulong(candev->chip[chipnr]->chip_base_addr),
+			id1>>4, id1&0x0f, id2>>4, id2&0x0f);
 
 
 	return 0;
@@ -264,16 +264,16 @@ int bfadcan_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/bfadcan.c
  */
-void bfadcan_write_register(unsigned data, unsigned long address)
+void bfadcan_write_register(unsigned data, can_ioptr_t address)
 {
 #ifdef WINDOWED_ACCESS
 	can_spin_irqflags_t flags;
 	can_spin_lock_irqsave(&bfadcan_win_lock,flags);
-	outb(address&0x00ff,0x200);
-	outb(data, 0x201);
+	can_outb(can_ioptr2ulong(address)&0x00ff,0x200);
+	can_outb(data, 0x201);
 	can_spin_unlock_irqrestore(&bfadcan_win_lock,flags);
 #else
-	outb(data,address);
+	can_outb(data,address);
 #endif
 }
 
@@ -287,18 +287,18 @@ void bfadcan_write_register(unsigned data, unsigned long address)
  * Return Value: The function returns the value stored in @address
  * File: src/bfadcan.c
  */
-unsigned bfadcan_read_register(unsigned long address)
+unsigned bfadcan_read_register(can_ioptr_t address)
 {
 #ifdef WINDOWED_ACCESS
 	can_spin_irqflags_t flags;
 	int ret;
 	can_spin_lock_irqsave(&bfadcan_win_lock,flags);
-	outb(address&0x00ff,0x200);
-	ret = inb(0x201);
+	can_outb(can_ioptr2ulong(address)&0x00ff,0x200);
+	ret = can_inb(0x201);
 	can_spin_unlock_irqrestore(&bfadcan_win_lock,flags);
 	return ret;
 #else
-	return inb(address);
+	return can_inb(address);
 #endif
 }