diff options
| author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-04 10:34:05 +0000 |
|---|---|---|
| committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-04 10:34:05 +0000 |
| commit | e3b8f0e33e350d79d720bc14dc8076e8fc653e13 (patch) | |
| tree | 25633eb3012d656fb4d1ac2dcec201cb9b4a6175 /sys/dev/usb/uaudio.c | |
| parent | 9de2d85fb9a6ed44d53a03d680c99999da003cfc (diff) | |
Last part of FreeBSD/NetBSD sepcific code removal.
ok jsg@
Diffstat (limited to 'sys/dev/usb/uaudio.c')
| -rw-r--r-- | sys/dev/usb/uaudio.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index daaa4ade912..772220d28b4 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.39 2007/05/27 04:00:25 jsg Exp $ */ +/* $OpenBSD: uaudio.c,v 1.40 2007/06/04 10:34:04 mbalmer Exp $ */ /* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */ /* @@ -350,9 +350,6 @@ Static struct audio_hw_if uaudio_hw_if = { uaudio_get_props, uaudio_trigger_output, uaudio_trigger_input, -#if defined(__NetBSD__) - NULL, -#endif }; Static struct audio_device uaudio_device = { @@ -452,12 +449,7 @@ uaudio_attach(struct device *parent, struct device *self, void *aux) if (usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_AU_NO_FRAC) sc->sc_altflags |= UA_NOFRAC; -#if defined(__NetBSD__) && !defined(UAUDIO_DEBUG) - if (bootverbose) -#endif - printf(", %d mixer controls", sc->sc_nctls); - - printf("\n"); + printf(", %d mixer controls\n", sc->sc_nctls); usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, USBDEV(sc->sc_dev)); @@ -469,12 +461,10 @@ uaudio_attach(struct device *parent, struct device *self, void *aux) /* * Macros to help sync OpenBSD to NetBSD */ -#if defined(__OpenBSD__) #define hw_channels channels #define hw_sample_rate sample_rate #define hw_precision precision #define hw_encoding encoding -#endif int uaudio_activate(device_ptr_t self, enum devact act) |