PERFORCE change 66991 for review
Sam Leffler
sam at FreeBSD.org
Mon Dec 13 10:25:44 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=66991
Change 66991 by sam at sam_ebb on 2004/12/13 18:24:41
IFC @ 66990
Affected files ...
.. //depot/projects/wifi/sbin/atm/atmconfig/Makefile#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#6 integrate
.. //depot/projects/wifi/sys/dev/usb/ugen.c#3 integrate
.. //depot/projects/wifi/sys/dev/usb/uhid.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/ukbd.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/umodem.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/wifi/sys/dev/usb/uplcom.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/urio.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/wifi/sys/dev/usb/usbdi.h#2 integrate
.. //depot/projects/wifi/sys/dev/usb/uscanner.c#4 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#9 integrate
.. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#6 integrate
.. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#8 integrate
.. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#5 integrate
.. //depot/projects/wifi/sys/i386/pci/pci_cfgreg.c#4 integrate
.. //depot/projects/wifi/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/wifi/sys/kern/kern_subr.c#5 integrate
.. //depot/projects/wifi/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/wifi/sys/kern/subr_disk.c#2 integrate
.. //depot/projects/wifi/sys/modules/acpi/acpi_ibm/Makefile#3 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#5 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#9 integrate
.. //depot/projects/wifi/sys/sys/bio.h#2 integrate
.. //depot/projects/wifi/sys/tools/vnode_if.awk#3 integrate
.. //depot/projects/wifi/sys/ufs/ufs/ufs_extattr.c#2 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#4 integrate
.. //depot/projects/wifi/usr.sbin/ppp/command.c#3 integrate
.. //depot/projects/wifi/usr.sbin/ppp/lcp.c#2 integrate
.. //depot/projects/wifi/usr.sbin/ppp/lcp.h#2 integrate
.. //depot/projects/wifi/usr.sbin/ppp/lqr.c#2 integrate
.. //depot/projects/wifi/usr.sbin/ppp/ppp.8.m4#4 integrate
.. //depot/projects/wifi/usr.sbin/pppctl/pppctl.c#2 integrate
Differences ...
==== //depot/projects/wifi/sbin/atm/atmconfig/Makefile#2 (text+ko) ====
@@ -3,7 +3,7 @@
# All rights reserved.
# Author: Harti Brandt <brandt at fokus.gmd.de>
#
-# $FreeBSD: src/sbin/atm/atmconfig/Makefile,v 1.6 2004/08/12 12:31:43 harti Exp $
+# $FreeBSD: src/sbin/atm/atmconfig/Makefile,v 1.7 2004/12/13 15:42:46 obrien Exp $
PROG= atmconfig
.ifndef RESCUE
@@ -30,7 +30,7 @@
.if ${MACHINE_ARCH} == "arm"
WARNS?= 3
.else
-WARNS?= 9
+WARNS?= 6
.endif
FILES= atmconfig.help atmconfig_device.help
==== //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.40 2004/12/01 21:05:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.41 2004/12/13 06:59:34 njl Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -753,7 +753,6 @@
static int
acpi_pci_link_resume(device_t dev)
{
-#if 0 /* XXX Disabled temporarily since this hangs resume. */
ACPI_STATUS status;
ACPI_SERIAL_BEGIN(pci_link);
@@ -762,7 +761,6 @@
if (ACPI_FAILURE(status))
return (ENXIO);
else
-#endif
return (0);
}
==== //depot/projects/wifi/sys/dev/usb/ugen.c#3 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.98 2004/12/12 02:27:30 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.100 2004/12/13 07:45:02 julian Exp $");
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -28,8 +28,8 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
@@ -70,9 +70,10 @@
#else
#include <sys/select.h>
#endif
-#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
+#include <sys/vnode.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
@@ -545,10 +546,10 @@
if (clalloc(&sce->q, UGEN_IBSIZE, 0) == -1)
return (ENOMEM);
err = usbd_open_pipe_intr(sce->iface,
- edesc->bEndpointAddress,
- USBD_SHORT_XFER_OK, &sce->pipeh, sce,
- sce->ibuf, isize, ugenintr,
- USBD_DEFAULT_INTERVAL);
+ edesc->bEndpointAddress,
+ USBD_SHORT_XFER_OK, &sce->pipeh, sce,
+ sce->ibuf, isize, ugenintr,
+ USBD_DEFAULT_INTERVAL);
if (err) {
free(sce->ibuf, M_USBDEV);
clfree(&sce->q);
@@ -632,12 +633,6 @@
DPRINTFN(5, ("ugenclose: flag=%d, mode=%d, unit=%d, endpt=%d\n",
flag, mode, UGENUNIT(dev), endpt));
-
-#if defined(__NetBSD__) || defined(__OpenBSD__)
- if (sc->sc_dying)
- wakeup(&sc->sc_dying);
-#endif
-
#ifdef DIAGNOSTIC
if (!sc->sc_is_open[endpt]) {
printf("ugenclose: not open\n");
@@ -673,6 +668,7 @@
case UE_ISOCHRONOUS:
for (i = 0; i < UGEN_NISOREQS; ++i)
usbd_free_xfer(sce->isoreqs[i].xfer);
+
default:
break;
}
@@ -709,6 +705,7 @@
if (endpt == USB_CONTROL_ENDPOINT)
return (ENODEV);
+#ifdef DIAGNOSTIC
if (sce->edesc == NULL) {
printf("ugenread: no edesc\n");
return (EIO);
@@ -717,6 +714,7 @@
printf("ugenread: no pipe\n");
return (EIO);
}
+#endif
switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
case UE_INTERRUPT:
@@ -757,32 +755,32 @@
}
break;
case UE_BULK:
- xfer = usbd_alloc_xfer(sc->sc_udev);
- if (xfer == 0)
- return (ENOMEM);
- while ((n = min(UGEN_BBSIZE, uio->uio_resid)) != 0) {
+ xfer = usbd_alloc_xfer(sc->sc_udev);
+ if (xfer == 0)
+ return (ENOMEM);
+ while ((n = min(UGEN_BBSIZE, uio->uio_resid)) != 0) {
DPRINTFN(1, ("ugenread: start transfer %d bytes\n",n));
tn = n;
- err = usbd_bulk_transfer(
- xfer, sce->pipeh,
- sce->state & UGEN_SHORT_OK ?
- USBD_SHORT_XFER_OK : 0,
- sce->timeout, buf, &tn, "ugenrb");
- if (err) {
- if (err == USBD_INTERRUPTED)
- error = EINTR;
- else if (err == USBD_TIMEOUT)
- error = ETIMEDOUT;
- else
- error = EIO;
- break;
- }
- DPRINTFN(1, ("ugenread: got %d bytes\n", tn));
- error = uiomove(buf, tn, uio);
- if (error || tn < n)
- break;
- }
- usbd_free_xfer(xfer);
+ err = usbd_bulk_transfer(
+ xfer, sce->pipeh,
+ sce->state & UGEN_SHORT_OK ?
+ USBD_SHORT_XFER_OK : 0,
+ sce->timeout, buf, &tn, "ugenrb");
+ if (err) {
+ if (err == USBD_INTERRUPTED)
+ error = EINTR;
+ else if (err == USBD_TIMEOUT)
+ error = ETIMEDOUT;
+ else
+ error = EIO;
+ break;
+ }
+ DPRINTFN(1, ("ugenread: got %d bytes\n", tn));
+ error = uiomove(buf, tn, uio);
+ if (error || tn < n)
+ break;
+ }
+ usbd_free_xfer(xfer);
break;
case UE_ISOCHRONOUS:
s = splusb();
@@ -862,6 +860,7 @@
if (endpt == USB_CONTROL_ENDPOINT)
return (ENODEV);
+#ifdef DIAGNOSTIC
if (sce->edesc == NULL) {
printf("ugenwrite: no edesc\n");
return (EIO);
@@ -870,6 +869,7 @@
printf("ugenwrite: no pipe\n");
return (EIO);
}
+#endif
switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
case UE_BULK:
@@ -906,7 +906,7 @@
break;
DPRINTFN(1, ("ugenwrite: transfer %d bytes\n", n));
err = usbd_intr_transfer(xfer, sce->pipeh, 0,
- sce->timeout, buf, &n,"ugenwi");
+ sce->timeout, buf, &n, "ugenwi");
if (err) {
if (err == USBD_INTERRUPTED)
error = EINTR;
@@ -1097,7 +1097,7 @@
if(sce->fill < sce->cur && sce->cur <= sce->fill + count) {
sce->cur += count;
if(sce->cur >= sce->limit)
- sce->cur = sce->ibuf + (sce->cur - sce->limit);
+ sce->cur = sce->ibuf + (sce->limit - sce->cur);
DPRINTFN(5, ("ugen_isoc_rintr: throwing away %d bytes\n",
count));
}
@@ -1289,9 +1289,9 @@
/* All handled in the upper FS layer. */
return (0);
case USB_SET_SHORT_XFER:
- /* This flag only affects read */
if (endpt == USB_CONTROL_ENDPOINT)
return (EINVAL);
+ /* This flag only affects read */
sce = &sc->sc_endpoints[endpt][IN];
if (sce->pipeh == NULL) {
@@ -1365,7 +1365,8 @@
ai->uai_interface_index, &iface);
if (err)
return (EINVAL);
- err = ugen_set_interface(sc, ai->uai_interface_index, ai->uai_alt_no);
+ err = ugen_set_interface(sc, ai->uai_interface_index,
+ ai->uai_alt_no);
if (err)
return (EINVAL);
break;
@@ -1379,7 +1380,8 @@
free(cdesc, M_TEMP);
return (EINVAL);
}
- ai->uai_alt_no = usbd_get_no_alts(cdesc, idesc->bInterfaceNumber);
+ ai->uai_alt_no = usbd_get_no_alts(cdesc,
+ idesc->bInterfaceNumber);
free(cdesc, M_TEMP);
break;
case USB_GET_DEVICE_DESC:
@@ -1565,7 +1567,7 @@
/* XXX always IN */
sce = &sc->sc_endpoints[UGENENDPOINT(dev)][IN];
-
+#ifdef DIAGNOSTIC
if (!sce->edesc) {
printf("ugenpoll: no edesc\n");
return (EIO);
@@ -1574,7 +1576,7 @@
printf("ugenpoll: no pipe\n");
return (EIO);
}
-
+#endif
s = splusb();
switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
case UE_INTERRUPT:
==== //depot/projects/wifi/sys/dev/usb/uhid.c#2 (text+ko) ====
@@ -5,7 +5,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.74 2004/10/09 07:48:31 takawata Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.75 2004/12/13 07:08:22 imp Exp $");
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,9 +76,10 @@
#include <sys/select.h>
#endif
#include <sys/proc.h>
-#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
+#include <sys/vnode.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
==== //depot/projects/wifi/sys/dev/usb/ukbd.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.49 2004/08/15 23:39:18 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.50 2004/12/13 07:09:54 imp Exp $");
/*
* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
@@ -66,8 +66,8 @@
#else
#include <sys/select.h>
#endif
-#include <sys/vnode.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
==== //depot/projects/wifi/sys/dev/usb/umodem.c#2 (text+ko) ====
@@ -2,7 +2,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.54 2004/09/17 11:53:45 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.55 2004/12/13 07:09:54 imp Exp $");
/*-
* Copyright (c) 2003, M. Warner Losh <imp at freebsd.org>.
* All rights reserved.
@@ -91,9 +91,9 @@
#include <sys/select.h>
#include <sys/sysctl.h>
#include <sys/proc.h>
-#include <sys/vnode.h>
#include <sys/bus.h>
#include <sys/poll.h>
+#include <sys/uio.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbcdc.h>
==== //depot/projects/wifi/sys/dev/usb/ums.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.73 2004/12/13 02:20:48 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.75 2004/12/13 07:08:22 imp Exp $");
/*
* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
@@ -58,9 +58,10 @@
#else
#include <sys/select.h>
#endif
-#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
+#include <sys/vnode.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
@@ -592,7 +593,7 @@
sc->qhead = sc->qtail = 0;
sc->status.flags = 0;
sc->status.button = sc->status.obutton = 0;
- sc->status.dx = sc->status.dy = sc->status.dz = /* sc->status.dt */ = 0;
+ sc->status.dx = sc->status.dy = sc->status.dz /* = sc->status.dt */ = 0;
callout_handle_init((struct callout_handle *)&sc->callout_handle);
==== //depot/projects/wifi/sys/dev/usb/uplcom.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.23 2004/10/02 12:47:30 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uplcom.c,v 1.24 2004/12/13 07:09:54 imp Exp $");
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -93,9 +93,9 @@
#include <sys/select.h>
#endif
#include <sys/proc.h>
-#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbcdc.h>
==== //depot/projects/wifi/sys/dev/usb/urio.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/urio.c,v 1.33 2004/08/15 23:39:18 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/urio.c,v 1.34 2004/12/13 07:09:54 imp Exp $");
/*
@@ -67,9 +67,9 @@
#else
#include <sys/select.h>
#endif
-#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
==== //depot/projects/wifi/sys/dev/usb/usb.c#2 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.100 2004/08/02 15:37:35 iedowse Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.101 2004/12/13 07:08:22 imp Exp $");
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -79,9 +79,10 @@
#else
#include <sys/select.h>
#endif
-#include <sys/vnode.h>
#include <sys/signalvar.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
+#include <sys/vnode.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
==== //depot/projects/wifi/sys/dev/usb/usbdi.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
-/* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */
-/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.50 2004/08/15 23:39:18 imp Exp $ */
+/* $NetBSD: usbdi.h,v 1.64 2004/10/23 13:26:34 augustss Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.52 2004/12/13 08:12:06 julian Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -88,81 +88,73 @@
#define USBD_NO_TIMEOUT 0
#define USBD_DEFAULT_TIMEOUT 5000 /* ms = 5 s */
-#if defined(__FreeBSD__)
-#endif
-
-usbd_status usbd_open_pipe(usbd_interface_handle iface, u_int8_t address,
- u_int8_t flags, usbd_pipe_handle *pipe);
-usbd_status usbd_close_pipe(usbd_pipe_handle pipe);
-usbd_status usbd_transfer(usbd_xfer_handle req);
+usbd_status usbd_open_pipe(usbd_interface_handle, u_int8_t,
+ u_int8_t, usbd_pipe_handle *);
+usbd_status usbd_close_pipe(usbd_pipe_handle);
+usbd_status usbd_transfer(usbd_xfer_handle);
usbd_xfer_handle usbd_alloc_xfer(usbd_device_handle);
-usbd_status usbd_free_xfer(usbd_xfer_handle xfer);
-void usbd_setup_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
- usbd_private_handle priv, void *buffer,
- u_int32_t length, u_int16_t flags, u_int32_t timeout,
+usbd_status usbd_free_xfer(usbd_xfer_handle);
+void usbd_setup_xfer(usbd_xfer_handle, usbd_pipe_handle,
+ usbd_private_handle, void *,
+ u_int32_t, u_int16_t, u_int32_t,
usbd_callback);
-void usbd_setup_default_xfer(usbd_xfer_handle xfer, usbd_device_handle dev,
- usbd_private_handle priv, u_int32_t timeout,
- usb_device_request_t *req, void *buffer,
- u_int32_t length, u_int16_t flags, usbd_callback);
-void usbd_setup_isoc_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
- usbd_private_handle priv, u_int16_t *frlengths,
- u_int32_t nframes, u_int16_t flags, usbd_callback);
-void usbd_get_xfer_status(usbd_xfer_handle xfer, usbd_private_handle *priv,
- void **buffer, u_int32_t *count, usbd_status *status);
+void usbd_setup_default_xfer(usbd_xfer_handle, usbd_device_handle,
+ usbd_private_handle, u_int32_t,
+ usb_device_request_t *, void *,
+ u_int32_t, u_int16_t, usbd_callback);
+void usbd_setup_isoc_xfer(usbd_xfer_handle, usbd_pipe_handle,
+ usbd_private_handle, u_int16_t *,
+ u_int32_t, u_int16_t, usbd_callback);
+void usbd_get_xfer_status(usbd_xfer_handle, usbd_private_handle *,
+ void **, u_int32_t *, usbd_status *);
usb_endpoint_descriptor_t *usbd_interface2endpoint_descriptor
- (usbd_interface_handle iface, u_int8_t address);
-usbd_status usbd_abort_pipe(usbd_pipe_handle pipe);
-usbd_status usbd_clear_endpoint_stall(usbd_pipe_handle pipe);
-usbd_status usbd_clear_endpoint_stall_async(usbd_pipe_handle pipe);
-void usbd_clear_endpoint_toggle(usbd_pipe_handle pipe);
-usbd_status usbd_endpoint_count(usbd_interface_handle dev, u_int8_t *count);
-usbd_status usbd_interface_count(usbd_device_handle dev, u_int8_t *count);
-void usbd_interface2device_handle(usbd_interface_handle iface,
- usbd_device_handle *dev);
-usbd_status usbd_device2interface_handle(usbd_device_handle dev,
- u_int8_t ifaceno, usbd_interface_handle *iface);
+ (usbd_interface_handle, u_int8_t);
+usbd_status usbd_abort_pipe(usbd_pipe_handle);
+usbd_status usbd_clear_endpoint_stall(usbd_pipe_handle);
+usbd_status usbd_clear_endpoint_stall_async(usbd_pipe_handle);
+void usbd_clear_endpoint_toggle(usbd_pipe_handle);
+usbd_status usbd_endpoint_count(usbd_interface_handle, u_int8_t *);
+usbd_status usbd_interface_count(usbd_device_handle, u_int8_t *);
+void usbd_interface2device_handle(usbd_interface_handle,
+ usbd_device_handle *);
+usbd_status usbd_device2interface_handle(usbd_device_handle,
+ u_int8_t, usbd_interface_handle *);
usbd_device_handle usbd_pipe2device_handle(usbd_pipe_handle);
-void *usbd_alloc_buffer(usbd_xfer_handle xfer, u_int32_t size);
-void usbd_free_buffer(usbd_xfer_handle xfer);
-void *usbd_get_buffer(usbd_xfer_handle xfer);
-usbd_status usbd_sync_transfer(usbd_xfer_handle req);
-usbd_status usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address,
- u_int8_t flags, usbd_pipe_handle *pipe,
- usbd_private_handle priv, void *buffer,
- u_int32_t length, usbd_callback, int);
-usbd_status usbd_do_request(usbd_device_handle pipe, usb_device_request_t *req,
- void *data);
-usbd_status usbd_do_request_async(usbd_device_handle pipe,
- usb_device_request_t *req, void *data);
-usbd_status usbd_do_request_flags(usbd_device_handle pipe,
- usb_device_request_t *req,
- void *data, u_int16_t flags, int*, u_int32_t);
-usbd_status usbd_do_request_flags_pipe(
- usbd_device_handle dev, usbd_pipe_handle pipe,
- usb_device_request_t *req, void *data, u_int16_t flags, int *actlen,
- u_int32_t);
+void *usbd_alloc_buffer(usbd_xfer_handle, u_int32_t);
+void usbd_free_buffer(usbd_xfer_handle);
+void *usbd_get_buffer(usbd_xfer_handle);
+usbd_status usbd_sync_transfer(usbd_xfer_handle);
+usbd_status usbd_open_pipe_intr(usbd_interface_handle, u_int8_t,
+ u_int8_t, usbd_pipe_handle *,
+ usbd_private_handle, void *,
+ u_int32_t, usbd_callback, int);
+usbd_status usbd_do_request(usbd_device_handle, usb_device_request_t *, void *);
+usbd_status usbd_do_request_async(usbd_device_handle,
+ usb_device_request_t *, void *);
+usbd_status usbd_do_request_flags(usbd_device_handle, usb_device_request_t *,
+ void *, u_int16_t, int*, u_int32_t);
+usbd_status usbd_do_request_flags_pipe(usbd_device_handle, usbd_pipe_handle,
+ usb_device_request_t *, void *, u_int16_t, int *, u_int32_t);
usb_interface_descriptor_t *usbd_get_interface_descriptor
- (usbd_interface_handle iface);
-usb_config_descriptor_t *usbd_get_config_descriptor(usbd_device_handle dev);
-usb_device_descriptor_t *usbd_get_device_descriptor(usbd_device_handle dev);
+ (usbd_interface_handle);
+usb_config_descriptor_t *usbd_get_config_descriptor(usbd_device_handle);
+usb_device_descriptor_t *usbd_get_device_descriptor(usbd_device_handle);
usbd_status usbd_set_interface(usbd_interface_handle, int);
int usbd_get_no_alts(usb_config_descriptor_t *, int);
-usbd_status usbd_get_interface(usbd_interface_handle iface, u_int8_t *aiface);
+usbd_status usbd_get_interface(usbd_interface_handle, u_int8_t *);
void usbd_fill_deviceinfo(usbd_device_handle, struct usb_device_info *, int);
-int usbd_get_interface_altindex(usbd_interface_handle iface);
+int usbd_get_interface_altindex(usbd_interface_handle);
-usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *cd,
- int iindex, int ano);
-usb_endpoint_descriptor_t *usbd_find_edesc(usb_config_descriptor_t *cd,
- int ifaceidx, int altidx,
- int endptidx);
+usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *,
+ int, int);
+usb_endpoint_descriptor_t *usbd_find_edesc(usb_config_descriptor_t *,
+ int, int, int);
void usbd_dopoll(usbd_interface_handle);
-void usbd_set_polling(usbd_device_handle dev, int on);
+void usbd_set_polling(usbd_device_handle, int);
-const char *usbd_errstr(usbd_status err);
+const char *usbd_errstr(usbd_status);
void usbd_add_dev_event(int, usbd_device_handle);
void usbd_add_drv_event(int, usbd_device_handle, device_ptr_t);
@@ -170,7 +162,7 @@
void usbd_devinfo(usbd_device_handle, int, char *);
const struct usbd_quirks *usbd_get_quirks(usbd_device_handle);
usb_endpoint_descriptor_t *usbd_get_endpoint_descriptor
- (usbd_interface_handle iface, u_int8_t address);
+ (usbd_interface_handle, u_int8_t);
usbd_status usbd_reload_device_desc(usbd_device_handle);
@@ -189,16 +181,16 @@
char onqueue;
};
-void usb_add_task(usbd_device_handle dev, struct usb_task *task);
-void usb_rem_task(usbd_device_handle dev, struct usb_task *task);
+void usb_add_task(usbd_device_handle, struct usb_task *);
+void usb_rem_task(usbd_device_handle, struct usb_task *);
#define usb_init_task(t, f, a) ((t)->fun = (f), (t)->arg = (a), (t)->onqueue = 0)
struct usb_devno {
u_int16_t ud_vendor;
u_int16_t ud_product;
};
-const struct usb_devno *usb_match_device(const struct usb_devno *tbl,
- u_int nentries, u_int sz, u_int16_t vendor, u_int16_t product);
+const struct usb_devno *usb_match_device(const struct usb_devno *,
+ u_int, u_int, u_int16_t, u_int16_t);
#define usb_lookup(tbl, vendor, product) \
usb_match_device((const struct usb_devno *)(tbl), sizeof (tbl) / sizeof ((tbl)[0]), sizeof ((tbl)[0]), (vendor), (product))
#define USB_PRODUCT_ANY 0xffff
==== //depot/projects/wifi/sys/dev/usb/uscanner.c#4 (text+ko) ====
@@ -5,7 +5,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.61 2004/12/13 00:25:03 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.62 2004/12/13 06:26:23 imp Exp $");
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -67,10 +67,10 @@
#include <sys/select.h>
#endif
#include <sys/proc.h>
-#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/conf.h>
#include <sys/sysctl.h>
+#include <sys/uio.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
==== //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#9 (text+ko) ====
@@ -31,7 +31,7 @@
* @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95
* From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43
*
- * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.89 2004/12/07 08:15:39 phk Exp $
+ * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.92 2004/12/13 07:41:19 phk Exp $
*/
/*
@@ -914,7 +914,7 @@
return (error);
resid = uio->uio_resid;
ioflag = 0;
- if (fp->f_flag & FNONBLOCK)
+ if (fp->f_flag & O_NONBLOCK)
ioflag |= IO_NDELAY;
if (fp->f_flag & O_DIRECT)
ioflag |= IO_DIRECT;
@@ -1345,8 +1345,8 @@
return (error);
KASSERT(uio->uio_td == td, ("uio_td %p is not td %p", uio->uio_td, td));
vp = fp->f_vnode;
- ioflag = IO_UNIT;
- if (fp->f_flag & FNONBLOCK)
+ ioflag = 0;
+ if (fp->f_flag & O_NONBLOCK)
ioflag |= IO_NDELAY;
if (fp->f_flag & O_DIRECT)
ioflag |= IO_DIRECT;
@@ -1412,6 +1412,7 @@
.vop_open = devfs_open,
.vop_pathconf = devfs_pathconf,
.vop_print = devfs_print,
+ .vop_read = VOP_PANIC,
.vop_readdir = VOP_PANIC,
.vop_readlink = VOP_PANIC,
.vop_reallocblks = VOP_PANIC,
@@ -1426,4 +1427,5 @@
#endif
.vop_strategy = VOP_PANIC,
.vop_symlink = VOP_PANIC,
+ .vop_write = VOP_PANIC,
};
==== //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
- * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.108 2004/12/01 23:16:32 phk Exp $
+ * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.110 2004/12/13 10:07:57 phk Exp $
*/
#include <sys/param.h>
@@ -116,6 +116,7 @@
.vop_open = fifo_open,
.vop_pathconf = fifo_pathconf,
.vop_print = fifo_print,
+ .vop_read = VOP_PANIC,
.vop_readdir = VOP_PANIC,
.vop_readlink = VOP_PANIC,
.vop_reallocblks = VOP_PANIC,
@@ -125,6 +126,7 @@
.vop_rmdir = VOP_PANIC,
.vop_setattr = VOP_EBADF,
.vop_symlink = VOP_PANIC,
+ .vop_write = VOP_PANIC,
};
struct mtx fifo_mtx;
@@ -274,17 +276,15 @@
* a reader. That (and not still having one)
* is the condition that we must wait for.
*/
- return (0);
+ mtx_lock(&fifo_mtx);
}
}
mtx_unlock(&fifo_mtx);
- if (ap->a_fdidx >= 0) {
- fp = ap->a_td->td_proc->p_fd->fd_ofiles[ap->a_fdidx];
- if (fp->f_ops == &badfileops) {
- fp->f_ops = &fifo_ops_f;
- fp->f_data = fip;
- }
- }
+ KASSERT(ap->a_fdidx >= 0, ("can't fifo/vnode bypass %d", ap->a_fdidx));
+ fp = ap->a_td->td_proc->p_fd->fd_ofiles[ap->a_fdidx];
+ KASSERT(fp->f_ops == &badfileops, ("not badfileops in fifo_open"));
+ fp->f_ops = &fifo_ops_f;
+ fp->f_data = fip;
return (0);
}
==== //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#8 (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/fs/ntfs/ntfs_vfsops.c,v 1.71 2004/12/12 12:02:33 phk Exp $
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.72 2004/12/13 16:21:48 ssouhlal Exp $
*/
@@ -154,15 +154,12 @@
/*
* If updating, check whether changing from read-only to
- * read/write; if there is no device name, that's all we do.
+ * read/write.
*/
if (mp->mnt_flag & MNT_UPDATE) {
- /* if not updating name...*/
- if (from == NULL) {
- error = vfs_copyopt(mp->mnt_optnew, "export",
- &export, sizeof export);
- if (error)
- return (error);
+ error = vfs_copyopt(mp->mnt_optnew, "export",
+ &export, sizeof export);
+ if ((error == 0) && export.ex_flags != 0) {
/*
* Process export requests. Jumping to "success"
* will return the vfs_export() error code.
==== //depot/projects/wifi/sys/geom/raid3/g_raid3.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.28 2004/12/04 21:20:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.29 2004/12/13 13:02:06 pjd Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -143,16 +143,6 @@
static void g_raid3_sync_stop(struct g_raid3_softc *sc, int type);
-/*
- * XXX: it should be placed in subr_disk.c.
- */
-static void
-bioq_insert_head(struct bio_queue_head *head, struct bio *bp)
-{
-
- TAILQ_INSERT_HEAD(&head->queue, bp, bio_queue);
-}
-
static const char *
g_raid3_disk_state2str(int state)
{
==== //depot/projects/wifi/sys/i386/pci/pci_cfgreg.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.114 2004/12/10 15:44:12 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.115 2004/12/13 07:08:44 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -523,7 +523,6 @@
TAILQ_REMOVE(pcielist, elem, elem);
TAILQ_INSERT_HEAD(pcielist, elem, elem);
}
- critical_exit();
return (elem);
}
==== //depot/projects/wifi/sys/kern/kern_sig.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.296 2004/11/15 20:51:32 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.297 2004/12/13 16:45:57 jeff Exp $");
#include "opt_compat.h"
#include "opt_ktrace.h"
@@ -1959,6 +1959,8 @@
* killed in this lifetime.
*/
if (action == SIG_DFL && (prop & SA_KILL)) {
+ if (p->p_nice > 0)
+ sched_nice(td->td_proc, 0);
if (td->td_priority > PUSER)
sched_prio(td, PUSER);
}
==== //depot/projects/wifi/sys/kern/kern_subr.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.94 2004/12/08 05:25:08 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.95 2004/12/13 06:24:14 alc Exp $");
#include "opt_zero.h"
@@ -68,6 +68,12 @@
/* Declared in uipc_socket.c */
extern int so_zero_copy_receive;
+/*
+ * Identify the physical page mapped at the given kernel virtual
+ * address. Insert this physical page into the given address space at
+ * the given virtual address, replacing the physical page, if any,
+ * that already exists there.
+ */
static int
vm_pgmoveco(vm_map_t mapa, vm_offset_t kaddr, vm_offset_t uaddr)
{
@@ -79,10 +85,17 @@
vm_prot_t prot;
boolean_t wired;
+ KASSERT((uaddr & PAGE_MASK) == 0,
+ ("vm_pgmoveco: uaddr is not page aligned"));
+
/*
- * First lookup the kernel page.
+ * Herein the physical page is validated and dirtied. It is
+ * unwired in sf_buf_mext().
*/
kern_pg = PHYS_TO_VM_PAGE(vtophys(kaddr));
+ kern_pg->valid = VM_PAGE_BITS_ALL;
+ KASSERT(kern_pg->queue == PQ_NONE && kern_pg->wire_count == 1,
+ ("vm_pgmoveco: kern_pg is not correctly wired"));
if ((vm_map_lookup(&map, uaddr,
VM_PROT_WRITE, &entry, &uobject,
@@ -90,28 +103,25 @@
return(EFAULT);
}
VM_OBJECT_LOCK(uobject);
+retry:
if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) {
- do
- vm_page_lock_queues();
- while (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco"));
+ vm_page_lock_queues();
+ if (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco"))
+ goto retry;
pmap_remove_all(user_pg);
vm_page_free(user_pg);
- } else
+ } else {
+ /*
+ * Even if a physical page does not exist in the
+ * object chain's first object, a physical page from a
+ * backing object may be mapped read only.
+ */
+ if (uobject->backing_object != NULL)
+ pmap_remove(map->pmap, uaddr, uaddr + PAGE_SIZE);
vm_page_lock_queues();
- if (kern_pg->busy || ((kern_pg->queue - kern_pg->pc) == PQ_FREE) ||
- (kern_pg->hold_count != 0)|| (kern_pg->flags & PG_BUSY)) {
- printf("vm_pgmoveco: pindex(%lu), busy(%d), PG_BUSY(%d), "
- "hold(%d) paddr(0x%lx)\n", (u_long)kern_pg->pindex,
- kern_pg->busy, (kern_pg->flags & PG_BUSY) ? 1 : 0,
- kern_pg->hold_count, (u_long)kern_pg->phys_addr);
- if ((kern_pg->queue - kern_pg->pc) == PQ_FREE)
- panic("vm_pgmoveco: renaming free page");
- else
- panic("vm_pgmoveco: renaming busy page");
}
vm_page_insert(kern_pg, uobject, upindex);
vm_page_dirty(kern_pg);
- kern_pg->valid = VM_PAGE_BITS_ALL;
vm_page_unlock_queues();
VM_OBJECT_UNLOCK(uobject);
vm_map_lookup_done(map, entry);
==== //depot/projects/wifi/sys/kern/sched_ule.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.137 2004/11/11 19:48:57 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.138 2004/12/13 13:09:33 jeff Exp $");
#include <opt_sched.h>
@@ -79,18 +79,6 @@
int realstathz;
int tickincr = 1;
-#ifdef PREEMPTION
-static void
-printf_caddr_t(void *data)
-{
- printf("%s", (char *)data);
-}
-static char preempt_warning[] =
- "WARNING: Kernel PREEMPTION is unstable under SCHED_ULE.\n";
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list