X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/c61a955168179d9b11a8f420979eed5cc24869c0..6234a9dc385e5a9258a84227b2eab09bbb099c27:/lincan/src/msmcan.c

diff --git a/lincan/src/msmcan.c b/lincan/src/msmcan.c
index 0cdb07d..b6ebbae 100644
--- a/lincan/src/msmcan.c
+++ b/lincan/src/msmcan.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"
@@ -13,7 +13,7 @@
 #include "../include/msmcan.h"
 #include "../include/i82527.h"
 
-static can_spinlock_t msmcan_port_lock=SPIN_LOCK_UNLOCKED;
+static CAN_DEFINE_SPINLOCK(msmcan_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
@@ -56,12 +56,12 @@ int msmcan_release_io(struct candevice_t *candev)
  */
 int msmcan_reset(struct candevice_t *candev)
 {
-	struct chip_t *chip=candev->chip[0];
+	struct canchip_t *chip=candev->chip[0];
 
 	DEBUGMSG("Resetting msmcan hardware ...\n");
 	/* we don't use template_write_register because we don't use the two first
 	   registers of the card but the third in order to make a hard reset */
-	/* outb (1, msmcan_base + candev->res_addr); */
+	/* can_outb (1, msmcan_base + candev->res_addr); */
 
 
 	/* terrible MSMCAN reset design - best to comment out */
@@ -122,14 +122,13 @@ int msmcan_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 msmcan_init_chip_data(struct candevice_t *candev, int chipnr)
 {
-	candev->chip[chipnr]->chip_type=CHIP_TYPE;
+	i82527_fill_chipspecops(candev->chip[chipnr]);
 	/* device uses indexed access */
 	candev->chip[chipnr]->chip_base_addr=
-	    candev->io_addr << 16;
+	    can_ioport2ioptr(candev->io_addr << 16);
 	candev->chip[chipnr]->clock = 16000000;
 	/* The CLKOUT has to be enabled to reset MSMCAN MAX1232 watchdog */
 	candev->chip[chipnr]->int_cpu_reg = iCPU_DSC | iCPU_CEN;
@@ -149,7 +148,7 @@ int msmcan_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 msmcan_init_obj_data(struct chip_t *chip, int objnr)
+int msmcan_init_obj_data(struct canchip_t *chip, int objnr)
 {
 
 	chip->msgobj[objnr]->obj_base_addr=
@@ -173,17 +172,18 @@ int msmcan_program_irq(struct candevice_t *candev)
  * on the CAN chip. You should only have to edit this function if your hardware
  * uses some specific write process.
  */
-void msmcan_write_register(unsigned data, unsigned long address)
+void msmcan_write_register(unsigned data, can_ioptr_t address)
 {
 	/* address is combination of base address shifted left by 16 and index */
 	can_spin_irqflags_t flags;
+	unsigned long addr=can_ioptr2ulong(address);
 
 	/* the msmcan card has two registers, the data register at 0x0
 	   and the address register at 0x01 */
 
 	can_spin_lock_irqsave(&msmcan_port_lock,flags);
-	outb(address & 0xff, (address>>16)+1);
-	outb(data, address>>16); 
+	can_outb(addr & 0xff, (addr>>16)+1);
+	can_outb(data, addr>>16); 
 	can_spin_unlock_irqrestore(&msmcan_port_lock,flags);
 }
 
@@ -191,7 +191,7 @@ void msmcan_write_register(unsigned data, unsigned long address)
  * on the CAN chip. You should only have to edit this function if your hardware
  * uses some specific read process.
  */
-unsigned msmcan_read_register(unsigned long address)
+unsigned msmcan_read_register(can_ioptr_t address)
 {
 	/* this is the same thing that the function write_register.
 	   We use the two register, we write the address where we 
@@ -199,11 +199,11 @@ unsigned msmcan_read_register(unsigned long address)
 	   data */
 	unsigned char ret;
 	can_spin_irqflags_t flags;
-    
+	unsigned long addr=can_ioptr2ulong(address);
 
 	can_spin_lock_irqsave(&msmcan_port_lock,flags);
-	outb(address & 0xff, (address>>16)+1);
-	ret=inb(address>>16); 
+	can_outb(addr & 0xff, (addr>>16)+1);
+	ret=can_inb(addr>>16); 
 	can_spin_unlock_irqrestore(&msmcan_port_lock,flags);
 	return ret;
 }