===================================================================
RCS file: /cvs/prex-old/sys/include/device.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/sys/include/device.h	2008/06/03 10:38:45	1.1.1.1
+++ prex-old/sys/include/device.h	2008/08/13 17:12:30	1.1.1.1.2.1
@@ -38,7 +38,7 @@
 	int	(*close)(device_t);
 	int	(*read)	(device_t, char *, size_t *, int);
 	int	(*write)(device_t, char *, size_t *, int);
-	int	(*ioctl)(device_t, int, u_long);
+	int	(*ioctl)(device_t, u_long, void *);
 	int	(*event)(int);
 };
 
@@ -47,7 +47,7 @@
  */
 struct device {
 	int		magic;		/* magic number */
-	int		ref_count;	/* reference count */
+	int		refcnt;		/* reference count */
 	int		flags;		/* device characteristics */
 	struct list	link;		/* linkage on device list */
 	struct devio	*devio;		/* device i/o table */
@@ -60,9 +60,8 @@
 extern int	 device_close(device_t);
 extern int	 device_read(device_t, void *, size_t *, int);
 extern int	 device_write(device_t, void *, size_t *, int);
-extern int	 device_ioctl(device_t, int, u_long);
+extern int	 device_ioctl(device_t, u_long, void *);
 extern int	 device_info(struct info_device *);
-extern void	 device_dump(void);
 extern void	 device_init(void);
 
 #endif /* !_DEVICE_H */