[tuxdroid-svn] r1154 - firmware/fuxusb/trunk/src
Status: Beta
Brought to you by:
ks156
From: Paul_R <c2m...@c2...> - 2008-05-15 14:00:05
|
Author: Paul_R Date: 2008-05-15 16:00:00 +0200 (Thu, 15 May 2008) New Revision: 1154 Modified: firmware/fuxusb/trunk/src/usb_desc.c Log: * Removed a commented part Modified: firmware/fuxusb/trunk/src/usb_desc.c =================================================================== --- firmware/fuxusb/trunk/src/usb_desc.c 2008-05-15 13:58:10 UTC (rev 1153) +++ firmware/fuxusb/trunk/src/usb_desc.c 2008-05-15 14:00:00 UTC (rev 1154) @@ -58,73 +58,7 @@ code struct usb_st_audio_descriptor usb_audio_normal = { sizeof(usb_audio_normal), STRING, AUDIO_NORMAL_NAME }; -/* -code struct -{ - struct usb_st_configuration_descriptor cfg; - //------------------------------------------------------------------------- - // Audio - //------------------------------------------------------------------------- - // Interface 0 :: Audio Control - //------------------------------------------------------------------------- - struct usb_Audio_st_ACinterface_descriptor StandardACInterfaceDescriptor_1; - struct usb_Audio_cs_ACinterface_descriptor SpecificACInterfaceDescriptor; - struct usb_Audio_InputTerminal_descriptor MicInputTerminal1Descriptor; - struct usb_Audio_InputTerminal_descriptor SpkInputTerminalDescriptor; - struct usb_Audio_OutputTerminal_descriptor MicOutputTerminal1Descriptor; - struct usb_Audio_OutputTerminal_descriptor SpkOutputTerminalDescriptor; - // Interface 1 :: Audio Stream Microphone - //------------------------------------------------------------------------- - struct usb_Audio_st_ASinterface_descriptor MicStandardAlt0ASInterfaceDescriptor; - struct usb_Audio_st_ASinterface_descriptor MicStandardAlt1ASInterfaceDescriptor; - struct usb_Audio_cs_ASinterface_descriptor MicSpecificASInterfaceDescriptor; - struct usb_Audio_TYPEI_FormatType_descriptor MicFormatTypeDescriptor; - struct usb_Audio_st_endpoint_descriptor MicStandardEndpointDescriptor; - struct usb_Audio_cs_ASendpoint_descriptor MicEndpointDescriptor; - - // Interface 2 :: Audio Stream Speaker - //------------------------------------------------------------------------- - struct usb_Audio_st_ASinterface_descriptor SpkStandardAlt0ASInterfaceDescriptor; - struct usb_Audio_st_ASinterface_descriptor SpkStandardAlt1ASInterfaceDescriptor; - struct usb_Audio_cs_ASinterface_descriptor SpkSpecificASInterfaceDescriptor; - struct usb_Audio_TYPEI_FormatType_descriptor SpkFormatTypeDescriptor; - struct usb_Audio_st_endpoint_descriptor SpkStandardEndpointDescriptor; - struct usb_Audio_cs_ASendpoint_descriptor SpkEndpointDescriptor; - - //------------------------------------------------------------------------- - // "HID" - //------------------------------------------------------------------------- - // Interface 3 :: Command / Status Interface - //------------------------------------------------------------------------- - struct usb_st_interface_descriptor HIDInterfaceDescriptor; - struct usb_hid_descriptor HIDStandardDescriptor; - struct usb_st_endpoint_descriptor HID_InEndpointDescriptor; - struct usb_st_endpoint_descriptor HID_OutEndpointDescriptor; - -#ifdef TTS_INTERFACE_ENABLED - // Interface 4 :: Audio Control - //------------------------------------------------------------------------- - struct usb_Audio_st_ACinterface_descriptor StandardACInterfaceDescriptor_TTS; - struct usb_Audio_cs_ACinterface_descriptor_NbCol1 SpecificACInterfaceDescriptor_TTS; - struct usb_Audio_InputTerminal_descriptor SpkInputTerminalDescriptor_TTS; - struct usb_Audio_OutputTerminal_descriptor SpkOutputTerminalDescriptor_TTS; - - // Interface 5 :: Audio Stream - //------------------------------------------------------------------------- - struct usb_Audio_st_ASinterface_descriptor SpkStandardAlt0ASInterfaceDescriptor_TTS; - struct usb_Audio_st_ASinterface_descriptor SpkStandardAlt1ASInterfaceDescriptor_TTS; - struct usb_Audio_cs_ASinterface_descriptor SpkSpecificASInterfaceDescriptor_TTS; - struct usb_Audio_TYPEI_FormatType_descriptor SpkFormatTypeDescriptor_TTS; - struct usb_Audio_st_endpoint_descriptor SpkStandardEndpointDescriptor_TTS; - struct usb_Audio_cs_ASendpoint_descriptor SpkEndpointDescriptor_TTS; -#endif - - // Report descriptor - //------------------------------------------------------------------------- - uint8_t rep[SIZE_OF_REPORT]; -} -*/ code struct usb_configuration_s usb_configuration = { { 9, CONFIGURATION, CONF_LENGTH, NB_INTERFACE, CONF_NB, |