From owner-p4-projects@FreeBSD.ORG Fri Mar 30 21:23:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47C9116A40E; Fri, 30 Mar 2007 21:23:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EBEF116A406 for ; Fri, 30 Mar 2007 21:23:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C34A113C4EE for ; Fri, 30 Mar 2007 21:23:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2ULN7CL005693 for ; Fri, 30 Mar 2007 21:23:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2ULN7H8005689 for perforce@freebsd.org; Fri, 30 Mar 2007 21:23:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 30 Mar 2007 21:23:07 GMT Message-Id: <200703302123.l2ULN7H8005689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 116974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2007 21:23:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=116974 Change 116974 by hselasky@hselasky_mini_itx on 2007/03/30 21:22:41 Imported ugensa.c from NetBSD. Affected files ... .. //depot/projects/usb/src/sys/conf/NOTES#5 edit .. //depot/projects/usb/src/sys/conf/files#13 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#1 add .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#35 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#6 edit .. //depot/projects/usb/src/sys/modules/ugensa/Makefile#1 add Differences ... ==== //depot/projects/usb/src/sys/conf/NOTES#5 (text+ko) ==== @@ -2395,6 +2395,8 @@ device ufm # Generic USB device driver device ugen +# Generic USB serial driver +device ugensa # Human Interface Device (anything with buttons and dials) device uhid # USB keyboard ==== //depot/projects/usb/src/sys/conf/files#13 (text+ko) ==== @@ -1050,6 +1050,7 @@ dev/usb/ufoma.c optional ufoma dev/usb/uftdi.c optional uftdi dev/usb/ugen.c optional ugen +dev/usb/ugensa.c optional ugensa dev/usb/uhci.c optional uhci dev/usb/uhci_pci.c optional uhci pci dev/usb/uhid.c optional uhid ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#35 (text+ko) ==== @@ -86,7 +86,7 @@ typedef uint8_t usbd_status; -typedef void (*usbd_callback_t)(struct usbd_xfer *); +typedef void (usbd_callback_t)(struct usbd_xfer *); struct usbd_bus_methods { void (*pipe_init)(struct usbd_device *udev, usb_endpoint_descriptor_t *edesc, struct usbd_pipe *pipe); @@ -266,7 +266,7 @@ }; struct usbd_config { - usbd_callback_t callback; + usbd_callback_t *callback; uint32_t flags; /* flags */ #define USBD_SYNCHRONOUS 0x0001 /* wait for completion */ @@ -349,7 +349,7 @@ void *buffer; uint16_t *frlengths; uint16_t *frlengths_old; - usbd_callback_t callback; + usbd_callback_t *callback; uint32_t length; /* bytes */ uint32_t actlen; /* bytes */ ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#6 (text+ko) ==== @@ -443,6 +443,7 @@ vendor ARRIS 0x09c1 Arris Interactive vendor ACTIVCARD 0x09c3 ACTIVCARD vendor ACTISYS 0x09c4 ACTiSYS +vendor NOVATEL 0x09d7 NovAtel vendor AFOURTECH 0x09da A-FOUR TECH vendor AIMEX 0x09dc AIMEX vendor ADDONICS 0x09df Addonics @@ -481,6 +482,7 @@ vendor CHICONY2 0x0c45 Chicony vendor SEALEVEL 0x0c52 Sealevel vendor LUWEN 0x0c76 Luwen +vendor QUALCOMM_K 0x0c88 Qualcomm Kyocera vendor ZCOM 0x0cde Z-Com vendor ATHEROS2 0x0cf3 Atheros Communications vendor TANGTOP 0x0d3d Tangtop @@ -497,6 +499,7 @@ vendor PILOTECH 0x0eaf Pilotech vendor NOVATECH 0x0eb0 NovaTech vendor EGALAX 0x0eef eGalax +vendor AIRPRIME 0x0f3d AirPrime, Incorporated vendor MICROTUNE 0x0f4d Microtune vendor VTECH 0x0f88 VTech vendor QUALCOMM2 0x1004 Qualcomm @@ -524,6 +527,7 @@ vendor RADIOSHACK 0x1453 Radio Shack vendor LINKSYS4 0x13b1 Linksys vendor SHARK 0x13d2 Shark +vendor NOVATEL2 0x1410 Novatel vendor SILICOM 0x1485 Silicom vendor RALINK 0x148f Ralink Technology vendor IMAGINATION 0x149a Imagination Technologies @@ -663,6 +667,9 @@ /* Ain Communication Technology products */ product AINCOMM AWU2000B 0x1001 AWU2000B Wireless adapter +/* AirPrime products */ +product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card + /* AKS products */ product AKS USBHASP 0x0001 USB-HASP 0.06 @@ -1430,6 +1437,10 @@ /* NovaTech Products */ product NOVATECH NV902 0x9020 NovaTech NV-902W +/* NovAtel products */ +product NOVATEL FLEXPACKGPS 0x0100 NovAtel FlexPack GPS receiver +product NOVATEL2 CDMA_MODEM 0x1110 Novatel Wireless Merlin CDMA + /* Olympus products */ product OLYMPUS C1 0x0102 C-1 Digital Camera product OLYMPUS C700 0x0105 C-700 Ultra Zoom @@ -1532,6 +1543,7 @@ /* Qualcomm products */ product QUALCOMM CDMA_MSM 0x3196 CDMA Technologies MSM modem product QUALCOMM2 CDMA_MSM 0x6000 CDMA Technologies MSM phone +product QUALCOMM_K CDMA_MSM_K 0x17da Qualcomm Kyocera CDMA Technologies MSM /* Qtronix products */ product QTRONIX 980N 0x2011 Scorpion-980N keyboard @@ -1612,6 +1624,7 @@ product SIEMENS SPEEDSTREAM 0x1001 SpeedStream USB /* Sierra Wireless products */ +product SIERRA AIRCARD580 0x0112 Sierra Wireless AirCard 580 product SIERRA MC5720 0x0218 MC5720 Wireless Modem /* Sigmatel products */