aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/function
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2014-07-22 13:58:42 -0400
committerFelipe Balbi <balbi@ti.com>2014-08-20 15:05:14 -0400
commitbcec9784dd78abfa9d8ca8b7144f6e37ea6abfd5 (patch)
tree789fc069ac48cbca4f9206bb0ce4c5e09b4bd5e2 /drivers/usb/gadget/function
parent807dccdba5c157c7131772bb6bd9a114a2ed9760 (diff)
usb: gadget: f_uac1: use defined constants as defaults
When configfs support is added the values in question will have to be used in two different places. Substitute them with defined constants to avoid duplicating magic numbers. Tested-by: Sebastian Reimers <sebastian.reimers@googlemail.com> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function')
-rw-r--r--drivers/usb/gadget/function/f_uac1.c4
-rw-r--r--drivers/usb/gadget/function/u_uac1.h8
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 34575375760e..9a6c7ec66757 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -17,8 +17,6 @@
17 17
18#include "u_uac1.h" 18#include "u_uac1.h"
19 19
20#define OUT_EP_MAX_PACKET_SIZE 200
21
22static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value); 20static int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value);
23static int generic_get_cmd(struct usb_audio_control *con, u8 cmd); 21static int generic_get_cmd(struct usb_audio_control *con, u8 cmd);
24 22
@@ -173,7 +171,7 @@ static struct usb_endpoint_descriptor as_out_ep_desc = {
173 .bEndpointAddress = USB_DIR_OUT, 171 .bEndpointAddress = USB_DIR_OUT,
174 .bmAttributes = USB_ENDPOINT_SYNC_ADAPTIVE 172 .bmAttributes = USB_ENDPOINT_SYNC_ADAPTIVE
175 | USB_ENDPOINT_XFER_ISOC, 173 | USB_ENDPOINT_XFER_ISOC,
176 .wMaxPacketSize = __constant_cpu_to_le16(OUT_EP_MAX_PACKET_SIZE), 174 .wMaxPacketSize = cpu_to_le16(UAC1_OUT_EP_MAX_PACKET_SIZE),
177 .bInterval = 4, 175 .bInterval = 4,
178}; 176};
179 177
diff --git a/drivers/usb/gadget/function/u_uac1.h b/drivers/usb/gadget/function/u_uac1.h
index 8507c27020c9..214441d96fe1 100644
--- a/drivers/usb/gadget/function/u_uac1.h
+++ b/drivers/usb/gadget/function/u_uac1.h
@@ -23,6 +23,14 @@
23 23
24#include "gadget_chips.h" 24#include "gadget_chips.h"
25 25
26#define FILE_PCM_PLAYBACK "/dev/snd/pcmC0D0p"
27#define FILE_PCM_CAPTURE "/dev/snd/pcmC0D0c"
28#define FILE_CONTROL "/dev/snd/controlC0"
29
30#define UAC1_OUT_EP_MAX_PACKET_SIZE 200
31#define UAC1_REQ_COUNT 256
32#define UAC1_AUDIO_BUF_SIZE 48000
33
26/* 34/*
27 * This represents the USB side of an audio card device, managed by a USB 35 * This represents the USB side of an audio card device, managed by a USB
28 * function which provides control and stream interfaces. 36 * function which provides control and stream interfaces.