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

- Fixed ifndef check

Browse Source 
- Fixed mix map update
This commit is contained in:
Ross Owen
2023-02-08 17:05:00 +00:00
parent e26b934233
commit 950beb55cb
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib_xua/api/xua_conf_default.h
View File

@@ -1093,7 +1093,7 @@
#endif #endif
/* Handle in volume control in the mixer - disabled by default */ /* Handle in volume control in the mixer - disabled by default */
#ifdef IN_VOLUME_IN_MIXER #ifndef IN_VOLUME_IN_MIXER
#define IN_VOLUME_IN_MIXER (0) #define IN_VOLUME_IN_MIXER (0)
#endif #endif

2
lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
View File

@@ -768,7 +768,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
else else
{ {
/* Update relevant mix map */ /* Update relevant mix map */
mixSel[cn-1][cn] = source; mixSel[cs-1][cn] = source;
UpdateMixMap(c_mix_ctl, cs-1, cn, mixSel[cs-1][cn]); UpdateMixMap(c_mix_ctl, cs-1, cn, mixSel[cs-1][cn]);
} }

3
lib_xua/src/core/mixer/mixer.xc
View File

@@ -125,15 +125,12 @@ int doMix5(volatile int * const unsafe samples, volatile int * const unsafe mult
int doMix6(volatile int * const unsafe samples, volatile int * const unsafe mult); int doMix6(volatile int * const unsafe samples, volatile int * const unsafe mult);
int doMix7(volatile int * const unsafe samples, volatile int * const unsafe mult); int doMix7(volatile int * const unsafe samples, volatile int * const unsafe mult);
#else #else
/* DO NOT inline, causes 10.4.2 tools to add extra loads in loop */
/* At 18 x 12dB we could get 64 x bigger */
#pragma unsafe arrays #pragma unsafe arrays
static inline int doMix(volatile int * unsafe samples, volatile int * unsafe const mixMap, volatile int * const unsafe mult) static inline int doMix(volatile int * unsafe samples, volatile int * unsafe const mixMap, volatile int * const unsafe mult)
{ {
int h=0; int h=0;
int l=0; int l=0;
/* By breaking up the loop we keep things in the encoding for ldw (0-11) */
#pragma loop unroll #pragma loop unroll
for (int i=0; i<MIX_INPUTS; i++) for (int i=0; i<MIX_INPUTS; i++)
unsafe{ unsafe{