d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change '#if UKBD_DEBUG' to '#ifdef...'

Browse Source 
Remove freeing of description on detach. Is done by subr_bus.c.
This commit is contained in:
n_hibma 1999-05-03 23:16:05 +00:00
parent 943f65fb32
commit 84a9dcacfc
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/usb/ukbd.c
View File

@ -217,7 +217,6 @@ int
ukbd_detach(device_t self)
{
struct ukbd_softc *sc = device_get_softc(self);
const char *devinfo = device_get_desc(self);
int error;
error = ukbd_remove_kbd(sc);
@ -228,10 +227,7 @@ ukbd_detach(device_t self)
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
if (devinfo) {
device_set_desc(self, NULL);
free((void *)devinfo, M_USB);
}
device_set_desc(self, NULL);
return (0);
}
@ -865,7 +861,7 @@ ukbd_interrupt(keyboard_t *kbd, void *arg)
if (state->ks_inputs <= 0)
return 0;
#if UKBD_DEBUG
#ifdef UKBD_DEBUG
for (i = state->ks_inputhead, j = 0; j < state->ks_inputs; ++j,
i = (i + 1)%INPUTBUFSIZE) {
c = state->ks_input[i];
@ -1425,7 +1421,7 @@ probe_keyboard(struct usb_attach_arg *uaa, int flags)
{
usb_interface_descriptor_t *id;
if (!uaa->iface)
if (!uaa->iface) /* we attach to ifaces only */
return EINVAL;
/* Check that this is a keyboard that speaks the boot protocol. */
@ -1434,7 +1430,8 @@ probe_keyboard(struct usb_attach_arg *uaa, int flags)
&& id->bInterfaceClass == UCLASS_HID
&& id->bInterfaceSubClass == USUBCLASS_BOOT
&& id->bInterfaceProtocol == UPROTO_BOOT_KEYBOARD)
return 0;
return 0; /* found it */
return EINVAL;
}