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

Fixed issue with initial MIDI message and first audio IN packet now used UAC1 chan count define

Browse Source
This commit is contained in:
Ross Owen
2013-02-07 17:19:56 +00:00
parent 420bbe8120
commit 2765fc58af
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -69,7 +69,6 @@ unsigned char fb_clocks[16];
#define FB_TOLERANCE 0x100 #define FB_TOLERANCE 0x100
extern unsigned inZeroBuff[]; extern unsigned inZeroBuff[];
extern unsigned g_numUsbChanIn;
/** /**
* Buffers data from audio endpoints * Buffers data from audio endpoints
* @param c_aud_out chanend for audio from xud * @param c_aud_out chanend for audio from xud
@@ -221,7 +220,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
if (usb_speed == XUD_SPEED_HS) if (usb_speed == XUD_SPEED_HS)
mid*=NUM_USB_CHAN_IN*4; mid*=NUM_USB_CHAN_IN*4;
else else
mid*=NUM_USB_CHAN_IN*3; mid*=NUM_USB_CHAN_IN_A1*3;
asm("stw %0, %1[0]"::"r"(mid),"r"(p_inZeroBuff)); asm("stw %0, %1[0]"::"r"(mid),"r"(p_inZeroBuff));
@@ -366,7 +365,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
if (usb_speed == XUD_SPEED_HS) if (usb_speed == XUD_SPEED_HS)
mid *= NUM_USB_CHAN_IN*4; mid *= NUM_USB_CHAN_IN*4;
else else
mid *= NUM_USB_CHAN_IN*3; mid *= NUM_USB_CHAN_IN_A1*3;
asm("stw %0, %1[0]"::"r"(mid),"r"(p_inZeroBuff)); asm("stw %0, %1[0]"::"r"(mid),"r"(p_inZeroBuff));
@@ -539,8 +538,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
/* Write datalength (tmp) into buffer[0], data stored in buffer[4] onwards */ /* Write datalength (tmp) into buffer[0], data stored in buffer[4] onwards */
midi_data_remaining_to_device = tmp; midi_data_remaining_to_device = tmp;
/* Increment read pointer - buffer[0] is length */ midi_from_host_rdptr = midi_from_host_buffer;
midi_from_host_rdptr = midi_from_host_buffer + 4;
if (midi_data_remaining_to_device) if (midi_data_remaining_to_device)
{ {
@@ -555,6 +553,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
case XUD_SetData_Select(c_midi_to_host, ep_midi_to_host, tmp): case XUD_SetData_Select(c_midi_to_host, ep_midi_to_host, tmp):
asm("#midi d->h"); asm("#midi d->h");
#if 1
swap(midi_to_host_buffer, midi_to_host_waiting_buffer); swap(midi_to_host_buffer, midi_to_host_waiting_buffer);
/* The buffer has been sent to the host, so we can ack the midi thread */ /* The buffer has been sent to the host, so we can ack the midi thread */
@@ -578,7 +577,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
{ {
midi_waiting_on_send_to_host = 0; midi_waiting_on_send_to_host = 0;
} }
#endif
break; break;
#endif #endif
@@ -627,10 +626,10 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
{ {
/* An ack from the midi/uart thread means it has accepted some data we sent it /* An ack from the midi/uart thread means it has accepted some data we sent it
* we are okay to send another word */ * we are okay to send another word */
if (midi_data_remaining_to_device == 0) if (midi_data_remaining_to_device <= 0)
{ {
/* We have read an entire packet - Mark ready to receive another */ /* We have read an entire packet - Mark ready to receive another */
XUD_SetReady_OutPtr(ep_midi_from_host, midi_from_host_buffer+4); XUD_SetReady_OutPtr(ep_midi_from_host, midi_from_host_buffer);
} }
else else
{ {