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

modified audio output frequency as a variable

Browse Source
This commit is contained in:
Keith Au
2019-12-31 10:34:32 +08:00
parent d8f34aa64d
commit 3b80f63cb9
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib_xua/api/xua_conf_default.h
View File

@@ -226,6 +226,13 @@
#define DEFAULT_FREQ (MIN_FREQ) #define DEFAULT_FREQ (MIN_FREQ)
#endif #endif
/**
* @brief Default Audio output sampling frequency
*/
#ifndef DEFAULT_AUDOUT_FREQ
#define DEFAULT_AUDOUT_FREQ (48000)
#endif
/* Audio Class Defines */ /* Audio Class Defines */
/** /**

3
lib_xua/src/core/endpoint0/xua_ep0_uacreqs.h
View File

@@ -17,4 +17,7 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, REFERENCE_PARAM(USB_S
void VendorAudioRequestsInit(chanend c_audioControl, NULLABLE_RESOURCE(chanend, c_mix_ctl), NULLABLE_RESOURCE(chanend, c_clk_ctl)); void VendorAudioRequestsInit(chanend c_audioControl, NULLABLE_RESOURCE(chanend, c_mix_ctl), NULLABLE_RESOURCE(chanend, c_clk_ctl));
extern unsigned int g_curAudOut_SamFreq;
#endif #endif

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

@@ -17,6 +17,7 @@
#ifdef MIXER #ifdef MIXER
#include "mixer.h" #include "mixer.h"
#endif #endif
#include "xua_conf.h"
#define CS_XU_MIXSEL (0x06) #define CS_XU_MIXSEL (0x06)
@@ -46,7 +47,7 @@ extern unsigned char mixSel[MAX_MIX_COUNT][MIX_INPUTS];
#endif #endif
/* Global var for current frequency, set to default freq */ /* Global var for current frequency, set to default freq */
unsigned int g_curSamFreq = DEFAULT_FREQ; unsigned int g_curAudOut_SamFreq = DEFAULT_AUDOUT_FREQ;
#if 0 #if 0
unsigned int g_curSamFreq48000Family = DEFAULT_FREQ % 48000 == 0; unsigned int g_curSamFreq48000Family = DEFAULT_FREQ % 48000 == 0;
@@ -320,14 +321,14 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
int newSampleRate = buffer[0]; int newSampleRate = buffer[0];
/* Instruct audio thread to change sample freq (if change required) */ /* Instruct audio thread to change sample freq (if change required) */
if(newSampleRate != g_curSamFreq) if(newSampleRate != g_curAudOut_SamFreq)
{ {
int newMasterClock; int newMasterClock;
g_curSamFreq = newSampleRate; g_curAudOut_SamFreq = newSampleRate;
#if 0 #if 0
/* Original feedback implementation */ /* Original feedback implementation */
g_curSamFreq48000Family = ((MCLK_48 % g_curSamFreq) == 0); g_curSamFreq48000Family = ((MCLK_48 % g_curAudOut_SamFreq) == 0);
if(g_curSamFreq48000Family) if(g_curSamFreq48000Family)
{ {
@@ -338,17 +339,17 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
newMasterClock = MCLK_441; newMasterClock = MCLK_441;
} }
setG_curSamFreqMultiplier(g_curSamFreq/(newMasterClock/512)); setG_curSamFreqMultiplier(g_curAudOut_SamFreq/(newMasterClock/512));
#endif #endif
#if ADAT_RX #if ADAT_RX
/* Configure ADAT SMUX based on sample rate */ /* Configure ADAT SMUX based on sample rate */
outuint(c_clk_ctl, SET_SMUX); outuint(c_clk_ctl, SET_SMUX);
if(g_curSamFreq < 88200) if(g_curAudOut_SamFreq < 88200)
{ {
/* No SMUX */ /* No SMUX */
outuint(c_clk_ctl, 0); outuint(c_clk_ctl, 0);
} }
else if(g_curSamFreq < 176400) else if(g_curAudOut_SamFreq < 176400)
{ {
/* SMUX */ /* SMUX */
outuint(c_clk_ctl, 1); outuint(c_clk_ctl, 1);
@@ -361,7 +362,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
outct(c_clk_ctl, XS1_CT_END); outct(c_clk_ctl, XS1_CT_END);
#endif #endif
outuint(c_audioControl, SET_SAMPLE_FREQ); outuint(c_audioControl, SET_SAMPLE_FREQ);
outuint(c_audioControl, g_curSamFreq); outuint(c_audioControl, g_curAudOut_SamFreq);
/* Wait for handshake back - i.e. PLL locked and clocks okay */ /* Wait for handshake back - i.e. PLL locked and clocks okay */
chkct(c_audioControl, XS1_CT_END); chkct(c_audioControl, XS1_CT_END);
@@ -395,7 +396,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
} }
else else
{ {
buffer[0] = g_curSamFreq; buffer[0] = g_curAudOut_SamFreq;
return XUD_DoGetRequest(ep0_out, ep0_in, (buffer, unsigned char[]), 4, sp.wLength ); return XUD_DoGetRequest(ep0_out, ep0_in, (buffer, unsigned char[]), 4, sp.wLength );
} }
@@ -403,7 +404,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
#endif #endif
case ID_CLKSRC_INT: case ID_CLKSRC_INT:
/* Always report our current operating frequency */ /* Always report our current operating frequency */
buffer[0] = g_curSamFreq; buffer[0] = g_curAudOut_SamFreq;
return XUD_DoGetRequest(ep0_out, ep0_in, (buffer, unsigned char[]), 4, sp.wLength ); return XUD_DoGetRequest(ep0_out, ep0_in, (buffer, unsigned char[]), 4, sp.wLength );
break; break;
@@ -1107,7 +1108,7 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp
/* Recontruct sample-freq */ /* Recontruct sample-freq */
int newSampleRate = (buffer, unsigned char[])[0] | ((buffer, unsigned char[])[1] << 8) | ((buffer, unsigned char[])[2] << 16); int newSampleRate = (buffer, unsigned char[])[0] | ((buffer, unsigned char[])[1] << 8) | ((buffer, unsigned char[])[2] << 16);
if(newSampleRate != g_curSamFreq) if(newSampleRate != g_curAudOut_SamFreq)
{ {
int curSamFreq44100Family; int curSamFreq44100Family;
int curSamFreq48000Family; int curSamFreq48000Family;
@@ -1119,11 +1120,11 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp
if(curSamFreq48000Family || curSamFreq44100Family) if(curSamFreq48000Family || curSamFreq44100Family)
{ {
g_curSamFreq = newSampleRate; g_curAudOut_SamFreq = newSampleRate;
/* Instruct audio thread to change sample freq */ /* Instruct audio thread to change sample freq */
outuint(c_audioControl, SET_SAMPLE_FREQ); outuint(c_audioControl, SET_SAMPLE_FREQ);
outuint(c_audioControl, g_curSamFreq); outuint(c_audioControl, g_curAudOut_SamFreq);
/* Wait for handshake back - i.e. pll locked and clocks okay */ /* Wait for handshake back - i.e. pll locked and clocks okay */
chkct(c_audioControl, XS1_CT_END); chkct(c_audioControl, XS1_CT_END);
@@ -1147,7 +1148,7 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp
switch(sp.bRequest) switch(sp.bRequest)
{ {
case UAC_B_REQ_GET_CUR: case UAC_B_REQ_GET_CUR:
buffer[0] = g_curSamFreq; buffer[0] = g_curAudOut_SamFreq;
return XUD_DoGetRequest(ep0_out, ep0_in, (buffer, unsigned char[]), 3, sp.wLength); return XUD_DoGetRequest(ep0_out, ep0_in, (buffer, unsigned char[]), 3, sp.wLength);
break; break;
} }