diff options
| author | Guillem Jover <guillem@hadrons.org> | 2011-09-01 20:24:56 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-09-02 20:17:03 +0200 |
| commit | 026f55873b827a14db61e6c2c246c454bb3b7b9f (patch) | |
| tree | bf9a4a53113165c1f85326442b6df2d3cfcc9a5e /i386 | |
| parent | 38369f6611561ec2557d71416f65aed4ff646308 (diff) | |
Use Mach native error codes instead of POSIX errno E* ones
* device/errno.h: Remove file.
* Makefrag.am (libkernel_a_SOURCES): Remove `device/errno.h'.
* i386/i386at/com.c: Include <device/device_types.h> instead of
<device/errno.h>.
(comopen): Replace ENXIO with D_NO_SUCH_DEVICE.
* i386/i386at/kd_event.c: Include <device/device_types.h> instead of
<device/errno.h>.
* i386/i386at/kd_mouse.c: Likewise.
(mouseopen): Replace ENODEV with D_NO_SUCH_DEVICE and EBUSY with
D_ALREADY_OPEN.
* i386/i386at/lpr.c: Include <device/device_types.h> instead of
<device/errno.h>.
(lpropen): Replace ENXIO with D_NO_SUCH_DEVICE and EBUSY with
D_ALREADY_OPEN.
Diffstat (limited to 'i386')
| -rw-r--r-- | i386/i386at/com.c | 6 | ||||
| -rw-r--r-- | i386/i386at/kd_event.c | 2 | ||||
| -rw-r--r-- | i386/i386at/kd_mouse.c | 6 | ||||
| -rw-r--r-- | i386/i386at/lpr.c | 6 |
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; |