--- margi2/dmxdev.h	2001/10/15 12:40:28	1.6
+++ margi2/dmxdev.h	2001/10/29 20:56:33	1.7
@@ -50,16 +50,20 @@
 #define WAIT_QUEUE                 wait_queue_head_t
 #endif
 
-#define DMXDEV_TYPE_SEC 1
-#define DMXDEV_TYPE_PES 2
-
-#define DMXDEV_STATE_FREE      0
-#define DMXDEV_STATE_ALLOCATED 1
-#define DMXDEV_STATE_SET       2
-#define DMXDEV_STATE_READY     3
-#define DMXDEV_STATE_GO        4
-#define DMXDEV_STATE_DONE      5
-#define DMXDEV_STATE_TIMEDOUT  6
+typedef enum {
+	DMXDEV_TYPE_NONE,
+	DMXDEV_TYPE_SEC,
+	DMXDEV_TYPE_PES,
+} dmxdev_type_t;
+
+typedef enum {
+	DMXDEV_STATE_FREE,
+	DMXDEV_STATE_ALLOCATED,
+	DMXDEV_STATE_SET,
+	DMXDEV_STATE_GO,
+	DMXDEV_STATE_DONE,
+	DMXDEV_STATE_TIMEDOUT
+} dmxdev_state_t;
 
 typedef struct dmxdev_buffer_s {
         uint8_t *data;
@@ -88,7 +92,7 @@ typedef struct dmxdev_filter_s {
 	} params;
 
         int type;
-        int state;
+        dmxdev_state_t state;
         struct dmxdev_s *dev;
         dmxdev_buffer_t buffer;