Forked to make modifications to bring the USBHID into USB compliance and add additional features.

Dependents:   HW4_AudioControl

Fork of USBDevice by mbed official

As of Revision 18 everything in the USBHID specification is now implemented, except Multi-reports.

Revision comments for changelist 18

USBHID.cpp

  • Added SET_PROTOCOL support
  • Added GET_PROTOCOL support
  • protocolSate is set to 1 by default to match USB HID specification. This variable should be checked to determine which format theinput report should have. 1 - Use the user specified report format. 0 - Use the BOOT protocol report format.

Revision comments for changelist 16

  • HID_REPORT transformed from structure to class. This was done for several reasons.
  1. When multiple reports are used the 64 byte size for every report becomes a problem.
  2. The length value should always remain the same for a report, Make the constructor set the vale at the same time it allocates memory for the DATA area.
  • By default the data will be an array of MAX_HID_REPORT_SIZE like the structure,
  • When given a length argument, the hid_report.length will be set, and hid_report.data will be an array of the size given.
  • Length zero causes data to be NULL
  • Mostly backwards compatible. The definition of a destructor caused a compiler error in USBMouse::update and USBMousekeyboard::update. This error was caused by instatiation of HID_REPORT in the middle of an IF logic statement. These files have been modified. The error complained that the logic skipped object initialization. The HID_REPORT has been moved to the class definition. Since both ABSOLUTE and RELATIVE modes used the HID_REPORT, this seems to make more sense. Previously the hid_report would be instatiated in <class>::mousesend and <class>::update.

Revision comments for changelist 14

USBdevice.cpp

  • Modified USB device state to change from Configure when disconnect is called.
  • Modified the call back function for when the suspend state changes. This should be used to turn off peripherals to conserve power.

Revision comments for changelist 13

USBdevice.cpp

  • ) Changed DEBUG messages to be more descriptive for string descriptor
  • ) Bug fix: Control Transfers did not actually transfer the data from Buffer to transfer->ptr

USBHIDTypes.h

  • ) Added ALL CLASS request to KEYWORD list
  • ) Added KEYWORDS for report type

USBHID.h

  • ) Added a new constructor to specify size of feature report
  • ) Added HID_REPORT inputReport and featureReport
  • ) Added data structures to support IDLE rate
  • ) Added data structures to support callback functions

USBHID.cpp

  • ) Changed constructor to initialize new feature data structures
  • ) Implemented Set_IDLE/GET_IDLE and the periodic resend of non-changed data
  • ) Implemented HID specification required control transfer GET_REPORT
  • ) Fixed issue where Intreput transfers and control transfers did not access the same data structures.
  • ) Implemented Feature reports
  • ) Implemented Callback Hooks for get_report/set_report actions.
  • ) Added callback hooks for interupt actions in the new functions.
  • ) interupt transfer can now write to outputReport
  • ) Modified SET_REPORT code to function for multiple types.
  • ) Refactored some code in preperation to add multi report support
Test NumberTest DescriptionTest ResultNotes
1Use USBmouse to verify backward compatibility of constructor and methodsPass
2Test SET_REPORT can set a feature reportPass
3Test GET_REPORT can retrieve a feature reportPass
4Test SET_IDLE sets up a reoccuring triggerPassIOCTL_SET_POLL_FREQUENCY_MSEC does not function for the windows HID driver. A Special test program is used to rearm the IDLE rate after windows sets it to zero
5Test SET_IDLE disables a triggerPassWindows automatically sends this command to a HID device when it is inserted.
6Enabled DEBUG in USBDevice.cpp and generated str descriptor requests.Pass
7Test SET_REPORT can set an output reportPass
8Test GET_REPORT can retrieve an output reportPass
9ReadFile, accesses the input_reportPass
10WriteFile accesses the output_report, via interupt transfer when ep1_out is used.Pass
11WriteFile accesses the output_report, via control transfer when ep1_out is NOT used.Not Tested
12Callback hooks trigger independently for each type of set_report/get_reportPass
13New constructor sets feature_report sizePass
14Control transfer SET_REPORT and writeFile access the same data structureBUGThe same data structure is accessed, but the data transfer size is different. The writeFile strips the leading byte which is the report ID, The Control transfer keeps the byte.
15Control transfer GET_REPORT and readFile access the same data structureBUGThe same dtat structure is accessed, but the data transfer size is different. The readFile strips the leading byte which is the report ID, The Control transfer keeps the byte.
16Test GET_IDLE retrieves the IDLE rateUnknownWindows HID driver does not implement IOCTL_HID_GET_POLL_FREQUENCY_MSEC

USBAudio/USBAudio_Types.h

Committer:
jakowisp
Date:
2013-08-08
Revision:
18:cb3afa532fcd
Parent:
1:80ab0d068708

File content as of revision 18:cb3afa532fcd:

/* Copyright (c) 2010-2011 mbed.org, MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
* and associated documentation files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all copies or
* substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#ifndef USBAUDIO_TYPES_H
#define USBAUDIO_TYPES_H


#define DEFAULT_CONFIGURATION (1)

// Audio Request Codes
#define REQUEST_SET_CUR     0x01
#define REQUEST_GET_CUR     0x81
#define REQUEST_SET_MIN     0x02
#define REQUEST_GET_MIN     0x82
#define REQUEST_SET_MAX     0x03
#define REQUEST_GET_MAX     0x83
#define REQUEST_SET_RES     0x04
#define REQUEST_GET_RES     0x84

#define MUTE_CONTROL        0x01
#define VOLUME_CONTROL      0x02


// Audio Descriptor Sizes
#define CONTROL_INTERFACE_DESCRIPTOR_LENGTH       0x09
#define STREAMING_INTERFACE_DESCRIPTOR_LENGTH     0x07
#define INPUT_TERMINAL_DESCRIPTOR_LENGTH          0x0C
#define OUTPUT_TERMINAL_DESCRIPTOR_LENGTH         0x09
#define FEATURE_UNIT_DESCRIPTOR_LENGTH            0x09
#define STREAMING_ENDPOINT_DESCRIPTOR_LENGTH      0x07

// Audio Format Type Descriptor Sizes
#define FORMAT_TYPE_I_DESCRIPTOR_LENGTH   0x0b

#define AUDIO_CLASS                       0x01
#define SUBCLASS_AUDIOCONTROL             0x01
#define SUBCLASS_AUDIOSTREAMING           0x02

// Audio Descriptor Types
#define INTERFACE_DESCRIPTOR_TYPE         0x24
#define ENDPOINT_DESCRIPTOR_TYPE          0x25

// Audio Control Interface Descriptor Subtypes
#define CONTROL_HEADER                    0x01
#define CONTROL_INPUT_TERMINAL            0x02
#define CONTROL_OUTPUT_TERMINAL           0x03
#define CONTROL_FEATURE_UNIT              0x06

// USB Terminal Types
#define TERMINAL_USB_STREAMING            0x0101

// Predefined Audio Channel Configuration Bits
// Mono
#define CHANNEL_M                         0x0000
#define CHANNEL_L                         0x0001  /* Left Front */
#define CHANNEL_R                         0x0002  /* Right Front */

// Feature Unit Control Bits
#define CONTROL_MUTE                      0x0001
#define CONTROL_VOLUME                    0x0002

// Input Terminal Types
#define TERMINAL_MICROPHONE               0x0201

// Output Terminal Types
#define TERMINAL_SPEAKER                  0x0301
#define TERMINAL_HEADPHONES               0x0302

// Audio Streaming Interface Descriptor Subtypes
#define STREAMING_GENERAL                 0x01
#define STREAMING_FORMAT_TYPE             0x02

// Audio Data Format Type I Codes
#define FORMAT_PCM                        0x0001

// Audio Format Types
#define FORMAT_TYPE_I                     0x01

// Audio Endpoint Descriptor Subtypes
#define ENDPOINT_GENERAL                  0x01

#endif