Commit Graph

263 Commits

Author SHA1 Message Date
Ross Owen
0d63c29a3b Merge branch '6V3_DEV' of git://git/apps/sc_usb_audio into 6V3_DEV 2013-12-19 12:08:40 +00:00
Ross Owen
3dd9ddcf47 Descriptors now use SAMPLE_SUBSLOT_SIZE_ and SAMPLE_BIT_RESOLUTION_ defines 2013-12-19 12:07:34 +00:00
Ross Owen
aa029aa685 Fixed usage of MAX_PACKET_SIZE_defines (Input was hardcoded to 1024 bytes) 2013-12-19 12:06:40 +00:00
Ross Owen
8bf5bc7ea8 Added default values and checks for SAMPLE_BIT_RESOLUTION_ and SAMPLE_SUBSLOT_SIZE_ defines 2013-12-19 12:01:15 +00:00
Ross Owen
d690ad9dfc Endpoint 0 now patches Audio 2 descriptors between FS and HS using SAMPLE_SUBSLOT_SIZE_ and SAMPLE_BIT_RESOLTION_ defines. 2013-12-19 12:00:16 +00:00
Ross Owen
855ba6b83f Fixed up null USB reset port but not null USB clock. This is for case when UserReset is used to reset USB phy (L1 iOS board has USB phy rst on shiftreg 2013-12-19 11:55:34 +00:00
Ross Owen
7fe8f1bbce Added use of SAMPLE_SUBSLOT_SIZE_ defines and general use of global slotSizevar. Added unpack/pack of 2 byte slot size. Added unreachable builtins to slotsize switch and default case. 2013-12-19 11:54:23 +00:00
Sam Chesney
0e25b24657 Updated MFi firmware version defines (to allow iAP1 and iAP2 to construct version info in required format) 2013-12-18 23:24:05 +00:00
Ross Owen
73d8aa1413 Removed reference to EP0_THREAD_COMBINED_WITH_SPI and assocaited params 2013-12-18 11:47:25 +00:00
Ross Owen
96b4360e4e Added comment about IAP ver no module_usb_audio/devicedefines.h 2013-12-16 16:45:29 +00:00
Ross Owen
728fb4f2cf Manual BCDDEVICE define change. 6.3.0 -> 6.3.1 2013-12-13 17:57:37 +00:00
Ross Owen
0e305b0207 Conflicted merge in descriptors.h 2013-12-12 12:20:08 +00:00
Ross Owen
37dc369c69 Merge commit 'b2816ac3aa4163a8b91c6079a89c9a5418292602' into 6V3_DEV 2013-12-12 12:12:03 +00:00
Ross Owen
1fefff6e7c Merge commit '662ac7df58af07f3dc1a34a04933b903e5ab5fdd' into 6V3_DEV 2013-12-12 12:11:14 +00:00
Ross Owen
1131d22e4f Merge 2013-12-12 12:10:00 +00:00
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
b2816ac3aa Remove commented out code. 2013-12-09 18:09:19 +00:00
Richard Osborne
662ac7df58 Don't store length of the buffer in the buffer itself.
This is pointless as nothing ever reads it.
2013-12-09 18:09:19 +00:00
Richard Osborne
e56b271e0c Make MIDI buffer globals static. 2013-12-09 18:09:19 +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
4b6b98af10 Remove unnecessary runtime initialization. 2013-12-09 18:09:19 +00:00
Richard Osborne
09bafcfb3a Base the buffer size on the MIDI_USB_BUFFER_TO_HOST_SIZE.
The buffer task never writes more than this amount of data to the buffer
so there is no point in a bigger buffer.
2013-12-09 18:09:19 +00:00
Richard Osborne
c337eccf0a Remove duplicate constants for string indicies.
It looks like STR_INDEX_OUT_CHAN STR_INDEX_IN_CHAN weren't calculated
correctly, and we already have existing constants for the index of
the input / output strings.
2013-12-09 18:09:19 +00:00
Richard Osborne
47d56e7138 Update comment. 2013-12-09 18:09:19 +00:00
Richard Osborne
2c36043119 Assign unique string indexes using a enum instead of #defines. 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