diff options
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r-- | firmware/mpeg.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 92f79b1977..bd560665a2 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -64,7 +64,6 @@ static int get_unswapped_space(void); | |||
64 | #define MPEG_TRACK_CHANGE 101 | 64 | #define MPEG_TRACK_CHANGE 101 |
65 | #define MPEG_SAVE_DATA 102 | 65 | #define MPEG_SAVE_DATA 102 |
66 | #define MPEG_STOP_DONE 103 | 66 | #define MPEG_STOP_DONE 103 |
67 | #define MPEG_REC_TIMEOUT 104 | ||
68 | 67 | ||
69 | enum | 68 | enum |
70 | { | 69 | { |
@@ -617,10 +616,11 @@ static void stop_dma(void) | |||
617 | dma_on = false; | 616 | dma_on = false; |
618 | } | 617 | } |
619 | 618 | ||
620 | long current_dma_tick = 0; | 619 | #ifdef HAVE_MAS3587F |
621 | long timing_info_index = 0; | 620 | long timing_info_index = 0; |
622 | long timing_info[1024]; | 621 | long timing_info[1024]; |
623 | bool inverted_pr; | 622 | bool inverted_pr; |
623 | #endif | ||
624 | 624 | ||
625 | static void dma_tick(void) | 625 | static void dma_tick(void) |
626 | { | 626 | { |
@@ -1618,13 +1618,6 @@ static void mpeg_thread(void) | |||
1618 | queue_post(&mpeg_queue, MPEG_SAVE_DATA, 0); | 1618 | queue_post(&mpeg_queue, MPEG_SAVE_DATA, 0); |
1619 | break; | 1619 | break; |
1620 | 1620 | ||
1621 | case MPEG_REC_TIMEOUT: | ||
1622 | demand_irq_enable(false); | ||
1623 | if(mpeg_file >= 0) | ||
1624 | close(mpeg_file); | ||
1625 | panicf("Timeout: %d", (int)ev.data); | ||
1626 | break; | ||
1627 | |||
1628 | case MPEG_STOP_DONE: | 1621 | case MPEG_STOP_DONE: |
1629 | DEBUGF("MPEG_STOP_DONE\n"); | 1622 | DEBUGF("MPEG_STOP_DONE\n"); |
1630 | 1623 | ||
@@ -2570,11 +2563,13 @@ void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int | |||
2570 | memset(id3tags, sizeof(id3tags), 0); | 2563 | memset(id3tags, sizeof(id3tags), 0); |
2571 | memset(_id3tags, sizeof(id3tags), 0); | 2564 | memset(_id3tags, sizeof(id3tags), 0); |
2572 | 2565 | ||
2566 | #ifdef HAVE_MAS3587F | ||
2573 | if(read_hw_mask() & PR_ACTIVE_HIGH) | 2567 | if(read_hw_mask() & PR_ACTIVE_HIGH) |
2574 | inverted_pr = true; | 2568 | inverted_pr = true; |
2575 | else | 2569 | else |
2576 | inverted_pr = false; | 2570 | inverted_pr = false; |
2577 | 2571 | #endif | |
2572 | |||
2578 | #ifdef DEBUG | 2573 | #ifdef DEBUG |
2579 | dbg_timer_start(); | 2574 | dbg_timer_start(); |
2580 | dbg_cnt2us(0); | 2575 | dbg_cnt2us(0); |