Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/chs-ubc2]: src/sys Update from trunk.
details: https://anonhg.NetBSD.org/src/rev/30ac1af4acde
branches: chs-ubc2
changeset: 471432:30ac1af4acde
user: thorpej <thorpej%NetBSD.org@localhost>
date: Mon Aug 02 21:56:13 1999 +0000
description:
Update from trunk.
diffstat:
sys/conf/files | 78 +-
sys/conf/osrelease.sh | 4 +-
sys/ddb/db_xxx.c | 3 +-
sys/dev/ic/clmpcc.c | 169 +-
sys/dev/ic/clmpccreg.h | 5 +-
sys/dev/ic/clmpccvar.h | 27 +-
sys/dev/ic/i82365.c | 6 +-
sys/dev/ic/isp.c | 882 +-
sys/dev/ic/isp_netbsd.c | 169 +-
sys/dev/ic/isp_netbsd.h | 62 +-
sys/dev/ic/ispmbox.h | 108 +-
sys/dev/ic/ispreg.h | 43 +-
sys/dev/ic/ispvar.h | 146 +-
sys/dev/ic/mpu.c | 263 +
sys/dev/ic/mpuvar.h | 55 +
sys/dev/ic/smc83c170.c | 5 +-
sys/dev/ic/smc83c170reg.h | 22 +-
sys/dev/ic/tcic2.c | 4 +-
sys/dev/ic/wdc.c | 6 +-
sys/dev/isa/files.isa | 9 +-
sys/dev/isa/mpu.c | 250 -
sys/dev/isa/mpu_isa.c | 114 +
sys/dev/isa/mpuvar.h | 56 -
sys/dev/isa/sb.c | 17 +-
sys/dev/isa/sbdsp.c | 6 +-
sys/dev/isa/sbdspvar.h | 8 +-
sys/dev/isapnp/mpu_isapnp.c | 2 +-
sys/dev/isapnp/sb_isapnp.c | 6 +-
sys/dev/microcode/isp/asm_pci.h | 30114 +++++++++++++++++++++++--------------
sys/dev/mii/nsphy.c | 9 +-
sys/dev/pci/files.pci | 13 +-
sys/dev/pci/isp_pci.c | 104 +-
sys/dev/pci/pcidevs | 73 +-
sys/dev/pci/pciide.c | 4 +-
sys/dev/pci/sv.c | 14 +-
35 files changed, 20650 insertions(+), 12206 deletions(-)
diffs (truncated from 35409 to 300 lines):
diff -r 7912ea437b7d -r 30ac1af4acde sys/conf/files
--- a/sys/conf/files Mon Aug 02 21:55:23 1999 +0000
+++ b/sys/conf/files Mon Aug 02 21:56:13 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.285.2.1.2.4 1999/07/01 23:31:05 thorpej Exp $
+# $NetBSD: files,v 1.285.2.1.2.5 1999/08/02 21:56:13 thorpej Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -50,7 +50,8 @@
COMPAT_13 COMPAT_NOMID
# networking protocols
-defopt INET
+defopt opt_inet.h INET INET6
+defopt opt_ipsec.h IPSEC IPSEC_ESP
defopt opt_inet_conf.h SUBNETSARELOCAL HOSTZEROBROADCAST
defopt opt_atalk.h NETATALK
defopt opt_ns.h NSIP # XNS tunneled over IP
@@ -209,6 +210,9 @@
file dev/ic/aha.c aha
# Qlogic ISP 10x0 SCSI Controllers
+defopt opt_isp.h ISP2100_FABRIC ISP2100_SCCLUN ISP_DISABLE_1020_SUPPORT
+ ISP_DISABLE_1080_SUPPORT ISP_DISABLE_2100_SUPPORT
+ ISP_DISABLE_2200_SUPPORT
device isp: scsi
file dev/ic/isp.c isp
file dev/ic/isp_netbsd.c isp
@@ -336,6 +340,10 @@
file dev/ic/opl.c opl
file dev/ic/oplinstrs.c opl
+# MPU401 MIDI UART compatibles
+device mpu: midibus
+file dev/ic/mpu.c mpu
+
# AD1848 (CS4248, CS4231, AD1845) audio codec support; used by other drivers
define ad1848
file dev/ic/ad1848.c ad1848
@@ -364,8 +372,8 @@
# device attributes: display, display with emulator, keyboard, and mouse
define wsdisplaydev { }
define wsemuldisplaydev {[console = -1]}
-define wskbddev {[console = -1]}
-define wsmousedev { }
+define wskbddev {[console = -1], [mux = -1]}
+define wsmousedev {[mux = -1]}
# attribute to pull in raster support
define wsrasteremulops
# common PC display functions
@@ -400,30 +408,30 @@
file dev/usb/ohci.c ohci needs-flag
# legitimate pseudo-devices
-pseudo-device vnd: disk
-pseudo-device ccd: disk
-pseudo-device raid: disk
-pseudo-device md: disk
-pseudo-device vcoda
+defpseudo vnd: disk
+defpseudo ccd: disk
+defpseudo raid: disk
+defpseudo md: disk
+defpseudo vcoda
-pseudo-device pty: tty
-pseudo-device tb: tty
-pseudo-device rnd
+defpseudo pty: tty
+defpseudo tb: tty
+defpseudo rnd
-pseudo-device loop: ifnet
-pseudo-device sl: ifnet
-pseudo-device ppp: ifnet
-pseudo-device sppp: ifnet
-pseudo-device tun: ifnet
-pseudo-device bpfilter: ifnet
-pseudo-device strip: ifnet
-pseudo-device ipfilter: ifnet
-pseudo-device ipip: ifnet
-pseudo-device gre: ifnet
-pseudo-device gif: ifnet
-pseudo-device faith: ifnet
+defpseudo loop: ifnet
+defpseudo sl: ifnet
+defpseudo ppp: ifnet
+defpseudo sppp: ifnet
+defpseudo tun: ifnet
+defpseudo bpfilter: ifnet
+defpseudo strip: ifnet
+defpseudo ipfilter: ifnet
+defpseudo ipip: ifnet
+defpseudo gre: ifnet
+defpseudo gif: ifnet
+defpseudo faith: ifnet
-pseudo-device sequencer
+defpseudo sequencer
# kernel sources
file adosfs/adlookup.c adosfs
@@ -577,24 +585,9 @@
file netinet6/raw_ip6.c inet6
file netinet6/udp6_usrreq.c inet6
file netinet6/ah_core.c ipsec
-file netinet6/esp_core.c ipsec & ipsec_esp
file netinet6/ipsec.c ipsec
file netinet6/ah_output.c ipsec
file netinet6/ah_input.c ipsec
-file netinet6/esp_output.c ipsec & ipsec_esp
-file netinet6/esp_input.c ipsec & ipsec_esp
-file crypto/des/des_cbc.c ipsec & ipsec_esp
-file crypto/des/des_ecb.c ipsec & ipsec_esp
-file crypto/des/des_setkey.c ipsec & ipsec_esp
-file crypto/des/des_3cbc.c ipsec & ipsec_esp
-file crypto/blowfish/bf_cbc.c ipsec & ipsec_esp
-file crypto/blowfish/bf_cbc_m.c ipsec & ipsec_esp
-file crypto/blowfish/bf_enc.c ipsec & ipsec_esp
-file crypto/blowfish/bf_skey.c ipsec & ipsec_esp
-file crypto/cast128/cast128.c ipsec & ipsec_esp
-file crypto/cast128/cast128_cbc.c ipsec & ipsec_esp
-file crypto/rc5/rc5.c ipsec & ipsec_esp
-file crypto/rc5/rc5_cbc.c ipsec & ipsec_esp
file netinet6/ipcomp_core.c ipsec
file netinet6/ipcomp_input.c ipsec
file netinet6/ipcomp_output.c ipsec
@@ -612,7 +605,6 @@
file kern/kern_exec.c
file kern/kern_exit.c
file kern/kern_fork.c
-file kern/kern_fthread.c
file kern/kern_kthread.c
file kern/kern_ktrace.c ktrace
file kern/kern_lkm.c lkm
@@ -676,9 +668,11 @@
file miscfs/fdesc/fdesc_vnops.c fdesc
file miscfs/fifofs/fifo_vnops.c
file miscfs/genfs/genfs_vnops.c
+file miscfs/genfs/layer_subr.c
+file miscfs/genfs/layer_vfsops.c
+file miscfs/genfs/layer_vnops.c
file miscfs/kernfs/kernfs_vfsops.c kernfs
file miscfs/kernfs/kernfs_vnops.c kernfs
-file miscfs/nullfs/null_subr.c nullfs
file miscfs/nullfs/null_vfsops.c nullfs
file miscfs/nullfs/null_vnops.c nullfs
file miscfs/portal/portal_vfsops.c portal
diff -r 7912ea437b7d -r 30ac1af4acde sys/conf/osrelease.sh
--- a/sys/conf/osrelease.sh Mon Aug 02 21:55:23 1999 +0000
+++ b/sys/conf/osrelease.sh Mon Aug 02 21:56:13 1999 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: osrelease.sh,v 1.15.2.3.2.1 1999/06/21 01:12:23 thorpej Exp $
+# $NetBSD: osrelease.sh,v 1.15.2.3.2.2 1999/08/02 21:56:13 thorpej Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,7 +38,7 @@
#
# Release number to use
-release=1.4D
+release=1.4I
case $1 in
diff -r 7912ea437b7d -r 30ac1af4acde sys/ddb/db_xxx.c
--- a/sys/ddb/db_xxx.c Mon Aug 02 21:55:23 1999 +0000
+++ b/sys/ddb/db_xxx.c Mon Aug 02 21:56:13 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_xxx.c,v 1.5 1998/09/08 23:50:13 thorpej Exp $ */
+/* $NetBSD: db_xxx.c,v 1.5.8.1 1999/08/02 21:56:52 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -141,6 +141,7 @@
break;
}
+ /* XXX LOCKING XXX */
pd = proclists;
loop:
for (p = LIST_FIRST(pd->pd_list); p != NULL;
diff -r 7912ea437b7d -r 30ac1af4acde sys/dev/ic/clmpcc.c
--- a/sys/dev/ic/clmpcc.c Mon Aug 02 21:55:23 1999 +0000
+++ b/sys/dev/ic/clmpcc.c Mon Aug 02 21:56:13 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clmpcc.c,v 1.4.2.1.2.1 1999/06/21 01:17:41 thorpej Exp $ */
+/* $NetBSD: clmpcc.c,v 1.4.2.1.2.2 1999/08/02 21:59:03 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -126,6 +126,8 @@
integrate void clmpcc_wrreg __P((struct clmpcc_softc *, u_int, u_int));
integrate u_int8_t clmpcc_rdreg_odd __P((struct clmpcc_softc *, u_int));
integrate void clmpcc_wrreg_odd __P((struct clmpcc_softc *, u_int, u_int));
+integrate void clmpcc_wrtx_multi __P((struct clmpcc_softc *, u_int8_t *,
+ u_int));
integrate u_int8_t clmpcc_select_channel __P((struct clmpcc_softc *, u_int));
integrate void clmpcc_channel_cmd __P((struct clmpcc_softc *,int,int));
integrate void clmpcc_enable_transmitter __P((struct clmpcc_chan *));
@@ -191,6 +193,22 @@
bus_space_write_1(sc->sc_iot, sc->sc_ioh, offset, val);
}
+integrate void
+clmpcc_wrtx_multi(sc, buff, count)
+ struct clmpcc_softc *sc;
+ u_int8_t *buff;
+ u_int count;
+{
+ u_int offset = CLMPCC_REG_TDR;
+
+#if !defined(CLMPCC_ONLY_BYTESWAP_LOW) && !defined(CLMPCC_ONLY_BYTESWAP_HIGH)
+ offset ^= (sc->sc_byteswap & 2);
+#elif defined(CLMPCC_ONLY_BYTESWAP_HIGH)
+ offset ^= (CLMPCC_BYTESWAP_HIGH & 2);
+#endif
+ bus_space_write_multi_1(sc->sc_iot, sc->sc_ioh, offset, buff, count);
+}
+
integrate u_int8_t
clmpcc_select_channel(sc, new_chan)
struct clmpcc_softc *sc;
@@ -234,13 +252,9 @@
old = clmpcc_select_channel(ch->ch_sc, ch->ch_car);
s = splserial();
-
clmpcc_wrreg(ch->ch_sc, CLMPCC_REG_IER,
clmpcc_rdreg(ch->ch_sc, CLMPCC_REG_IER) | CLMPCC_IER_TX_EMPTY);
-
- CLR(ch->ch_flags, CLMPCC_FLG_START);
SET(ch->ch_tty->t_state, TS_BUSY);
-
splx(s);
clmpcc_select_channel(ch->ch_sc, old);
@@ -1007,28 +1021,34 @@
{
struct clmpcc_softc *sc = clmpcc_cd.cd_devs[CLMPCCUNIT(tp->t_dev)];
struct clmpcc_chan *ch = &sc->sc_chans[CLMPCCCHAN(tp->t_dev)];
+ u_int oldch;
int s;
s = spltty();
- if ( ISCLR(tp->t_state, TS_TTSTOP | TS_TIMEOUT | TS_BUSY) &&
- ISCLR(ch->ch_flags, CLMPCC_FLG_STOP) ) {
+ if ( ISCLR(tp->t_state, TS_TTSTOP | TS_TIMEOUT | TS_BUSY) ) {
if ( tp->t_outq.c_cc <= tp->t_lowat ) {
if ( ISSET(tp->t_state, TS_ASLEEP) ) {
CLR(tp->t_state, TS_ASLEEP);
wakeup(&tp->t_outq);
}
selwakeup(&tp->t_wsel);
+ }
- if ( tp->t_outq.c_cc == 0 )
- goto out;
+ if ( tp->t_outq.c_cc > 0 ) {
+ ch->ch_obuf_addr = tp->t_outq.c_cf;
+ ch->ch_obuf_size = ndqb(&tp->t_outq, 0);
+
+ /* Enable TX empty interrupts */
+ oldch = clmpcc_select_channel(ch->ch_sc, ch->ch_car);
+ clmpcc_wrreg(ch->ch_sc, CLMPCC_REG_IER,
+ clmpcc_rdreg(ch->ch_sc, CLMPCC_REG_IER) |
+ CLMPCC_IER_TX_EMPTY);
+ clmpcc_select_channel(ch->ch_sc, oldch);
+ SET(tp->t_state, TS_BUSY);
}
- SET(tp->t_state, TS_BUSY);
- clmpcc_enable_transmitter(ch);
}
-out:
- CLR(ch->ch_flags, CLMPCC_FLG_START);
splx(s);
}
@@ -1044,17 +1064,12 @@
struct clmpcc_chan *ch = &sc->sc_chans[CLMPCCCHAN(tp->t_dev)];
int s;
- s = spltty();
+ s = splserial();
if ( ISSET(tp->t_state, TS_BUSY) ) {
if ( ISCLR(tp->t_state, TS_TTSTOP) )
SET(tp->t_state, TS_FLUSH);
-
- /*
- * The transmit interrupt routine will disable transmit when it
- * notices that CLMPCC_FLG_STOP has been set.
- */
- SET(ch->ch_flags, CLMPCC_FLG_STOP);
Home |
Main Index |
Thread Index |
Old Index