X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/786c7d54e8d820e89997e507c29ea716c0d55fd9..3129fcd8094edcb910b708463fdf1a234f11fb55:/lincan/src/pc_i03.c diff --git a/lincan/src/pc_i03.c b/lincan/src/pc_i03.c index bf64ff6..daec69c 100644 --- a/lincan/src/pc_i03.c +++ b/lincan/src/pc_i03.c @@ -1,18 +1,13 @@ /* pc-i03.c * Linux CAN-bus device driver. * Written by Arnaud Westenberg email:arnaud@wnadoo.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 */ #include -#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS) -#define MODVERSIONS -#endif - -#if defined (MODVERSIONS) -#include -#endif #include #include @@ -37,9 +32,9 @@ unsigned int pci03_base_addr; #define IO_RANGE 0x200 // The pc-i03 uses an additional 0x100 bytes reset space /** - * pci03_request_io: - reserve io memory - * @io_addr: The reserved memory starts at @io_addr, wich is the module - * parameter @io. + * pci03_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 pci03_request_io() is used to reserve the io-memory. If your * hardware uses a dedicated memory range as hardware control registers you @@ -50,22 +45,20 @@ unsigned int pci03_base_addr; * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/pc-i03.c */ -int pci03_request_io(unsigned long io_addr) +int pci03_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; } /** - * pci03_release_io - free reserved io-memory - * @io_addr: Start of the memory range to be released. + * pci03_elease_io - free reserved io memory range + * @candev: pointer to candevice/board which releases io * * The function pci03_release_io() is used to free reserved io-memory. * In case you have reserved more io memory, don't forget to free it here. @@ -75,16 +68,16 @@ int pci03_request_io(unsigned long io_addr) * Return Value: The function always returns zero * File: src/pc-i03.c */ -int pci03_release_io(unsigned long io_addr) +int pci03_release_io(struct candevice_t *candev) { - release_region(io_addr,IO_RANGE); + can_release_io_region(candev->io_addr,IO_RANGE); return 0; } /** * pci03_reset - hardware reset routine - * @card: Number of the hardware card. + * @candev: Pointer to candevice/board structure * * The function pci03_reset() is used to give a hardware reset. This is * rather hardware specific so I haven't included example code. Don't forget to @@ -92,7 +85,7 @@ int pci03_release_io(unsigned long io_addr) * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/pc-i03.c */ -int pci03_reset(int card) +int pci03_reset(struct candevice_t *candev) { int i=0; @@ -126,8 +119,8 @@ int pci03_reset(int card) #define NR_SJA1000 1 /** - * pci03_init_hw_data - Initialze hardware cards - * @card: Number of the hardware card. + * pci03_init_hw_data - Initialize hardware cards + * @candev: Pointer to candevice/board structure * * The function pci03_init_hw_data() is used to initialize the hardware * structure containing information about the installed CAN-board. @@ -139,20 +132,19 @@ int pci03_reset(int card) * Return Value: The function always returns zero * File: src/pc-i03.c */ -int pci03_init_hw_data(int card) +int pci03_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 |= ~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; return 0; } #define CHIP_TYPE "sja1000" /** * pci03_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 pci03_init_chip_data() is used to initialize the hardware @@ -179,14 +171,14 @@ int pci03_init_hw_data(int card) * Return Value: The function always returns zero * File: src/pc-i03.c */ -int pci03_init_chip_data(int card, int chipnr) +int pci03_init_chip_data(struct candevice_t *candev, int chipnr) { - pci03_base_addr = candevices_p[card]->io_addr; - 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 = 16000000; - candevices_p[card]->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF; - candevices_p[card]->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | + pci03_base_addr = candev->io_addr; + candev->chip[chipnr]->chip_type=CHIP_TYPE; + candev->chip[chipnr]->chip_base_addr=candev->io_addr; + candev->chip[chipnr]->clock = 16000000; + candev->chip[chipnr]->sja_cdr_reg = CDR_CBP | CDR_CLK_OFF; + candev->chip[chipnr]->sja_ocr_reg = OCR_MODE_NORMAL | OCR_TX0_HL | OCR_TX1_LZ; return 0; @@ -194,7 +186,7 @@ int pci03_init_chip_data(int card, int chipnr) /** * pci03_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 pci03_init_obj_data() is used to initialize the hardware @@ -209,17 +201,17 @@ int pci03_init_chip_data(int card, int chipnr) * Return Value: The function always returns zero * File: src/pc-i03.c */ -int pci03_init_obj_data(int chipnr, int objnr) +int pci03_init_obj_data(struct chip_t *chip, int objnr) { - chips_p[chipnr]->msgobj[objnr]->obj_base_addr=chips_p[chipnr]->chip_base_addr; - chips_p[chipnr]->msgobj[objnr]->flags=0; + chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr; + chip->msgobj[objnr]->flags=0; return 0; } /** * pci03_program_irq - program interrupts - * @card: Number of the hardware card. + * @candev: Pointer to candevice/board structure * * The function pci03_program_irq() is used for hardware that uses * programmable interrupts. If your hardware doesn't use programmable interrupts @@ -229,7 +221,7 @@ int pci03_init_obj_data(int chipnr, int objnr) * Return value: The function returns zero on success or %-ENODEV on failure * File: src/pc-i03.c */ -int pci03_program_irq(int card) +int pci03_program_irq(struct candevice_t *candev) { return 0; }