Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added a timeout debug panic for the recording DMA protocol

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2825 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-11-11 13:24:41 +00:00
parent ddcc25a141
commit 1e524abd5b
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
firmware/mpeg.c
View file

@ -64,6 +64,7 @@ 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
{ {
@ -643,19 +644,31 @@ static void dma_tick(void)
else else
{ {
int i; int i;
int x;
int num_bytes = 0; int num_bytes = 0;
if(recording && (PBDR & 0x4000)) if(recording && (PBDR & 0x4000))
{ {
timing_info[timing_info_index++] = current_dma_tick; timing_info[timing_info_index++] = current_dma_tick;
TCNT2 = 0; TCNT2 = 0;
for(i = 0;i < 30;i++) for(i = 0;i < 30 && (PBDR & 0x4000);i++)
{ {
if(read_hw_mask() & PR_ACTIVE_HIGH) if(read_hw_mask() & PR_ACTIVE_HIGH)
PADR |= 0x800; PADR |= 0x800;
else else
PADR &= ~0x800; PADR &= ~0x800;
while(PBDR & 0x8000) {}; for(x = 2000;PBDR & 0x8000 && x;x--) {};
if(x == 0)
{
queue_post(&mpeg_queue, MPEG_REC_TIMEOUT, (void *)0);
if(read_hw_mask() & PR_ACTIVE_HIGH)
PADR &= ~0x800;
else
PADR |= 0x800;
break;
}
mp3buf[mp3buf_write] = *(unsigned char *)0x4000000; mp3buf[mp3buf_write] = *(unsigned char *)0x4000000;
if(read_hw_mask() & PR_ACTIVE_HIGH) if(read_hw_mask() & PR_ACTIVE_HIGH)
@ -668,7 +681,17 @@ static void dma_tick(void)
mp3buf_write = 0; mp3buf_write = 0;
num_bytes++; num_bytes++;
while(!(PBDR & 0x8000)) {};
for(x = 2000;!(PBDR & 0x8000) && x;x--) {};
if(x == 0)
{
queue_post(&mpeg_queue, MPEG_REC_TIMEOUT, (void *)1);
if(read_hw_mask() & PR_ACTIVE_HIGH)
PADR &= ~0x800;
else
PADR |= 0x800;
break;
}
} }
timing_info[timing_info_index++] = TCNT2 + (num_bytes << 16); timing_info[timing_info_index++] = TCNT2 + (num_bytes << 16);
@ -1570,6 +1593,12 @@ 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:
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");