X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/626f7414aee3ecd51ab35d093314919528f67b12..4dc78b4651f006bf0404c8ec7db85651bcee7c2e:/lincan/src/kv_pcican.c diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c index 273db86..30ac377 100644 --- a/lincan/src/kv_pcican.c +++ b/lincan/src/kv_pcican.c @@ -1,11 +1,36 @@ -/* kv_pcican.c - support for KVASER PCIcan-S/D/Q cards - * 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.2 9 Jul 2003 - */ +/**************************************************************************/ +/* File: kv_pcican.c - support for KVASER PCIcan-S/D/Q cards */ +/* */ +/* 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" @@ -56,18 +81,18 @@ void kv_pcican_disconnect_irq(struct candevice_t *candev) { unsigned long tmp; /* Disable interrupts from card */ - tmp = inl(candev->dev_base_addr + S5920_INTCSR); + tmp = can_inl(candev->dev_base_addr + S5920_INTCSR); tmp &= ~INTCSR_ADDON_INTENABLE_M; - outl(tmp, candev->dev_base_addr + S5920_INTCSR); + can_outl(tmp, candev->dev_base_addr + S5920_INTCSR); } void kv_pcican_connect_irq(struct candevice_t *candev) { unsigned long tmp; /* Enable interrupts from card */ - tmp = inl(candev->dev_base_addr + S5920_INTCSR); + tmp = can_inl(candev->dev_base_addr + S5920_INTCSR); tmp |= INTCSR_ADDON_INTENABLE_M; - outl(tmp, candev->dev_base_addr + S5920_INTCSR); + can_outl(tmp, candev->dev_base_addr + S5920_INTCSR); } @@ -121,26 +146,26 @@ int kv_pcican_release_io(struct candevice_t *candev) } -void kv_pcican_write_register(unsigned data, unsigned long address) +void kv_pcican_write_register(unsigned data, can_ioptr_t address) { - outb(data,address); + can_outb(data,address); } -unsigned kv_pcican_read_register(unsigned long address) +unsigned kv_pcican_read_register(can_ioptr_t address) { - return inb(address); + return can_inb(address); } int kv_pcican_reset(struct candevice_t *candev) { int i=0,chip_nr; - struct chip_t *chip; + struct canchip_t *chip; unsigned cdr; DEBUGMSG("Resetting kv_pcican hardware ...\n"); /* Assert PTADR# - we're in passive mode so the other bits are not important */ - outl(0x80808080L, candev->dev_base_addr + S5920_PTCR); + can_outl(0x80808080L, candev->dev_base_addr + S5920_PTCR); kv_pcican_disconnect_irq(candev); @@ -180,16 +205,16 @@ int kv_pcican_reset(struct candevice_t *candev) int kv_pcican_init_hw_data(struct candevice_t *candev) { - struct pci_dev *pcidev = NULL; + struct pci_dev *pcidev; int i; - do { - pcidev = pci_find_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID, pcidev); - if(pcidev == NULL) return -ENODEV; - } while(can_check_dev_taken(pcidev)); + pcidev = can_pci_get_next_untaken_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID); + if(pcidev == NULL) + return -ENODEV; if (pci_enable_device (pcidev)){ printk(KERN_CRIT "Setup of PCICAN failed\n"); + can_pci_dev_put(pcidev); return -EIO; } candev->sysdevptr.pcidev=pcidev; @@ -197,6 +222,7 @@ int kv_pcican_init_hw_data(struct candevice_t *candev) for(i=0;i<3;i++){ if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){ printk(KERN_CRIT "PCICAN region %d is not IO\n",i); + can_pci_dev_put(pcidev); return -EIO; } } @@ -225,6 +251,12 @@ int kv_pcican_init_hw_data(struct candevice_t *candev) return 0; } +void kv_pcican_done_hw_data(struct candevice_t *candev) +{ + struct pci_dev *pcidev = candev->sysdevptr.pcidev; + can_pci_dev_put(pcidev); +} + int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr) { @@ -233,7 +265,7 @@ int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr) candev->chip[chipnr]->chip_irq=candev->sysdevptr.pcidev->irq; - candev->chip[chipnr]->chip_type="sja1000p"; + sja1000p_fill_chipspecops(candev->chip[chipnr]); candev->chip[chipnr]->chip_base_addr= candev->io_addr+chipnr*KV_PCICAN_BYTES_PER_CIRCUIT; candev->chip[chipnr]->flags = 0; @@ -248,7 +280,7 @@ int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr) return 0; } -int kv_pcican_init_obj_data(struct chip_t *chip, int objnr) +int kv_pcican_init_obj_data(struct canchip_t *chip, int objnr) { chip->msgobj[objnr]->obj_base_addr=chip->chip_base_addr; return 0; @@ -266,6 +298,7 @@ int kv_pcican_register(struct hwspecops_t *hwspecops) hwspecops->release_io = kv_pcican_release_io; hwspecops->reset = kv_pcican_reset; hwspecops->init_hw_data = kv_pcican_init_hw_data; + hwspecops->done_hw_data = kv_pcican_done_hw_data; hwspecops->init_chip_data = kv_pcican_init_chip_data; hwspecops->init_obj_data = kv_pcican_init_obj_data; hwspecops->write_register = kv_pcican_write_register;