Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / constants.h

diff --git a/lincan/include/constants.h b/lincan/include/constants.h
index 2643d0d84180cc16173c6b07a7a77d08bffabb6a..8ba9ba465179e836ea45cd7dc1b4a5435bd33d39 100644 (file)
--- a/lincan/include/constants.h
+++ b/lincan/include/constants.h
@@ -19,7 +19,7 @@
 /* Version of the driver */
 #define CAN_DRV_VER_MAJOR 0
 #define CAN_DRV_VER_MINOR 3
-#define CAN_DRV_VER_PATCH 0
+#define CAN_DRV_VER_PATCH 3
 #define CAN_DRV_VER ((CAN_DRV_VER_MAJOR<<16) | (CAN_DRV_VER_MINOR<<8) | CAN_DRV_VER_PATCH)
 
 /* Default driver major number, see /usr/src/linux/Documentation/devices.txt */
@@ -50,6 +50,7 @@
 #define MSGOBJ_FILTCH_REQUEST_b    5
 #define MSGOBJ_RX_MODE_b           6
 #define MSGOBJ_RX_MODE_EXT_b       7
+#define MSGOBJ_TX_PENDING_b        8
 
 #define MSGOBJ_OPENED              (1<<MSGOBJ_OPENED_b)
 #define MSGOBJ_TX_REQUEST          (1<<MSGOBJ_TX_REQUEST_b)
@@ -59,6 +60,7 @@
 #define MSGOBJ_FILTCH_REQUEST      (1<<MSGOBJ_FILTCH_REQUEST_b)
 #define MSGOBJ_RX_MODE             (1<<MSGOBJ_RX_MODE_b)
 #define MSGOBJ_RX_MODE_EXT         (1<<MSGOBJ_RX_MODE_EXT_b)
+#define MSGOBJ_TX_PENDING          (1<<MSGOBJ_TX_PENDING_b)
 
 #define can_msgobj_test_fl(obj,obj_fl) \
   test_bit(MSGOBJ_##obj_fl##_b,&(obj)->obj_flags)
@@ -73,13 +75,14 @@
 
 
 /* These flags can be used for the canchip_t structure flags data entry */
-#define CHIP_CONFIGURED  (1<<0)  /* chip is configured and prepared for communication */
-#define CHIP_SEGMENTED   (1<<1)  /* segmented access, ex: i82527 with 16 byte window*/
-#define CHIP_IRQ_SETUP   (1<<2)  /* IRQ handler has been set */
-#define CHIP_IRQ_PCI     (1<<3)  /* chip is on PCI board and uses PCI interrupt  */
-#define CHIP_IRQ_VME     (1<<4)  /* interrupt is VME bus and requires VME bridge */
-#define CHIP_IRQ_CUSTOM  (1<<5)  /* custom interrupt provided by board or chip code */
-#define CHIP_IRQ_FAST    (1<<6)  /* interrupt handler only schedules postponed processing */
+#define CHIP_ATTACHED    (1<<0)  /* chip is attached to HW, release_chip() has to be called */
+#define CHIP_CONFIGURED  (1<<1)  /* chip is configured and prepared for communication */
+#define CHIP_SEGMENTED   (1<<2)  /* segmented access, ex: i82527 with 16 byte window*/
+#define CHIP_IRQ_SETUP   (1<<3)  /* IRQ handler has been set */
+#define CHIP_IRQ_PCI     (1<<4)  /* chip is on PCI board and uses PCI interrupt  */
+#define CHIP_IRQ_VME     (1<<5)  /* interrupt is VME bus and requires VME bridge */
+#define CHIP_IRQ_CUSTOM  (1<<6)  /* custom interrupt provided by board or chip code */
+#define CHIP_IRQ_FAST    (1<<7)  /* interrupt handler only schedules postponed processing */
 
 #define CHIP_MAX_IRQLOOP 1000