laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Attempt to address bug #10897 - corner case for overflow

Browse Source
This commit is contained in:
Ross Owen
2012-11-16 17:31:43 +00:00
parent 749230620b
commit b8af693143
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module_usb_audio/usb_buffer/decouple.xc
View File

@@ -759,8 +759,6 @@ void decouple(chanend c_mix_out,
} }
#if 1
//TODO RACE HERE
/* Check if we have an IN packet ready to go */ /* Check if we have an IN packet ready to go */
if (aud_in_ready) if (aud_in_ready)
{ {
@@ -770,12 +768,10 @@ void decouple(chanend c_mix_out,
GET_SHARED_GLOBAL(p, g_aud_to_host_buffer); GET_SHARED_GLOBAL(p, g_aud_to_host_buffer);
read_via_xc_ptr(len, p); read_via_xc_ptr(len, p);
//XUD_Change_ReadyIn_Buffer(aud_to_host_usb_ep, p+4, len); /* Update packet size */
XUD_SetReady_InPtr(aud_to_host_usb_ep, p+4, len); XUD_SetReady_InPtr(aud_to_host_usb_ep, p+4, len);
} }
#endif
/* Reset OUT buffer state */ /* Reset OUT buffer state */
outUnderflow = 1; outUnderflow = 1;
SET_SHARED_GLOBAL(g_aud_from_host_rdptr, aud_from_host_fifo_start); SET_SHARED_GLOBAL(g_aud_from_host_rdptr, aud_from_host_fifo_start);
@@ -784,7 +780,8 @@ void decouple(chanend c_mix_out,
if(outOverflow) if(outOverflow)
{ {
//XUD_SetReady(aud_from_host_usb_ep, 1); /* If we were previously in overflow we wont have marked as ready */
XUD_SetReady_OutPtr(aud_from_host_usb_ep, aud_from_host_fifo_start+4);
outOverflow = 0; outOverflow = 0;
} }
@@ -896,7 +893,7 @@ void decouple(chanend c_mix_out,
/* Come out of OUT overflow state */ /* Come out of OUT overflow state */
outOverflow = 0; outOverflow = 0;
SET_SHARED_GLOBAL(g_aud_from_host_buffer, aud_from_host_wrptr); SET_SHARED_GLOBAL(g_aud_from_host_buffer, aud_from_host_wrptr);
//XUD_SetReady(aud_from_host_usb_ep, 1); XUD_SetReady_OutPtr(aud_from_host_usb_ep, aud_from_host_wrptr+4);
#ifdef DEBUG_LEDS #ifdef DEBUG_LEDS
led(c_led); led(c_led);
#endif #endif

2
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -655,7 +655,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
} }
break; break;
#endif /* ifdef MIDI */ #endif /* ifdef MIDI */
} }
} }