diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 1999-01-10 18:42:54 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 1999-01-10 18:42:54 +0000 |
| commit | 910aa44d3b83a9b8499aa367bb1117572d1390d6 (patch) | |
| tree | 8a044a96be7b26512d809593ab4478a2285e6ae4 /sys/dev/usb/usb_subr.c | |
| parent | 2850284f098bcd5c582370a3b4b97dbba890d7bf (diff) | |
| download | FreeBSD-src-910aa44d3b83a9b8499aa367bb1117572d1390d6.zip FreeBSD-src-910aa44d3b83a9b8499aa367bb1117572d1390d6.tar.gz | |
Sync with NetBSD sources. Almost there. Mostly style fixes.
Diffstat (limited to 'sys/dev/usb/usb_subr.c')
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index 69035f2..d903c07 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,5 +1,5 @@ -/* $NetBSD: usb_subr.c,v 1.24 1999/01/01 15:21:42 augustss Exp $ */ -/* FreeBSD $Id$ */ +/* $NetBSD: usb_subr.c,v 1.27 1999/01/08 11:58:25 augustss Exp $ */ +/* FreeBSD $Id: usb_subr.c,v 1.6 1999/01/07 23:31:40 n_hibma Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -80,8 +80,6 @@ int usbd_getnewaddr __P((usbd_bus_handle bus)); int usbd_print __P((void *aux, const char *pnp)); int usbd_submatch __P((bdevice *, struct cfdata *cf, void *)); #endif -usb_interface_descriptor_t *usbd_find_idesc __P((usb_config_descriptor_t *cd, - int ifaceidx, int altidx)); void usbd_free_iface_data __P((usbd_device_handle dev, int ifcno)); void usbd_kill_pipe __P((usbd_pipe_handle)); usbd_status usbd_probe_and_attach @@ -725,7 +723,6 @@ usbd_probe_and_attach(parent, dev, port, addr) int port; int addr; { - bdevice bdev; struct usb_attach_arg uaa; usb_device_descriptor_t *dd = &dev->ddesc; int r, found, i, confi, nifaces; @@ -735,6 +732,7 @@ usbd_probe_and_attach(parent, dev, port, addr) /* XXX uaa is a static var. Not a problem as it _should_ be used only * during probe and attach. Should be changed however */ + bdevice bdev; bdev = device_add_child(*parent, NULL, -1, &uaa); if (!bdev) { printf("%s: Device creation failed\n", USBDEVNAME(dev->bus->bdev)); @@ -1029,14 +1027,6 @@ usbd_submatch(parent, cf, aux) return 0; return ((*cf->cf_attach->ca_match)(parent, cf, aux)); } - -#elif defined(__FreeBSD__) -static void -usbd_bus_print_child(device_t bus, device_t dev) -{ - /* FIXME print the device address and the configuration used - */ -} #endif usbd_status |
