Ross Owen
cea9522fb5
Merge commit '82e07458911e4115981508e0538f682c146544ca' into 6V3_DEV
2013-12-12 12:07:57 +00:00
Ross Owen
2cbba4be9e
Revert "Reduce the amount of output buffering." Not safe if channel count
...
differs between input and output
This reverts commit a2a151b510
2013-12-12 12:03:42 +00:00
Ross Owen
e037be0f26
Merge commit 'a2a151b510be13c72a2ea0515c4eaead7dee43da' into 6V3_DEV
2013-12-12 11:56:32 +00:00
Ross Owen
1fa6e99473
Conflicted merge in mixer
2013-12-12 11:50:32 +00:00
Ross Owen
a3ea0d2858
Merge commit '4b22faaf690dd5c5a687b93f0ccaba21c0b19d39' into 6V3_DEV
2013-12-12 11:43:04 +00:00
Ross Owen
97281b80ba
Merge commit 'a695e58524b1615a8bfd487bed1e555b2cbea362' into 6V3_DEV
2013-12-12 10:52:16 +00:00
Ross Owen
712300cf50
Merge commit 'f19653b759eb16616603cbd721bca92822ea032a' into 6V3_DEV
2013-12-12 10:51:16 +00:00
Ross Owen
3e35609c6a
Merge branch '6V3_DEV' of git://git/apps/sc_usb_audio into 6V3_DEV
2013-12-12 10:27:37 +00:00
Ross Owen
22afdb295c
Mixer: device chan map inline asm tidy
2013-12-12 10:27:33 +00:00
Ross Owen
a00d3c329b
Fixed up tile defines in main.xc Some were hardcoded to 0
2013-12-11 18:19:15 +00:00
Richard Osborne
82e0745891
Remove local buffer pointers which are set but never used.
2013-12-09 18:09:19 +00:00
Richard Osborne
a2a151b510
Reduce the amount of output buffering.
...
It looks their was a typo here - the code calculates the maximum audio
packet size and uses it for the input buffer but not the output buffer.
Now the amount of input buffering matches the amount of output buffering.
2013-12-09 18:09:19 +00:00
Richard Osborne
577b5f500d
Make functions static where possible, no intended functionality change.
...
This saves 208 bytes.
2013-12-09 18:09:18 +00:00
Richard Osborne
4b22faaf69
Remove checked in file generated from a merge conflict.
2013-12-09 18:09:18 +00:00
Richard Osborne
f19653b759
Remove pointless .extern directives.
...
These have no effect and are ignored by the assembler.
2013-12-09 18:09:18 +00:00
Richard Osborne
93590833cf
Add resource usage symbols / elimination blocks to assembly files.
...
See bug 10909 and bug 15022.
2013-12-09 18:09:18 +00:00
Ross Owen
bfca1da409
Quick patch to fix TX channel strings
2013-12-09 16:03:28 +00:00
Ross Owen
c0129c683a
Mixer related L2 app build issues patched up
2013-12-09 15:58:35 +00:00
Ross Owen
1ce3c74ebc
Deliver to/from mixer comms fixed up for new underflow protocol
2013-12-09 15:49:50 +00:00
Ross Owen
5c7366eec2
Mixer descriptors now only enabled if MAX_MIX_COUNT > 0
2013-12-09 15:48:25 +00:00
Ross Owen
51e9415a57
Mixer communications updated for new underflow protocol
2013-12-09 15:47:59 +00:00
Ross Owen
042d8f1969
Re-instated mixer core on main()
2013-12-09 15:46:04 +00:00
Ross Owen
2b3f9ea5ca
iap_conf.h no longer included in devicedefines.h
2013-12-06 14:48:47 +00:00
Sam Chesney
d3398ef523
Added iap_conf.h include to avoid ACCESSORY_FIRMWARE_VERSION redefinition risk
2013-12-05 12:22:30 +00:00
Sam Chesney
a90878a94b
Removed uppercase letters from file names from module_iap
2013-12-05 11:16:20 +00:00
Sam Chesney
a3480befd6
Whitespace only
2013-12-04 18:39:39 +00:00
Sam Chesney
39207ac7f4
Fixed iAP firmware version format
2013-12-04 18:24:05 +00:00
Ross Owen
b5bfaa17a4
warnings.xc tidy
2013-12-04 18:16:13 +00:00
Ross Owen
656edd6df9
customdefines.h included in warnings.xc so warnings actually work
2013-12-04 18:09:21 +00:00
Sam Chesney
b05d73e825
Fixed IAP build issue
2013-12-04 17:07:25 +00:00
Ross Owen
cd432cd513
Merge branch 'master' into 6V3_DEV
2013-12-04 12:31:28 +00:00
Ross Owen
f4620cd463
SpdifReceive.h include now guarded by SPDIF_RX define
2013-12-04 11:08:06 +00:00
Ross Owen
9ed17c917b
NATIVE_DSD can now be set to 0
2013-12-03 15:18:50 +00:00
Ross Owen
d36edf7218
module dfu readme updates
2013-11-29 17:19:34 +00:00
Ross Owen
a86789d590
Updates by XPD
2013-11-29 17:06:47 +00:00
Ross Owen
c8672b24ab
Reverted BCD_DEVICE to test xpd
2013-11-29 16:52:17 +00:00
Ross Owen
1ec376c591
Adding BCD_DEVICE
2013-11-29 16:45:06 +00:00
Ross Owen
d252fa029c
Fixed MIDI build issues
2013-11-29 13:59:44 +00:00
Ross Owen
3d92d4b79f
Main() now makes calls to two funcions (with their own pars). Also added USER_MAIN_DECLARIONS and USER_MAIN_CORES
2013-11-29 12:36:14 +00:00
Ross Owen
edca022c50
Added use of XUD_TILE def
2013-11-29 12:33:41 +00:00
Ross Owen
98d08e18c5
Merge branch 'master' into 6V3_DEV
2013-11-28 16:23:54 +00:00
Sam Chesney
d8b6a2d53a
Corrected include name (failed to build on Linux)
2013-11-28 13:14:43 +00:00
Ross Owen
d7aebe5e17
Added DEFAULT_MCLK_FREQ define
2013-11-28 12:03:41 +00:00
Ross Owen
17e668b33d
Whitespace and intentation tidy
2013-11-28 12:02:07 +00:00
Sam Chesney
8d49bd66fe
Revert "Revert "Use the version number from xpd""
...
This reverts commit e40bdb2c60
2013-11-28 11:46:58 +00:00
Sam Chesney
e40bdb2c60
Revert "Use the version number from xpd"
...
This reverts commit 49a94c16d3
2013-11-27 18:43:48 +00:00
Sam Chesney
3c2617d18f
Merge branch '6V3_DEV' of git://git/apps/sc_usb_audio into 6V3_DEV
2013-11-27 18:31:26 +00:00
Sam Chesney
49a94c16d3
Use the version number from xpd
2013-11-27 16:38:56 +00:00
Ross Owen
405623885d
Merge branch 'master' into 6V3_DEV
2013-11-27 15:32:32 +00:00
Ross Owen
15f7739f23
Tab removal
2013-11-27 11:08:06 +00:00
