4 files changed, 10 insertions, 10 deletions
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index b1406f0..9ffe874 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -35,7 +35,7 @@
 #include <kern/mach_clock.h>
 #include <sys/time.h>
 #include <device/conf.h>
-#include <device/errno.h>
+#include <device/device_types.h>
 #include <device/tty.h>
 #include <device/io_req.h>
 
@@ -335,13 +335,13 @@ io_return_t comopen(
 	io_return_t	result;
 
 	if (unit >= NCOM)
-	    return ENXIO;	/* no such device */
+	    return D_NO_SUCH_DEVICE;	/* no such device */
 	if ((isai = cominfo[unit]) == 0 || isai->alive == 0) {
 	    /*
 	     *	Try to probe it again
 	     */
 	    if (!com_reprobe(unit))
-		return ENXIO;
+		return D_NO_SUCH_DEVICE;
 	}
 	tp = &com_tty[unit];
 
diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c
index 3983a11..8ea313b 100644
--- a/i386/i386at/kd_event.c
+++ b/i386/i386at/kd_event.c
@@ -61,7 +61,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef	MACH_KERNEL
 #include <device/ds_routines.h>
-#include <device/errno.h>
+#include <device/device_types.h>
 #include <device/io_req.h>
 #else	/* MACH_KERNEL */
 #include <sys/file.h>
diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c
index 640209c..770a3fe 100644
--- a/i386/i386at/kd_mouse.c
+++ b/i386/i386at/kd_mouse.c
@@ -69,7 +69,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kern/printf.h>
 #ifdef	MACH_KERNEL
 #include <device/ds_routines.h>
-#include <device/errno.h>
+#include <device/device_types.h>
 #include <device/io_req.h>
 #include <device/subrs.h>
 #else	/* MACH_KERNEL */
@@ -179,10 +179,10 @@ mouseopen(dev, flags)
 #ifdef	MACH_KERNEL
 #else	/* MACH_KERNEL */
 	if (flags & FWRITE)
-		return(ENODEV);
+		return (D_NO_SUCH_DEVICE);
 #endif	/* MACH_KERNEL */
 	if (mouse_in_use)
-		return(EBUSY);
+		return (D_ALREADY_OPEN);
 	mouse_in_use = TRUE;		/* locking? */
 	kdq_reset(&mouse_queue);
 	lastbuttons = MOUSE_ALL_UP;
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
index 8d077d5..cf76da2 100644
--- a/i386/i386at/lpr.c
+++ b/i386/i386at/lpr.c
@@ -37,7 +37,7 @@
 #include <kern/mach_clock.h>
 #include <sys/time.h>
 #include <device/conf.h>
-#include <device/errno.h>
+#include <device/device_types.h>
 #include <device/tty.h>
 #include <device/io_req.h>
 #else	/* MACH_KERNEL */
@@ -140,11 +140,11 @@ struct tty *tp;
 u_short addr;
   
 	if (unit >= NLPR || (isai = lprinfo[unit]) == 0 || isai->alive == 0)
-		return(ENXIO);
+		return (D_NO_SUCH_DEVICE);
 	tp = &lpr_tty[unit];
 #ifndef	MACH_KERNEL
 	if (tp->t_state & TS_XCLUDE && u.u_uid != 0)
-		return(EBUSY);
+		return (D_ALREADY_OPEN);
 #endif	/* MACH_KERNEL */
 	addr = (u_short) isai->address;
 	tp->t_dev = dev;