[src/netbsd-1-5]: src/sys Pull up (requested by thorpej)

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c38d53350031
branches:  netbsd-1-5
changeset: 488813:c38d53350031
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Jul 30 17:56:50 2000 +0000

description:
Pull up (requested by thorpej)
conf.c 1.127->1.128
conf.h 1.75->1.76

Put `sysmon' in the `lm' slot, and free the `viaenv' slot.
Add cdev_sysmon_init().

diffstat:

 sys/arch/i386/i386/conf.c |  21 +++++----------------
 sys/sys/conf.h            |   3 ++-
 2 files changed, 7 insertions(+), 17 deletions(-)

diffs (63 lines):

diff -r 02276f875ed9 -r c38d53350031 sys/arch/i386/i386/conf.c
--- a/sys/arch/i386/i386/conf.c Sun Jul 30 17:55:18 2000 +0000
+++ b/sys/arch/i386/i386/conf.c Sun Jul 30 17:56:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.127 2000/06/11 02:46:29 mycroft Exp $       */
+/*     $NetBSD: conf.c,v 1.127.2.1 2000/07/30 17:56:52 bouyer Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -133,19 +133,8 @@
        (dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
        (dev_type_mmap((*))) enodev }
 
-/* open, close, ioctl */
-#define cdev_lm78_init(c,n) { \
-       dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
-       (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
-       (dev_type_stop((*))) enodev, 0, seltrue, \
-       (dev_type_mmap((*))) enodev }
-#define cdev_viaenv_init(c,n) cdev_lm78_init(c,n)
-
-#include "lm.h"
-cdev_decl(lm);
-
-#include "viaenv.h"
-cdev_decl(viaenv_);
+#include "sysmon.h"
+cdev_decl(sysmon);
 
 cdev_decl(cn);
 cdev_decl(ctty);
@@ -393,12 +382,12 @@
        cdev_ugen_init(NUGEN,ugen),     /* 64: USB generic driver */
        cdev_mouse_init(NWSMUX, wsmux), /* 65: ws multiplexor */
        cdev_tty_init(NUCOM, ucom),     /* 66: USB tty */
-       cdev_lm78_init(NLM, lm),        /* 67: LM7[89] */
+       cdev_sysmon_init(NSYSMON, sysmon),/* 67: System Monitor */
        cdev_vmegen_init(NVMEGENERIC, vmegeneric), /* 68: generic VME access */
        cdev_disk_init(NCA, ca),        /* 69: Compaq array */
        cdev_usbdev_init(NURIO,urio),   /* 70: Diamond Rio 500 */
        cdev_bktr_init(NBKTR, bktr),    /* 71: Bt848 video capture device */
-       cdev_viaenv_init(NVIAENV, viaenv_),/* 72: VIA VT82C686A hwmon */
+       cdev_notdef(),                  /* 72 */
        cdev_tty_init(NCZ,cztty),       /* 73: Cyclades-Z serial port */
        cdev_ses_init(NSES,ses),        /* 74: SCSI SES/SAF-TE */
 };
diff -r 02276f875ed9 -r c38d53350031 sys/sys/conf.h
--- a/sys/sys/conf.h    Sun Jul 30 17:55:18 2000 +0000
+++ b/sys/sys/conf.h    Sun Jul 30 17:56:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.h,v 1.75.4.1 2000/06/30 16:27:53 simonb Exp $     */
+/*     $NetBSD: conf.h,v 1.75.4.2 2000/07/30 17:56:50 bouyer Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -294,6 +294,7 @@
 #define        cdev_scsibus_init(c,n)  cdev__oci_init(c,n)
 #define        cdev_se_init(c,n)       cdev__oci_init(c,n)
 #define        cdev_ses_init(c,n)      cdev__oci_init(c,n)
+#define        cdev_sysmon_init(c,n)   cdev__oci_init(c,n)
 
 #define        cdev_usb_init(c,n) { \
        dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \