summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/mp3_playback.c4
-rw-r--r--firmware/mpeg.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index cc02505979..140d1ff75b 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -45,6 +45,7 @@ enum
45 45
46#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) 46#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
47extern unsigned long shadow_io_control_main; 47extern unsigned long shadow_io_control_main;
48extern unsigned shadow_codec_reg0;
48#endif 49#endif
49 50
50/**** globals ****/ 51/**** globals ****/
@@ -539,7 +540,8 @@ static void init_playback(void)
539 } while(val); 540 } while(val);
540 541
541 /* Enable the D/A Converter */ 542 /* Enable the D/A Converter */
542 mas_codec_writereg(0x0, 0x0001); 543 shadow_codec_reg0 = 0x0001;
544 mas_codec_writereg(0x0, shadow_codec_reg0);
543 545
544 /* ADC scale 0%, DSP scale 100% */ 546 /* ADC scale 0%, DSP scale 100% */
545 mas_codec_writereg(6, 0x0000); 547 mas_codec_writereg(6, 0x0000);
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index becd3d54cb..5b5faceeb1 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -53,7 +53,6 @@ static void stop_recording(void);
53static int get_unsaved_space(void); 53static int get_unsaved_space(void);
54static void pause_recording(void); 54static void pause_recording(void);
55static void resume_recording(void); 55static void resume_recording(void);
56static int shadow_codec_reg0;
57#endif /* #if CONFIG_HWCODEC == MAS3587F */ 56#endif /* #if CONFIG_HWCODEC == MAS3587F */
58 57
59#ifndef SIMULATOR 58#ifndef SIMULATOR
@@ -362,6 +361,7 @@ unsigned long shadow_encoder_control = 0;
362unsigned long shadow_io_control_main = 0; 361unsigned long shadow_io_control_main = 0;
363unsigned long shadow_app_select = 0; 362unsigned long shadow_app_select = 0;
364unsigned long shadow_soft_mute = 0; 363unsigned long shadow_soft_mute = 0;
364unsigned shadow_codec_reg0;
365#endif 365#endif
366 366
367static int mpeg_file; 367static int mpeg_file;
@@ -648,7 +648,7 @@ void rec_tick(void)
648 num_bytes = mp3buf_write - mp3buf_read; 648 num_bytes = mp3buf_write - mp3buf_read;
649 if(num_bytes < 0) 649 if(num_bytes < 0)
650 num_bytes += mp3buflen; 650 num_bytes += mp3buflen;
651 651
652 if(mp3buflen - num_bytes < MPEG_RECORDING_LOW_WATER && !saving) 652 if(mp3buflen - num_bytes < MPEG_RECORDING_LOW_WATER && !saving)
653 { 653 {
654 saving = true; 654 saving = true;
@@ -2393,7 +2393,7 @@ void mpeg_beep(int duration)
2393void mpeg_new_file(const char *filename) 2393void mpeg_new_file(const char *filename)
2394{ 2394{
2395 mpeg_errno = 0; 2395 mpeg_errno = 0;
2396 2396
2397 strncpy(recording_filename, filename, MAX_PATH - 1); 2397 strncpy(recording_filename, filename, MAX_PATH - 1);
2398 recording_filename[MAX_PATH - 1] = 0; 2398 recording_filename[MAX_PATH - 1] = 0;
2399 2399