author | Frank Livingston <frank-livingston@ti.com> | |
Fri, 17 Feb 2017 23:48:46 +0000 (17:48 -0600) | ||
committer | Frank Livingston <frank-livingston@ti.com> | |
Fri, 17 Feb 2017 23:48:46 +0000 (17:48 -0600) |
Simple merge
diff --cc pasdk/test_dsp/framework/itopo/params.c
index 43b6ef0004f5e57276506d7ee582053d505773b3,0edd4247627ed4cc1fd1b0d2f2b7afa7b748ad7b..79c971955cc4a70928b6ec4059516f1efd972b0b
// GJ Debug: The below is not required; hence 0
- // IRAM scratch memory for autodetection and stereo PCM input
+ #if 0
- // IRAM scratch memory for autodetection and stereo PCM input
++ // IRAM scratch memory for autodetection and stereo PCM input
// High watermark needs are set by the latter:
// double buffer stereo 32bit PCM input 512 max frame size
// 1 buffers * 512 samples/buffer * 2 words/sample * 4 bytes/word
diff --cc pasdk/test_dsp/sap/sap.c
index aff66f8a17eb23e6de178d11c7061de6f4b3a3e5,b2299d17f957aabda8a980797e5ead28cc3697bc..174e76b143bf391df2fac8bab27199d93f33a2a4
+++ b/pasdk/test_dsp/sap/sap.c
return;
}
- // GJ: Revisit, along with other context protections here.
- // GJ: Is this architecture ok?
-
// protect context
Task_disable (); // needed since we may call SEM_post
//oldMask = Hwi_disable ();
}
else {
edmaConfig.destBIdx = 0;
+ edmaConfig.srcBIdx = pDevExt->edmaWordSize;
edmaConfig.destAddr = (unsigned int) (hPort->xbufAddr);
-
if (addr) {
- edmaConfig.srcBIdx = pDevExt->edmaWordSize;
edmaConfig.srcCIdx = pDevExt->edmaWordSize * pDevExt->numSers ;
edmaConfig.srcAddr = addr;
- Edma3_CacheFlush ((unsigned int) addr, (size+3)/4);
+ //Edma3_CacheFlush ((unsigned int) addr, (size+3)/4);
}
else {
edmaConfig.srcBIdx = 0;
diff --cc pasdk/test_dsp/sap/sap_d10.c
index 306650ba019aeaf9e72d3cd8033d66f9c95f99ce,f17de3f10898dd4535e9be066c2417ff0c331ac2..e7933bd2d49fb663e7e0754dfe376a37a32d3d98
{
pStatusIn->emphasis = PAF_IEC_PREEMPHASIS_NO;
- //pStatusIn->lock = 1;
- //pStatusIn->nonaudio = PAF_IEC_AUDIOMODE_AUDIO;
+
- if(!HDMIGpioGetState())
+ pStatusIn->lock = 1;
+ pStatusIn->nonaudio = PAF_IEC_AUDIOMODE_AUDIO;
+ RateHdmi = PAF_SAMPLERATE_192000HZ;
+ pStatusIn->sampleRateMeasured = RateTable_hdmi[RateHdmi];
+ pStatusIn->sampleRateData = pStatusIn->sampleRateMeasured;
+
+ #if 0
+ if(!HDMIGpioGetState())
{
+ Log_info0("SAP_D10: Entering HMINT!\n");
clear_hdmi_hmint();
gHmint_ctr++;
gNonAudio_ctr++;
pStatusIn->nonaudio = PAF_IEC_AUDIOMODE_NONAUDIO;
}
--
- Log_info0("SAP_D10: Exiting HMINT!\n");
--
}
else
{