target/linux/brcm2708/patches-4.4/0321-Revert-rpi-update-vc_vchi_audioserv_defs.h.patch

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