summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2007-06-09 06:49:05 +0000
committerimp <imp@FreeBSD.org>2007-06-09 06:49:05 +0000
commitea3321396e9b9c814bdfabf56ca27af3452c04a4 (patch)
tree97a61105020a32f65b52e20173432939e33befff /sys/dev/sound
parent6b57bca6dcae3f2de6ad019610dcce6e0e17313d (diff)
downloadFreeBSD-src-ea3321396e9b9c814bdfabf56ca27af3452c04a4.zip
FreeBSD-src-ea3321396e9b9c814bdfabf56ca27af3452c04a4.tar.gz
Expand USB_ATTACH_SETUP inline + devinfo tweaks
# looks like there's a chance that uaudio might compile on otherBSD, so leave # those #defines alone as well as make this change in a compatible way.
Diffstat (limited to 'sys/dev/sound')
-rw-r--r--sys/dev/sound/usb/uaudio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index d331763..8b8e7d2 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -523,13 +523,14 @@ USB_ATTACH(uaudio)
USB_ATTACH_START(uaudio, sc, uaa);
usb_interface_descriptor_t *id;
usb_config_descriptor_t *cdesc;
+#if !define(__FreeBSD__)
char devinfo[1024];
+#endif
usbd_status err;
int i, j, found;
#if defined(__FreeBSD__)
- usbd_devinfo(uaa->device, 0, devinfo);
- USB_ATTACH_SETUP;
+ sc->sc_dev = self;
#else
usbd_devinfo(uaa->device, 0, devinfo, sizeof(devinfo));
printf(": %s\n", devinfo);
OpenPOWER on IntegriCloud