===================================================================
RCS file: /cvs/funnyos/sys/device.h,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- funnyos/sys/device.h	2007/10/16 15:00:28	1.2
+++ funnyos/sys/device.h	2007/10/29 20:53:59	1.4
@@ -1,5 +1,5 @@
 /*
- * $Id: device.h,v 1.2 2007/10/16 14:00:28 init Exp $
+ * $Id: device.h,v 1.4 2007/10/29 20:53:59 init Exp $
  */
 #ifndef _SYS_DEVICE_H
 #define _SYS_DEVICE_H
@@ -24,7 +24,7 @@
 	uint32_t 		dr_ddsize;				/* size of xxx_dd (devdata) */
 	int 			(*dr_attach)(struct device *self, uint32_t loc, uint8_t flags); /* attach subroutine */
 	int 			(*dr_detach)(struct device *self); /* detach subroutine */
-//	void 			(*dr_interrupt)(struct device *self); /* intr handler */
+	void 			(*dr_interrupt)(struct device *self); /* intr handler */
 };
 
 
@@ -47,15 +47,10 @@
 	char 			*ai_pname;		/* parent device name */
 	uint8_t 		ai_pminor;					/* parent minor */
 	uint32_t 		ai_locator;					/* location on parent (0 - default) */
-//	uint8_t 		ai_intrno;					/* interrupt line */
+	uint8_t 		ai_intrno;					/* interrupt line */
 	uint8_t 		ai_flags;					/* flags passed to dr_attach() */
 };
 
-
-
-#define ATTACH(x) devlist[x].dv_parent
-#define AT =
-#define PARENT(y) &devlist[y]
 
 #endif /* _SYS_DEVICE_H */