Commit Graph

111 Commits

Author SHA1 Message Date
Ross Owen
29535560db Merge branch 'MAINTAIN_6v11' 2015-04-08 11:47:16 +01:00
Ross Owen
0634406bbf Fixed stream issue when mixer not enabled. 2015-04-08 11:40:11 +01:00
Ross Owen
2e67773f0f Merge: master -> DEV_X200_BRINGUP 2015-03-23 12:57:57 +00:00
Ross Owen
7cd5631e4b The audio i/o core now uses "underflow" sample as it's request word (i.e. different for PCM/DSD). This gets passed all the way through mixer and on to decouple such that it can be used in the underflow state. This allows the removal of the communication of the underflow state to the audio i/o core from decouple and thus "stand-alone" mixer now works again. 2015-03-20 17:23:24 +00:00
Ross Owen
b1e69b0590 Various changes to get SPDIF working on x200 board config 2015-03-17 11:52:45 +00:00
Ross Owen
6eaa986eb9 xpd: Cleaned up whitespace 2015-03-04 16:10:04 +00:00
Ross Owen
389546a2b5 Fixed hard-coded adat/mclk multiplier 2015-03-04 15:59:52 +00:00
Ross Owen
ea931680ad Fixed trap when SPDIF_TX and ADAT_TX both enabled - caused by sharing clock block 2015-03-04 15:56:01 +00:00
Ross Owen
1447be3ca0 Added ADAT tx via shared memory buffer. Also added SMUX re-shuffle code. 2015-02-27 19:26:15 +00:00
Ross Owen
385b26b7fb Further work to debug adding adat tx to deliver 2015-02-17 18:23:18 +00:00
Ross Owen
a9de259963 Initial addition of adat sample transfer into audio core 2015-01-30 16:05:58 +00:00
Ross Owen
6816278557 Basic addition of ADAT tx core. 2015-01-29 18:33:45 +00:00
Ross Owen
f5a822d42d Comment only. 2015-01-09 17:19:24 +00:00
Ross Owen
b2e848e9b4 Fix up channel alignment issue in slave mode TDM 2015-01-09 15:55:13 +00:00
Ross Owen
7f53fc08ee Resolved further build issues when CODEC_MASTER enabled 2015-01-06 16:56:42 +00:00
Ross Owen
db961a38f0 Fixed build issue when mixer not enabled. 2014-12-12 15:43:32 +00:00
Ross Owen
a4af4fd0f2 xpd: Cleaned up whitespace 2014-12-12 15:31:07 +00:00
Ross Owen
d22030009c Removed duplicate line due to merge. 2014-12-12 14:59:48 +00:00
Ross Owen
38958db165 xpd: Cleaned up whitespace 2014-12-12 13:19:10 +00:00
Ross Owen
178f0c4580 Merge DEV_TDM -> master 2014-12-12 13:03:57 +00:00
Ross Owen
4ab8cff9a4 I2_CHANS_PER_FRAME default define moved from audio.xc to devicedefines.xc 2014-12-02 14:22:11 +00:00
Ross Owen
7ac0e87e0b Fixed issue with TDM and S/PDIF Tx 2014-12-02 14:07:50 +00:00
Ross Owen
ee0c69c50f Output TDM and I2S code now unified. 2014-11-27 18:29:26 +00:00
Ross Owen
86faae8890 Removed the extra I2S input code. TDM and I2S port input code now shared. 2014-11-27 18:15:04 +00:00
Ross Owen
673946b028 Standard I2S mode up and running again. Still needs more generalisation. 2014-11-27 17:58:07 +00:00
Ross Owen
a6fdb9b22a Digital RX channels sent over in a separate loop in DoSampleTransfer(). Only I2S channels double buffered. 2014-11-27 17:57:28 +00:00
Ross Owen
dbbeddff03 Removed unused debug vars 2014-11-27 12:44:54 +00:00
Ross Owen
3ffbc99456 DoSampleTransfer now takes readBuffNo rather than actual buffer. Now two separate In buffers (was 2D array). Attempts to help compiler. 2014-11-27 12:44:39 +00:00
Ross Owen
69f8e83cc7 TDM code made a bit more generic. Fixed issue with multiple TDM input lines missing channels. 2014-11-20 17:28:48 +00:00
Ross Owen
d26f478835 Introduced second input buffer to take up sample delay on last TDM channel. 2014-11-19 18:03:53 +00:00
Ross Owen
8d6ef4d1d4 Simplified TDM buffer to reduce copying. 2014-11-19 15:52:37 +00:00
Ross Owen
2b85adc01d Simple TDM buffer added to sort channel delay issue. 2014-11-19 14:39:07 +00:00
Ross Owen
c82ddb5726 LRClk startup a bit nicer (was double high) 2014-11-13 15:51:10 +00:00
Ross Owen
6f0bf1e2e2 First cut TDM input 2014-11-10 18:36:51 +00:00
Ross Owen
33d2cbd538 TDM clock div tidied up 2014-11-10 18:36:38 +00:00
Ross Owen
c08e4fc5d1 TDM clock div tidied up 2014-11-10 18:36:20 +00:00
Ross Owen
925ecc631b First cut TDM implementation added 2014-11-07 12:24:16 +00:00
Ross Owen
dc84486239 Port init pulled out to a function 2014-11-07 10:42:22 +00:00
Ross Owen
743a4564f6 Added DoSampleTransfer() function and updated comments 2014-11-06 23:57:45 +00:00
Ross Owen
3c34a1c3c0 Updated I2S init and loop ordering to attempt to fix sample offset 2014-11-06 23:21:52 +00:00
Ross Owen
30f610d185 Inline ASM for I2C port inputs now marked volatile to avoid compiler touching them 2014-10-31 15:16:07 +00:00
Ross Owen
c25f6b5589 Initial removal of samplesInPrev buffer in deliver 2014-10-31 10:48:31 +00:00
Ross Owen
730c043ad5 I2S input operations now in ASM due to compiler adding extra setc instructions. Performance opt only (Compiler bug #15256) 2014-10-28 12:08:32 +00:00
Ross Owen
085c444f40 xpd: Cleaned up whitespace 2014-09-19 13:14:55 +01:00
Ross Owen
92ea5e492a Moved digital channel transfer to help I2S timings (24.576 MCLK not working previously) 2014-09-19 11:23:34 +01:00
Ross Owen
1a20175b01 Fixed build issue with c_dig_rx 2014-09-19 11:22:11 +01:00
Ross Owen
cc4165e57b c_dig_rx is no longer nullable (helps with timing due to issue with compiler checks) 2014-09-18 11:50:08 +01:00
Ross Owen
3848bddcc9 Re-enabled digi sample transfer in audio.xc 2014-07-29 12:28:20 +01:00
Ross Owen
9be1ef8d70 xpd: Cleaned up whitespace 2014-07-15 12:12:23 +01:00
Ross Owen
4d4c7b8f39 DSD ports now only enabled once - avoids issue with stop_clock and un-driven clock. ConfigAudioPortsWrapper() also simplified. 2014-07-14 14:51:13 +01:00