X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/b8ebad64ba024cba4fa9984ade263dc50db97268..fdda6e9262ba019da93832120a9999941e9b8f3b:/lincan/include/main.h

diff --git a/lincan/include/main.h b/lincan/include/main.h
index f360dcf..22fb92f 100644
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -1,11 +1,36 @@
-/* main.h
- * Header file for the Linux CAN-bus 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: main.h - the CAN driver basic data structures and functions      */
+/*                                                                        */
+/* 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.h"
 #include "./constants.h"
@@ -88,6 +113,10 @@ struct candevice_t {
 
 	struct canhardware_t *hosthardware_p;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+	struct kref refcount;
+#endif
+	
 	union {
 		void *anydev;
 	    #ifdef CAN_ENABLE_PCI_SUPPORT
@@ -156,7 +185,7 @@ struct canchip_t {
 	int chip_idx;	/* chip index in candevice_t.chip[] */
 	int chip_irq;
 	can_ioptr_t chip_base_addr;
-	unsigned int flags;
+	uint16_t flags;
 	long clock; /* Chip clock in Hz */
 	long baudrate;
 
@@ -301,6 +330,11 @@ struct hwspecops_t {
 	int (*program_irq)(struct candevice_t *candev);
 	void (*write_register)(unsigned data, can_ioptr_t address);
 	unsigned (*read_register)(can_ioptr_t address);
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+	void (*release_device)(struct kref *refcount);
+#endif
+	
 };
 
 /**
@@ -513,5 +547,6 @@ void can_filltimestamp(canmsg_tstamp_t *ptimestamp)
 extern int can_rtl_priority;
 #endif /*CAN_WITH_RTL*/
 
-extern struct candevice_t* register_usbdev(const char *hwname,void *devdata,void (*chipdataregfnc)(struct canchip_t *chip,void *data));
-extern void cleanup_usbdev(struct candevice_t *dev);
+extern struct candevice_t* register_hotplug_dev(const char *hwname,int (*chipdataregfnc)(struct canchip_t *chip,void *data),void *devdata);
+extern void deregister_hotplug_dev(struct candevice_t *dev);
+extern void cleanup_hotplug_dev(struct candevice_t *dev);