From owner-p4-projects Tue Jul 30 17:13:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 947A337B401; Tue, 30 Jul 2002 17:13:39 -0700 (PDT) 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 3708737B400 for ; Tue, 30 Jul 2002 17:13:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA6F343E42 for ; Tue, 30 Jul 2002 17:13:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V0DcJU005806 for ; Tue, 30 Jul 2002 17:13:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V0Dciv005803 for perforce@freebsd.org; Tue, 30 Jul 2002 17:13:38 -0700 (PDT) Date: Tue, 30 Jul 2002 17:13:38 -0700 (PDT) Message-Id: <200207310013.g6V0Dciv005803@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15251 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15251 Change 15251 by rwatson@rwatson_tislabs on 2002/07/30 17:13:17 Trickle-down MFC the MAC changes back from the FreeBSD tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#8 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.61 2002/07/09 16:45:03 joe Exp $ + * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.62 2002/07/30 23:30:14 joe Exp $ */ /* @@ -99,7 +99,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.61 2002/07/09 16:45:03 joe Exp $"; + "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.62 2002/07/30 23:30:14 joe Exp $"; #endif /* @@ -114,6 +114,7 @@ }; Static const struct aue_type aue_devs[] = { + {{ USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B}, PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1}, PNA|PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2}, PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000}, LSYS }, @@ -129,6 +130,7 @@ {{ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS}, PNA }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, PII }, + {{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, PII }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0 }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, PNA }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100}, 0 }, ==== //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhci.c,v 1.160 2002/05/28 12:42:39 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.122 2002/05/28 20:51:43 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.123 2002/07/30 23:26:22 iedowse Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -581,32 +581,8 @@ usbd_status uhci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size) { - struct uhci_softc *sc = (struct uhci_softc *)bus; - u_int32_t n; - - /* - * XXX - * Since we are allocating a buffer we can assume that we will - * need TDs for it. Since we don't want to allocate those from - * an interrupt context, we allocate them here and free them again. - * This is no guarantee that we'll get the TDs next time... - */ - n = size / 8; - if (n > 16) { - u_int32_t i; - uhci_soft_td_t **stds; - DPRINTF(("uhci_allocm: get %d TDs\n", n)); - stds = malloc(sizeof(uhci_soft_td_t *) * n, M_TEMP, - M_WAITOK|M_ZERO); - for(i=0; i < n; i++) - stds[i] = uhci_alloc_std(sc); - for(i=0; i < n; i++) - if (stds[i] != NULL) - uhci_free_std(sc, stds[i]); - free(stds, M_TEMP); - } - - return (usb_allocmem(&sc->sc_bus, size, 0, dma)); + return (usb_allocmem(&((struct uhci_softc *)bus)->sc_bus, size, 0, + dma)); } void ==== //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#15 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -460,6 +460,7 @@ /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ product BELKIN2 F5U002 0x0002 F5U002 Parallel printer adapter +product BELKIN USB2LAN 0x0121 USB to LAN Converter /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet Adapter ==== //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#15 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.107 2002/07/30 11:03:50 sobomax Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.108 2002/07/30 23:30:56 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp */ /* @@ -467,6 +467,7 @@ /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */ +#define USB_PRODUCT_BELKIN_USB2LAN 0x0121 /* USB to LAN Converter */ /* Billionton products */ #define USB_PRODUCT_BILLIONTON_USB100 0x0986 /* USB100N 10/100 FastEthernet Adapter */ ==== //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#15 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.107 2002/07/30 11:03:50 sobomax Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.108 2002/07/30 23:30:56 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp */ /* @@ -430,6 +430,12 @@ "F5U002 Parallel printer adapter", }, { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN, + 0, + "Belkin Components", + "USB to LAN Converter", + }, + { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0, "Billionton Systems", ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * @(#)kernfs.h 8.6 (Berkeley) 3/29/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs.h 1.14 * - * $FreeBSD: src/sys/fs/devfs/devfs.h,v 1.11 2002/07/28 06:57:57 dd Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs.h,v 1.12 2002/07/30 23:12:37 rwatson Exp $ */ #ifndef _FS_DEVFS_DEVFS_H_ @@ -159,7 +159,7 @@ mode_t de_mode; uid_t de_uid; gid_t de_gid; - struct label de_label; + struct label de_label; struct timespec de_atime; struct timespec de_mtime; struct timespec de_ctime; ==== //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#5 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)bpfdesc.h 8.1 (Berkeley) 6/10/93 * - * $FreeBSD: src/sys/net/bpfdesc.h,v 1.19 2001/12/14 22:17:54 jdp Exp $ + * $FreeBSD: src/sys/net/bpfdesc.h,v 1.20 2002/07/30 23:03:29 rwatson Exp $ */ #ifndef _NET_BPFDESC_H_ ==== //depot/projects/trustedbsd/mac/sys/net/if_var.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_var.h,v 1.46 2002/05/07 18:11:55 imp Exp $ + * $FreeBSD: src/sys/net/if_var.h,v 1.47 2002/07/30 23:06:07 rwatson Exp $ */ #ifndef _NET_IF_VAR_H_ ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.63 2002/07/20 22:46:20 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.64 2002/07/30 23:09:20 rwatson Exp $ */ #ifndef _NETINET_IP_VAR_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message