From owner-p4-projects@FreeBSD.ORG Sat Mar 20 01:00:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 402BE16A4D0; Sat, 20 Mar 2004 01:00:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19FE616A4CE for ; Sat, 20 Mar 2004 01:00:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1238543D1D for ; Sat, 20 Mar 2004 01:00:39 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K90cGe052898 for ; Sat, 20 Mar 2004 01:00:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K90c22052895 for perforce@freebsd.org; Sat, 20 Mar 2004 01:00:38 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 20 Mar 2004 01:00:38 -0800 (PST) Message-Id: <200403200900.i2K90c22052895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 49357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 09:00:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=49357 Change 49357 by marcel@marcel_nfs on 2004/03/20 00:59:41 IFC @49353 Affected files ... .. //depot/projects/gdb/etc/rc.d/devfs#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 integrate .. //depot/projects/gdb/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/gdb/sys/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/gdb/sys/ia64/include/reg.h#2 integrate Differences ... ==== //depot/projects/gdb/etc/rc.d/devfs#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.7 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.8 2004/03/20 07:10:16 green Exp $ # # PROVIDE: devfs @@ -16,10 +16,23 @@ devfs_start() { - if [ -n "$devfs_system_ruleset" ]; then + if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ]; then devfs_init_rulesets - devfs_set_ruleset $devfs_system_ruleset /dev - devfs_apply_ruleset $devfs_system_ruleset /dev + if [ -n "$devfs_system_ruleset" ]; then + devfs_set_ruleset $devfs_system_ruleset /dev + devfs_apply_ruleset $devfs_system_ruleset /dev + fi + if [ -n "$devfs_set_rulesets" ]; then + local _dir_set + local _dir + local _set + for _dir_set in $devfs_set_rulesets; do + _dir=${_dir_set%=*} + _set=${_dir_set#*=} + devfs_set_ruleset $_set $_dir + devfs_apply_ruleset $_set $_dir + done + fi fi read_devfs_conf } ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.700 2004/03/18 17:51:55 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.703 2004/03/20 07:17:12 hrs Exp $ 2000 @@ -191,6 +191,12 @@ This is currently non-functional, and would require some amount of work to make it work under the &man.geom.4; API in 5-CURRENT. + For the &man.uart.4; device + hw.uart.console and + hw.uart.dbgport environment variables + have been added. They can be used to select a serial console and + debug port respectively, as well as the attributes. + The &man.ubser.4; device driver has been added to support BWCT console management serial adapters. @@ -321,6 +327,9 @@ support for USB Ethernet adapters based on the Davicom DM9601 chipset. + The hardware TX checksum support of the &man.xl.4; driver + has been disabled as it does not work correctly and slows down + the transmission rate. &merged; @@ -376,6 +385,9 @@ work better, and some problems with timeouts should be resolved. + The &man.ips.4; driver now supports the recent + Adaptec ServeRAID series SCSI controller cards. + The &man.umass.4; driver now supports the missing ATAPI MMC commands and handles the timeout properly. ==== //depot/projects/gdb/sys/dev/sound/pci/vibes.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.15 2004/03/06 15:52:42 matk Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.16 2004/03/20 04:38:21 marcel Exp $"); /* ------------------------------------------------------------------------- */ /* Constants */ @@ -547,6 +547,7 @@ } } DEB(printf("sv_mix_setrecsrc: mask 0x%08x adc_input 0x%02x\n", mask, v)); + sv_indirect_set(sc, SV_REG_ADC_INPUT, v); return mask; } ==== //depot/projects/gdb/sys/dev/uart/uart_subr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.1 2004/03/20 02:14:02 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_subr.c,v 1.2 2004/03/20 08:38:33 marcel Exp $"); #include #include @@ -177,6 +177,8 @@ else if (devtype == UART_DEV_DBGPORT) spec = getenv("hw.uart.dbgport"); else + spec = NULL; + if (spec == NULL) return (ENXIO); /* Set defaults. */ ==== //depot/projects/gdb/sys/dev/usb/usb_subr.c#4 (text+ko) ==== @@ -7,7 +7,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.61 2004/03/19 08:19:52 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.62 2004/03/20 07:31:11 julian Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1124,14 +1124,14 @@ DPRINTF(("usbd_new_device: new dev (addr %d), dev=%p, parent=%p\n", addr, dev, parent)); - usbd_add_dev_event(USB_EVENT_DEVICE_ATTACH, dev); - err = usbd_probe_and_attach(parent, dev, port, addr); if (err) { usbd_remove_device(dev, up); return (err); } + usbd_add_dev_event(USB_EVENT_DEVICE_ATTACH, dev); + return (USBD_NORMAL_COMPLETION); } ==== //depot/projects/gdb/sys/ia64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,2 @@ -# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.6 2003/11/08 23:19:13 marcel Exp $ -hint.uart.0.baud="115200" -hint.uart.0.flags="0x10" -hint.uart.0.port="0x3f8" +# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.7 2004/03/20 04:23:03 marcel Exp $ +hw.uart.console="io:0x3f8,br:115200" ==== //depot/projects/gdb/sys/ia64/include/reg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/reg.h,v 1.12 2003/05/16 21:26:41 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/reg.h,v 1.13 2004/03/20 05:27:14 marcel Exp $ */ #ifndef _MACHINE_REG_H_ @@ -44,8 +44,8 @@ }; struct dbreg { - uint64_t dbr_data[8]; - uint64_t dbr_inst[8]; + unsigned long dbr_data[8]; + unsigned long dbr_inst[8]; }; #ifdef _KERNEL