Date: Fri, 25 Jun 2004 04:41:33 GMT From: rwatson@FreeBSD.org (Robert Watson) To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 55762 for review Message-ID: <200406250441.i5P4fXa8003340@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
Change 55762 by rwatson@rwatson_tislabs on 2004/06/25 04:08:48
Integrate netperf_socket:
- serial.h
- ufs_extattr.c, vfs_syscalls.c cleanups.
And etc.
Affected files ...
.. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#7 integrate
.. //depot/projects/netperf_socket/sys/conf/files#30 integrate
.. //depot/projects/netperf_socket/sys/conf/kmod.mk#10 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_quirks#1 branch
.. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_bus.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_i8251.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_ns8250.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_sab82532.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_z8530.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#14 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#14 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_slice.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/tty.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#16 integrate
.. //depot/projects/netperf_socket/sys/net/if_vlan.c#8 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#8 integrate
.. //depot/projects/netperf_socket/sys/sys/serial.h#1 branch
.. //depot/projects/netperf_socket/sys/sys/ttycom.h#6 integrate
.. //depot/projects/netperf_socket/sys/tools/acpi_quirks2h.awk#1 branch
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extattr.c#3 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_map.c#9 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/boot/forth/loader.conf#7 (text+ko) ====
@@ -6,7 +6,7 @@
#
# All arguments must be in double quotes.
#
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.80 2004/06/24 17:49:18 josef Exp $
##############################################################
### Basic configuration options ############################
@@ -278,7 +278,6 @@
snd_via8233_load="NO" # via8233
snd_via82c686_load="NO" # via82c686
snd_driver_load="NO" # All sound drivers
-#pcm0.line="0" # Default value for a mixer channel
##############################################################
### USB modules ############################################
==== //depot/projects/netperf_socket/sys/conf/files#30 (text+ko) ====
@@ -1,9 +1,14 @@
-# $FreeBSD: src/sys/conf/files,v 1.908 2004/06/23 21:04:36 ps Exp $
+# $FreeBSD: src/sys/conf/files,v 1.909 2004/06/24 06:29:22 njl Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
# dependency lines other than the first are silently ignored.
#
+acpi_quirks.h standard \
+ dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+ no-obj no-implicit-rule \
+ clean "acpi_quirks.h"
aicasm optional ahc \
dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
==== //depot/projects/netperf_socket/sys/conf/kmod.mk#10 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.161 2004/06/13 17:29:06 mlaier Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $
#
# The include file <bsd.kmod.mk> handles installing Kernel Loadable Device
# drivers (KLD's).
@@ -343,6 +343,17 @@
.endif
.endfor # _i
+.if ${SRCS:Macpi_quirks.h} != ""
+CLEANFILES+= acpi_quirks.h
+.if !exists(@)
+acpi_quirks.h: @
+.endif
+.if exists(@)
+acpi_quirks.h: @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks
+.endif
+ ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks
+.endif
+
regress:
lint: ${SRCS}
==== //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.12 2004/05/30 20:08:33 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.13 2004/06/24 18:21:28 ambrisko Exp $");
/*
* Support for the SMBus controller logical device which is part of the
@@ -73,6 +73,7 @@
#define ID_82801CA 0x24838086
#define ID_82801DC 0x24C38086
#define ID_82801EB 0x24D38086
+#define ID_6300ESB 0x25a48086
#define PCIS_SERIALBUS_SMBUS_PROGIF 0x00
@@ -137,6 +138,9 @@
case ID_82801EB:
device_set_desc(dev, "Intel 82801EB (ICH5) SMBus controller");
break;
+ case ID_6300ESB:
+ device_set_desc(dev, "Intel 6300ESB (ICH) SMBus controller");
+ break;
default:
if (pci_get_class(dev) == PCIC_SERIALBUS
&& pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS
@@ -167,6 +171,9 @@
sc->io_rid = ICH_SMB_BASE;
sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT,
&sc->io_rid, 0, ~0, 16, RF_ACTIVE);
+ if (sc->io_res == NULL)
+ sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT,
+ &sc->io_rid, 0, ~0, 32, RF_ACTIVE);
if (sc->io_res == NULL) {
log(LOG_ERR, "%s: can't map I/O\n", device_get_nameunit(dev));
error = ENXIO;
==== //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#5 (text+ko) ====
@@ -25,11 +25,10 @@
*/
#include <dev/sound/pcm/sound.h>
-#include <sys/kernel.h>
#include "mixer_if.h"
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.38 2004/06/20 15:38:11 josef Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.39 2004/06/24 17:41:20 josef Exp $");
MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
@@ -190,7 +189,6 @@
{
struct snddev_info *snddev;
struct snd_mixer *m;
- char devname[20];
u_int16_t v;
struct cdev *pdev;
int i, unit, val;
@@ -206,13 +204,14 @@
goto bad;
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
- snprintf(devname, sizeof(devname), "%s.%s", device_get_nameunit(dev), snd_mixernames[i]);
- TUNABLE_INT_FETCH(devname, &val);
-
- if (val >= 0 && val <= 100)
- v = (u_int16_t) val;
- else
+ if (resource_int_value(device_get_name(dev),
+ device_get_unit(dev), snd_mixernames[i], &val) == 0) {
+ if (val >= 0 && val <= 100) {
+ v = (u_int16_t) val;
+ }
+ } else {
v = snd_mixerdefaults[i];
+ }
mixer_set(m, i, v | (v << 8));
}
==== //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/twa/twa_freebsd.c,v 1.6 2004/06/16 09:47:00 phk Exp $
+ * $FreeBSD: src/sys/dev/twa/twa_freebsd.c,v 1.7 2004/06/24 18:30:08 scottl Exp $
*/
/*
@@ -584,7 +584,7 @@
TWA_ALIGNMENT, /* alignment */
0, /* boundary */
BUS_SPACE_MAXADDR, /* lowaddr */
- BUS_SPACE_MAXADDR + 1, /* highaddr */
+ BUS_SPACE_MAXADDR, /* highaddr */
NULL, NULL, /* filter, filterarg */
TWA_Q_LENGTH *
(sizeof(struct twa_command_packet)),/* maxsize */
==== //depot/projects/netperf_socket/sys/dev/uart/uart_bus.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.5 2004/06/16 09:47:00 phk Exp $
+ * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.6 2004/06/24 10:07:28 phk Exp $
*/
#ifndef _DEV_UART_BUS_H_
@@ -33,6 +33,7 @@
#include "opt_uart.h"
#endif
+#include <sys/serial.h>
#include <sys/timepps.h>
/* Drain and flush targets. */
@@ -45,7 +46,7 @@
* Interrupt sources (in priority order). See also uart_core.c
* Note that the low order 16 bits are used to pass modem signals
* from the hardware interrupt handler to the software interrupt
- * handler. See UART_SIG_* and UART_SIGMASK_* below.
+ * handler.
*/
#define UART_IPEND_OVERRUN 0x010000
#define UART_IPEND_BREAK 0x020000
@@ -62,31 +63,17 @@
#define UART_STAT_OVERRUN 0x0400
#define UART_STAT_PARERR 0x0800
-/* Modem and line signals. */
-#define UART_SIG_DTR 0x0001
-#define UART_SIG_RTS 0x0002
-#define UART_SIG_DSR 0x0004
-#define UART_SIG_CTS 0x0008
-#define UART_SIG_DCD 0x0010
-#define UART_SIG_RI 0x0020
-#define UART_SIG_DDTR 0x0100
-#define UART_SIG_DRTS 0x0200
-#define UART_SIG_DDSR 0x0400
-#define UART_SIG_DCTS 0x0800
-#define UART_SIG_DDCD 0x1000
-#define UART_SIG_DRI 0x2000
-
-#define UART_SIGMASK_DTE 0x0003
-#define UART_SIGMASK_DCE 0x003c
-#define UART_SIGMASK_STATE 0x003f
-#define UART_SIGMASK_DELTA 0x3f00
+#define UART_SIGMASK_DTE (SER_DTR | SER_RTS)
+#define UART_SIGMASK_DCE (SER_DSR | SER_CTS | SER_DCD | SER_RI)
+#define UART_SIGMASK_STATE (UART_SIGMASK_DTE | UART_SIGMASK_DCE)
+#define UART_SIGMASK_DELTA (UART_SIGMASK_STATE << 8)
#ifdef UART_PPS_ON_CTS
-#define UART_SIG_DPPS UART_SIG_DCTS
-#define UART_SIG_PPS UART_SIG_CTS
+#define UART_SIG_DPPS SER_DCTS
+#define UART_SIG_PPS SER_CTS
#else
-#define UART_SIG_DPPS UART_SIG_DDCD
-#define UART_SIG_PPS UART_SIG_DCD
+#define UART_SIG_DPPS SER_DDCD
+#define UART_SIG_PPS SER_DCD
#endif
/* UART_IOCTL() requests */
==== //depot/projects/netperf_socket/sys/dev/uart/uart_dev_i8251.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_i8251.c,v 1.3 2003/09/17 03:11:32 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_i8251.c,v 1.4 2004/06/24 10:07:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -398,9 +398,9 @@
i8251_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER);
if (i8251->mcr & MCR_DTR)
- sc->sc_hwsig |= UART_SIG_DTR;
+ sc->sc_hwsig |= SER_DTR;
if (i8251->mcr & MCR_RTS)
- sc->sc_hwsig |= UART_SIG_RTS;
+ sc->sc_hwsig |= SER_RTS;
i8251_bus_getsig(sc);
i8251_clrint(bas);
@@ -454,10 +454,10 @@
mtx_lock_spin(&sc->sc_hwmtx);
msr = uart_getreg(&sc->sc_bas, REG_MSR);
mtx_unlock_spin(&sc->sc_hwmtx);
- SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR);
- SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS);
- SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD);
- SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI);
+ SIGCHG(msr & MSR_DSR, sig, SER_DSR, SER_DDSR);
+ SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS);
+ SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD);
+ SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI);
new = sig & ~UART_SIGMASK_DELTA;
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
return (sig);
@@ -715,20 +715,20 @@
do {
old = sc->sc_hwsig;
new = old;
- if (sig & UART_SIG_DDTR) {
- SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR,
- UART_SIG_DDTR);
+ if (sig & SER_DDTR) {
+ SIGCHG(sig & SER_DTR, new, SER_DTR,
+ SER_DDTR);
}
- if (sig & UART_SIG_DRTS) {
- SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS,
- UART_SIG_DRTS);
+ if (sig & SER_DRTS) {
+ SIGCHG(sig & SER_RTS, new, SER_RTS,
+ SER_DRTS);
}
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
mtx_lock_spin(&sc->sc_hwmtx);
i8251->mcr &= ~(MCR_DTR|MCR_RTS);
- if (new & UART_SIG_DTR)
+ if (new & SER_DTR)
i8251->mcr |= MCR_DTR;
- if (new & UART_SIG_RTS)
+ if (new & SER_RTS)
i8251->mcr |= MCR_RTS;
uart_setreg(bas, REG_MCR, i8251->mcr);
uart_barrier(bas);
==== //depot/projects/netperf_socket/sys/dev/uart/uart_dev_ns8250.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.7 2004/05/26 21:59:01 tmm Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.8 2004/06/24 10:07:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -399,9 +399,9 @@
ns8250_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER);
if (ns8250->mcr & MCR_DTR)
- sc->sc_hwsig |= UART_SIG_DTR;
+ sc->sc_hwsig |= SER_DTR;
if (ns8250->mcr & MCR_RTS)
- sc->sc_hwsig |= UART_SIG_RTS;
+ sc->sc_hwsig |= SER_RTS;
ns8250_bus_getsig(sc);
ns8250_clrint(bas);
@@ -455,10 +455,10 @@
mtx_lock_spin(&sc->sc_hwmtx);
msr = uart_getreg(&sc->sc_bas, REG_MSR);
mtx_unlock_spin(&sc->sc_hwmtx);
- SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR);
- SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS);
- SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD);
- SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI);
+ SIGCHG(msr & MSR_DSR, sig, SER_DSR, SER_DDSR);
+ SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS);
+ SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD);
+ SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI);
new = sig & ~UART_SIGMASK_DELTA;
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
return (sig);
@@ -753,20 +753,20 @@
do {
old = sc->sc_hwsig;
new = old;
- if (sig & UART_SIG_DDTR) {
- SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR,
- UART_SIG_DDTR);
+ if (sig & SER_DDTR) {
+ SIGCHG(sig & SER_DTR, new, SER_DTR,
+ SER_DDTR);
}
- if (sig & UART_SIG_DRTS) {
- SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS,
- UART_SIG_DRTS);
+ if (sig & SER_DRTS) {
+ SIGCHG(sig & SER_RTS, new, SER_RTS,
+ SER_DRTS);
}
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
mtx_lock_spin(&sc->sc_hwmtx);
ns8250->mcr &= ~(MCR_DTR|MCR_RTS);
- if (new & UART_SIG_DTR)
+ if (new & SER_DTR)
ns8250->mcr |= MCR_DTR;
- if (new & UART_SIG_RTS)
+ if (new & SER_RTS)
ns8250->mcr |= MCR_RTS;
uart_setreg(bas, REG_MCR, ns8250->mcr);
uart_barrier(bas);
==== //depot/projects/netperf_socket/sys/dev/uart/uart_dev_sab82532.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.6 2004/04/25 04:30:40 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.7 2004/06/24 10:07:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -410,7 +410,7 @@
uart_barrier(bas);
if (sc->sc_sysdev == NULL)
- sab82532_bus_setsig(sc, UART_SIG_DDTR|UART_SIG_DRTS);
+ sab82532_bus_setsig(sc, SER_DDTR|SER_DRTS);
(void)sab82532_bus_getsig(sc);
return (0);
}
@@ -455,9 +455,9 @@
sig = old;
mtx_lock_spin(&sc->sc_hwmtx);
star = uart_getreg(bas, SAB_STAR);
- SIGCHG(star & SAB_STAR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS);
+ SIGCHG(star & SAB_STAR_CTS, sig, SER_CTS, SER_DCTS);
vstr = uart_getreg(bas, SAB_VSTR);
- SIGCHG(vstr & SAB_VSTR_CD, sig, UART_SIG_DCD, UART_SIG_DDCD);
+ SIGCHG(vstr & SAB_VSTR_CD, sig, SER_DCD, SER_DDCD);
pvr = uart_getreg(bas, SAB_PVR);
switch (bas->chan) {
case 1:
@@ -467,7 +467,7 @@
pvr &= SAB_PVR_DSR_B;
break;
}
- SIGCHG(~pvr, sig, UART_SIG_DSR, UART_SIG_DDSR);
+ SIGCHG(~pvr, sig, SER_DSR, SER_DDSR);
mtx_unlock_spin(&sc->sc_hwmtx);
new = sig & ~UART_SIGMASK_DELTA;
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
@@ -655,13 +655,13 @@
do {
old = sc->sc_hwsig;
new = old;
- if (sig & UART_SIG_DDTR) {
- SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR,
- UART_SIG_DDTR);
+ if (sig & SER_DDTR) {
+ SIGCHG(sig & SER_DTR, new, SER_DTR,
+ SER_DDTR);
}
- if (sig & UART_SIG_DRTS) {
- SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS,
- UART_SIG_DRTS);
+ if (sig & SER_DRTS) {
+ SIGCHG(sig & SER_RTS, new, SER_RTS,
+ SER_DRTS);
}
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
@@ -670,13 +670,13 @@
pvr = uart_getreg(bas, SAB_PVR);
switch (bas->chan) {
case 1:
- if (new & UART_SIG_DTR)
+ if (new & SER_DTR)
pvr &= ~SAB_PVR_DTR_A;
else
pvr |= SAB_PVR_DTR_A;
break;
case 2:
- if (new & UART_SIG_DTR)
+ if (new & SER_DTR)
pvr &= ~SAB_PVR_DTR_B;
else
pvr |= SAB_PVR_DTR_B;
@@ -686,7 +686,7 @@
/* Set RTS pin. */
mode = uart_getreg(bas, SAB_MODE);
- if (new & UART_SIG_RTS)
+ if (new & SER_RTS)
mode &= ~SAB_MODE_FRTS;
else
mode |= SAB_MODE_FRTS;
==== //depot/projects/netperf_socket/sys/dev/uart/uart_dev_z8530.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.7 2004/05/04 06:58:10 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.8 2004/06/24 10:07:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -350,8 +350,8 @@
mtx_lock_spin(&sc->sc_hwmtx);
bes = uart_getmreg(&sc->sc_bas, RR_BES);
mtx_unlock_spin(&sc->sc_hwmtx);
- SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS);
- SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD);
+ SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS);
+ SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD);
new = sig & ~UART_SIGMASK_DELTA;
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
return (sig);
@@ -411,8 +411,8 @@
if (bes & BES_RXA)
ipend |= UART_IPEND_RXREADY;
sig = sc->sc_hwsig;
- SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS);
- SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD);
+ SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS);
+ SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD);
if (sig & UART_SIGMASK_DELTA)
ipend |= UART_IPEND_SIGCHG;
src = uart_getmreg(bas, RR_SRC);
@@ -509,22 +509,22 @@
do {
old = sc->sc_hwsig;
new = old;
- if (sig & UART_SIG_DDTR) {
- SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR,
- UART_SIG_DDTR);
+ if (sig & SER_DDTR) {
+ SIGCHG(sig & SER_DTR, new, SER_DTR,
+ SER_DDTR);
}
- if (sig & UART_SIG_DRTS) {
- SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS,
- UART_SIG_DRTS);
+ if (sig & SER_DRTS) {
+ SIGCHG(sig & SER_RTS, new, SER_RTS,
+ SER_DRTS);
}
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
mtx_lock_spin(&sc->sc_hwmtx);
- if (new & UART_SIG_DTR)
+ if (new & SER_DTR)
z8530->tpc |= TPC_DTR;
else
z8530->tpc &= ~TPC_DTR;
- if (new & UART_SIG_RTS)
+ if (new & SER_RTS)
z8530->tpc |= TPC_RTS;
else
z8530->tpc &= ~TPC_RTS;
==== //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.12 2004/06/23 10:28:09 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.13 2004/06/24 10:07:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,11 +164,11 @@
*/
if ((tp->t_cflag & CRTS_IFLOW) && !sc->sc_hwiflow) {
if ((tp->t_state & TS_TBLOCK) &&
- (sc->sc_hwsig & UART_SIG_RTS))
- UART_SETSIG(sc, UART_SIG_DRTS);
+ (sc->sc_hwsig & SER_RTS))
+ UART_SETSIG(sc, SER_DRTS);
else if (!(tp->t_state & TS_TBLOCK) &&
- !(sc->sc_hwsig & UART_SIG_RTS))
- UART_SETSIG(sc, UART_SIG_DRTS|UART_SIG_RTS);
+ !(sc->sc_hwsig & SER_RTS))
+ UART_SETSIG(sc, SER_DRTS|SER_RTS);
}
if (tp->t_state & TS_TTSTOP)
@@ -207,7 +207,7 @@
t->c_cflag &= ~HUPCL;
}
if (t->c_ospeed == 0) {
- UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS);
+ UART_SETSIG(sc, SER_DDTR | SER_DRTS);
return (0);
}
switch (t->c_cflag & CSIZE) {
@@ -224,13 +224,13 @@
parity = UART_PARITY_NONE;
if (UART_PARAM(sc, t->c_ospeed, databits, stopbits, parity) != 0)
return (EINVAL);
- UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DTR);
+ UART_SETSIG(sc, SER_DDTR | SER_DTR);
/* Set input flow control state. */
if (!sc->sc_hwiflow) {
if ((t->c_cflag & CRTS_IFLOW) && (tp->t_state & TS_TBLOCK))
- UART_SETSIG(sc, UART_SIG_DRTS);
+ UART_SETSIG(sc, SER_DRTS);
else
- UART_SETSIG(sc, UART_SIG_DRTS | UART_SIG_RTS);
+ UART_SETSIG(sc, SER_DRTS | SER_RTS);
} else
UART_IOCTL(sc, UART_IOCTL_IFLOW, (t->c_cflag & CRTS_IFLOW));
/* Set output flow control state. */
@@ -297,11 +297,11 @@
if (pend & UART_IPEND_SIGCHG) {
sig = pend & UART_IPEND_SIGMASK;
- if (sig & UART_SIG_DDCD)
- ttyld_modem(tp, sig & UART_SIG_DCD);
- if ((sig & UART_SIG_DCTS) && (tp->t_cflag & CCTS_OFLOW) &&
+ if (sig & SER_DDCD)
+ ttyld_modem(tp, sig & SER_DCD);
+ if ((sig & SER_DCTS) && (tp->t_cflag & CCTS_OFLOW) &&
!sc->sc_hwoflow) {
- if (sig & UART_SIG_CTS) {
+ if (sig & SER_CTS) {
tp->t_state &= ~TS_TTSTOP;
ttyld_start(tp);
} else
@@ -418,7 +418,7 @@
/*
* Handle initial DCD.
*/
- if ((sc->sc_hwsig & UART_SIG_DCD) || sc->sc_callout)
+ if ((sc->sc_hwsig & SER_DCD) || sc->sc_callout)
ttyld_modem(tp, 1);
}
/*
@@ -464,7 +464,7 @@
if (sc->sc_hwoflow)
UART_IOCTL(sc, UART_IOCTL_OFLOW, 0);
if (sc->sc_sysdev == NULL)
- UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS);
+ UART_SETSIG(sc, SER_DDTR | SER_DRTS);
/* Disable pulse capturing. */
sc->sc_pps.ppsparam.mode = 0;
@@ -504,52 +504,52 @@
UART_IOCTL(sc, UART_IOCTL_BREAK, 0);
break;
case TIOCSDTR:
- UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DTR);
+ UART_SETSIG(sc, SER_DDTR | SER_DTR);
break;
case TIOCCDTR:
- UART_SETSIG(sc, UART_SIG_DDTR);
+ UART_SETSIG(sc, SER_DDTR);
break;
case TIOCMSET:
bits = *(int*)data;
- sig = UART_SIG_DDTR | UART_SIG_DRTS;
+ sig = SER_DDTR | SER_DRTS;
if (bits & TIOCM_DTR)
- sig |= UART_SIG_DTR;
+ sig |= SER_DTR;
if (bits & TIOCM_RTS)
- sig |= UART_SIG_RTS;
+ sig |= SER_RTS;
UART_SETSIG(sc, sig);
break;
case TIOCMBIS:
bits = *(int*)data;
sig = 0;
if (bits & TIOCM_DTR)
- sig |= UART_SIG_DDTR | UART_SIG_DTR;
+ sig |= SER_DDTR | SER_DTR;
if (bits & TIOCM_RTS)
- sig |= UART_SIG_DRTS | UART_SIG_RTS;
+ sig |= SER_DRTS | SER_RTS;
UART_SETSIG(sc, sig);
break;
case TIOCMBIC:
bits = *(int*)data;
sig = 0;
if (bits & TIOCM_DTR)
- sig |= UART_SIG_DDTR;
+ sig |= SER_DDTR;
if (bits & TIOCM_RTS)
- sig |= UART_SIG_DRTS;
+ sig |= SER_DRTS;
UART_SETSIG(sc, sig);
break;
case TIOCMGET:
sig = sc->sc_hwsig;
bits = TIOCM_LE;
- if (sig & UART_SIG_DTR)
+ if (sig & SER_DTR)
bits |= TIOCM_DTR;
- if (sig & UART_SIG_RTS)
+ if (sig & SER_RTS)
bits |= TIOCM_RTS;
- if (sig & UART_SIG_DSR)
+ if (sig & SER_DSR)
bits |= TIOCM_DSR;
- if (sig & UART_SIG_CTS)
+ if (sig & SER_CTS)
bits |= TIOCM_CTS;
- if (sig & UART_SIG_DCD)
+ if (sig & SER_DCD)
bits |= TIOCM_CD;
- if (sig & (UART_SIG_DRI | UART_SIG_RI))
+ if (sig & (SER_DRI | SER_RI))
bits |= TIOCM_RI;
*(int*)data = bits;
break;
==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#14 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.183 2004/06/24 05:05:56 jb Exp $
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -363,6 +363,7 @@
vendor PLX 0x10b5 PLX
vendor ASANTE 0x10bd Asante
vendor JRC 0x1145 Japan Radio Company
+vendor DELORME 0x1163 Delorme Publishing
vendor ACERCM 0x1189 Acer Communications & Multimedia Inc.
vendor BELKIN2 0x1293 Belkin Components
vendor MOBILITY 0x1342 Mobility
@@ -601,6 +602,9 @@
/* Dell products */
product DELL BC02 0x8000 Dell BC02 Bluetooth USB Adapter
+/* Delorme Paublishing products */
+product DELORME EARTHMATE 0x0100 Earthmate GPS
+
/* Diamond products */
product DIAMOND RIO500USB 0x0001 Rio 500 USB
@@ -1078,6 +1082,7 @@
product PHILIPS PCA646VC 0x0303 PCA646VC PC Camera
product PHILIPS PCVC680K 0x0308 PCVC680K Vesta Pro PC Camera
product PHILIPS DSS150 0x0471 DSS 150 Digital Speaker System
+product PHILIPS UM10016 0x1552 ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit
product PHILIPS DIVAUSB 0x1801 DIVA USB mp3 player
/* Philips Semiconductor products */
==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#14 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.189 2004/06/19 22:17:34 sanpei Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.190 2004/06/24 05:25:04 jb Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.183 2004/06/24 05:05:56 jb Exp
*/
/*
@@ -370,6 +370,7 @@
#define USB_VENDOR_PLX 0x10b5 /* PLX */
#define USB_VENDOR_ASANTE 0x10bd /* Asante */
#define USB_VENDOR_JRC 0x1145 /* Japan Radio Company */
+#define USB_VENDOR_DELORME 0x1163 /* Delorme Publishing */
#define USB_VENDOR_ACERCM 0x1189 /* Acer Communications & Multimedia Inc. */
#define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components */
#define USB_VENDOR_MOBILITY 0x1342 /* Mobility */
@@ -608,6 +609,9 @@
/* Dell products */
#define USB_PRODUCT_DELL_BC02 0x8000 /* Dell BC02 Bluetooth USB Adapter */
+/* Delorme Paublishing products */
+#define USB_PRODUCT_DELORME_EARTHMATE 0x0100 /* Earthmate GPS */
+
/* Diamond products */
#define USB_PRODUCT_DIAMOND_RIO500USB 0x0001 /* Rio 500 USB */
@@ -1085,6 +1089,7 @@
#define USB_PRODUCT_PHILIPS_PCA646VC 0x0303 /* PCA646VC PC Camera */
#define USB_PRODUCT_PHILIPS_PCVC680K 0x0308 /* PCVC680K Vesta Pro PC Camera */
#define USB_PRODUCT_PHILIPS_DSS150 0x0471 /* DSS 150 Digital Speaker System */
+#define USB_PRODUCT_PHILIPS_UM10016 0x1552 /* ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit */
#define USB_PRODUCT_PHILIPS_DIVAUSB 0x1801 /* DIVA USB mp3 player */
/* Philips Semiconductor products */
==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#14 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.189 2004/06/19 22:17:34 sanpei Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.190 2004/06/24 05:25:04 jb Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.183 2004/06/24 05:05:56 jb Exp
*/
/*
@@ -802,6 +802,12 @@
"Dell BC02 Bluetooth USB Adapter",
},
{
+ USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE,
+ 0,
+ "Delorme Publishing",
+ "Earthmate GPS",
+ },
+ {
USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
0,
"Diamond",
@@ -2596,6 +2602,12 @@
"DSS 150 Digital Speaker System",
},
{
+ USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_UM10016,
+ 0,
+ "Philips",
+ "ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit",
+ },
+ {
USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DIVAUSB,
0,
"Philips",
@@ -5218,6 +5230,12 @@
NULL,
},
{
+ USB_VENDOR_DELORME, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Delorme Publishing",
+ NULL,
+ },
+ {
USB_VENDOR_ACERCM, 0,
USB_KNOWNDEV_NOPROD,
"Acer Communications & Multimedia Inc.",
==== //depot/projects/netperf_socket/sys/geom/geom_slice.c#3 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.51 2004/02/12 22:42:11 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.52 2004/06/24 10:50:20 pjd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,10 @@
struct g_slicer *gsp;
gsp = g_malloc(sizeof *gsp, M_WAITOK | M_ZERO);
- gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO);
+ if (scsize > 0)
+ gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO);
+ else
+ gsp->softc = NULL;
gsp->slices = g_malloc(nslice * sizeof(struct g_slice),
M_WAITOK | M_ZERO);
gsp->nslice = nslice;
@@ -468,7 +471,8 @@
g_wither_geom(gp, ENXIO);
return (NULL);
}
- *vp = gsp->softc;
+ if (extrap != NULL)
+ *vp = gsp->softc;
*cpp = cp;
return (gp);
}
==== //depot/projects/netperf_socket/sys/kern/tty.c#10 (text+ko) ====
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.220 2004/06/21 22:57:15 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.222 2004/06/24 10:32:30 phk Exp $");
#include "opt_compat.h"
#include "opt_tty.h"
@@ -97,6 +97,7 @@
#include <sys/poll.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
+#include <sys/serial.h>
#include <sys/signalvar.h>
#include <sys/resourcevar.h>
#include <sys/malloc.h>
@@ -2858,3 +2859,20 @@
tp->t_state &= ~TS_CAN_BYPASS_L_RINT;
return (linesw[tp->t_line]->l_hotchar);
}
+
+
+/*
+ * Record the relationship between the serial ports notion of modem control
+ * signals and the one used in certain ioctls in a way the compiler can enforce
+ * XXX: We should define TIOCM_* in terms of SER_ if we can limit the
+ * XXX: consequences of the #include work that would take.
+ */
+CTASSERT(SER_DTR == TIOCM_DTR / 2);
+CTASSERT(SER_RTS == TIOCM_RTS / 2);
+CTASSERT(SER_STX == TIOCM_ST / 2);
+CTASSERT(SER_SRX == TIOCM_SR / 2);
+CTASSERT(SER_CTS == TIOCM_CTS / 2);
+CTASSERT(SER_DCD == TIOCM_DCD / 2);
+CTASSERT(SER_RI == TIOCM_RI / 2);
+CTASSERT(SER_DSR == TIOCM_DSR / 2);
+
==== //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#12 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.352 2004/06/22 04:34:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.354 2004/06/24 17:22:29 rwatson Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -4398,15 +4398,6 @@
size_t size, *sizep;
int error;
- /*
- * XXX: Temporary API compatibility for applications that know
- * about this hack ("" means list), but haven't been updated
- * for the extattr_list_*() system calls yet. This will go
- * away for FreeBSD 5.3.
- */
- if (strlen(attrname) == 0)
- return (extattr_list_vp(vp, attrnamespace, data, nbytes, td));
-
VOP_LEASE(vp, td, td->td_ucred, LEASE_READ);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
@@ -4433,9 +4424,8 @@
auio.uio_td = td;
auiop = &auio;
cnt = nbytes;
- } else {
+ } else
sizep = &size;
- }
#ifdef MAC
error = mac_check_vnode_getextattr(td->td_ucred, vp, attrnamespace,
@@ -4450,9 +4440,8 @@
if (auiop != NULL) {
cnt -= auio.uio_resid;
td->td_retval[0] = cnt;
- } else {
+ } else
td->td_retval[0] = size;
- }
done:
VOP_UNLOCK(vp, 0, td);
@@ -4721,9 +4710,8 @@
auio.uio_td = td;
auiop = &auio;
cnt = nbytes;
- } else {
+ } else
sizep = &size;
- }
#ifdef MAC
error = mac_check_vnode_listextattr(td->td_ucred, vp, attrnamespace);
@@ -4737,9 +4725,8 @@
if (auiop != NULL) {
cnt -= auio.uio_resid;
td->td_retval[0] = cnt;
- } else {
+ } else
>>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406250441.i5P4fXa8003340>