From e6d3c659028476079ec76e2cd6de219208bc4d32 Mon Sep 17 00:00:00 2001 From: xross Date: Thu, 8 Sep 2022 17:45:28 +0100 Subject: [PATCH] Revert "Updated various vars from unsigned to int in decouple" This reverts commit 9f105dd48a0f81557d0ac1f6d8d9ec0ba9a699a4. --- lib_xua/src/core/buffer/decouple/decouple.xc | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib_xua/src/core/buffer/decouple/decouple.xc b/lib_xua/src/core/buffer/decouple/decouple.xc index 085d27cf..60002b35 100644 --- a/lib_xua/src/core/buffer/decouple/decouple.xc +++ b/lib_xua/src/core/buffer/decouple/decouple.xc @@ -65,18 +65,18 @@ static xc_ptr p_multIn; #endif #if (AUDIO_CLASS == 2) -int g_numUsbChan_In = NUM_USB_CHAN_IN; /* Number of channels to/from the USB bus - initialised to HS for UAC2.0 */ -int g_numUsbChan_Out = NUM_USB_CHAN_OUT; -int g_curSubSlot_Out = HS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES; -int g_curSubSlot_In = HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES; +unsigned g_numUsbChan_In = NUM_USB_CHAN_IN; /* Number of channels to/from the USB bus - initialised to HS for UAC2.0 */ +unsigned g_numUsbChan_Out = NUM_USB_CHAN_OUT; +unsigned g_curSubSlot_Out = HS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES; +unsigned g_curSubSlot_In = HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES; int sampsToWrite = DEFAULT_FREQ/8000; /* HS assumed here. Expect to be junked during a overflow before stream start */ int totalSampsToWrite = DEFAULT_FREQ/8000; int g_maxPacketSize = MAX_DEVICE_AUD_PACKET_SIZE_IN_HS; /* IN packet size. Init to something sensible, but expect to be re-set before stream start */ #else -int g_numUsbChan_In = NUM_USB_CHAN_IN_FS; /* Number of channels to/from the USB bus - initialised to FS for UAC1.0 */ -int g_numUsbChan_Out = NUM_USB_CHAN_OUT_FS; -int g_curSubSlot_Out = FS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES; -int g_curSubSlot_In = FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES; +unsigned g_numUsbChan_In = NUM_USB_CHAN_IN_FS; /* Number of channels to/from the USB bus - initialised to FS for UAC1.0 */ +unsigned g_numUsbChan_Out = NUM_USB_CHAN_OUT_FS; +unsigned g_curSubSlot_Out = FS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES; +unsigned g_curSubSlot_In = FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES; int sampsToWrite = DEFAULT_FREQ/1000; /* FS assumed here. Expect to be junked during a overflow before stream start */ int totalSampsToWrite = DEFAULT_FREQ/1000; int g_maxPacketSize = MAX_DEVICE_AUD_PACKET_SIZE_IN_FS; /* IN packet size. Init to something sensible, but expect to be re-set before stream start */ @@ -457,7 +457,7 @@ __builtin_unreachable(); packState = 0; /* Write last packet length into FIFO */ - int datasize = totalSampsToWrite * g_curSubSlot_In * g_numUsbChan_In; + unsigned datasize = totalSampsToWrite * g_curSubSlot_In * g_numUsbChan_In; write_via_xc_ptr(g_aud_to_host_wrptr, datasize); @@ -507,11 +507,11 @@ __builtin_unreachable(); /* In pipe has filled its buffer - we need to overflow * Accept the packet, and throw away the oldest in the buffer */ - int sampFreq; + unsigned sampFreq; GET_SHARED_GLOBAL(sampFreq, g_freqChange_sampFreq); int min, mid, max; GetADCCounts(sampFreq, min, mid, max); - int max_pkt_size = ((max * g_curSubSlot_In * g_numUsbChan_In + 3) & ~0x3) + 4; + unsigned max_pkt_size = ((max * g_curSubSlot_In * g_numUsbChan_In + 3) & ~0x3) + 4; /* Keep throwing away packets until buffer contains two packets */ do @@ -519,7 +519,7 @@ __builtin_unreachable(); unsigned rdPtr; /* Read length of packet in buffer at read pointer */ - int datalength; + unsigned datalength; GET_SHARED_GLOBAL(rdPtr, g_aud_to_host_rdptr); asm volatile("ldw %0, %1[0]":"=r"(datalength):"r"(rdPtr));