X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/4cf24de229090b1ab6279570a564d224e13dd706..2827b727d2910a3b48f9de7d67b3a67f59e256c7:/lincan/src/ssv.c diff --git a/lincan/src/ssv.c b/lincan/src/ssv.c index bc54d63..802aee7 100644 --- a/lincan/src/ssv.c +++ b/lincan/src/ssv.c @@ -5,21 +5,8 @@ * Version 0.6 18 Sept 2000 */ -#include -#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS) -#define MODVERSIONS -#endif - -#ifdef MODVERSIONS -#include -#endif - -#include -#include -#include -#include -#include - +#include "../include/can.h" +#include "../include/can_sysdep.h" #include "../include/main.h" #include "../include/ssv.h" #include "../include/i82527.h" @@ -27,6 +14,8 @@ int ssvcan_irq[2]={-1,-1}; unsigned long ssvcan_base=0x0; +static can_spinlock_t ssv_port_lock=SPIN_LOCK_UNLOCKED; + /* 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. @@ -38,17 +27,15 @@ unsigned long ssvcan_base=0x0; * will have to add the code to reserve this memory as well. * The reserved memory starts at io_addr, wich is the module parameter io. */ -int ssv_request_io(unsigned long io_addr) +int ssv_request_io(struct candevice_t *candev) { - if (check_region(io_addr,IO_RANGE)) { - CANMSG("Unable to open port: 0x%lx\n",io_addr); + if (!can_request_io_region(candev->io_addr,IO_RANGE,DEVICE_NAME)) { + CANMSG("Unable to open port: 0x%lx\n",candev->io_addr); return -ENODEV; - } - else { - request_region(io_addr,IO_RANGE,DEVICE_NAME); - DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", io_addr, - io_addr + IO_RANGE - 1); + } else { + DEBUGMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr, + candev->io_addr + IO_RANGE - 1); } return 0; } @@ -56,10 +43,10 @@ int ssv_request_io(unsigned long io_addr) /* The function template_release_io is used to free the previously reserved * io-memory. In case you reserved more memory, don't forget to free it here. */ -int ssv_release_io(unsigned long io_addr) +int ssv_release_io(struct candevice_t *candev) { - release_region(io_addr,IO_RANGE); + can_release_io_region(candev->io_addr,IO_RANGE); return 0; } @@ -68,7 +55,7 @@ int ssv_release_io(unsigned long io_addr) * hardware specific so I haven't included example code. Don't forget to check * the reset status of the chip before returning. */ -int ssv_reset(int card) +int ssv_reset(struct candevice_t *candev) { int i; @@ -119,19 +106,20 @@ int ssv_reset(int card) * RESET_ADDR represents the io-address of the hardware reset register. * NR_82527 represents the number of intel 82527 chips on the board. * NR_SJA1000 represents the number of philips sja1000 chips on the board. - * The flags entry can currently only be PROGRAMMABLE_IRQ to indicate that + * The flags entry can currently only be CANDEV_PROGRAMMABLE_IRQ to indicate that * the hardware uses programmable interrupts. */ #define RESET_ADDR 0x02 #define NR_82527 2 #define NR_SJA1000 0 -int ssv_init_hw_data(int card) +int ssv_init_hw_data(struct candevice_t *candev) { - candevices_p[card]->res_addr=RESET_ADDR; - candevices_p[card]->nr_82527_chips=NR_82527; - candevices_p[card]->nr_sja1000_chips=0; - candevices_p[card]->flags |= PROGRAMMABLE_IRQ; + candev->res_addr=RESET_ADDR; + candev->nr_82527_chips=NR_82527; + candev->nr_sja1000_chips=0; + candev->nr_all_chips=NR_82527; + candev->flags |= CANDEV_PROGRAMMABLE_IRQ; return 0; } @@ -147,19 +135,19 @@ int ssv_init_hw_data(int card) */ #define CHIP_TYPE "i82527" -int ssv_init_chip_data(int card, int chipnr) +int ssv_init_chip_data(struct candevice_t *candev, int chipnr) { - candevices_p[card]->chip[chipnr]->chip_type=CHIP_TYPE; - candevices_p[card]->chip[chipnr]->chip_base_addr= - candevices_p[card]->io_addr+0x100*chipnr; - candevices_p[card]->chip[chipnr]->clock = 16000000; - ssvcan_irq[chipnr]=candevices_p[card]->chip[chipnr]->chip_irq; + candev->chip[chipnr]->chip_type=CHIP_TYPE; + candev->chip[chipnr]->chip_base_addr= + candev->io_addr+0x100*chipnr; + candev->chip[chipnr]->clock = 16000000; + ssvcan_irq[chipnr]=candev->chip[chipnr]->chip_irq; - ssvcan_base=candevices_p[card]->io_addr; + ssvcan_base=candev->io_addr; - candevices_p[card]->chip[chipnr]->int_cpu_reg = iCPU_DSC; - candevices_p[card]->chip[chipnr]->int_clk_reg = iCLK_SL1; - candevices_p[card]->chip[chipnr]->int_bus_reg = iBUS_CBY; + candev->chip[chipnr]->int_cpu_reg = iCPU_DSC; + candev->chip[chipnr]->int_clk_reg = iCLK_SL1; + candev->chip[chipnr]->int_bus_reg = iBUS_CBY; return 0; } @@ -173,23 +161,22 @@ int ssv_init_chip_data(int card, int chipnr) * base address. * Unless the hardware uses a segmented memory map, flags can be set zero. */ -int ssv_init_obj_data(int chipnr, int objnr) +int ssv_init_obj_data(struct chip_t *chip, int objnr) { - chips_p[chipnr]->msgobj[objnr]->obj_base_addr= - chips_p[chipnr]->chip_base_addr+(objnr+1)*0x10; - chips_p[chipnr]->msgobj[objnr]->flags=0; + chip->msgobj[objnr]->obj_base_addr= + chip->chip_base_addr+(objnr+1)*0x10; return 0; } /* The function template_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 PROGRAMMABLE_IRQ and leave this + * 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. */ -int ssv_program_irq(int card) +int ssv_program_irq(struct candevice_t *candev) { return 0; } @@ -224,21 +211,22 @@ unsigned ssv_read_register(unsigned long address) want to read in a first time. In a second time we read the data */ unsigned char ret; + can_spin_irqflags_t flags; if((address-ssvcan_base)<0x100) { - disable_irq(ssvcan_irq[0]); + can_spin_lock_irqsave(&ssv_port_lock,flags); outb(address-ssvcan_base, ssvcan_base); ret=inb(ssvcan_base+1); - enable_irq(ssvcan_irq[0]); + can_spin_unlock_irqrestore(&ssv_port_lock,flags); } else { - disable_irq(ssvcan_irq[1]); + can_spin_lock_irqsave(&ssv_port_lock,flags); outb(address-ssvcan_base-0x100, ssvcan_base+0x02); ret=inb(ssvcan_base+1+0x02); - enable_irq(ssvcan_irq[1]); + can_spin_unlock_irqrestore(&ssv_port_lock,flags); } return ret;