changeset 271:473405ab23a3

l1audio_sync.c: more enum fixes
author Mychaela Falconia <falcon@freecalypso.org>
date Mon, 13 Mar 2017 06:11:12 +0000 (2017-03-13)
parents ac232fc44bfc
children 82a9407a75ce
files chipsetsw/layer1/audio_cfile/l1audio_sync.c
diffstat 1 files changed, 37 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/chipsetsw/layer1/audio_cfile/l1audio_sync.c	Mon Mar 13 06:01:56 2017 +0000
+++ b/chipsetsw/layer1/audio_cfile/l1audio_sync.c	Mon Mar 13 06:11:12 2017 +0000
@@ -1742,11 +1742,16 @@
         M0_INACTIVE                 = 0,
 #if (L1_AUDIO_MCU_ONOFF == 1)
         M0_WAIT_AUDIO_START         = 1,
-#endif
         M0_WAIT_DSP_START           = 2,
         M0_WAIT_COUNTER_EQUAL_0     = 3,
         M0_WAIT_DESCRIPTION_START   = 4,
         M0_WAIT_END_MELO            = 5
+#else
+        M0_WAIT_DSP_START           = 1,
+        M0_WAIT_COUNTER_EQUAL_0     = 2,
+        M0_WAIT_DESCRIPTION_START   = 3,
+        M0_WAIT_END_MELO            = 4
+#endif
       };
 
       UWORD8            *state      = &l1s.audio_state[L1S_MELODY0_STATE];
@@ -2072,11 +2077,16 @@
         M1_INACTIVE                 = 0,
 #if (L1_AUDIO_MCU_ONOFF == 1)
         M1_WAIT_AUDIO_START         = 1,
-#endif
         M1_WAIT_DSP_START           = 2,
         M1_WAIT_COUNTER_EQUAL_0     = 3,
         M1_WAIT_DESCRIPTION_START   = 4,
         M1_WAIT_END_MELO            = 5
+#else
+        M1_WAIT_DSP_START           = 1,
+        M1_WAIT_COUNTER_EQUAL_0     = 2,
+        M1_WAIT_DESCRIPTION_START   = 3,
+        M1_WAIT_END_MELO            = 4
+#endif
       };
 
       UWORD8            *state      = &l1s.audio_state[L1S_MELODY1_STATE];
@@ -2399,10 +2409,14 @@
         IDLE              = 0,
 #if (L1_AUDIO_MCU_ONOFF == 1)
         WAIT_AUDIO_ON     = 1,
-#endif
         WAIT_DSP_START    = 2,
         WAIT_DSP_REQUEST  = 3,
         WAIT_DSP_STOP     = 4
+#else
+        WAIT_DSP_START    = 1,
+        WAIT_DSP_REQUEST  = 2,
+        WAIT_DSP_STOP     = 3
+#endif
       };
 
       UWORD8            *state      = &l1s.audio_state[L1S_VM_PLAY_STATE];
@@ -2639,10 +2653,14 @@
         IDLE              = 0,
 #if (L1_AUDIO_MCU_ONOFF == 1)
         WAIT_AUDIO_ON     = 1,
-#endif // L1_AUDIO_MCU_ONOFF
         WAIT_DSP_START    = 2,
         WAIT_DSP_SAMPLE   = 3,
         WAIT_DSP_STOP     = 4
+#else
+        WAIT_DSP_START    = 1,
+        WAIT_DSP_SAMPLE   = 2,
+        WAIT_DSP_STOP     = 3
+#endif // L1_AUDIO_MCU_ONOFF
       };
 
       UWORD8            *state      = &l1s.audio_state[L1S_VM_RECORD_STATE];
@@ -2877,10 +2895,14 @@
         IDLE                    = 0,
 #if (L1_AUDIO_MCU_ONOFF == 1)
         WAIT_AUDIO_ON           = 1,
-#endif
         WAIT_DEDIC_SPEECH_MODE  = 2,
         WAIT_TONE_UL_START      = 3,
         WAIT_TONE_UL_STOP       = 4
+#else
+        WAIT_DEDIC_SPEECH_MODE  = 1,
+        WAIT_TONE_UL_START      = 2,
+        WAIT_TONE_UL_STOP       = 3
+#endif
       };
 
       UWORD8            *state      = &l1s.audio_state[L1S_TONE_UL_STATE];
@@ -3394,10 +3416,14 @@
         IDLE              = 0,
 #if (L1_AUDIO_MCU_ONOFF == 1)
         WAIT_AUDIO_ON     = 1,
-#endif
         WAIT_DSP_START    = 2,
         WAIT_DSP_REQUEST  = 3,
         WAIT_DSP_STOP     = 4
+#else
+        WAIT_DSP_START    = 1,
+        WAIT_DSP_REQUEST  = 2,
+        WAIT_DSP_STOP     = 3
+#endif
       };
 
       UWORD8            *state      = &l1s.audio_state[L1S_VM_AMR_PLAY_STATE];
@@ -3700,10 +3726,14 @@
         IDLE              = 0,
 #if (L1_AUDIO_MCU_ONOFF == 1)
         WAIT_AUDIO_ON     = 1,
-#endif
         WAIT_DSP_START    = 2,
         WAIT_DSP_SAMPLE   = 3,
         WAIT_DSP_STOP     = 4
+#else
+        WAIT_DSP_START    = 1,
+        WAIT_DSP_SAMPLE   = 2,
+        WAIT_DSP_STOP     = 3
+#endif
       };
 
       UWORD8            *state      = &l1s.audio_state[L1S_VM_AMR_RECORD_STATE];