X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/2fc9be1994ae2be41a743f5c4b3aa38d65efaffb..3c47a7cd435662f7e2daa006596722271f5dd090:/lincan/include/main.h

diff --git a/lincan/include/main.h b/lincan/include/main.h
index 30713f6..aad913d 100644
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -113,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
@@ -181,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;
 
@@ -321,11 +325,17 @@ struct hwspecops_t {
 	int (*release_io)(struct candevice_t *candev);
 	int (*reset)(struct candevice_t *candev);
 	int (*init_hw_data)(struct candevice_t *candev);
+	void (*done_hw_data)(struct candevice_t *candev);
 	int (*init_chip_data)(struct candevice_t *candev, int chipnr);
 	int (*init_obj_data)(struct canchip_t *chip, int objnr);
 	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
+
 };
 
 /**
@@ -396,6 +406,7 @@ struct mem_addr {
 /* Structure for the RTR queue */
 struct rtr_id {
 	unsigned long id;
+	int ready_fl;
 	struct canmsg_t *rtr_message;
 	wait_queue_head_t rtr_wq;
 	struct rtr_id *next;
@@ -419,7 +430,7 @@ extern struct mem_addr *mem_head;
 
 
 #if defined(CONFIG_OC_LINCAN_PORTIO_ONLY)
-extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned reg_offs)
+extern inline void can_write_reg(const struct canchip_t *chip, unsigned data, unsigned reg_offs)
 {
 	can_outb(data, chip->chip_base_addr+reg_offs);
 }
@@ -428,7 +439,7 @@ extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_o
 	return can_inb(chip->chip_base_addr+reg_offs);
 }
 extern inline void canobj_write_reg(const struct canchip_t *chip, const struct msgobj_t *obj,
-				unsigned char data, unsigned reg_offs)
+				unsigned data, unsigned reg_offs)
 {
 	can_outb(data, obj->obj_base_addr+reg_offs);
 }
@@ -439,7 +450,7 @@ extern inline unsigned canobj_read_reg(const struct canchip_t *chip, const struc
 }
 
 #elif defined(CONFIG_OC_LINCAN_MEMIO_ONLY)
-extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned reg_offs)
+extern inline void can_write_reg(const struct canchip_t *chip, unsigned data, unsigned reg_offs)
 {
 	can_writeb(data, chip->chip_base_addr+reg_offs);
 }
@@ -448,7 +459,7 @@ extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_o
 	return can_readb(chip->chip_base_addr+reg_offs);
 }
 extern inline void canobj_write_reg(const struct canchip_t *chip, const struct msgobj_t *obj,
-				unsigned char data, unsigned reg_offs)
+				unsigned data, unsigned reg_offs)
 {
 	can_writeb(data, obj->obj_base_addr+reg_offs);
 }
@@ -466,7 +477,7 @@ extern inline unsigned canobj_read_reg(const struct canchip_t *chip, const struc
 /* Inline function to write to the hardware registers. The argument reg_offs is
  * relative to the memory map of the chip and not the absolute memory reg_offs.
  */
-extern inline void can_write_reg(const struct canchip_t *chip, unsigned char data, unsigned reg_offs)
+extern inline void can_write_reg(const struct canchip_t *chip, unsigned data, unsigned reg_offs)
 {
 	can_ioptr_t address_to_write;
 	address_to_write = chip->chip_base_addr+reg_offs;
@@ -481,7 +492,7 @@ extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_o
 }
 
 extern inline void canobj_write_reg(const struct canchip_t *chip, const struct msgobj_t *obj,
-				unsigned char data, unsigned reg_offs)
+				unsigned data, unsigned reg_offs)
 {
 	can_ioptr_t address_to_write;
 	address_to_write = obj->obj_base_addr+reg_offs;
@@ -504,6 +515,12 @@ void can_release_io_region(unsigned long start, unsigned long n);
 int can_request_mem_region(unsigned long start, unsigned long n, const char *name);
 void can_release_mem_region(unsigned long start, unsigned long n);
 
+#ifdef CAN_ENABLE_PCI_SUPPORT
+struct pci_dev *can_pci_get_next_untaken_device(unsigned int vendor, unsigned int device);
+struct pci_dev *can_pci_get_next_untaken_subsyst(unsigned int vendor, unsigned int device,
+			unsigned int ss_vendor, unsigned int ss_device);
+#endif /*CAN_ENABLE_PCI_SUPPORT*/
+
 struct boardtype_t {
 	const char *boardtype;
 	int (*board_register)(struct hwspecops_t *hwspecops);
@@ -538,5 +555,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);