X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/11132ea490f9e860744ee4f851c67e7fb4444231..2827b727d2910a3b48f9de7d67b3a67f59e256c7:/lincan/src/m437.c diff --git a/lincan/src/m437.c b/lincan/src/m437.c index 7405160..37308b2 100644 --- a/lincan/src/m437.c +++ b/lincan/src/m437.c @@ -22,13 +22,8 @@ * */ -#include - -#include -#include -#include -#include - +#include "../include/can.h" +#include "../include/can_sysdep.h" #include "../include/main.h" #include "../include/m437.h" #include "../include/i82527.h" @@ -44,9 +39,9 @@ static long base = 0L; /** - * m437_request_io: - reserve io memory - * @io_addr: The reserved memory starts at @io_addr, wich is the module - * parameter @io. + * m437_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 m437_request_io() is used to reserve the io-memory. If your * hardware uses a dedicated memory range as hardware control registers you @@ -60,13 +55,14 @@ static long base = 0L; int m437_request_io(struct candevice_t *candev) { - if (!request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME)) { + if (!can_request_mem_region(candev->io_addr,IO_RANGE,DEVICE_NAME)) { CANMSG("Unable to request IO-memory: 0x%lx\n",candev->io_addr); return -ENODEV; } if ( !( base = (long) ioremap( candev->io_addr, IO_RANGE ) ) ) { CANMSG("Unable to access I/O memory at: 0x%lx\n", candev->io_addr); + can_release_mem_region(candev->io_addr,IO_RANGE); return -ENODEV; } @@ -75,8 +71,8 @@ int m437_request_io(struct candevice_t *candev) } /** - * m437_release_io - free reserved io-memory - * @io_addr: Start of the memory range to be released. + * m437_elease_io - free reserved io memory range + * @candev: pointer to candevice/board which releases io * * The function m437_release_io() is used to free reserved io-memory. * In case you have reserved more io memory, don't forget to free it here. @@ -116,14 +112,14 @@ int m437_release_io(struct candevice_t *candev) /* release I/O memory mapping */ iounmap((void*)base); - release_mem_region(candev->io_addr,IO_RANGE); + can_release_mem_region(candev->io_addr,IO_RANGE); return 0; } /** * m437_reset - hardware reset routine - * @card: Number of the hardware card. + * @candev: Pointer to candevice/board structure * * The function m437_reset() is used to give a hardware reset. This is * rather hardware specific so I haven't included example code. Don't forget to @@ -141,15 +137,15 @@ int m437_reset(struct candevice_t *candev) #define NR_SJA1000 0 /** - * m437_init_hw_data - Initialze hardware cards - * @card: Number of the hardware card. + * m437_init_hw_data - Initialize hardware cards + * @candev: Pointer to candevice/board structure * * The function m437_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/m437.c @@ -161,7 +157,7 @@ int m437_init_hw_data(struct candevice_t *candev) candev->nr_82527_chips=1; candev->nr_sja1000_chips=0; candev->nr_all_chips=1; - candev->flags &= ~PROGRAMMABLE_IRQ; + candev->flags &= ~CANDEV_PROGRAMMABLE_IRQ; /* The M437 has no programmable IRQ */ return 0; @@ -170,7 +166,7 @@ int m437_init_hw_data(struct candevice_t *candev) #define CHIP_TYPE "i82527" /** * m437_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 m437_init_chip_data() is used to initialize the hardware @@ -215,7 +211,7 @@ int m437_init_chip_data(struct candevice_t *candev, int chipnr) /** * m437_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 m437_init_obj_data() is used to initialize the hardware @@ -233,18 +229,17 @@ int m437_init_chip_data(struct candevice_t *candev, int chipnr) int m437_init_obj_data(struct chip_t *chip, int objnr) { chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr+(objnr+1)*0x10; - chip->msgobj[objnr]->flags=0; return 0; } /** * m437_program_irq - program interrupts - * @card: Number of the hardware card. + * @candev: Pointer to candevice/board structure * * The function m437_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