Dwayne Dilbeck / USBDevice

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.h@1:80ab0d068708, 2012-07-17 (annotated)

Committer:
samux
Date:
Tue Jul 17 14:30:29 2012 +0000
Revision:
1:80ab0d068708
Child:
4:eaa07ce86d49
Update USBDevice lib

Who changed what in which revision?

UserRevisionLine numberNew contents of line
samux 1:80ab0d068708 1 /* Copyright (c) 2010-2011 mbed.org, MIT License
samux 1:80ab0d068708 2 *
samux 1:80ab0d068708 3 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
samux 1:80ab0d068708 4 * and associated documentation files (the "Software"), to deal in the Software without
samux 1:80ab0d068708 5 * restriction, including without limitation the rights to use, copy, modify, merge, publish,
samux 1:80ab0d068708 6 * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
samux 1:80ab0d068708 7 * Software is furnished to do so, subject to the following conditions:
samux 1:80ab0d068708 8 *
samux 1:80ab0d068708 9 * The above copyright notice and this permission notice shall be included in all copies or
samux 1:80ab0d068708 10 * substantial portions of the Software.
samux 1:80ab0d068708 11 *
samux 1:80ab0d068708 12 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
samux 1:80ab0d068708 13 * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
samux 1:80ab0d068708 14 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
samux 1:80ab0d068708 15 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
samux 1:80ab0d068708 16 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
samux 1:80ab0d068708 17 */
samux 1:80ab0d068708 18
samux 1:80ab0d068708 19 #ifndef USBAudio_H
samux 1:80ab0d068708 20 #define USBAudio_H
samux 1:80ab0d068708 21
samux 1:80ab0d068708 22 /* These headers are included for child class. */
samux 1:80ab0d068708 23 #include "USBEndpoints.h"
samux 1:80ab0d068708 24 #include "USBDescriptor.h"
samux 1:80ab0d068708 25 #include "USBDevice_Types.h"
samux 1:80ab0d068708 26
samux 1:80ab0d068708 27 #include "USBDevice.h"
samux 1:80ab0d068708 28
samux 1:80ab0d068708 29
samux 1:80ab0d068708 30 /**
samux 1:80ab0d068708 31 * USBAudio example
samux 1:80ab0d068708 32 *
samux 1:80ab0d068708 33 * #include "mbed.h"
samux 1:80ab0d068708 34 * #include "USBAudio.h"
samux 1:80ab0d068708 35 *
samux 1:80ab0d068708 36 * Serial pc(USBTX, USBRX);
samux 1:80ab0d068708 37 *
samux 1:80ab0d068708 38 * // frequency: 48 kHz
samux 1:80ab0d068708 39 * #define FREQ 48000
samux 1:80ab0d068708 40 *
samux 1:80ab0d068708 41 * // 1 channel: mono
samux 1:80ab0d068708 42 * #define NB_CHA 1
samux 1:80ab0d068708 43 *
samux 1:80ab0d068708 44 * // length of an audio packet: each ms, we receive 48 * 16bits ->48 * 2 bytes. as there is one channel, the length will be 48 * 2 * 1
samux 1:80ab0d068708 45 * #define AUDIO_LENGTH_PACKET 48 * 2 * 1
samux 1:80ab0d068708 46 *
samux 1:80ab0d068708 47 * // USBAudio
samux 1:80ab0d068708 48 * USBAudio audio(FREQ, NB_CHA);
samux 1:80ab0d068708 49 *
samux 1:80ab0d068708 50 * int main() {
samux 1:80ab0d068708 51 * int16_t buf[AUDIO_LENGTH_PACKET/2];
samux 1:80ab0d068708 52 *
samux 1:80ab0d068708 53 * while (1) {
samux 1:80ab0d068708 54 * // read an audio packet
samux 1:80ab0d068708 55 * audio.read((uint8_t *)buf);
samux 1:80ab0d068708 56 *
samux 1:80ab0d068708 57 *
samux 1:80ab0d068708 58 * // print packet received
samux 1:80ab0d068708 59 * pc.printf("recv: ");
samux 1:80ab0d068708 60 * for(int i = 0; i < AUDIO_LENGTH_PACKET/2; i++) {
samux 1:80ab0d068708 61 * pc.printf("%d ", buf[i]);
samux 1:80ab0d068708 62 * }
samux 1:80ab0d068708 63 * pc.printf("\r\n");
samux 1:80ab0d068708 64 * }
samux 1:80ab0d068708 65 * }
samux 1:80ab0d068708 66 * @endcode
samux 1:80ab0d068708 67 */
samux 1:80ab0d068708 68 class USBAudio: public USBDevice {
samux 1:80ab0d068708 69 public:
samux 1:80ab0d068708 70
samux 1:80ab0d068708 71 /**
samux 1:80ab0d068708 72 * Constructor
samux 1:80ab0d068708 73 *
samux 1:80ab0d068708 74 * @param frequency_in frequency in Hz (default: 48000)
samux 1:80ab0d068708 75 * @param channel_nb_in channel number (1 or 2) (default: 1)
samux 1:80ab0d068708 76 * @param frequency_out frequency in Hz (default: 8000)
samux 1:80ab0d068708 77 * @param channel_nb_out_in channel number (1 or 2) (default: 1)
samux 1:80ab0d068708 78 * @param vendor_id Your vendor_id
samux 1:80ab0d068708 79 * @param product_id Your product_id
samux 1:80ab0d068708 80 * @param product_release Your preoduct_release
samux 1:80ab0d068708 81 */
samux 1:80ab0d068708 82 USBAudio(uint32_t frequency_in = 48000, uint8_t channel_nb_in = 1, uint32_t frequency_out = 8000, uint8_t channel_nb_out = 1, uint16_t vendor_id = 0x7bb8, uint16_t product_id = 0x1111, uint16_t product_release = 0x0100);
samux 1:80ab0d068708 83
samux 1:80ab0d068708 84 /**
samux 1:80ab0d068708 85 * Get current volume between 0.0 and 1.0
samux 1:80ab0d068708 86 *
samux 1:80ab0d068708 87 * @returns volume
samux 1:80ab0d068708 88 */
samux 1:80ab0d068708 89 float getVolume();
samux 1:80ab0d068708 90
samux 1:80ab0d068708 91 /**
samux 1:80ab0d068708 92 * Read an audio packet. During a frame, only a single reading (you can't write and read an audio packet during the same frame)can be done using this method. Warning: Blocking
samux 1:80ab0d068708 93 *
samux 1:80ab0d068708 94 * @param buf pointer on a buffer which will be filled with an audio packet
samux 1:80ab0d068708 95 *
samux 1:80ab0d068708 96 * @returns true if successfull
samux 1:80ab0d068708 97 */
samux 1:80ab0d068708 98 bool read(uint8_t * buf);
samux 1:80ab0d068708 99
samux 1:80ab0d068708 100 /**
samux 1:80ab0d068708 101 * Try to read an audio packet. During a frame, only a single reading (you can't write and read an audio packet during the same frame)can be done using this method. Warning: Non Blocking
samux 1:80ab0d068708 102 *
samux 1:80ab0d068708 103 * @param buf pointer on a buffer which will be filled if an audio packet is available
samux 1:80ab0d068708 104 *
samux 1:80ab0d068708 105 * @returns true if successfull
samux 1:80ab0d068708 106 */
samux 1:80ab0d068708 107 bool readNB(uint8_t * buf);
samux 1:80ab0d068708 108
samux 1:80ab0d068708 109 /**
samux 1:80ab0d068708 110 * Write an audio packet. During a frame, only a single writing (you can't write and read an audio packet during the same frame)can be done using this method.
samux 1:80ab0d068708 111 *
samux 1:80ab0d068708 112 * @param buf pointer on the audio packet which will be sent
samux 1:80ab0d068708 113 * @returns true if successful
samux 1:80ab0d068708 114 */
samux 1:80ab0d068708 115 bool write(uint8_t * buf);
samux 1:80ab0d068708 116
samux 1:80ab0d068708 117 /**
samux 1:80ab0d068708 118 * Write and read an audio packet at the same time (on the same frame)
samux 1:80ab0d068708 119 *
samux 1:80ab0d068708 120 * @param buf_read pointer on a buffer which will be filled with an audio packet
samux 1:80ab0d068708 121 * @param buf_write pointer on the audio packet which will be sent
samux 1:80ab0d068708 122 * @returns true if successful
samux 1:80ab0d068708 123 */
samux 1:80ab0d068708 124 bool readWrite(uint8_t * buf_read, uint8_t * buf_write);
samux 1:80ab0d068708 125
samux 1:80ab0d068708 126
samux 1:80ab0d068708 127 /** attach a handler to update the volume
samux 1:80ab0d068708 128 *
samux 1:80ab0d068708 129 * @param function Function to attach
samux 1:80ab0d068708 130 *
samux 1:80ab0d068708 131 */
samux 1:80ab0d068708 132 void attach(void(*fptr)(void)) {
samux 1:80ab0d068708 133 updateVol.attach(fptr);
samux 1:80ab0d068708 134 }
samux 1:80ab0d068708 135
samux 1:80ab0d068708 136 /** Attach a nonstatic void/void member function to update the volume
samux 1:80ab0d068708 137 *
samux 1:80ab0d068708 138 * @param tptr Object pointer
samux 1:80ab0d068708 139 * @param mptr Member function pointer
samux 1:80ab0d068708 140 *
samux 1:80ab0d068708 141 */
samux 1:80ab0d068708 142 template<typename T>
samux 1:80ab0d068708 143 void attach(T *tptr, void(T::*mptr)(void)) {
samux 1:80ab0d068708 144 updateVol.attach(tptr, mptr);
samux 1:80ab0d068708 145 }
samux 1:80ab0d068708 146
samux 1:80ab0d068708 147
samux 1:80ab0d068708 148 protected:
samux 1:80ab0d068708 149
samux 1:80ab0d068708 150 /*
samux 1:80ab0d068708 151 * Called by USBDevice layer. Set configuration of the device.
samux 1:80ab0d068708 152 * For instance, you can add all endpoints that you need on this function.
samux 1:80ab0d068708 153 *
samux 1:80ab0d068708 154 * @param configuration Number of the configuration
samux 1:80ab0d068708 155 * @returns true if class handles this request
samux 1:80ab0d068708 156 */
samux 1:80ab0d068708 157 virtual bool USBCallback_setConfiguration(uint8_t configuration);
samux 1:80ab0d068708 158
samux 1:80ab0d068708 159 /*
samux 1:80ab0d068708 160 * Called by USBDevice on Endpoint0 request. Warning: Called in ISR context
samux 1:80ab0d068708 161 * This is used to handle extensions to standard requests
samux 1:80ab0d068708 162 * and class specific requests
samux 1:80ab0d068708 163 *
samux 1:80ab0d068708 164 * @returns true if class handles this request
samux 1:80ab0d068708 165 */
samux 1:80ab0d068708 166 virtual bool USBCallback_request();
samux 1:80ab0d068708 167
samux 1:80ab0d068708 168 /*
samux 1:80ab0d068708 169 * Get string product descriptor
samux 1:80ab0d068708 170 *
samux 1:80ab0d068708 171 * @returns pointer to the string product descriptor
samux 1:80ab0d068708 172 */
samux 1:80ab0d068708 173 virtual uint8_t * stringIproductDesc();
samux 1:80ab0d068708 174
samux 1:80ab0d068708 175 /*
samux 1:80ab0d068708 176 * Get string interface descriptor
samux 1:80ab0d068708 177 *
samux 1:80ab0d068708 178 * @returns pointer to the string interface descriptor
samux 1:80ab0d068708 179 */
samux 1:80ab0d068708 180 virtual uint8_t * stringIinterfaceDesc();
samux 1:80ab0d068708 181
samux 1:80ab0d068708 182 /*
samux 1:80ab0d068708 183 * Get configuration descriptor
samux 1:80ab0d068708 184 *
samux 1:80ab0d068708 185 * @returns pointer to the configuration descriptor
samux 1:80ab0d068708 186 */
samux 1:80ab0d068708 187 virtual uint8_t * configurationDesc();
samux 1:80ab0d068708 188
samux 1:80ab0d068708 189 /*
samux 1:80ab0d068708 190 * Called by USBDevice layer. Set interface/alternate of the device.
samux 1:80ab0d068708 191 *
samux 1:80ab0d068708 192 * @param interface Number of the interface to be configured
samux 1:80ab0d068708 193 * @param alternate Number of the alternate to be configured
samux 1:80ab0d068708 194 * @returns true if class handles this request
samux 1:80ab0d068708 195 */
samux 1:80ab0d068708 196 virtual bool USBCallback_setInterface(uint16_t interface, uint8_t alternate);
samux 1:80ab0d068708 197
samux 1:80ab0d068708 198 /*
samux 1:80ab0d068708 199 * Called by USBDevice on Endpoint0 request completion
samux 1:80ab0d068708 200 * if the 'notify' flag has been set to true. Warning: Called in ISR context
samux 1:80ab0d068708 201 *
samux 1:80ab0d068708 202 * In this case it is used to indicate that a HID report has
samux 1:80ab0d068708 203 * been received from the host on endpoint 0
samux 1:80ab0d068708 204 *
samux 1:80ab0d068708 205 * @param buf buffer received on endpoint 0
samux 1:80ab0d068708 206 * @param length length of this buffer
samux 1:80ab0d068708 207 */
samux 1:80ab0d068708 208 virtual void USBCallback_requestCompleted(uint8_t * buf, uint32_t length);
samux 1:80ab0d068708 209
samux 1:80ab0d068708 210 /*
samux 1:80ab0d068708 211 * Callback called on each Start of Frame event
samux 1:80ab0d068708 212 */
samux 1:80ab0d068708 213 virtual void SOF(int frameNumber);
samux 1:80ab0d068708 214
samux 1:80ab0d068708 215 /*
samux 1:80ab0d068708 216 * Callback called when a packet is received
samux 1:80ab0d068708 217 */
samux 1:80ab0d068708 218 virtual bool EP3_OUT_callback();
samux 1:80ab0d068708 219
samux 1:80ab0d068708 220 /*
samux 1:80ab0d068708 221 * Callback called when a packet has been sent
samux 1:80ab0d068708 222 */
samux 1:80ab0d068708 223 virtual bool EP3_IN_callback();
samux 1:80ab0d068708 224
samux 1:80ab0d068708 225 private:
samux 1:80ab0d068708 226
samux 1:80ab0d068708 227 // stream available ?
samux 1:80ab0d068708 228 volatile bool available;
samux 1:80ab0d068708 229
samux 1:80ab0d068708 230 // interrupt OUT has been received
samux 1:80ab0d068708 231 volatile bool interruptOUT;
samux 1:80ab0d068708 232
samux 1:80ab0d068708 233 // interrupt IN has been received
samux 1:80ab0d068708 234 volatile bool interruptIN;
samux 1:80ab0d068708 235
samux 1:80ab0d068708 236 // audio packet has been written
samux 1:80ab0d068708 237 volatile bool writeIN;
samux 1:80ab0d068708 238
samux 1:80ab0d068708 239 // FREQ
samux 1:80ab0d068708 240 uint32_t FREQ_OUT;
samux 1:80ab0d068708 241 uint32_t FREQ_IN;
samux 1:80ab0d068708 242
samux 1:80ab0d068708 243 // size of the maximum packet for the isochronous endpoint
samux 1:80ab0d068708 244 uint32_t PACKET_SIZE_ISO_IN;
samux 1:80ab0d068708 245 uint32_t PACKET_SIZE_ISO_OUT;
samux 1:80ab0d068708 246
samux 1:80ab0d068708 247 // mono, stereo,...
samux 1:80ab0d068708 248 uint8_t channel_nb_in;
samux 1:80ab0d068708 249 uint8_t channel_nb_out;
samux 1:80ab0d068708 250
samux 1:80ab0d068708 251 // channel config: master, left, right
samux 1:80ab0d068708 252 uint8_t channel_config_in;
samux 1:80ab0d068708 253 uint8_t channel_config_out;
samux 1:80ab0d068708 254
samux 1:80ab0d068708 255 // mute state
samux 1:80ab0d068708 256 uint8_t mute;
samux 1:80ab0d068708 257
samux 1:80ab0d068708 258 // Volume Current Value
samux 1:80ab0d068708 259 uint16_t volCur;
samux 1:80ab0d068708 260
samux 1:80ab0d068708 261 // Volume Minimum Value
samux 1:80ab0d068708 262 uint16_t volMin;
samux 1:80ab0d068708 263
samux 1:80ab0d068708 264 // Volume Maximum Value
samux 1:80ab0d068708 265 uint16_t volMax;
samux 1:80ab0d068708 266
samux 1:80ab0d068708 267 // Volume Resolution
samux 1:80ab0d068708 268 uint16_t volRes;
samux 1:80ab0d068708 269
samux 1:80ab0d068708 270 // Buffer containing one audio packet (to be read)
samux 1:80ab0d068708 271 volatile uint8_t * buf_stream_in;
samux 1:80ab0d068708 272
samux 1:80ab0d068708 273 // Buffer containing one audio packet (to be written)
samux 1:80ab0d068708 274 volatile uint8_t * buf_stream_out;
samux 1:80ab0d068708 275
samux 1:80ab0d068708 276 // callback to update volume
samux 1:80ab0d068708 277 FunctionPointer updateVol;
samux 1:80ab0d068708 278
samux 1:80ab0d068708 279 // boolean showing that the SOF handler has been called. Useful for readNB.
samux 1:80ab0d068708 280 volatile bool SOF_handler;
samux 1:80ab0d068708 281
samux 1:80ab0d068708 282 volatile float volume;
samux 1:80ab0d068708 283
samux 1:80ab0d068708 284 };
samux 1:80ab0d068708 285
samux 1:80ab0d068708 286 #endif