summaryrefslogtreecommitdiff
path: root/firmware/mpeg.c
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-11-19 10:29:38 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-11-19 10:29:38 +0000
commitfde9b57f7010369800d56b6b2eb98e6593236e13 (patch)
tree2f1ae451bc6ecc5963a1cf1269e38e872553ec93 /firmware/mpeg.c
parent0dcd47eb848d159efd03577cc638a69074b0fb9b (diff)
downloadrockbox-fde9b57f7010369800d56b6b2eb98e6593236e13.tar.gz
rockbox-fde9b57f7010369800d56b6b2eb98e6593236e13.zip
Fixed some sim build errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2856 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r--firmware/mpeg.c15
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
69enum 68enum
70{ 69{
@@ -617,10 +616,11 @@ static void stop_dma(void)
617 dma_on = false; 616 dma_on = false;
618} 617}
619 618
620long current_dma_tick = 0; 619#ifdef HAVE_MAS3587F
621long timing_info_index = 0; 620long timing_info_index = 0;
622long timing_info[1024]; 621long timing_info[1024];
623bool inverted_pr; 622bool inverted_pr;
623#endif
624 624
625static void dma_tick(void) 625static 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);