diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-05-29 18:46:57 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-05-29 18:46:57 +0000 |
| commit | 44c17bdf07d7ee7ab581951d10bfe1b3300a21a5 (patch) | |
| tree | 5ff9fef81906105040348e5e28fafc3efac89f62 /sys/dev/sound | |
| parent | 40062c9280416ae05d892e9651e3889e64644621 (diff) | |
| download | FreeBSD-src-44c17bdf07d7ee7ab581951d10bfe1b3300a21a5.zip FreeBSD-src-44c17bdf07d7ee7ab581951d10bfe1b3300a21a5.tar.gz | |
s/usb2_/usb_/ on all typedefs for the USB stack.
Diffstat (limited to 'sys/dev/sound')
| -rw-r--r-- | sys/dev/sound/usb/uaudio.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 2e14b8f..c2f3b80 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -308,13 +308,13 @@ static device_probe_t uaudio_probe; static device_attach_t uaudio_attach; static device_detach_t uaudio_detach; -static usb2_callback_t uaudio_chan_play_callback; -static usb2_callback_t uaudio_chan_record_callback; -static usb2_callback_t uaudio_mixer_write_cfg_callback; -static usb2_callback_t umidi_read_clear_stall_callback; -static usb2_callback_t umidi_bulk_read_callback; -static usb2_callback_t umidi_write_clear_stall_callback; -static usb2_callback_t umidi_bulk_write_callback; +static usb_callback_t uaudio_chan_play_callback; +static usb_callback_t uaudio_chan_record_callback; +static usb_callback_t uaudio_mixer_write_cfg_callback; +static usb_callback_t umidi_read_clear_stall_callback; +static usb_callback_t umidi_bulk_read_callback; +static usb_callback_t umidi_write_clear_stall_callback; +static usb_callback_t umidi_bulk_write_callback; static void uaudio_chan_fill_info_sub(struct uaudio_softc *, struct usb_device *, uint32_t, uint16_t, uint8_t, uint8_t); @@ -362,7 +362,7 @@ static uint16_t uaudio_mixer_get(struct usb_device *, uint8_t, struct uaudio_mixer_node *); static void uaudio_mixer_ctl_set(struct uaudio_softc *, struct uaudio_mixer_node *, uint8_t, int32_t val); -static usb2_error_t uaudio_set_speed(struct usb_device *, uint8_t, uint32_t); +static usb_error_t uaudio_set_speed(struct usb_device *, uint8_t, uint32_t); static int uaudio_mixer_signext(uint8_t, int); static int uaudio_mixer_bsd2value(struct uaudio_mixer_node *, int32_t val); static const void *uaudio_mixer_verify_desc(const void *, uint32_t); @@ -1295,7 +1295,7 @@ uaudio_chan_init(struct uaudio_softc *sc, struct snd_dbuf *b, uint8_t endpoint; uint8_t iface_index; uint8_t alt_index; - usb2_error_t err; + usb_error_t err; /* compute required buffer size */ buf_size = (ch->bytes_per_frame * UAUDIO_MINFRAMES); @@ -2873,7 +2873,7 @@ uaudio_mixer_get(struct usb_device *udev, uint8_t what, uint16_t val; uint16_t len = MIX_SIZE(mc->type); uint8_t data[4]; - usb2_error_t err; + usb_error_t err; if (mc->wValue[0] == -1) { return (0); @@ -2987,7 +2987,7 @@ tr_setup: } } -static usb2_error_t +static usb_error_t uaudio_set_speed(struct usb_device *udev, uint8_t endpt, uint32_t speed) { struct usb_device_request req; |
