Modifications so can compile with IAP disabled.

This commit is contained in:
Russell
2011-12-05 18:19:29 +00:00
parent c1ff1a141a
commit f979c80dbd
2 changed files with 4 additions and 5 deletions

View File

@@ -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;

View File

@@ -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,