summaryrefslogtreecommitdiff
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
parent0dcd47eb848d159efd03577cc638a69074b0fb9b (diff)
downloadrockbox-fde9b57f7010369800d56b6b2eb98e6593236e13.zip
rockbox-fde9b57f7010369800d56b6b2eb98e6593236e13.tar.gz
rockbox-fde9b57f7010369800d56b6b2eb98e6593236e13.tar.bz2
rockbox-fde9b57f7010369800d56b6b2eb98e6593236e13.tar.xz
Fixed some sim build errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2856 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/mpeg.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 92f79b1..bd56066 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -64,7 +64,6 @@ static int get_unswapped_space(void);
#define MPEG_TRACK_CHANGE 101
#define MPEG_SAVE_DATA 102
#define MPEG_STOP_DONE 103
-#define MPEG_REC_TIMEOUT 104
enum
{
@@ -617,10 +616,11 @@ static void stop_dma(void)
dma_on = false;
}
-long current_dma_tick = 0;
+#ifdef HAVE_MAS3587F
long timing_info_index = 0;
long timing_info[1024];
bool inverted_pr;
+#endif
static void dma_tick(void)
{
@@ -1618,13 +1618,6 @@ static void mpeg_thread(void)
queue_post(&mpeg_queue, MPEG_SAVE_DATA, 0);
break;
- case MPEG_REC_TIMEOUT:
- demand_irq_enable(false);
- if(mpeg_file >= 0)
- close(mpeg_file);
- panicf("Timeout: %d", (int)ev.data);
- break;
-
case MPEG_STOP_DONE:
DEBUGF("MPEG_STOP_DONE\n");
@@ -2570,11 +2563,13 @@ void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int
memset(id3tags, sizeof(id3tags), 0);
memset(_id3tags, sizeof(id3tags), 0);
+#ifdef HAVE_MAS3587F
if(read_hw_mask() & PR_ACTIVE_HIGH)
inverted_pr = true;
else
inverted_pr = false;
-
+#endif
+
#ifdef DEBUG
dbg_timer_start();
dbg_cnt2us(0);