Remove inconsequential changes on ios branch

This commit is contained in:
Russell
2011-11-21 10:56:24 +00:00
parent b5faf8a621
commit d8f49497c9
5 changed files with 12 additions and 14 deletions

View File

@@ -1129,13 +1129,13 @@ unsigned char cfgDesc_Audio2[] =
#if 0 #if 0
/* DFU 1.0 Run-Time DFU Functional Descriptor */ /* DFU 1.0 Run-Time DFU Functional Descriptor */
0x07, 0x07,
0x21, 0x21,
0x07, 0x07,
0xFA, 0xFA,
0x00, 0x00,
0x40, 0x40,
0x00, 0x00
#else #else
/* DFU 1.1 Run-Time DFU Functional Descriptor */ /* DFU 1.1 Run-Time DFU Functional Descriptor */
0x09, /* 0 Size */ 0x09, /* 0 Size */
@@ -1618,7 +1618,7 @@ unsigned char cfgDesc_Audio1[] =
0xFE, /* 5 bInterfaceClass : DFU. (field size 1 bytes) */ 0xFE, /* 5 bInterfaceClass : DFU. (field size 1 bytes) */
0x01, /* 6 bInterfaceSubclass : (field size 1 bytes) */ 0x01, /* 6 bInterfaceSubclass : (field size 1 bytes) */
0x01, /* 7 bInterfaceProtocol : Unused. (field size 1 bytes) */ 0x01, /* 7 bInterfaceProtocol : Unused. (field size 1 bytes) */
8, /* 8 iInterface : Unused. (field size 1 bytes) */ 8, /* 8 iInterface : Unused. (field size 1 bytes) */
#if 0 #if 0
/* DFU 1.0 Run-Time DFU Functional Descriptor */ /* DFU 1.0 Run-Time DFU Functional Descriptor */

View File

@@ -198,7 +198,6 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
} }
#endif #endif
/* Set up channel mapping default */ /* Set up channel mapping default */
for (int i = 0; i < NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN; i++) for (int i = 0; i < NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN; i++)
{ {
@@ -810,13 +809,11 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
the general case of a functional stall */ the general case of a functional stall */
XUD_SetStall_Out(0); XUD_SetStall_Out(0);
XUD_SetStall_In(0); XUD_SetStall_In(0);
} }
if (retVal < 0) if (retVal < 0)
{ {
g_curUsbSpeed = XUD_ResetEndpoint(ep0_in, ep0_out); g_curUsbSpeed = XUD_ResetEndpoint(ep0_in, ep0_out);
//printstrln("Resetting");
g_config = 0; g_config = 0;

View File

@@ -641,4 +641,5 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
} }
set_thread_fast_mode_off(); set_thread_fast_mode_off();
} }