jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 01:38:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove double removal of children of a hub. (remove disconnected method)

Browse Source 
This was introduced when merging a patch for the newbus people.

And change the debugging flag from USB_DEBUG to UHUB_DEBUG.
This commit is contained in:
Nick Hibma 1999-05-03 23:14:46 +00:00
parent 808844911f
commit 6fed05b974
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=46374
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/dev/usb/uhub.c
View File

@ -60,7 +60,7 @@
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
#ifdef USB_DEBUG
#ifdef UHUB_DEBUG
#define DPRINTF(x) if (usbdebug) logprintf x
#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x
extern int usbdebug;
@ -81,15 +81,10 @@ usbd_status uhub_init_port __P((struct usbd_port *));
void uhub_disconnect_port __P((struct usbd_port *up));
usbd_status uhub_explore __P((usbd_device_handle hub));
void uhub_intr __P((usbd_request_handle, usbd_private_handle, usbd_status));
#ifdef __FreeBSD__
#include "usb_if.h"
static void uhub_disconnected __P((device_t));
#endif
/* void uhub_disco __P((void *)); */
USB_DECLARE_DRIVER_INIT(uhub,
DEVMETHOD(usb_disconnected, uhub_disconnected));
USB_DECLARE_DRIVER(uhub);
#if defined(__FreeBSD__)
devclass_t uhubroot_devclass;
@ -256,27 +251,6 @@ USB_ATTACH(uhub)
}
#if defined(__FreeBSD__)
static void
uhub_disconnected(device_t self)
{
struct uhub_softc *sc = device_get_softc(self);
struct usbd_port *up;
usbd_device_handle dev = sc->sc_hub;
int nports;
int p;
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
nports = dev->hub->hubdesc.bNbrPorts;
for (p = 0; p < nports; p++) {
up = &sc->sc_hub->hub->ports[p];
if (up->device) {
uhub_disconnect_port(up);
}
}
return;
}
static int
uhub_detach(device_t self)
{
@ -515,7 +489,6 @@ uhub_disconnect_port(up)
}
}
#if defined(__FreeBSD__)
USB_DISCONNECTED(sc->sc_dev);
device_delete_child(scp->sc_dev, sc->sc_dev);
#endif