laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

xpd: Cleaned up whitespace

Browse Source
This commit is contained in:
Ross Owen
2014-03-28 14:56:42 +00:00
parent b229f372f8
commit 125d4e6eb1
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
module_usb_audio/endpoint0/descriptors.h
View File

@@ -592,28 +592,28 @@ StringDescTable_t g_strTable =
/* Interface numbers enum */ /* Interface numbers enum */
enum USBInterfaceNumber enum USBInterfaceNumber
{ {
INTERFACE_NUMBER_AUDIO_CONTROL = 0, INTERFACE_NUMBER_AUDIO_CONTROL = 0,
#if defined(OUTPUT) && (OUTPUT != 0) #if defined(OUTPUT) && (OUTPUT != 0)
INTERFACE_NUMBER_AUDIO_OUTPUT, INTERFACE_NUMBER_AUDIO_OUTPUT,
#endif #endif
#if defined(INPUT) && (INPUT != 0) #if defined(INPUT) && (INPUT != 0)
INTERFACE_NUMBER_AUDIO_INPUT, INTERFACE_NUMBER_AUDIO_INPUT,
#endif #endif
#if defined(MIDI) && (MIDI != 0) #if defined(MIDI) && (MIDI != 0)
INTERFACE_NUMBER_MIDI_CONTROL, INTERFACE_NUMBER_MIDI_CONTROL,
INTERFACE_NUMBER_MIDI_STREAM, INTERFACE_NUMBER_MIDI_STREAM,
#endif #endif
#if defined(DFU) && (DFU != 0) #if defined(DFU) && (DFU != 0)
INTERFACE_NUMBER_DFU, INTERFACE_NUMBER_DFU,
#endif #endif
#if defined(IAP) && (IAP != 0) #if defined(IAP) && (IAP != 0)
INTERFACE_NUMBER_IAP, INTERFACE_NUMBER_IAP,
#endif #endif
#if defined(HID_CONTROLS) && (HID_CONTROLS != 0) #if defined(HID_CONTROLS) && (HID_CONTROLS != 0)
INTERFACE_NUMBER_HID, INTERFACE_NUMBER_HID,
#endif #endif
INTERFACE_COUNT /* End marker */ INTERFACE_COUNT /* End marker */
}; };
#if defined(INPUT) && defined(OUTPUT) #if defined(INPUT) && defined(OUTPUT)
#define AUDIO_INTERFACE_COUNT 3 #define AUDIO_INTERFACE_COUNT 3
@@ -818,11 +818,11 @@ unsigned char hidReportDescriptor[] =
#define FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE (MAX_PACKET_SIZE_MULT_IN_FS * FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES) #define FS_STREAM_FORMAT_INPUT_1_MAXPACKETSIZE (MAX_PACKET_SIZE_MULT_IN_FS * FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES)
#if (NUM_CLOCKS == 1) #if (NUM_CLOCKS == 1)
#define USB_Descriptor_Audio_ClockSelector_t USB_Descriptor_Audio_ClockSelector_1_t #define USB_Descriptor_Audio_ClockSelector_t USB_Descriptor_Audio_ClockSelector_1_t
#elif (NUM_CLOCKS == 2) #elif (NUM_CLOCKS == 2)
#define USB_Descriptor_Audio_ClockSelector_t USB_Descriptor_Audio_ClockSelector_2_t #define USB_Descriptor_Audio_ClockSelector_t USB_Descriptor_Audio_ClockSelector_2_t
#elif (NUM_CLOCKS == 3) #elif (NUM_CLOCKS == 3)
#define USB_Descriptor_Audio_ClockSelector_t USB_Descriptor_Audio_ClockSelector_3_t #define USB_Descriptor_Audio_ClockSelector_t USB_Descriptor_Audio_ClockSelector_3_t
#endif #endif
typedef struct typedef struct
@@ -1008,7 +1008,7 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
.bAssocTerminal = 0x00, .bAssocTerminal = 0x00,
.iClockSource = offsetof(StringDescTable_t, internalClockSourceStr)/sizeof(char *), .iClockSource = offsetof(StringDescTable_t, internalClockSourceStr)/sizeof(char *),
}, },
#ifdef SPDIF_RX #ifdef SPDIF_RX
/* Clock Source Descriptor (4.7.2.1) */ /* Clock Source Descriptor (4.7.2.1) */
.Audio_ClockSource_SPDIF = .Audio_ClockSource_SPDIF =

4
module_usb_audio/ports/audioports.c
View File

@@ -55,11 +55,11 @@ unsigned int divide, unsigned int dsdMode)
{ {
/* Ensure dsd clock is on in all modes since I2S mode sets it low on exit /* Ensure dsd clock is on in all modes since I2S mode sets it low on exit
* to avoid stop_clock() potentially pausing forever. If this is not done * to avoid stop_clock() potentially pausing forever. If this is not done
* an exception will be raised with audio() attempts to set this port low * an exception will be raised with audio() attempts to set this port low
*/ */
/* TODO Do we really need to do this on every SF change? Once is probably enough */ /* TODO Do we really need to do this on every SF change? Once is probably enough */
EnableBufferedPort(p_dsd_clk, 32); EnableBufferedPort(p_dsd_clk, 32);
if(dsdMode) if(dsdMode)
{ {
/* Make sure the ports are on and buffered - just in case they are not shared with I2S */ /* Make sure the ports are on and buffered - just in case they are not shared with I2S */