1841afab464f2e7239fc058bfd249b711e571389
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.4 / 0128-rpi-update-vc_vchi_audioserv_defs.h.patch
1 From cd33640409eb73b99703273192971e0ea874652f Mon Sep 17 00:00:00 2001
2 From: wm4 <wm4@nowhere>
3 Date: Wed, 13 Jan 2016 19:42:48 +0100
4 Subject: [PATCH 128/381] rpi: update vc_vchi_audioserv_defs.h
5
6 Add audioserv 3 extensions. The changes were taken from the paste
7 linked here:
8
9 https://github.com/raspberrypi/linux/pull/1166#issuecomment-151917067
10 ---
11 sound/arm/vc_vchi_audioserv_defs.h | 13 +++++++++++--
12 1 file changed, 11 insertions(+), 2 deletions(-)
13
14 --- a/sound/arm/vc_vchi_audioserv_defs.h
15 +++ b/sound/arm/vc_vchi_audioserv_defs.h
16 @@ -16,7 +16,7 @@
17 #define _VC_AUDIO_DEFS_H_
18
19 #define VC_AUDIOSERV_MIN_VER 1
20 -#define VC_AUDIOSERV_VER 2
21 +#define VC_AUDIOSERV_VER 3
22
23 // FourCC code used for VCHI connection
24 #define VC_AUDIO_SERVER_NAME MAKE_FOURCC("AUDS")
25 @@ -36,6 +36,7 @@ typedef enum {
26 VC_AUDIO_MSG_TYPE_START, // Configure audio
27 VC_AUDIO_MSG_TYPE_STOP, // Configure audio
28 VC_AUDIO_MSG_TYPE_WRITE, // Configure audio
29 + VC_AUDIO_MSG_TYPE_LATENCY, // request latency in cycles
30 VC_AUDIO_MSG_TYPE_MAX
31 } VC_AUDIO_MSG_TYPE;
32
33 @@ -44,6 +45,7 @@ typedef struct {
34 uint32_t channels;
35 uint32_t samplerate;
36 uint32_t bps;
37 + uint32_t channelmap;
38
39 } VC_AUDIO_CONFIG_T;
40
41 @@ -84,6 +86,12 @@ typedef struct {
42 uint16_t max_packet;
43 } VC_AUDIO_WRITE_T;
44
45 +// query latency in samples of sink
46 +typedef struct
47 +{
48 + uint32_t dummy;
49 +} VC_AUDIO_LATENCY_T;
50 +
51 // Generic result for a request (VC->HOST)
52 typedef struct {
53 int32_t success; // Success value
54 @@ -108,9 +116,10 @@ typedef struct {
55 VC_AUDIO_START_T start;
56 VC_AUDIO_STOP_T stop;
57 VC_AUDIO_WRITE_T write;
58 + VC_AUDIO_LATENCY_T latency;
59 VC_AUDIO_RESULT_T result;
60 VC_AUDIO_COMPLETE_T complete;
61 } u;
62 } VC_AUDIO_MSG_T;
63
64 -#endif // _VC_AUDIO_DEFS_H_
65 +#endif // _VC_AUDIO_DEFS_H_
66 \ No newline at end of file