X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/342df29e2031e12a3e928420873cbebeb85d645a..9c8ab08d7e8fca3916a7f91a3c001d151989137c:/lincan/src/pimx1.c diff --git a/lincan/src/pimx1.c b/lincan/src/pimx1.c index 8486882..f866766 100644 --- a/lincan/src/pimx1.c +++ b/lincan/src/pimx1.c @@ -1,16 +1,44 @@ -/* pikronisa.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 lincan-0.3 17 Jun 2004 - */ +/**************************************************************************/ +/* File: pimx1.c - MX1_DIS1 extension board for PiMX1 ARM based BCC */ +/* */ +/* LinCAN - (Not only) Linux CAN bus driver */ +/* Copyright (C) 2002-2009 DCE FEE CTU Prague */ +/* Copyright (C) 2002-2009 Pavel Pisa */ +/* Funded by OCERA and FRESCOR IST projects */ +/* Based on CAN driver code by Arnaud Westenberg */ +/* */ +/* LinCAN is free software; you can redistribute it and/or modify it */ +/* under terms of the GNU General Public License as published by the */ +/* Free Software Foundation; either version 2, or (at your option) any */ +/* later version. LinCAN is distributed in the hope that it will be */ +/* useful, but WITHOUT ANY WARRANTY; without even the implied warranty */ +/* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */ +/* General Public License for more details. You should have received a */ +/* copy of the GNU General Public License along with LinCAN; see file */ +/* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, */ +/* Cambridge, MA 02139, USA. */ +/* */ +/* To allow use of LinCAN in the compact embedded systems firmware */ +/* and RT-executives (RTEMS for example), main authors agree with next */ +/* special exception: */ +/* */ +/* Including LinCAN header files in a file, instantiating LinCAN generics */ +/* or templates, or linking other files with LinCAN objects to produce */ +/* an application image/executable, does not by itself cause the */ +/* resulting application image/executable to be covered by */ +/* the GNU General Public License. */ +/* This exception does not however invalidate any other reasons */ +/* why the executable file might be covered by the GNU Public License. */ +/* Publication of enhanced or derived LinCAN files is required although. */ +/**************************************************************************/ #include "../include/can.h" #include "../include/can_sysdep.h" #include "../include/main.h" #include "../include/sja1000p.h" +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) && defined(CONFIG_GENERIC_HARDIRQS) +#include +#endif /* <2.6.14 */ #include #include @@ -29,7 +57,7 @@ #define NR_82527 0 #define NR_SJA1000 1 -static can_spinlock_t pimx1_setup_hardware_lock=SPIN_LOCK_UNLOCKED; +static CAN_DEFINE_SPINLOCK(pimx1_setup_hardware_lock); int pimx1_setup_hardware(struct candevice_t *candev) { @@ -40,10 +68,17 @@ int pimx1_setup_hardware(struct candevice_t *candev) EIM_CS1U = 0x00000902; EIM_CS1L = 0x82820903; imx_gpio_mode(PA21_PF_A0); + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) /* Setup IRQ port as input */ + imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | GPIO_PUEN | 17); + /* Setup SJA1000 reset as output */ + imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_OUT | GPIO_DR | 15); + #else /* <2.6.14 */ imx_gpio_mode(GPIO_PORTB | GPIO_IN | GPIO_PUEN | GPIO_GPIO | 17); - /* Setup SJA1000 reset as ourput */ imx_gpio_mode(GPIO_PORTB | GPIO_OUT | GPIO_GPIO | 15); + #endif /* <2.6.14 */ + DR(1) |= 1<<15; can_spin_unlock_irqrestore(&pimx1_setup_hardware_lock,flags); @@ -69,7 +104,7 @@ int pimx1_setup_hardware(struct candevice_t *candev) */ int pimx1_request_io(struct candevice_t *candev) { - int remap_addr; + can_ioptr_t remap_addr; if(pimx1_setup_hardware(candev)<0){ CANMSG("PiMX1 board hardware setup failure\n"); @@ -86,7 +121,8 @@ int pimx1_request_io(struct candevice_t *candev) return -ENODEV; } can_base_addr_fixup(candev, remap_addr); - CANMSG("Registered IO-memory: 0x%lx - 0x%lx\n", candev->io_addr, candev->io_addr + PIMX1_CAN_IO_RANGE - 1); + CANMSG("Registered IO-memory: 0x%lx - 0x%lx (VMA 0x%lx)\n", + candev->io_addr, candev->io_addr + PIMX1_CAN_IO_RANGE - 1, (long)remap_addr); return 0; } @@ -122,11 +158,11 @@ int pimx1_release_io(struct candevice_t *candev) * Return Value: The function does not return a value * File: src/pikronisa.c */ -void pimx1_write_register(unsigned data, unsigned long address) +void pimx1_write_register(unsigned data, can_ioptr_t address) { - /*DEBUGMSG("pimx1_write_register: addr=0x%lx data=0x%x", + /*DEBUGMSG("pimx1_write_register: addr=0x%lx data=0x%x\n", address,data);*/ - writeb(data,address); + can_writeb(data,address); } /** @@ -139,9 +175,9 @@ void pimx1_write_register(unsigned data, unsigned long address) * Return Value: The function returns the value stored in @address * File: src/pikronisa.c */ -unsigned pimx1_read_register(unsigned long address) +unsigned pimx1_read_register(can_ioptr_t address) { - return readb(address); + return can_readb(address); } /**