Commit Graph

599 Commits

Author SHA1 Message Date
Ross Owen
f37a196627 Removed g_iap_reset declaration from usb_buffer. 2014-02-19 17:06:47 +00:00
Ross Owen
a97666892a Removed setting of g_iap_reset. Previously was used to signal decouple to reset iAP on a SetConfig event. No longer used 2014-02-19 17:06:16 +00:00
Ross Owen
859e264fb6 Removed guard that was used when re-calling SetReady_In on sample rate change. New (non-channel-based XUD API means this can be called multiple times without locking) 2014-02-19 15:23:44 +00:00
Ross Owen
77cb50170e Removed initial wait for USB speed from decouple before g_numUsbChanXX is set. This would break mixer on initial startup if USB not connected. This should be okay since g_numUsbChan is set on SET_CHANNEL_COUNT 2014-02-19 14:58:06 +00:00
Ross Owen
9cc53f1736 Resolving conficted merge 2014-02-19 12:29:42 +00:00
Ross Owen
3fbb537d31 Merge 2014-02-19 12:28:54 +00:00
Sam Chesney
9150813b3e Removed initial iAP resets 2014-02-18 18:38:51 +00:00
Sam Chesney
d6809a4082 Added call to XUD_ResetEndpoint to cause buffer to fall through into while(1) loop... 2014-02-18 18:00:54 +00:00
Sam Chesney
d98736a18d Resolve excess elements in array initializer warning when iAP interrupt EP is disabled 2014-02-18 17:59:04 +00:00
Ross Owen
e126ba349b Removed debug prints. 2014-02-18 17:50:55 +00:00
Ross Owen
1338adf031 Merge branch 'master' of git://git/apps/sc_usb_audio 2014-02-18 16:51:45 +00:00
Ross Owen
6afd42be8e XUD_Result_t usage in audiorequests (fixing audio class 1.0 build issues) 2014-02-18 16:51:37 +00:00
Sam Chesney
593ccd7172 Changed reset result type (int -> XUD_Result_t) 2014-02-18 15:08:08 +00:00
Sam Chesney
927de7bbca Removed debug print 2014-02-18 15:07:21 +00:00
Sam Chesney
51bfdc113a Merge branch 'IAP2_DEV'
Conflicts:
	module_usb_audio/usb_buffer/usb_buffer.xc
2014-02-18 13:17:54 +00:00
Ross Owen
fbbe6d50a1 Merge branch 'XUD_RESET_EP' of git://git/apps/sc_usb_audio into XUD_RESET_EP 2014-02-18 11:59:43 +00:00
Ross Owen
b9b9ee5e36 retVal -> result and XUD_Result_t enum properly used. 2014-02-18 11:59:36 +00:00
Sam Chesney
f43470f20b Explicitly select the PC connector to begin with (as connections to the USB B cannot actively be detected) for designs where the USB B is selected by driving the switch high (#13887) 2014-02-17 19:46:54 +00:00
Ross Owen
80920296d7 Call to GetSetupPacker now uses XUD_Result_t 2014-02-14 16:21:06 +00:00
Ross Owen
7c83dcb0cd Removed #error 2014-02-14 16:20:37 +00:00
Ross Owen
7ef494f651 Call to GetBuffer now passed length param. 2014-02-14 16:20:26 +00:00
Ross Owen
b138b46496 buffer() tidy after reset work. 2014-02-14 16:20:12 +00:00
Ross Owen
a7d88ae583 Started adding length params and checking for XUD_Result_t 2014-02-14 16:19:41 +00:00
Sam Chesney
e3905ae3a4 Fix for bug 15181 - the iAP interrupt In EP can now be disabled, as its use is now reported as deprecated by the ATS system. Disabled by default. 2014-02-14 14:25:42 +00:00
Sam Chesney
f2366e0f34 Merge branch 'IAP2_DEV' into XUD_RESET_EP 2014-02-14 11:39:29 +00:00
Ross Owen
e21a42c26d Added the required +1 for IAP_INTERFACE_STRING_INDEX in string index enum. 2014-02-13 18:36:13 +00:00
Ross Owen
255c336f97 Fixed up IAP_INTERFACE_STRING_INDEX when MIXER not enabled but MAX_MIX_COUNT !=0 2014-02-13 18:26:35 +00:00
Ross Owen
2894eaf106 buffer() checks new return from SetReady_functions to check for reset. 2014-02-13 14:14:34 +00:00
Ross Owen
b820d321ba XUD_STATUS_ENABLE enabled on IAP in EP's (and disabled on IAP out EP) 2014-02-13 14:13:29 +00:00
Ross Owen
8e60cfc77f GetADC counts used instead of inline code. 2014-02-12 14:52:51 +00:00
Sam Chesney
11f341ccf6 Call to check_iAP_timeout() added to iAPTimer case in usb_midi.xc, as is done in iap.xc.
This should ensure that that iAP2 timeouts happen correctly in iAP + MIDI builds.
2014-02-11 17:40:19 +00:00
Ross Owen
cc0ddbf026 Merge remote-tracking branch 'origin/IAP2_DEV' 2014-02-10 14:43:23 +00:00
Ross Owen
bf1a7373d1 Comment only. 2014-02-10 13:20:04 +00:00
Sam Chesney
34640a49d4 DEBUG: print length of iAP data following XUD_SetReady_In() 2014-02-10 11:25:14 +00:00
Sam Chesney
f625904415 Fix for bug 15218 - iAP detect sequence can fail after rapid reconnection attempts. On reset drain the c_iap channel of old data until the iAP core returns a reset token. 2014-02-06 11:48:59 +00:00
Ross Owen
f7047cafb9 Added clkblk defines to main 2014-02-05 18:12:56 +00:00
Ross Owen
d5a0ec743d Added clkblk defines to main.xc 2014-02-05 18:12:37 +00:00
Ross Owen
e632eb3e02 Tidied up XUD_SERIES_SUPPORT checking. 2014-02-05 18:12:09 +00:00
Ross Owen
977e25e573 TILE defines removed (now in device defines) 2014-02-05 18:11:06 +00:00
Ross Owen
c35411424e FULL_SPEED_AUDIO_2 only defined by default if AUDIO_CLASS_FALLBACK not enabled (#15272) 2014-02-05 18:10:45 +00:00
Ross Owen
893463e560 Added IAP_TILE and MIDI_TILE defines. 2014-02-05 18:09:56 +00:00
Ross Owen
3f11f56de7 Removed remaining use of ARCH_ defines (XUD_SERIES_SUPPORT now used) 2014-02-05 16:44:25 +00:00
Ross Owen
9f5f8080a1 Merge remote-tracking branch 'origin/6.4_MAINTENANCE' 2014-02-05 15:14:45 +00:00
Ross Owen
bbaa2bfb16 i2c ports struct renamed. 2014-02-05 15:14:41 +00:00
Ross Owen
d78c3b8345 L-series clock block for MIDI doesn't use XS1_CLKBCLK_REF when MIDI on XUD tile (#15267) 2014-02-05 15:00:03 +00:00
Ross Owen
9422376a5a IAP_TILE defined. IAP_TILE can now != AUDIO_IO_TILE. 2014-02-04 15:18:41 +00:00
Ross Owen
4d61917717 i2c ports not declared in structure (as per module_i2c_simple) 2014-02-04 15:18:04 +00:00
Ross Owen
2dbbd305da Fixed iAP interface string index in descriptors when MIXER enabled. 2014-02-04 15:13:50 +00:00
Ross Owen
6e3dfa127a Default FULL_SPEED_AUDIO_2 set high 2014-02-04 15:08:45 +00:00
Ross Owen
eeb2ffcedd Merge branch 'master' of git://git/apps/sc_usb_audio 2014-01-31 11:20:52 +00:00