X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/786c7d54e8d820e89997e507c29ea716c0d55fd9..2827b727d2910a3b48f9de7d67b3a67f59e256c7:/lincan/src/bfadcan.c diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c index 930e91a..c2c9ce7 100644 --- a/lincan/src/bfadcan.c +++ b/lincan/src/bfadcan.c @@ -1,8 +1,10 @@ /* bfadcan.c * Linux CAN-bus device driver. * Written by Arnaud Westenberg email:arnaud@wanadoo.nl + * 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 0.7 6 Aug 2001 + * Version lincan-0.2 9 Jul 2003 */ /* This file is intended as a bfadcan file for currently unsupported hardware. @@ -10,42 +12,24 @@ * possible to load the driver with the hardware option hw=bfadcan. */ -#define __NO_VERSION__ /* this is not a main module, do not include module info */ - -#include -#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS) -#define MODVERSIONS -#endif - -#if defined (MODVERSIONS) -#include -#endif -#include - -#include -#include -#include -#include -#include - -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0)) -#include -#else -#include -#endif #define WINDOWED_ACCESS +#include "../include/can.h" +#include "../include/can_sysdep.h" #include "../include/main.h" #include "../include/i82527.h" #include "../include/sja1000p.h" +#define __NO_VERSION__ +#include + long clock_freq; MODULE_PARM(clock_freq,"i"); /* cli and sti are not allowed in 2.5.5x SMP kernels */ #ifdef WINDOWED_ACCESS -spinlock_t bfadcan_win_lock=SPIN_LOCK_UNLOCKED; +static can_spinlock_t bfadcan_win_lock=SPIN_LOCK_UNLOCKED; #endif /* @@ -64,9 +48,9 @@ void bfadcan_write_register(unsigned char data, unsigned long address); /** - * bfadcan_request_io: - reserve io memory - * @io_addr: The reserved memory starts at @io_addr, wich is the module - * parameter @io. + * bfadcan_request_io: - reserve io or memory range for can board + * @candev: pointer to candevice/board which asks for io. Field @io_addr + * of @candev is used in most cases to define start of the range * * 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 @@ -77,22 +61,20 @@ void bfadcan_write_register(unsigned char data, unsigned long address); * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/bfadcan.c */ -int bfadcan_request_io(unsigned long io_addr) +int bfadcan_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; } /** - * bfadcan_release_io - free reserved io-memory - * @io_addr: Start of the memory range to be released. + * bfadcan_elease_io - free reserved io memory range + * @candev: pointer to candevice/board which releases io * * The function bfadcan_release_io() is used to free reserved io-memory. * In case you have reserved more io memory, don't forget to free it here. @@ -102,16 +84,16 @@ int bfadcan_request_io(unsigned long io_addr) * Return Value: The function always returns zero * File: src/bfadcan.c */ -int bfadcan_release_io(unsigned long io_addr) +int bfadcan_release_io(struct candevice_t *candev) { - release_region(io_addr,IO_RANGE); + can_release_io_region(candev->io_addr,IO_RANGE); return 0; } /** * bfadcan_reset - hardware reset routine - * @card: Number of the hardware card. + * @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 @@ -119,11 +101,11 @@ int bfadcan_release_io(unsigned long io_addr) * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/bfadcan.c */ -int bfadcan_reset(int card) +int bfadcan_reset(struct candevice_t *candev) { int i; - struct chip_t *chip=candevices_p[card]->chip[0]; + struct chip_t *chip=candev->chip[0]; unsigned cdr; bfadcan_write_register(MOD_RM, chip->chip_base_addr+SJAMOD); @@ -155,25 +137,26 @@ int bfadcan_reset(int card) #define NR_SJA1000 1 /** - * bfadcan_init_hw_data - Initialze hardware cards - * @card: Number of the hardware card. + * bfadcan_init_hw_data - Initialize hardware cards + * @candev: Pointer to candevice/board structure * * The function bfadcan_init_hw_data() is used to initialize the hardware * structure containing information about the installed CAN-board. * %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. * Return Value: The function always returns zero * File: src/bfadcan.c */ -int bfadcan_init_hw_data(int card) +int bfadcan_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=NR_SJA1000; - candevices_p[card]->flags |= 0 /* PROGRAMMABLE_IRQ */ ; + candev->res_addr=RESET_ADDR; + candev->nr_82527_chips=NR_82527; + candev->nr_sja1000_chips=NR_SJA1000; + candev->nr_all_chips=NR_82527+NR_SJA1000; + candev->flags |= 0 /* CANDEV_PROGRAMMABLE_IRQ */ ; return 0; } @@ -181,7 +164,7 @@ int bfadcan_init_hw_data(int card) #define CHIP_TYPE "sja1000p" /** * bfadcan_init_chip_data - Initialize chips - * @card: Number of the hardware card + * @candev: Pointer to candevice/board structure * @chipnr: Number of the CAN chip on the hardware card * * The function bfadcan_init_chip_data() is used to initialize the hardware @@ -211,24 +194,24 @@ int bfadcan_init_hw_data(int card) * Return Value: The function always returns zero * File: src/bfadcan.c */ -int bfadcan_init_chip_data(int card, int chipnr) +int bfadcan_init_chip_data(struct candevice_t *candev, int chipnr) { unsigned int id1, id2; - candevices_p[card]->chip[chipnr]->chip_type=CHIP_TYPE; - candevices_p[card]->chip[chipnr]->chip_base_addr=candevices_p[card]->io_addr; - candevices_p[card]->chip[chipnr]->clock = clock_freq; - 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; - candevices_p[card]->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF; - candevices_p[card]->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | + candev->chip[chipnr]->chip_type=CHIP_TYPE; + candev->chip[chipnr]->chip_base_addr=candev->io_addr; + candev->chip[chipnr]->clock = clock_freq; + candev->chip[chipnr]->int_cpu_reg = iCPU_DSC; + candev->chip[chipnr]->int_clk_reg = iCLK_SL1; + candev->chip[chipnr]->int_bus_reg = iBUS_CBY; + candev->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF; + candev->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | OCR_TX0_LH; id1 = inb(0xe284); id2 = inb(0xe285); - CANMSG("can driver ver 0.7.1-tm5, at %04lx, CPLD v%d.%d.%d.%d\n", - candevices_p[card]->chip[chipnr]->chip_base_addr, + CANMSG("can driver ver lincan-0.2, at %04lx, CPLD v%d.%d.%d.%d\n", + candev->chip[chipnr]->chip_base_addr, id1>>4, id1&0x0f, id2>>4, id2&0x0f); @@ -237,7 +220,7 @@ int bfadcan_init_chip_data(int card, int chipnr) /** * bfadcan_init_obj_data - Initialize message buffers - * @chipnr: Number of the CAN chip + * @chip: Pointer to chip specific structure * @objnr: Number of the message buffer * * The function bfadcan_init_obj_data() is used to initialize the hardware @@ -252,27 +235,26 @@ int bfadcan_init_chip_data(int card, int chipnr) * Return Value: The function always returns zero * File: src/bfadcan.c */ -int bfadcan_init_obj_data(int chipnr, int objnr) +int bfadcan_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; } /** * bfadcan_program_irq - program interrupts - * @card: Number of the hardware card. + * @candev: Pointer to candevice/board structure * * 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 %PROGRAMMABLE_IRQ and + * 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 */ -int bfadcan_program_irq(int card) +int bfadcan_program_irq(struct candevice_t *candev) { return 0; } @@ -291,11 +273,11 @@ int bfadcan_program_irq(int card) void bfadcan_write_register(unsigned char data, unsigned long address) { #ifdef WINDOWED_ACCESS - long flags; - spin_lock_irqsave(&bfadcan_win_lock,flags); + can_spin_irqflags_t flags; + can_spin_lock_irqsave(&bfadcan_win_lock,flags); outb(address&0x00ff,0x200); outb(data, 0x201); - spin_unlock_irqrestore(&bfadcan_win_lock,flags); + can_spin_unlock_irqrestore(&bfadcan_win_lock,flags); #else outb(data,address); #endif @@ -314,12 +296,12 @@ void bfadcan_write_register(unsigned char data, unsigned long address) unsigned bfadcan_read_register(unsigned long address) { #ifdef WINDOWED_ACCESS - long flags; + can_spin_irqflags_t flags; int ret; - spin_lock_irqsave(&bfadcan_win_lock,flags); + can_spin_lock_irqsave(&bfadcan_win_lock,flags); outb(address&0x00ff,0x200); ret = inb(0x201); - spin_unlock_irqrestore(&bfadcan_win_lock,flags); + can_spin_unlock_irqrestore(&bfadcan_win_lock,flags); return ret; #else return inb(address);