[src/trunk]: src revert previous change

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

details:   https://anonhg.NetBSD.org/src/rev/f49a8d5f195f
branches:  trunk
changeset: 482831:f49a8d5f195f
user:      tls <tls%NetBSD.org@localhost>
date:      Tue Feb 22 21:09:50 2000 +0000

description:
revert previous change

diffstat:

 sys/arch/alpha/alpha/conf.c |   8 +++++-
 sys/arch/alpha/conf/ALPHA   |   3 +-
 sys/dev/scsipi/files.scsipi |   6 ++++-
 sys/sys/conf.h              |   3 +-
 usr.sbin/Makefile           |  54 +++++++++++++++-----------------------------
 5 files changed, 34 insertions(+), 40 deletions(-)

diffs (154 lines):

diff -r 5a00c0219b74 -r f49a8d5f195f sys/arch/alpha/alpha/conf.c
--- a/sys/arch/alpha/alpha/conf.c       Tue Feb 22 17:43:57 2000 +0000
+++ b/sys/arch/alpha/alpha/conf.c       Tue Feb 22 21:09:50 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.44 2000/02/22 17:46:49 mjacob Exp $ */
+/* $NetBSD: conf.c,v 1.45 2000/02/22 21:12:03 tls Exp $ */
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.44 2000/02/22 17:46:49 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.45 2000/02/22 21:12:03 tls Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -142,6 +142,8 @@
 cdev_decl(lpt);
 cdev_decl(md);
 cdev_decl(raid);
+#include "ses.h"
+cdev_decl(ses);
 #include "ss.h"
 cdev_decl(ss);
 #include "uk.h"
@@ -319,6 +321,8 @@
 #endif
        cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
        cdev_tty_init(NUCOM, ucom),     /* 57: USB tty */
+       cdev_ses_init(NSES,ses),        /* 58: SCSI SES/SAF-TE */
+       
 };
 int    nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
 
diff -r 5a00c0219b74 -r f49a8d5f195f sys/arch/alpha/conf/ALPHA
--- a/sys/arch/alpha/conf/ALPHA Tue Feb 22 17:43:57 2000 +0000
+++ b/sys/arch/alpha/conf/ALPHA Tue Feb 22 21:09:50 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALPHA,v 1.114 2000/02/22 17:45:05 mjacob Exp $
+# $NetBSD: ALPHA,v 1.115 2000/02/22 21:13:15 tls Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
@@ -343,6 +343,7 @@
 ch*    at      scsibus? target ? lun ?         # SCSI autochangers
 sd*    at      scsibus? target ? lun ?         # SCSI disk drives
 se*    at      scsibus? target ? lun ?         # Cabletron SCSI<->Ethernet
+ses*   at      scsibus? target ? lun ?         # SCSI SES/SAF-TE
 ss*    at      scsibus? target ? lun ?         # SCSI scanners
 st*    at      scsibus? target ? lun ?         # SCSI tape drives
 uk*    at      scsibus? target ? lun ?         # SCSI unknown
diff -r 5a00c0219b74 -r f49a8d5f195f sys/dev/scsipi/files.scsipi
--- a/sys/dev/scsipi/files.scsipi       Tue Feb 22 17:43:57 2000 +0000
+++ b/sys/dev/scsipi/files.scsipi       Tue Feb 22 21:09:50 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.scsipi,v 1.23 2000/02/22 17:43:57 mjacob Exp $
+#      $NetBSD: files.scsipi,v 1.24 2000/02/22 21:10:41 tls Exp $
 #
 # Config file and device description for machine-independent SCSI code.
 # Included by ports that need it.  Ports that use it must provide
@@ -49,6 +49,10 @@
 attach st at scsibus
 file   dev/scsipi/st.c                 st                      needs-flag
 
+device ses
+attach ses at scsibus
+file   dev/scsipi/ses.c                ses                     needs-flag
+
 device ss
 attach ss at scsibus
 file   dev/scsipi/ss.c                 ss                      needs-flag
diff -r 5a00c0219b74 -r f49a8d5f195f sys/sys/conf.h
--- a/sys/sys/conf.h    Tue Feb 22 17:43:57 2000 +0000
+++ b/sys/sys/conf.h    Tue Feb 22 21:09:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.h,v 1.71 2000/02/22 17:48:10 mjacob Exp $ */
+/*     $NetBSD: conf.h,v 1.72 2000/02/22 21:11:28 tls Exp $    */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -293,6 +293,7 @@
 #define        cdev_uk_init(c,n)       cdev__oci_init(c,n)
 #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_usb_init(c,n) { \
        dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
diff -r 5a00c0219b74 -r f49a8d5f195f usr.sbin/Makefile
--- a/usr.sbin/Makefile Tue Feb 22 17:43:57 2000 +0000
+++ b/usr.sbin/Makefile Tue Feb 22 21:09:50 2000 +0000
@@ -1,41 +1,25 @@
-#      $NetBSD: Makefile,v 1.134 2000/02/22 17:30:49 mjacob Exp $
-#      from: @(#)Makefile      5.20 (Berkeley) 6/12/93
+#      from: @(#)Makefile      5.6.1.2 (Berkeley) 5/8/91
+#      $Id: Makefile,v 1.135 2000/02/22 21:09:50 tls Exp $
 
-# XXX Temporary for BUILD_POSTFIX
-.include <bsd.own.mk>
-
-SRCTOP=        ..
-.include <bsd.crypto.mk>
+# not yet done: catman
 
-SUBDIR=        ac accton amd apm apmd arp bad144 bind bootp catman \
-       chown chroot chrtbl cnwctl config cron dbsym dev_mkdb \
-       dhcp diskpart dumpfs dumplfs edquota eeprom eshconfig greconfig \
-       grfconfig grfinfo gspa hilinfo inetd iostat ipf iteconfig kgmon \
-       kvm_mkdb lastlogin link lpr mailwrapper map-mbone mbrlabel \
-       mdconfig mdsetimage \
-       memswitch mopd mountd mrinfo mrouted mtrace mtree \
-       netgroup_mkdb nfsd nfsiod pkg_install portmap pppd pstat \
-       pwd_mkdb quot quotacheck quotaon rarpd rbootd rdate \
-       repquota rmt rpc.bootparamd rpc.lockd rpc.pcnfsd \
-       rpc.statd rpc.yppasswdd rwhod sa screenblank \
-       sliplogin slstats spray sup syslogd tadpolectl tcpdchk \
-       tcpdmatch tcpdump timed traceroute trpt trsp unlink \
-       usbdevs user videomode vipw vnconfig wiconfig wsconscfg \
-       wsfontload xntp ypbind yppoll ypserv ypset zdump zic
+SUBDIR=        ac accton amd arp chown chroot config config.new cron dev_mkdb \
+       diskpart edquota gettable htable inetd iostat kgmon \
+       kvm_mkdb lpr mrouted mtree named portmap pppd pwd_mkdb quot quotaon \
+       rarpd rbootd repquota rmt rpc.bootparamd rwhod \
+       sa sendmail sliplogin slstats spray swapinfo \
+       syslogd tcpdump timed traceroute trpt trsp update vipw vnconfig \
+       ypbind yppoll ypset
 
-# IPv6
-SUBDIR+=faithd gifconfig ifmcstat mld6query mtrace6 ndp pim6dd pim6sd \
-       rip6query route6d rtadvd setkey traceroute6 rtsold
-
-# ATM PVC
-SUBDIR+=pvcsif pvctxctl
-
-.if defined(BUILD_POSTFIX)
-SUBDIR+=       postfix
-.endif
-
-.if defined(CRYPTOPATH)
-.sinclude "${CRYPTOPATH}/usr.sbin/Makefile.frag"
+.if   make(clean) || make(cleandir)
+SUBDIR+=bad144 hilinfo grfinfo
+.elif ${MACHINE} == "i386"
+SUBDIR+=bad144 
+.elif ${MACHINE} == "hp300"
+# probably could be expanded to other machines, too
+SUBDIR+=hilinfo grfinfo
+.elif ${MACHINE} == "amiga"
+SUBDIR+=iteconfig
 .endif
 
 .include <bsd.subdir.mk>