From 002b9c7d51f7fdb0fe222d4a6023655687c6e501 Mon Sep 17 00:00:00 2001 From: Thomas Bushnell Date: Mon, 26 Apr 1999 05:30:06 +0000 Subject: 1999-02-27 OKUJI Yoshinori * i386/i386at/i386at_ds_routines.c: Include instead of . * device/ds_routines.c [LINUX_DEV]: Likewise. * i386/linux/Makefile.in (linux-gen-flags): Fix an extra slash. (distclean): Remove asm links. * linux/src/COPYING: Copied from linux-2.0.36. 1999-02-02 OKUJI Yoshinori * i386/i386at/kd_event.c (kbdgetstat): Fix a typo DEV_GET_SIZES -> DEV_GET_SIZE. * i386/i386at/kd_mouse.c (mousegetstat): Likewise. * device/kmsg.c (kmsggetstat): Likewise. 1999-02-01 OKUJI Yoshinori * linux/dev/glue/block.c (dev_getstat): Fix a missing `struct'. * device/cons.c (cninit): Don't call kmsginit. * kmsg.c (kmsg_buffer): Defined as static. (kmsg_write_offset): Likewise. (kmsg_read_offset): Likewise. (kmsg_read_queue): Likewise. (kmsg_in_use): Likewise. (kmsg_lock): Likewise. (kmsginit): Likewise, and call queue_init instead of setting PREV and NEXT manually. (kmsg_done_init): New variable. (kmsg_putchar): Call kmsginit if not initialized yet. (kmsggetstat): New function. * kmsg.h (kmsggetstat): Add the prototype. * i386/i386at/kd_event.c (kbdgetstat): Handle DEV_GET_SIZE. (kbdread): Check if the amount a user specify is a multiple of sizeof(kd_event). * i386/i386at/kd_mouse.c (mousegetstat): New function. (mouseread): Check if the amount a user specify is a multiple of sizeof(kd_event). * i386/i386at/conf.c (dev_name_list): Set the mouse getstat entry to mousegetstat and the kmsg getstat entry to kmsggetstat. Use MACH_COM instead of NCOM to determine if com is used. Use MACH_LPR instead of NLPR to determine if lpr is used. * configure.in (--enable-com): New option. (--enable-lpr): Likewise. * Makefile.in (enable_com): New variable. (enable_lpr): Likewise. * i386/Makefrag (i386at-files): Remove com.c. (objfiles): Add com.o if enable_com is yes, and lpr.o if enable_lpr is yes. 1999-01-10 OKUJI Yoshinori * i386/i386at/kd.c: Applied a keymap patch. Reported by Marcus Brinkmann . * i386/i386at/kd.h: Likewise. 1998-12-06 OKUJI Yoshinori Add kmsg device. * Makefile.in (device-files): Add kmsg.c and kmsg.h. * configure.in (--enable-kmsg): New option. * device/cons.c: Include kmsg.h. (cninit): Call kmsginit if MACH_KMSG is defined. (cnputc): Call kmsg_putchar if MACH_KMSG is defined. * device/kmsg.c: New file. * device/kmsg.h: Likewise. * i386/i386at/conf.c (dev_name_list): Add kmsg entry. 1998-12-01 OKUJI Yoshinori * i386/i386at/i386at_ds_routines.c: Include only if LINUX_DEV is defined. Reported by UCHIYAMA Yasushi . * device/ds_routines.c: Likewise. * configure.in: AC_CONFIG_SUBDIRS(linux) instead of linuxdev. (--disable-linuxdev): New option. * linux/Makefile.in (CPPFLAGS): Remove -DLINUX_DEV, and add @DEFS@. (objfiles): Add linux.o only if LINUX_DEV is defined. * linux/Drivers.in (--disable-linuxdev): New option. * i386/Makefrag (DEFINES): Remove -DLINUX_DEV. --- i386/i386at/conf.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'i386/i386at/conf.c') diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c index 2bd2d2a..7bca47b 100644 --- a/i386/i386at/conf.c +++ b/i386/i386at/conf.c @@ -175,13 +175,16 @@ extern int kbdopen(), kbdclose(), kbdread(); extern int kbdgetstat(), kbdsetstat(); #define kbdname "kbd" -extern int mouseopen(), mouseclose(), mouseread(); +extern int mouseopen(), mouseclose(), mouseread(), mousegetstat(); #define mousename "mouse" extern int ioplopen(), ioplclose(); extern vm_offset_t ioplmmap(); #define ioplname "iopl" +extern int kmsgopen(), kmsgclose(), kmsgread(), kmsggetstat(); +#define kmsgname "kmsg" + /* * List of devices - console must be at slot 0 */ @@ -328,21 +331,19 @@ struct dev_ops dev_name_list[] = #endif #endif /* ! LINUX_DEV */ -#if NCOM > 0 +#ifdef MACH_COM { comname, comopen, comclose, comread, comwrite, comgetstat, comsetstat, nomap, nodev, nulldev, comportdeath, 0, nodev }, #endif -#ifndef LINUX_DEV -#if NLPR > 0 +#ifdef MACH_LPR { lprname, lpropen, lprclose, lprread, lprwrite, lprgetstat, lprsetstat, nomap, nodev, nulldev, lprportdeath, 0, nodev }, #endif -#endif /* ! LINUX_DEV */ #if NBLIT > 0 { blitname, blitopen, blitclose, nodev, @@ -352,7 +353,7 @@ struct dev_ops dev_name_list[] = #endif { mousename, mouseopen, mouseclose, mouseread, - nodev, nulldev, nulldev, nomap, + nodev, mousegetstat, nulldev, nomap, nodev, nulldev, nulldev, 0, nodev }, @@ -384,6 +385,13 @@ struct dev_ops dev_name_list[] = #endif NHD > 0 #endif 0 /* Kevin doesn't know why this was here. */ +#ifdef MACH_KMSG + { kmsgname, kmsgopen, kmsgclose, kmsgread, + nodev, kmsggetstat, nodev, nomap, + nodev, nulldev, nulldev, 0, + nodev }, +#endif + }; int dev_name_count = sizeof(dev_name_list)/sizeof(dev_name_list[0]); -- cgit v1.2.3