X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/97078fff5202521b758c9081d75580880417a123..11132ea490f9e860744ee4f851c67e7fb4444231:/lincan/src/template.c diff --git a/lincan/src/template.c b/lincan/src/template.c index 1c638ae..3075ad5 100644 --- a/lincan/src/template.c +++ b/lincan/src/template.c @@ -1,8 +1,10 @@ /* template.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 template file for currently unsupported hardware. @@ -11,13 +13,6 @@ */ #include -#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS) -#define MODVERSIONS -#endif - -#if defined (MODVERSIONS) -#include -#endif #include #include @@ -50,15 +45,13 @@ * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/template.c */ -int template_request_io(unsigned long io_addr) +int template_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; } @@ -75,9 +68,9 @@ int template_request_io(unsigned long io_addr) * Return Value: The function always returns zero * File: src/template.c */ -int template_release_io(unsigned long io_addr) +int template_release_io(struct candevice_t *candev) { - release_region(io_addr,IO_RANGE); + can_release_io_region(candev->io_addr,IO_RANGE); return 0; } @@ -92,35 +85,36 @@ int template_release_io(unsigned long io_addr) * Return Value: The function returns zero on success or %-ENODEV on failure * File: src/template.c */ -int template_reset(int card) +int template_reset(struct candevice_t *candev) { return 0; } #define RESET_ADDR 0x0 -#define NR_82527 0 +#define NR_82527 1 #define NR_SJA1000 0 /** - * template_init_hw_data - Initialze hardware cards + * template_init_hw_data - Initialize hardware cards * @card: Number of the hardware card. * * The function template_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. + * %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 hardware uses programmable interrupts. * Return Value: The function always returns zero * File: src/template.c */ -int template_init_hw_data(int card) +int template_init_hw_data(struct candevice_t *candev) { - candevices_p[card]->res_addr=RESET_ADDR; - candevices_p[card]->nr_82527_chips=1; - 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=NR_SJA1000; + candev->nr_all_chips=NR_82527+NR_SJA1000; + candev->flags |= PROGRAMMABLE_IRQ; return 0; } @@ -158,16 +152,16 @@ int template_init_hw_data(int card) * Return Value: The function always returns zero * File: src/template.c */ -int template_init_chip_data(int card, int chipnr) +int template_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; - candevices_p[card]->chip[chipnr]->clock = 16000000; - 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 = 16000000; + 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; return 0; @@ -190,10 +184,10 @@ int template_init_chip_data(int card, int chipnr) * Return Value: The function always returns zero * File: src/template.c */ -int template_init_obj_data(int chipnr, int objnr) +int template_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; + chip->msgobj[objnr]->flags=0; return 0; } @@ -210,7 +204,7 @@ int template_init_obj_data(int chipnr, int objnr) * Return value: The function returns zero on success or %-ENODEV on failure * File: src/template.c */ -int template_program_irq(int card) +int template_program_irq(struct candevice_t *candev) { return 0; }