1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From 9023265ca66a0152d9e57ba44c6e619aabd3df1e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 6 May 2016 17:18:57 +0100
Subject: [PATCH] Revert "rpi: update vc_vchi_audioserv_defs.h"
This reverts commit 64fa9f963dffab0145f7960a593422064bb0aa8d.
---
sound/arm/vc_vchi_audioserv_defs.h | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
--- a/sound/arm/vc_vchi_audioserv_defs.h
+++ b/sound/arm/vc_vchi_audioserv_defs.h
@@ -16,7 +16,7 @@
#define _VC_AUDIO_DEFS_H_
#define VC_AUDIOSERV_MIN_VER 1
-#define VC_AUDIOSERV_VER 3
+#define VC_AUDIOSERV_VER 2
// FourCC code used for VCHI connection
#define VC_AUDIO_SERVER_NAME MAKE_FOURCC("AUDS")
@@ -36,7 +36,6 @@ typedef enum {
VC_AUDIO_MSG_TYPE_START, // Configure audio
VC_AUDIO_MSG_TYPE_STOP, // Configure audio
VC_AUDIO_MSG_TYPE_WRITE, // Configure audio
- VC_AUDIO_MSG_TYPE_LATENCY, // request latency in cycles
VC_AUDIO_MSG_TYPE_MAX
} VC_AUDIO_MSG_TYPE;
@@ -45,7 +44,6 @@ typedef struct {
uint32_t channels;
uint32_t samplerate;
uint32_t bps;
- uint32_t channelmap;
} VC_AUDIO_CONFIG_T;
@@ -86,12 +84,6 @@ typedef struct {
uint16_t max_packet;
} VC_AUDIO_WRITE_T;
-// query latency in samples of sink
-typedef struct
-{
- uint32_t dummy;
-} VC_AUDIO_LATENCY_T;
-
// Generic result for a request (VC->HOST)
typedef struct {
int32_t success; // Success value
@@ -116,10 +108,9 @@ typedef struct {
VC_AUDIO_START_T start;
VC_AUDIO_STOP_T stop;
VC_AUDIO_WRITE_T write;
- VC_AUDIO_LATENCY_T latency;
VC_AUDIO_RESULT_T result;
VC_AUDIO_COMPLETE_T complete;
} u;
} VC_AUDIO_MSG_T;
-#endif // _VC_AUDIO_DEFS_H_
\ No newline at end of file
+#endif // _VC_AUDIO_DEFS_H_
|
