Date: Wed, 12 Feb 2003 10:19:02 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 25053 for review Message-ID: <200302121819.h1CIJ2X3006890@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=25053 Change 25053 by peter@peter_daintree on 2003/02/12 10:18:33 IFC @25052 (symmetric number) Affected files ... .. //depot/projects/ia64/etc/rc.d/devd#5 integrate .. //depot/projects/ia64/etc/rc.d/network1#9 integrate .. //depot/projects/ia64/etc/rc.d/pccard#4 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#24 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#19 integrate .. //depot/projects/ia64/lib/libc/gen/signbit.3#1 branch .. //depot/projects/ia64/lib/libc/gen/signbit.c#1 branch .. //depot/projects/ia64/lib/msun/src/math.h#10 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#20 integrate .. //depot/projects/ia64/share/man/man4/firewire.4#5 integrate .. //depot/projects/ia64/share/man/man4/fwe.4#3 integrate .. //depot/projects/ia64/share/man/man4/fwohci.4#4 integrate .. //depot/projects/ia64/share/man/man4/sbp.4#5 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#30 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#32 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#14 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#11 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#16 integrate .. //depot/projects/ia64/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#26 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#25 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#25 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#26 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_int.h#8 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#18 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#14 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#34 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#9 integrate .. //depot/projects/ia64/sys/net/bridge.c#17 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#26 integrate .. //depot/projects/ia64/sys/sys/bio.h#15 integrate .. //depot/projects/ia64/sys/sys/rman.h#4 integrate .. //depot/projects/ia64/tools/tools/tinderbox/Makefile#1 branch .. //depot/projects/ia64/tools/tools/tinderbox/tinderbox.pl#1 branch .. //depot/projects/ia64/tools/tools/whereintheworld/whereintheworld.pl#3 integrate Differences ... ==== //depot/projects/ia64/etc/rc.d/devd#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devd,v 1.4 2003/01/16 02:27:52 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devd,v 1.5 2003/02/12 04:22:40 imp Exp $ # # PROVIDE: devd -# REQUIRE: rcconf -# BEFORE: disks +# REQUIRE: NETWORKING +# BEFORE: mountcritremote # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/network1#9 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -x # -# $FreeBSD: src/etc/rc.d/network1,v 1.144 2002/12/13 23:36:31 imp Exp $ +# $FreeBSD: src/etc/rc.d/network1,v 1.145 2003/02/12 04:26:10 imp Exp $ # # PROVIDE: network1 @@ -146,12 +146,6 @@ dhcp_interfaces="" for ifn in ${network_interfaces}; do - _up=`ifconfig ${ifn} | head -1 | grep -v LOOPBACK | grep UP,` - if [ "$_up" != "" ]; then - # Interface is already up, so ignore it. - continue; - fi - if [ -r /etc/start_if.${ifn} ]; then . /etc/start_if.${ifn} eval showstat_$ifn=1 ==== //depot/projects/ia64/etc/rc.d/pccard#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/pccard,v 1.27 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/pccard,v 1.28 2003/02/12 04:12:23 imp Exp $ # # PROVIDE: pccard @@ -39,6 +39,9 @@ pccard_start() { + if [ ! -c /dev/card0 ]; then + exit 0 + fi if checkyesno pccard_enable; then echo -n 'Setup PC-CARD:' ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#24 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.103 2003/02/10 17:34:32 mike Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.104 2003/02/11 21:38:02 wes Exp $ % -- Gifts for Children -- @@ -5599,6 +5599,10 @@ -- Robert Watson February 2003, FreeBSD-CVS Mailing List % +FreeBSD: putting the horse before the cart since 1992. + + -- Warner Losh +% Fresco's Discovery: If you knew what you were doing you'd probably be bored. % ==== //depot/projects/ia64/lib/libc/gen/Makefile.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.101 2003/02/08 20:37:50 mike Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.102 2003/02/11 21:56:20 mike Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -24,7 +24,7 @@ scandir.c seed48.c seekdir.c semctl.c \ setdomainname.c sethostname.c setjmperr.c setmode.c \ setproctitle.c setprogname.c \ - siginterrupt.c siglist.c signal.c \ + siginterrupt.c siglist.c signal.c signbit.c \ sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \ sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \ @@ -53,7 +53,8 @@ nice.3 nlist.3 pause.3 popen.3 pselect.3 psignal.3 pwcache.3 \ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ - siginterrupt.3 signal.3 sigsetops.3 sleep.3 statvfs.3 stringlist.3 \ + siginterrupt.3 signal.3 signbit.3 sigsetops.3 sleep.3 \ + statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \ ==== //depot/projects/ia64/lib/msun/src/math.h#10 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.21 2003/02/08 20:37:54 mike Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.22 2003/02/11 21:56:21 mike Exp $ */ #ifndef _MATH_H_ @@ -50,6 +50,7 @@ ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) \ : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \ : __fpclassifyl(x)) +#define signbit(x) __signbit(x) typedef __double_t double_t; typedef __float_t float_t; @@ -147,6 +148,7 @@ int __fpclassifyd(double); int __fpclassifyf(float); int __fpclassifyl(long double); +int __signbit(double); double acos(double); double asin(double); ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#20 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.55 2003/01/23 22:28:53 wilko Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.56 2003/02/12 08:25:30 wilko Exp $ --> <sect1 id="support-proc"> <sect1info> @@ -818,7 +818,8 @@ <para>Not all VGA cards will work behind the PCI-PCI bridge. This manifests itself as no video at all. Workaround is to put the VGA card <quote>before</quote> the bridge, in - one of the 64 bit PCI slots.</para> + one of the 64 bit PCI slots. Graphics performance using a + 64 bit slot is generally substantially better.</para> <para>Both MX5 and MiataGL have an on-board sound chip, an ESS1888. It emulates a SoundBlaster and can be enabled by ==== //depot/projects/ia64/share/man/man4/firewire.4#5 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/firewire.4,v 1.4 2003/02/05 06:41:19 simokawa Exp $ +.\" $FreeBSD: src/share/man/man4/firewire.4,v 1.5 2003/02/12 06:48:45 simokawa Exp $ .\" .Dd May 23, 2002 .Dt FIREWIRE 4 @@ -38,6 +38,10 @@ .Nm firewire .Nd IEEE1394 High-performance Serial Bus .Sh SYNOPSIS +.Cd "kldload firewire" +.Pp +or +.Pp .Cd "device firewire" .Cd "device fwohci" .Pp @@ -82,6 +86,7 @@ .Xr fwcontrol 8 , .Xr fwe 4 , .Xr fwohci 4 , +.Xr kldload 8 , .Xr pci 4 , .Xr sbp 4 , .Xr sysctl 8 @@ -101,3 +106,6 @@ for the .Fx project. +.Pp +.Sh BUGS +See fwohci(4) for security note. ==== //depot/projects/ia64/share/man/man4/fwe.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/fwe.4,v 1.2 2002/12/10 14:21:55 ru Exp $ +.\" $FreeBSD: src/share/man/man4/fwe.4,v 1.3 2003/02/12 06:48:45 simokawa Exp $ .\" .\" .Dd November 8, 2002 @@ -32,6 +32,11 @@ .Nm fwe .Nd Ethernet emulation driver for FireWire .Sh SYNOPSIS +.Cd "kldload firewire" +.Cd "kldload if_fwe" +.Pp +or +.Pp .Cd "device fwe" .Cd "device firewire" .Cd "device fwohci" @@ -69,6 +74,7 @@ .Xr arp 4 , .Xr firewire 4 , .Xr fwohci 4 , +.Xr kldload 8 , .Xr netintro 4 , .Xr ng_ether 4 , .Xr polling 4 , ==== //depot/projects/ia64/share/man/man4/fwohci.4#4 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/fwohci.4,v 1.3 2003/01/25 15:24:59 simokawa Exp $ +.\" $FreeBSD: src/share/man/man4/fwohci.4,v 1.4 2003/02/12 06:48:45 simokawa Exp $ .\" .\" .Dd April 10, 2000 @@ -39,6 +39,10 @@ .Nm fwohci .Nd OHCI firewire chipset device driver .Sh SYNOPSIS +.Cd "kldload firewire" +.Pp +or +.Pp .Cd "device fwohci" .Cd "device firewire" .Sh DESCRIPTION @@ -63,6 +67,7 @@ .Xr firewire 4 , .Xr fwcontrol 8 , .Xr fwe 4 , +.Xr kldload 8 , .Xr sbp 4 .Sh HISTORY The @@ -76,3 +81,11 @@ .An Katsushi Kobayashi and .An Hidetoshi Shimokawa . +.Pp +.Sh BUGS +The driver allows physical access from any nodes on the bus by default. +This means that any devices on the bus can read and modify any memory space +which can be accessed by IEEE 1394 OHCI chip. It is allowed mostly +for sbp(4) devices. This should be changed to allow it only for specific +devices. Anyway FireWire is a bus and not expected to be connected with +un-trustable devices because a node can monitor all the traffic. ==== //depot/projects/ia64/share/man/man4/sbp.4#5 (text+ko) ==== @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/sbp.4,v 1.4 2003/02/05 06:41:19 simokawa Exp $ +.\" $FreeBSD: src/share/man/man4/sbp.4,v 1.5 2003/02/12 06:48:45 simokawa Exp $ .\" .Dd May 20, 2002 .Dt SBP 4 @@ -38,6 +38,12 @@ .Nm sbp .Nd Serial Bus Protocol 2 (SBP-2) Mass Storage Devices driver .Sh SYNOPSIS +.Cd "kldload firewire" +.Cd "kldload cam" +.Cd "kldload sbp" +.Pp +or +.Pp .Cd "device sbp" .Cd "device firewire" .Cd "device scbus" @@ -56,6 +62,7 @@ .Xr camcontrol 8 , .Xr firewire 4 , .Xr fwcontrol 8 , +.Xr kldload 8 , .Xr sysctl 8 .Sh AUTHORS .An -nosplit ==== //depot/projects/ia64/share/man/man5/make.conf.5#30 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.68 2003/02/10 19:57:48 nectar Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.69 2003/02/12 02:30:04 trhodes Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -476,6 +476,9 @@ Set to not build the .Xr mailwrapper 8 MTA selector. +.It Va NOMAN +.Pq Vt bool +Set to not build manual pages. .It Va NO_OBJC .Pq Vt bool Set to not build Objective C support. ==== //depot/projects/ia64/sys/cam/scsi/scsi_da.c#32 (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/cam/scsi/scsi_da.c,v 1.124 2003/02/09 21:49:45 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.125 2003/02/11 21:30:28 phk Exp $ */ #ifdef _KERNEL @@ -1160,6 +1160,7 @@ softc->dev = disk_create(periph->unit_number, &softc->disk, 0, &da_cdevsw, &dadisk_cdevsw); softc->dev->si_drv1 = periph; + softc->dev->si_iosize_max = DFLTPHYS; /* * Add async callbacks for bus reset and ==== //depot/projects/ia64/sys/dev/cardbus/cardbus.c#14 (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/cardbus/cardbus.c,v 1.31 2003/02/11 05:31:35 imp Exp $ + * $FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.33 2003/02/12 05:57:02 imp Exp $ */ /* @@ -313,6 +313,17 @@ DEVICE_IDENTIFY(driver, cbdev); device_get_children(cbdev, &devlist, &numdevs); + /* + * If there are no drivers attached, but there are children, + * then power the card up. + */ + for (i = 0; i < numdevs; i++) { + dev = devlist[i]; + if (device_get_state(dev) != DS_NOTPRESENT) + break; + } + if (i > 0 && i == numdevs) + POWER_ENABLE_SOCKET(device_get_parent(cbdev), cbdev); for (i = 0; i < numdevs; i++) { dev = devlist[i]; if (device_get_state(dev) != DS_NOTPRESENT) @@ -534,7 +545,7 @@ } } else { if (rle->res == NULL) { - } else if (rle->res->r_dev == cbdev && + } else if (rman_get_device(rle->res) == cbdev && (!(rman_get_flags(rle->res) & RF_ACTIVE))) { int f; f = rman_get_flags(rle->res); @@ -595,7 +606,7 @@ rle = resource_list_find(rl, type, rid); if (rle) { if (rle->res) { - if (rle->res->r_dev != cbdev || + if (rman_get_device(rle->res) != cbdev || rman_get_flags(rle->res) & RF_ACTIVE) { device_printf(cbdev, "delete_resource: " "Resource still owned by child, oops. " @@ -652,16 +663,14 @@ /* Free all allocated resources */ SLIST_FOREACH(rle, &dinfo->pci.resources, link) { if (rle->res) { - if (rle->res->r_dev != cbdev) + if (rman_get_device(rle->res) != cbdev) device_printf(cbdev, "release_all_resource: " "Resource still owned by child, oops. " "(type=%d, rid=%d, addr=%lx)\n", rle->type, rle->rid, rman_get_start(rle->res)); BUS_RELEASE_RESOURCE(device_get_parent(cbdev), - rle->res->r_dev, - rle->type, rle->rid, - rle->res); + cbdev, rle->type, rle->rid, rle->res); rle->res = NULL; /* * zero out config so the card won't acknowledge @@ -697,7 +706,7 @@ return NULL; } else { /* Release the cardbus hold on the resource */ - if (rle->res->r_dev != cbdev) + if (rman_get_device(rle->res) != cbdev) return NULL; bus_release_resource(cbdev, type, *rid, rle->res); rle->res = NULL; ==== //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#11 (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/cardbus/cardbus_cis.c,v 1.29 2003/01/27 05:47:01 imp Exp $ + * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.31 2003/02/12 06:11:47 imp Exp $ */ /* @@ -57,29 +57,52 @@ #define DPRINTF(a) if (cardbus_cis_debug) printf a #define DEVPRINTF(x) if (cardbus_cis_debug) device_printf x -#define DECODE_PARAMS \ - (device_t cbdev, device_t child, int id, int len, \ - uint8_t *tupledata, uint32_t start, uint32_t *off, \ - struct tuple_callbacks *info) +struct tuple_callbacks; + +typedef int (tuple_cb) (device_t cbdev, device_t child, int id, int len, + uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); struct tuple_callbacks { int id; char *name; - int (*func) DECODE_PARAMS; + tuple_cb *func; }; -#define DECODE_PROTOTYPE(NAME) static int decode_tuple_ ## NAME DECODE_PARAMS -DECODE_PROTOTYPE(generic); -DECODE_PROTOTYPE(nothing); -DECODE_PROTOTYPE(copy); -DECODE_PROTOTYPE(linktarget); -DECODE_PROTOTYPE(vers_1); -DECODE_PROTOTYPE(funcid); -DECODE_PROTOTYPE(manfid); -DECODE_PROTOTYPE(funce); -DECODE_PROTOTYPE(bar); -DECODE_PROTOTYPE(unhandled); -DECODE_PROTOTYPE(end); +static int decode_tuple_generic(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_nothing(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_copy(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_linktarget(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_vers_1(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_funcid(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_manfid(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_funce(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_bar(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_unhandled(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); +static int decode_tuple_end(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info); + static int cardbus_read_tuple_conf(device_t cbdev, device_t child, uint32_t start, uint32_t *off, int *tupleid, int *len, uint8_t *tupledata); @@ -138,32 +161,41 @@ * Handler functions for various CIS tuples */ -DECODE_PROTOTYPE(generic) +static int +decode_tuple_generic(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { -#ifdef CARDBUS_DEBUG int i; - if (info) - printf("TUPLE: %s [%d]:", info->name, len); - else - printf("TUPLE: Unknown(0x%02x) [%d]:", id, len); + if (cardbus_cis_debug) { + if (info) + printf("TUPLE: %s [%d]:", info->name, len); + else + printf("TUPLE: Unknown(0x%02x) [%d]:", id, len); - for (i = 0; i < len; i++) { - if (i % 0x10 == 0 && len > 0x10) - printf("\n 0x%02x:", i); - printf(" %02x", tupledata[i]); + for (i = 0; i < len; i++) { + if (i % 0x10 == 0 && len > 0x10) + printf("\n 0x%02x:", i); + printf(" %02x", tupledata[i]); + } + printf("\n"); } - printf("\n"); -#endif return (0); } -DECODE_PROTOTYPE(nothing) +static int +decode_tuple_nothing(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { return (0); } -DECODE_PROTOTYPE(copy) +static int +decode_tuple_copy(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { struct cis_tupleinfo *tmpbuf; @@ -184,20 +216,23 @@ return (0); } -DECODE_PROTOTYPE(linktarget) +static int +decode_tuple_linktarget(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { -#ifdef CARDBUS_DEBUG int i; - printf("TUPLE: %s [%d]:", info->name, len); + if (cardbus_cis_debug) { + printf("TUPLE: %s [%d]:", info->name, len); - for (i = 0; i < len; i++) { - if (i % 0x10 == 0 && len > 0x10) - printf("\n 0x%02x:", i); - printf(" %02x", tupledata[i]); + for (i = 0; i < len; i++) { + if (i % 0x10 == 0 && len > 0x10) + printf("\n 0x%02x:", i); + printf(" %02x", tupledata[i]); + } + printf("\n"); } - printf("\n"); -#endif if (len != 3 || tupledata[0] != 'C' || tupledata[1] != 'I' || tupledata[2] != 'S') { printf("Invalid data for CIS Link Target!\n"); @@ -208,72 +243,91 @@ return (0); } -DECODE_PROTOTYPE(vers_1) +static int +decode_tuple_vers_1(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { int i; - printf("Product version: %d.%d\n", tupledata[0], tupledata[1]); - printf("Product name: "); - for (i = 2; i < len; i++) { - if (tupledata[i] == '\0') - printf(" | "); - else if (tupledata[i] == 0xff) - break; - else - printf("%c", tupledata[i]); + if (cardbus_cis_debug) { + printf("Product version: %d.%d\n", tupledata[0], tupledata[1]); + printf("Product name: "); + for (i = 2; i < len; i++) { + if (tupledata[i] == '\0') + printf(" | "); + else if (tupledata[i] == 0xff) + break; + else + printf("%c", tupledata[i]); + } + printf("\n"); } - printf("\n"); return (0); } -DECODE_PROTOTYPE(funcid) +static int +decode_tuple_funcid(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { struct cardbus_devinfo *dinfo = device_get_ivars(child); int numnames = sizeof(funcnames) / sizeof(funcnames[0]); int i; - printf("Functions: "); - for (i = 0; i < len; i++) { - if (tupledata[i] < numnames) - printf("%s", funcnames[tupledata[i]]); - else - printf("Unknown(%d)", tupledata[i]); - if (i < len-1) - printf(", "); + if (cardbus_cis_debug) { + printf("Functions: "); + for (i = 0; i < len; i++) { + if (tupledata[i] < numnames) + printf("%s", funcnames[tupledata[i]]); + else + printf("Unknown(%d)", tupledata[i]); + if (i < len-1) + printf(", "); + } + printf("\n"); } - if (len > 0) dinfo->funcid = tupledata[0]; /* use first in list */ - printf("\n"); return (0); } -DECODE_PROTOTYPE(manfid) +static int +decode_tuple_manfid(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { struct cardbus_devinfo *dinfo = device_get_ivars(child); int i; - printf("Manufacturer ID: "); - for (i = 0; i < len; i++) - printf("%02x", tupledata[i]); - printf("\n"); + if (cardbus_cis_debug) { + printf("Manufacturer ID: "); + for (i = 0; i < len; i++) + printf("%02x", tupledata[i]); + printf("\n"); + } if (len == 5) { - dinfo->mfrid = tupledata[1] | (tupledata[2]<<8); - dinfo->prodid = tupledata[3] | (tupledata[4]<<8); + dinfo->mfrid = tupledata[1] | (tupledata[2] << 8); + dinfo->prodid = tupledata[3] | (tupledata[4] << 8); } return (0); } -DECODE_PROTOTYPE(funce) +static int +decode_tuple_funce(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { struct cardbus_devinfo *dinfo = device_get_ivars(child); int type, i; - printf("Function Extension: "); - for (i = 0; i < len; i++) - printf("%02x", tupledata[i]); - printf("\n"); + if (cardbus_cis_debug) { + printf("Function Extension: "); + for (i = 0; i < len; i++) + printf("%02x", tupledata[i]); + printf("\n"); + } if (len < 2) /* too short */ return (0); type = tupledata[0]; /* XXX <32 always? */ @@ -313,8 +367,12 @@ } break; case TPL_FUNCE_LAN_NID: - if (len > 6) - bcopy(&tupledata[1], dinfo->funce.lan.nid, 6); + if (tupledata[1] > sizeof(dinfo->funce.lan.nid)) { + /* ignore, warning? */ + return (0); + } + bcopy(tupledata + 2, dinfo->funce.lan.nid, + tupledata[1]); break; case TPL_FUNCE_LAN_CONN: dinfo->funce.lan.contype = tupledata[1];/*XXX mask? */ @@ -326,17 +384,24 @@ return (0); } -DECODE_PROTOTYPE(bar) +static int +decode_tuple_bar(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { struct cardbus_devinfo *dinfo = device_get_ivars(child); int type; int reg; uint32_t bar; + if (cardbus_cis_debug) { + /* XXX print something XXX */ + } if (len != 6) { printf("*** ERROR *** BAR length not 6 (%d)\n", len); return (EINVAL); } + /* XXX the next two lines are bogus and contain endian errors */ reg = *(uint16_t*)tupledata; len = *(uint32_t*)(tupledata + 2); if (reg & TPL_BAR_REG_AS) { @@ -378,15 +443,24 @@ return (0); } -DECODE_PROTOTYPE(unhandled) +static int +decode_tuple_unhandled(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { + /* Make this message suck less XXX */ printf("TUPLE: %s [%d] is unhandled! Bailing...", info->name, len); return (-1); } -DECODE_PROTOTYPE(end) +static int +decode_tuple_end(device_t cbdev, device_t child, int id, + int len, uint8_t *tupledata, uint32_t start, uint32_t *off, + struct tuple_callbacks *info) { - printf("CIS reading done\n"); + if (cardbus_cis_debug) { + printf("CIS reading done\n"); + } return (0); } @@ -554,7 +628,7 @@ imagebase + CARDBUS_EXROM_SIGNATURE); if (romsig != 0xaa55) { device_printf(cbdev, "Bad header in rom %d: " - "[%x] %04x\n", romnum, imagebase + + "[%x] %04x\n", romnum, imagebase + CARDBUS_EXROM_SIGNATURE, romsig); bus_release_resource(cbdev, SYS_RES_MEMORY, *rid, res); @@ -589,7 +663,7 @@ /* Image size is in 512 byte units */ imagesize <<= 9; - if ((bus_space_read_1(bt, bh, pcidata + + if ((bus_space_read_1(bt, bh, pcidata + CARDBUS_EXROM_DATA_INDICATOR) & 0x80) != 0) { device_printf(cbdev, "Cannot find CIS in " "Option ROM\n"); ==== //depot/projects/ia64/sys/dev/ccd/ccd.c#16 (text+ko) ==== @@ -50,7 +50,7 @@ * * $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ * - * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.123 2003/02/01 11:17:22 phk Exp $ + * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.124 2003/02/11 21:29:53 phk Exp $ */ #include <sys/param.h> @@ -1134,6 +1134,7 @@ cs->sc_disk->d_fwheads = ccg->ccg_ntracks; cs->sc_dev = disk_create(unit, cs->sc_disk, 0, NULL, NULL); cs->sc_dev->si_drv1 = cs; + cs->sc_dev->si_iosize_max = MAXPHYS; ccdunlock(cs); ==== //depot/projects/ia64/sys/dev/usb/usb_quirks.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: usb_quirks.c,v 1.42 2003/01/02 04:19:00 imp Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.31 2003/01/02 04:22:44 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.32 2003/02/12 13:20:39 sanpei Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -91,6 +91,15 @@ { USB_VENDOR_HP, USB_PRODUCT_HP_810C, ANY, { UQ_BROKEN_BIDIR }}, { USB_VENDOR_HP, USB_PRODUCT_HP_830C, ANY, { UQ_BROKEN_BIDIR }}, { USB_VENDOR_HP, USB_PRODUCT_HP_1220C, ANY, { UQ_BROKEN_BIDIR }}, + /* YAMAHA router's ucdDevice is the version of farmware and often changes. */ + { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA54I, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, + { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA55I, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, + { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65B, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, + { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65I, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, { 0, 0, 0, { 0 } } }; ==== //depot/projects/ia64/sys/dev/usb/usbdevs#26 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.112 2003/02/11 00:15:01 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.113 2003/02/12 13:20:39 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -1130,6 +1130,10 @@ /* Yamaha products */ product YAMAHA UX256 0x1000 UX256 MIDI I/F product YAMAHA UX96 0x1008 UX96 MIDI I/F +product YAMAHA RTA54I 0x4000 NetVolante RTA54i Broadband&ISDN Router +product YAMAHA RTA55I 0x4004 NetVolante RTA55i Broadband VoIP Router +product YAMAHA RTW65B 0x4001 NetVolante RTW65b Broadband Wireless Router +product YAMAHA RTW65I 0x4002 NetVolante RTW65i Broadband&ISDN Wireless Router /* Yano products */ product YANO U640MO 0x0101 U640MO-03 ==== //depot/projects/ia64/sys/dev/usb/usbdevs.h#25 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.121 2003/02/11 00:16:56 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.122 2003/02/12 13:22:55 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.112 2003/02/11 00:15:01 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.113 2003/02/12 13:20:39 sanpei Exp */ /* @@ -1137,6 +1137,10 @@ /* Yamaha products */ #define USB_PRODUCT_YAMAHA_UX256 0x1000 /* UX256 MIDI I/F */ #define USB_PRODUCT_YAMAHA_UX96 0x1008 /* UX96 MIDI I/F */ +#define USB_PRODUCT_YAMAHA_RTA54I 0x4000 /* NetVolante RTA54i Broadband&ISDN Router */ +#define USB_PRODUCT_YAMAHA_RTA55I 0x4004 /* NetVolante RTA55i Broadband VoIP Router */ +#define USB_PRODUCT_YAMAHA_RTW65B 0x4001 /* NetVolante RTW65b Broadband Wireless Router */ +#define USB_PRODUCT_YAMAHA_RTW65I 0x4002 /* NetVolante RTW65i Broadband&ISDN Wireless Router */ /* Yano products */ #define USB_PRODUCT_YANO_U640MO 0x0101 /* U640MO-03 */ ==== //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#25 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.121 2003/02/11 00:16:56 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.122 2003/02/12 13:22:55 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.112 2003/02/11 00:15:01 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.113 2003/02/12 13:20:39 sanpei Exp */ /* @@ -2776,6 +2776,30 @@ "UX96 MIDI I/F", }, { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA54I, + 0, + "YAMAHA", + "NetVolante RTA54i Broadband&ISDN Router", + }, + { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA55I, + 0, + "YAMAHA", + "NetVolante RTA55i Broadband VoIP Router", + }, + { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65B, + 0, + "YAMAHA", + "NetVolante RTW65b Broadband Wireless Router", + }, + { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65I, + 0, + "YAMAHA", + "NetVolante RTW65i Broadband&ISDN Wireless Router", + }, + { USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO, 0, "Yano", ==== //depot/projects/ia64/sys/geom/geom_dev.c#26 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302121819.h1CIJ2X3006890>