From f979c80dbdbf03c7429717c58f4d8acfc4f33537 Mon Sep 17 00:00:00 2001 From: Russell Date: Mon, 5 Dec 2011 18:19:29 +0000 Subject: [PATCH] Modifications so can compile with IAP disabled. --- module_usb_aud_shared/endpoint0/endpoint0.xc | 4 ++++ module_usb_midi/src/usb_midi.xc | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/module_usb_aud_shared/endpoint0/endpoint0.xc b/module_usb_aud_shared/endpoint0/endpoint0.xc index 601dcc6e..899b5520 100755 --- a/module_usb_aud_shared/endpoint0/endpoint0.xc +++ b/module_usb_aud_shared/endpoint0/endpoint0.xc @@ -99,7 +99,9 @@ void VendorHostActive(int active); #endif /* Global used for signalling reset to decouple */ +#ifdef IAP extern unsigned g_iap_reset; +#endif /* Used when setting/clearing EP halt */ void SetEndpointStatus(unsigned epNum, unsigned status) @@ -575,10 +577,12 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, VendorHostActive(1); } #endif +#ifdef IAP { int iap_reset = 1; SET_SHARED_GLOBAL(g_iap_reset, iap_reset); } +#endif /* No data stage for this request, just do status stage */ retVal = XUD_DoSetRequestStatus(ep0_in, 0); break; diff --git a/module_usb_midi/src/usb_midi.xc b/module_usb_midi/src/usb_midi.xc index 2bffa8ac..e329d91d 100644 --- a/module_usb_midi/src/usb_midi.xc +++ b/module_usb_midi/src/usb_midi.xc @@ -63,15 +63,10 @@ extern unsigned authenticating; // state for auto-selecting dock or USB B extern unsigned polltime; -#ifdef IAP extern port p_i2c_scl; extern port p_i2c_sda; #define p_midi_out p_i2c_scl #define p_midi_in p_i2c_sda -#else -extern port p_midi_out; -extern port p_midi_in; -#endif void usb_midi(in port ?p_midi_inj, out port ?p_midi_outj,