X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/3367930de7bb1e08bed6463ff3ed66f242bf8fc0..b29ebe97fb5acced24e8ce9bb30e5d4dcad58815:/lincan/include/main.h

diff --git a/lincan/include/main.h b/lincan/include/main.h
index 5b4e0e0..f7a302c 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;
 
@@ -327,6 +331,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
+
 };
 
 /**
@@ -420,7 +429,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);
 }
@@ -429,7 +438,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);
 }
@@ -440,7 +449,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);
 }
@@ -449,7 +458,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);
 }
@@ -467,7 +476,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;
@@ -482,7 +491,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;
@@ -544,3 +553,7 @@ void can_filltimestamp(canmsg_tstamp_t *ptimestamp)
 #ifdef CAN_WITH_RTL
 extern int can_rtl_priority;
 #endif /*CAN_WITH_RTL*/
+
+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);