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

Missed some changes.

Browse Source
This commit is contained in:
Russell Gallop
2011-07-29 16:01:05 +01:00
parent 17babda9e5
commit 13835851b3
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
module_usb_aud_shared/usb_buffer/decouple.xc
View File

@@ -1175,16 +1175,16 @@ void decouple(chanend c_mix_out,
if (iap_data_collected_from_device != 0) if (iap_data_collected_from_device != 0)
{ {
/* We have some more data to send set the amount of data to send */ /* We have some more data to send set the amount of data to send */
write_via_xc_ptr(iap_to_host_buffer_being_collected, midi_data_collected_from_device); write_via_xc_ptr(iap_to_host_buffer_being_collected, iap_data_collected_from_device);
/* Swap the collecting and sending buffer */ /* Swap the collecting and sending buffer */
swap(iap_to_host_buffer_being_collected, midi_to_host_buffer_being_sent); swap(iap_to_host_buffer_being_collected, iap_to_host_buffer_being_sent);
{ {
/* Request to send packet */ /* Request to send packet */
int len; int len;
asm("ldw %0, %1[0]":"=r"(len):"r"(iap_to_host_buffer_being_sent)); asm("ldw %0, %1[0]":"=r"(len):"r"(iap_to_host_buffer_being_sent));
XUD_SetReady_In(iap_to_host_usb_ep, 0, midi_to_host_buffer_being_sent+4, len); XUD_SetReady_In(iap_to_host_usb_ep, 0, iap_to_host_buffer_being_sent+4, len);
} }
/* Mark as waiting for host to poll us */ /* Mark as waiting for host to poll us */
@@ -1201,7 +1201,7 @@ void decouple(chanend c_mix_out,
else else
{ {
/* Check if host has sent us iap OUT data */ /* Check if host has sent us iap OUT data */
GET_SHARED_GLOBAL(iap_from_host_flag, g_midi_from_host_flag); GET_SHARED_GLOBAL(iap_from_host_flag, g_iap_from_host_flag);
if (iap_from_host_flag) if (iap_from_host_flag)
{ {
/* The buffer() thread has filled up a buffer */ /* The buffer() thread has filled up a buffer */
@@ -1212,10 +1212,10 @@ void decouple(chanend c_mix_out,
SET_SHARED_GLOBAL(g_iap_from_host_flag, 0); SET_SHARED_GLOBAL(g_iap_from_host_flag, 0);
/* Read length from buffer[0] */ /* Read length from buffer[0] */
read_via_xc_ptr(iap_data_remaining_to_device, midi_from_host_buffer); read_via_xc_ptr(iap_data_remaining_to_device, iap_from_host_buffer);
/* Increment read pointer - buffer[0] is length */ /* Increment read pointer - buffer[0] is length */
iap_from_host_rdptr = midi_from_host_buffer + 4; iap_from_host_rdptr = iap_from_host_buffer + 4;
if (iap_data_remaining_to_device) if (iap_data_remaining_to_device)
{ {
@@ -1230,7 +1230,7 @@ void decouple(chanend c_mix_out,
select select
{ {
/* Received word from iap thread - Check for ACK or Data */ /* Received word from iap thread - Check for ACK or Data */
case iap_get_ack_or_data(c_midi, is_ack_iap, datum_iap): case iap_get_ack_or_data(c_iap, is_ack_iap, datum_iap):
if (is_ack_iap) if (is_ack_iap)
{ {
/* An ack from the iap/uart thread means it has accepted some data we sent it /* An ack from the iap/uart thread means it has accepted some data we sent it
@@ -1252,11 +1252,11 @@ void decouple(chanend c_mix_out,
else else
{ {
/* The iap/uart thread has sent us some data - handshake back */ /* The iap/uart thread has sent us some data - handshake back */
iap_send_ack(c_midi); iap_send_ack(c_iap);
if (iap_data_collected_from_device < MIDI_USB_BUFFER_TO_HOST_SIZE) if (iap_data_collected_from_device < IAP_USB_BUFFER_TO_HOST_SIZE)
{ {
/* There is room in the collecting buffer for the data */ /* There is room in the collecting buffer for the data */
xc_ptr p = (iap_to_host_buffer_being_collected + 4) + midi_data_collected_from_device; xc_ptr p = (iap_to_host_buffer_being_collected + 4) + iap_data_collected_from_device;
// Add data to the buffer // Add data to the buffer
write_via_xc_ptr(p, datum_iap); write_via_xc_ptr(p, datum_iap);
iap_data_collected_from_device += 4; iap_data_collected_from_device += 4;
@@ -1269,16 +1269,16 @@ void decouple(chanend c_mix_out,
// If we are not sending data to the host then initiate it // If we are not sending data to the host then initiate it
if (!iap_waiting_on_send_to_host) if (!iap_waiting_on_send_to_host)
{ {
write_via_xc_ptr(iap_to_host_buffer_being_collected, midi_data_collected_from_device); write_via_xc_ptr(iap_to_host_buffer_being_collected, iap_data_collected_from_device);
iap_data_collected_from_device = 0; iap_data_collected_from_device = 0;
swap(iap_to_host_buffer_being_collected, midi_to_host_buffer_being_sent); swap(iap_to_host_buffer_being_collected, iap_to_host_buffer_being_sent);
// Signal other side to swap // Signal other side to swap
{ {
int len; int len;
asm("ldw %0, %1[0]":"=r"(len):"r"(iap_to_host_buffer_being_sent)); asm("ldw %0, %1[0]":"=r"(len):"r"(iap_to_host_buffer_being_sent));
XUD_SetReady_In(iap_to_host_usb_ep, 0, midi_to_host_buffer_being_sent+4, len); XUD_SetReady_In(iap_to_host_usb_ep, 0, iap_to_host_buffer_being_sent+4, len);
} }
iap_waiting_on_send_to_host = 1; iap_waiting_on_send_to_host = 1;
} }
@@ -1287,7 +1287,7 @@ void decouple(chanend c_mix_out,
default: default:
break; break;
} }
#endif // MIDI #endif // IAP
} }
} }