USBCAN converter code updated to match full version of LinCAN sources.

[lincan.git] / embedded / app / usbcan / setup.c

diff --git a/embedded/app/usbcan/setup.c b/embedded/app/usbcan/setup.c
index e046c9be24265da5847c9a4f7f7beb6371f3df97..22b21bb9aea29aeddd425544a4945bd975c6bce2 100644 (file)
--- a/embedded/app/usbcan/setup.c
+++ b/embedded/app/usbcan/setup.c
@@ -1,14 +1,39 @@
-/* setup.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: setup.c - CAN driver and chips setup code                        */
+/*                                                                        */
+/* LinCAN - (Not only) Linux CAN bus driver                               */
+/* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+/* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+/* Funded by OCERA and FRESCOR IST projects                               */
+/* Based on CAN driver code by Arnaud Westenberg <arnaud@wanadoo.nl>      */
+/*                                                                        */
+/* 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 "./can/can.h"
 
 #include "./can/can.h"

-#include "./can/can_sysless.h"
+#include "./can/can_sysdep.h"

 #include "./can/main.h"
 #include "./can/devcommon.h"
 #include "./can/setup.h"
 #include "./can/main.h"
 #include "./can/devcommon.h"
 #include "./can/setup.h"


@@ -16,7 +41,7 @@
 
 int init_hwspecops(struct candevice_t *candev, int *irqnum_p);
 int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p);
 
 int init_hwspecops(struct candevice_t *candev, int *irqnum_p);
 int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p);

-int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate);
+int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate, long clock);

 int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int objnr);
 
 /**
 int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int objnr);
 
 /**


@@ -30,9 +55,9 @@ int init_obj_struct(struct candevice_t *candev, struct canchip_t *hostchip, int
  * This function is prepared to simplify board specific xxx_request_io() function
  * for memory mapped devices.
  */
  * This function is prepared to simplify board specific xxx_request_io() function
  * for memory mapped devices.
  */

-int can_base_addr_fixup(struct candevice_t *candev, unsigned long new_base)
+int can_base_addr_fixup(struct candevice_t *candev, can_ioptr_t new_base)

 {
 {

-       unsigned long offs;
+       long offs;

        int i, j;
 
        offs=new_base-candev->dev_base_addr;
        int i, j;
 
        offs=new_base-candev->dev_base_addr;


@@ -270,6 +295,7 @@ int register_chip_struct(struct canchip_t *chip, int minorbase)
  * @chipnr: index of the chip in the corresponding device/board structure
  * @irq: chip IRQ number or (-1) if not appropriate
  * @baudrate: baudrate in the units of 1Bd
  * @chipnr: index of the chip in the corresponding device/board structure
  * @irq: chip IRQ number or (-1) if not appropriate
  * @baudrate: baudrate in the units of 1Bd

+ * @clock: optional chip base clock frequency in 1Hz step

  *
  * Chip structure is allocated and chip specific operations are filled by
  * call to board specific init_chip_data() which calls chip specific
  *
  * Chip structure is allocated and chip specific operations are filled by
  * call to board specific init_chip_data() which calls chip specific


@@ -278,7 +304,7 @@ int register_chip_struct(struct canchip_t *chip, int minorbase)
  *
  * Return Value: returns negative number in the case of fail
  */
  *
  * Return Value: returns negative number in the case of fail
  */

-int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate)
+int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudrate, long clock)

 {
        struct canchip_t *chip;
        int objnr;
 {
        struct canchip_t *chip;
        int objnr;


@@ -302,6 +328,7 @@ int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudr
        chip->hostdevice=candev;
        chip->chip_irq=irq;
        chip->baudrate=baudrate;
        chip->hostdevice=candev;
        chip->chip_irq=irq;
        chip->baudrate=baudrate;

+       chip->clock=clock;

        chip->flags=0x0;
 
        if(candev->hwspecops->init_chip_data(candev,chipnr)<0)
        chip->flags=0x0;
 
        if(candev->hwspecops->init_chip_data(candev,chipnr)<0)