diff options
| -rw-r--r-- | sys/dev/usb/uaudio.c | 12 | ||||
| -rw-r--r-- | sys/dev/usb/usb_port.h | 11 |
2 files changed, 7 insertions, 16 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 8c4341a356e..9e9b1e20ee4 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.46 2007/06/13 06:25:03 mbalmer Exp $ */ +/* $OpenBSD: uaudio.c,v 1.47 2007/06/13 10:10:30 mbalmer Exp $ */ /* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */ /* @@ -3067,11 +3067,11 @@ uaudio_set_params(void *addr, int setmode, int usemode, case AUDIO_ENCODING_ULINEAR_LE: if (p->precision == 16) { if (enc == AUDIO_ENCODING_ULINEAR_LE) - swcode = change_sign16_le; + swcode = change_sign16; else if (mode == AUMODE_PLAY) - swcode = swap_bytes_change_sign16_le; + swcode = swap_bytes_change_sign16; else - swcode = change_sign16_swap_bytes_le; + swcode = change_sign16_swap_bytes; enc = AUDIO_ENCODING_SLINEAR_LE; } else if (p->precision == 8) { if (flags & HAS_8U) { @@ -3084,9 +3084,9 @@ uaudio_set_params(void *addr, int setmode, int usemode, p->hw_precision = 16; enc = AUDIO_ENCODING_SLINEAR_LE; if (mode == AUMODE_PLAY) - swcode = ulinear8_to_slinear16_le; + swcode = ulinear8_to_linear16_le; else - swcode = slinear16_to_ulinear8_le; + swcode = linear16_to_ulinear8_le; } } break; diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 74a0af45046..275615cc801 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_port.h,v 1.86 2007/06/12 16:26:37 mbalmer Exp $ */ +/* $OpenBSD: usb_port.h,v 1.87 2007/06/13 10:10:30 mbalmer Exp $ */ /* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -69,15 +69,6 @@ #define IF_INPUT(ifp, m) ether_input_mbuf((ifp), (m)) -#define swap_bytes_change_sign16_le swap_bytes_change_sign16 -#define change_sign16_swap_bytes_le change_sign16_swap_bytes -#define change_sign16_le change_sign16 - -#define ulinear8_to_slinear16_le ulinear8_to_linear16_le -#define ulinear8_to_slinear16_be ulinear8_to_linear16_be -#define slinear16_to_ulinear8_le linear16_to_ulinear8_le -#define slinear16_to_ulinear8_be linear16_to_ulinear8_be - #define DECLARE_USB_DMA_T \ struct usb_dma_block; \ typedef struct { \ |