len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-23 11:09:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some sim build errors

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2856 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-11-19 10:29:38 +00:00
parent 0dcd47eb84
commit fde9b57f70
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
firmware/mpeg.c
View file

@ -64,7 +64,6 @@ static int get_unswapped_space(void);
#define MPEG_TRACK_CHANGE 101 #define MPEG_TRACK_CHANGE 101
#define MPEG_SAVE_DATA 102 #define MPEG_SAVE_DATA 102
#define MPEG_STOP_DONE 103 #define MPEG_STOP_DONE 103
#define MPEG_REC_TIMEOUT 104
enum enum
{ {
@ -617,10 +616,11 @@ static void stop_dma(void)
dma_on = false; dma_on = false;
} }
long current_dma_tick = 0; #ifdef HAVE_MAS3587F
long timing_info_index = 0; long timing_info_index = 0;
long timing_info[1024]; long timing_info[1024];
bool inverted_pr; bool inverted_pr;
#endif
static void dma_tick(void) static void dma_tick(void)
{ {
@ -1618,13 +1618,6 @@ static void mpeg_thread(void)
queue_post(&mpeg_queue, MPEG_SAVE_DATA, 0); queue_post(&mpeg_queue, MPEG_SAVE_DATA, 0);
break; 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: case MPEG_STOP_DONE:
DEBUGF("MPEG_STOP_DONE\n"); 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);
memset(_id3tags, sizeof(id3tags), 0); memset(_id3tags, sizeof(id3tags), 0);
#ifdef HAVE_MAS3587F
if(read_hw_mask() & PR_ACTIVE_HIGH) if(read_hw_mask() & PR_ACTIVE_HIGH)
inverted_pr = true; inverted_pr = true;
else else
inverted_pr = false; inverted_pr = false;
#endif
#ifdef DEBUG #ifdef DEBUG
dbg_timer_start(); dbg_timer_start();
dbg_cnt2us(0); dbg_cnt2us(0);