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

USBMSD/USBMSD.h@8:335f2506f422, 2013-03-01 (annotated)

Committer:
samux
Date:
Fri Mar 01 13:10:29 2013 +0000
Revision:
8:335f2506f422
Parent:
7:f8f057664123
Child:
10:1e3d126a322b
add FRDM-KL25Z support

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
samux 1:80ab0d068708 20 #ifndef USBMSD_H
samux 1:80ab0d068708 21 #define USBMSD_H
samux 1:80ab0d068708 22
samux 1:80ab0d068708 23 /* These headers are included for child class. */
samux 1:80ab0d068708 24 #include "USBEndpoints.h"
samux 1:80ab0d068708 25 #include "USBDescriptor.h"
samux 1:80ab0d068708 26 #include "USBDevice_Types.h"
samux 1:80ab0d068708 27
samux 1:80ab0d068708 28 #include "USBDevice.h"
samux 1:80ab0d068708 29
samux 1:80ab0d068708 30 /**
samux 1:80ab0d068708 31 * USBMSD class: generic class in order to use all kinds of blocks storage chip
samux 1:80ab0d068708 32 *
samux 1:80ab0d068708 33 * Introduction
samux 1:80ab0d068708 34 *
samux 1:80ab0d068708 35 * The USBMSD implements the MSD protocol. It permits to access a memory chip (flash, sdcard,...)
samux 1:80ab0d068708 36 * from a computer over USB. But this class doesn't work standalone, you need to subclass this class
samux 1:80ab0d068708 37 * and define virtual functions which are called in USBMSD.
samux 1:80ab0d068708 38 *
samux 1:80ab0d068708 39 * How to use this class with your chip ?
samux 1:80ab0d068708 40 *
samux 1:80ab0d068708 41 * You have to inherit and define some pure virtual functions (mandatory step):
samux 1:80ab0d068708 42 * - virtual int disk_read(char * data, int block): function to read a block
samux 1:80ab0d068708 43 * - virtual int disk_write(const char * data, int block): function to write a block
samux 1:80ab0d068708 44 * - virtual int disk_initialize(): function to initialize the memory
samux 1:80ab0d068708 45 * - virtual int disk_sectors(): return the number of blocks
samux 1:80ab0d068708 46 * - virtual int disk_size(): return the memory size
samux 1:80ab0d068708 47 * - virtual int disk_status(): return the status of the storage chip (0: OK, 1: not initialized, 2: no medium in the drive, 4: write protection)
samux 1:80ab0d068708 48 *
samux 1:80ab0d068708 49 * All functions names are compatible with the fat filesystem library. So you can imagine using your own class with
samux 1:80ab0d068708 50 * USBMSD and the fat filesystem library in the same program. Just be careful because there are two different parts which
samux 1:80ab0d068708 51 * will access the sd card. You can do a master/slave system using the disk_status method.
samux 1:80ab0d068708 52 *
samux 1:80ab0d068708 53 * Once these functions defined, you can call connect() (at the end of the constructor of your class for instance)
samux 1:80ab0d068708 54 * of USBMSD to connect your mass storage device. connect() will first call disk_status() to test the status of the disk.
samux 1:80ab0d068708 55 * If disk_status() returns 1 (disk not initialized), then disk_initialize() is called. After this step, connect() will collect information
samux 1:80ab0d068708 56 * such as the number of blocks and the memory size.
samux 1:80ab0d068708 57 */
samux 1:80ab0d068708 58 class USBMSD: public USBDevice {
samux 1:80ab0d068708 59 public:
samux 1:80ab0d068708 60
samux 1:80ab0d068708 61 /**
samux 1:80ab0d068708 62 * Constructor
samux 1:80ab0d068708 63 *
samux 1:80ab0d068708 64 * @param vendor_id Your vendor_id
samux 1:80ab0d068708 65 * @param product_id Your product_id
samux 1:80ab0d068708 66 * @param product_release Your preoduct_release
samux 1:80ab0d068708 67 */
samux 1:80ab0d068708 68 USBMSD(uint16_t vendor_id = 0x0703, uint16_t product_id = 0x0104, uint16_t product_release = 0x0001);
samux 1:80ab0d068708 69
samux 1:80ab0d068708 70 /**
samux 1:80ab0d068708 71 * Connect the USB MSD device. Establish disk initialization before really connect the device.
samux 1:80ab0d068708 72 *
samux 1:80ab0d068708 73 * @returns true if successful
samux 1:80ab0d068708 74 */
samux 1:80ab0d068708 75 bool connect();
samux 1:80ab0d068708 76
samux 1:80ab0d068708 77
samux 1:80ab0d068708 78 protected:
samux 1:80ab0d068708 79
samux 1:80ab0d068708 80 /*
samux 1:80ab0d068708 81 * read a block on a storage chip
samux 1:80ab0d068708 82 *
samux 1:80ab0d068708 83 * @param data pointer where will be stored read data
samux 1:80ab0d068708 84 * @param block block number
samux 1:80ab0d068708 85 * @returns 0 if successful
samux 1:80ab0d068708 86 */
samux 7:f8f057664123 87 virtual int disk_read(uint8_t * data, uint64_t block) = 0;
samux 1:80ab0d068708 88
samux 1:80ab0d068708 89 /*
samux 1:80ab0d068708 90 * write a block on a storage chip
samux 1:80ab0d068708 91 *
samux 1:80ab0d068708 92 * @param data data to write
samux 1:80ab0d068708 93 * @param block block number
samux 1:80ab0d068708 94 * @returns 0 if successful
samux 1:80ab0d068708 95 */
samux 7:f8f057664123 96 virtual int disk_write(const uint8_t * data, uint64_t block) = 0;
samux 1:80ab0d068708 97
samux 1:80ab0d068708 98 /*
samux 1:80ab0d068708 99 * Disk initilization
samux 1:80ab0d068708 100 */
samux 1:80ab0d068708 101 virtual int disk_initialize() = 0;
samux 1:80ab0d068708 102
samux 1:80ab0d068708 103 /*
samux 1:80ab0d068708 104 * Return the number of blocks
samux 1:80ab0d068708 105 *
samux 1:80ab0d068708 106 * @returns number of blocks
samux 1:80ab0d068708 107 */
samux 7:f8f057664123 108 virtual uint64_t disk_sectors() = 0;
samux 1:80ab0d068708 109
samux 1:80ab0d068708 110 /*
samux 1:80ab0d068708 111 * Return memory size
samux 1:80ab0d068708 112 *
samux 1:80ab0d068708 113 * @returns memory size
samux 1:80ab0d068708 114 */
samux 7:f8f057664123 115 virtual uint64_t disk_size() = 0;
samux 1:80ab0d068708 116
samux 1:80ab0d068708 117
samux 1:80ab0d068708 118 /*
samux 1:80ab0d068708 119 * To check the status of the storage chip
samux 1:80ab0d068708 120 *
samux 1:80ab0d068708 121 * @returns status: 0: OK, 1: disk not initialized, 2: no medium in the drive, 4: write protected
samux 1:80ab0d068708 122 */
samux 1:80ab0d068708 123 virtual int disk_status() = 0;
samux 1:80ab0d068708 124
samux 1:80ab0d068708 125 /*
samux 1:80ab0d068708 126 * Get string product descriptor
samux 1:80ab0d068708 127 *
samux 1:80ab0d068708 128 * @returns pointer to the string product descriptor
samux 1:80ab0d068708 129 */
samux 1:80ab0d068708 130 virtual uint8_t * stringIproductDesc();
samux 1:80ab0d068708 131
samux 1:80ab0d068708 132 /*
samux 1:80ab0d068708 133 * Get string interface descriptor
samux 1:80ab0d068708 134 *
samux 1:80ab0d068708 135 * @returns pointer to the string interface descriptor
samux 1:80ab0d068708 136 */
samux 1:80ab0d068708 137 virtual uint8_t * stringIinterfaceDesc();
samux 1:80ab0d068708 138
samux 1:80ab0d068708 139 /*
samux 1:80ab0d068708 140 * Get configuration descriptor
samux 1:80ab0d068708 141 *
samux 1:80ab0d068708 142 * @returns pointer to the configuration descriptor
samux 1:80ab0d068708 143 */
samux 1:80ab0d068708 144 virtual uint8_t * configurationDesc();
samux 1:80ab0d068708 145
samux 1:80ab0d068708 146 /*
samux 1:80ab0d068708 147 * Callback called when a packet is received
samux 1:80ab0d068708 148 */
samux 1:80ab0d068708 149 virtual bool EP2_OUT_callback();
samux 1:80ab0d068708 150
samux 1:80ab0d068708 151 /*
samux 1:80ab0d068708 152 * Callback called when a packet has been sent
samux 1:80ab0d068708 153 */
samux 1:80ab0d068708 154 virtual bool EP2_IN_callback();
samux 1:80ab0d068708 155
samux 1:80ab0d068708 156 /*
samux 1:80ab0d068708 157 * Set configuration of device. Add endpoints
samux 1:80ab0d068708 158 */
samux 1:80ab0d068708 159 virtual bool USBCallback_setConfiguration(uint8_t configuration);
samux 1:80ab0d068708 160
samux 1:80ab0d068708 161 /*
samux 1:80ab0d068708 162 * Callback called to process class specific requests
samux 1:80ab0d068708 163 */
samux 1:80ab0d068708 164 virtual bool USBCallback_request();
samux 1:80ab0d068708 165
samux 1:80ab0d068708 166
samux 1:80ab0d068708 167 private:
samux 1:80ab0d068708 168
samux 1:80ab0d068708 169 // MSC Bulk-only Stage
samux 1:80ab0d068708 170 enum Stage {
samux 1:80ab0d068708 171 READ_CBW, // wait a CBW
samux 1:80ab0d068708 172 ERROR, // error
samux 1:80ab0d068708 173 PROCESS_CBW, // process a CBW request
samux 1:80ab0d068708 174 SEND_CSW, // send a CSW
samux 1:80ab0d068708 175 WAIT_CSW, // wait that a CSW has been effectively sent
samux 1:80ab0d068708 176 };
samux 1:80ab0d068708 177
samux 1:80ab0d068708 178 // Bulk-only CBW
samux 1:80ab0d068708 179 typedef __packed struct {
samux 1:80ab0d068708 180 uint32_t Signature;
samux 1:80ab0d068708 181 uint32_t Tag;
samux 1:80ab0d068708 182 uint32_t DataLength;
samux 1:80ab0d068708 183 uint8_t Flags;
samux 1:80ab0d068708 184 uint8_t LUN;
samux 1:80ab0d068708 185 uint8_t CBLength;
samux 1:80ab0d068708 186 uint8_t CB[16];
samux 1:80ab0d068708 187 } CBW;
samux 1:80ab0d068708 188
samux 1:80ab0d068708 189 // Bulk-only CSW
samux 1:80ab0d068708 190 typedef __packed struct {
samux 1:80ab0d068708 191 uint32_t Signature;
samux 1:80ab0d068708 192 uint32_t Tag;
samux 1:80ab0d068708 193 uint32_t DataResidue;
samux 1:80ab0d068708 194 uint8_t Status;
samux 1:80ab0d068708 195 } CSW;
samux 1:80ab0d068708 196
samux 1:80ab0d068708 197 //state of the bulk-only state machine
samux 1:80ab0d068708 198 Stage stage;
samux 1:80ab0d068708 199
samux 1:80ab0d068708 200 // current CBW
samux 1:80ab0d068708 201 CBW cbw;
samux 1:80ab0d068708 202
samux 1:80ab0d068708 203 // CSW which will be sent
samux 1:80ab0d068708 204 CSW csw;
samux 1:80ab0d068708 205
samux 1:80ab0d068708 206 // addr where will be read or written data
samux 1:80ab0d068708 207 uint32_t addr;
samux 1:80ab0d068708 208
samux 1:80ab0d068708 209 // length of a reading or writing
samux 1:80ab0d068708 210 uint32_t length;
samux 1:80ab0d068708 211
samux 1:80ab0d068708 212 // memory OK (after a memoryVerify)
samux 1:80ab0d068708 213 bool memOK;
samux 1:80ab0d068708 214
samux 1:80ab0d068708 215 // cache in RAM before writing in memory. Useful also to read a block.
samux 1:80ab0d068708 216 uint8_t * page;
samux 1:80ab0d068708 217
samux 1:80ab0d068708 218 int BlockSize;
samux 7:f8f057664123 219 uint64_t MemorySize;
samux 7:f8f057664123 220 uint64_t BlockCount;
samux 1:80ab0d068708 221
samux 1:80ab0d068708 222 void CBWDecode(uint8_t * buf, uint16_t size);
samux 1:80ab0d068708 223 void sendCSW (void);
samux 1:80ab0d068708 224 bool inquiryRequest (void);
samux 1:80ab0d068708 225 bool write (uint8_t * buf, uint16_t size);
samux 1:80ab0d068708 226 bool readFormatCapacity();
samux 1:80ab0d068708 227 bool readCapacity (void);
samux 1:80ab0d068708 228 bool infoTransfer (void);
samux 1:80ab0d068708 229 void memoryRead (void);
samux 1:80ab0d068708 230 bool modeSense6 (void);
samux 1:80ab0d068708 231 void testUnitReady (void);
samux 1:80ab0d068708 232 bool requestSense (void);
samux 1:80ab0d068708 233 void memoryVerify (uint8_t * buf, uint16_t size);
samux 1:80ab0d068708 234 void memoryWrite (uint8_t * buf, uint16_t size);
samux 1:80ab0d068708 235 void reset();
samux 1:80ab0d068708 236 void fail();
samux 1:80ab0d068708 237 };
samux 1:80ab0d068708 238
samux 8:335f2506f422 239 #endif