Zachary Russell / USBHost_Modified

USBHost library with fixes

Dependencies:   mbed-rtos FATFileSystem

Dependents:   mbedica

USBHostMSD/USBHostMSD.cpp@0:b176d95bb38f, 2018-12-13 (annotated)

Committer:
zrussell3
Date:
Thu Dec 13 19:24:21 2018 +0000
Revision:
0:b176d95bb38f
Modified USBHost library to fix modifier input

Who changed what in which revision?

UserRevisionLine numberNew contents of line
zrussell3 0:b176d95bb38f 1 /* mbed USBHost Library
zrussell3 0:b176d95bb38f 2 * Copyright (c) 2006-2013 ARM Limited
zrussell3 0:b176d95bb38f 3 *
zrussell3 0:b176d95bb38f 4 * Licensed under the Apache License, Version 2.0 (the "License");
zrussell3 0:b176d95bb38f 5 * you may not use this file except in compliance with the License.
zrussell3 0:b176d95bb38f 6 * You may obtain a copy of the License at
zrussell3 0:b176d95bb38f 7 *
zrussell3 0:b176d95bb38f 8 * http://www.apache.org/licenses/LICENSE-2.0
zrussell3 0:b176d95bb38f 9 *
zrussell3 0:b176d95bb38f 10 * Unless required by applicable law or agreed to in writing, software
zrussell3 0:b176d95bb38f 11 * distributed under the License is distributed on an "AS IS" BASIS,
zrussell3 0:b176d95bb38f 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
zrussell3 0:b176d95bb38f 13 * See the License for the specific language governing permissions and
zrussell3 0:b176d95bb38f 14 * limitations under the License.
zrussell3 0:b176d95bb38f 15 */
zrussell3 0:b176d95bb38f 16
zrussell3 0:b176d95bb38f 17 #include "USBHostMSD.h"
zrussell3 0:b176d95bb38f 18
zrussell3 0:b176d95bb38f 19 #if USBHOST_MSD
zrussell3 0:b176d95bb38f 20
zrussell3 0:b176d95bb38f 21 #include "dbg.h"
zrussell3 0:b176d95bb38f 22
zrussell3 0:b176d95bb38f 23 #define CBW_SIGNATURE 0x43425355
zrussell3 0:b176d95bb38f 24 #define CSW_SIGNATURE 0x53425355
zrussell3 0:b176d95bb38f 25
zrussell3 0:b176d95bb38f 26 #define DEVICE_TO_HOST 0x80
zrussell3 0:b176d95bb38f 27 #define HOST_TO_DEVICE 0x00
zrussell3 0:b176d95bb38f 28
zrussell3 0:b176d95bb38f 29 #define GET_MAX_LUN (0xFE)
zrussell3 0:b176d95bb38f 30 #define BO_MASS_STORAGE_RESET (0xFF)
zrussell3 0:b176d95bb38f 31
zrussell3 0:b176d95bb38f 32 USBHostMSD::USBHostMSD(const char * rootdir) : FATFileSystem(rootdir)
zrussell3 0:b176d95bb38f 33 {
zrussell3 0:b176d95bb38f 34 host = USBHost::getHostInst();
zrussell3 0:b176d95bb38f 35 init();
zrussell3 0:b176d95bb38f 36 }
zrussell3 0:b176d95bb38f 37
zrussell3 0:b176d95bb38f 38 void USBHostMSD::init() {
zrussell3 0:b176d95bb38f 39 dev_connected = false;
zrussell3 0:b176d95bb38f 40 dev = NULL;
zrussell3 0:b176d95bb38f 41 bulk_in = NULL;
zrussell3 0:b176d95bb38f 42 bulk_out = NULL;
zrussell3 0:b176d95bb38f 43 dev_connected = false;
zrussell3 0:b176d95bb38f 44 blockSize = 0;
zrussell3 0:b176d95bb38f 45 blockCount = 0;
zrussell3 0:b176d95bb38f 46 msd_intf = -1;
zrussell3 0:b176d95bb38f 47 msd_device_found = false;
zrussell3 0:b176d95bb38f 48 disk_init = false;
zrussell3 0:b176d95bb38f 49 dev_connected = false;
zrussell3 0:b176d95bb38f 50 nb_ep = 0;
zrussell3 0:b176d95bb38f 51 }
zrussell3 0:b176d95bb38f 52
zrussell3 0:b176d95bb38f 53
zrussell3 0:b176d95bb38f 54 bool USBHostMSD::connected()
zrussell3 0:b176d95bb38f 55 {
zrussell3 0:b176d95bb38f 56 return dev_connected;
zrussell3 0:b176d95bb38f 57 }
zrussell3 0:b176d95bb38f 58
zrussell3 0:b176d95bb38f 59 bool USBHostMSD::connect()
zrussell3 0:b176d95bb38f 60 {
zrussell3 0:b176d95bb38f 61
zrussell3 0:b176d95bb38f 62 if (dev_connected) {
zrussell3 0:b176d95bb38f 63 return true;
zrussell3 0:b176d95bb38f 64 }
zrussell3 0:b176d95bb38f 65
zrussell3 0:b176d95bb38f 66 for (uint8_t i = 0; i < MAX_DEVICE_CONNECTED; i++) {
zrussell3 0:b176d95bb38f 67 if ((dev = host->getDevice(i)) != NULL) {
zrussell3 0:b176d95bb38f 68
zrussell3 0:b176d95bb38f 69 USB_DBG("Trying to connect MSD device\r\n");
zrussell3 0:b176d95bb38f 70
zrussell3 0:b176d95bb38f 71 if(host->enumerate(dev, this))
zrussell3 0:b176d95bb38f 72 break;
zrussell3 0:b176d95bb38f 73
zrussell3 0:b176d95bb38f 74 if (msd_device_found) {
zrussell3 0:b176d95bb38f 75 bulk_in = dev->getEndpoint(msd_intf, BULK_ENDPOINT, IN);
zrussell3 0:b176d95bb38f 76 bulk_out = dev->getEndpoint(msd_intf, BULK_ENDPOINT, OUT);
zrussell3 0:b176d95bb38f 77
zrussell3 0:b176d95bb38f 78 if (!bulk_in || !bulk_out)
zrussell3 0:b176d95bb38f 79 continue;
zrussell3 0:b176d95bb38f 80
zrussell3 0:b176d95bb38f 81 USB_INFO("New MSD device: VID:%04x PID:%04x [dev: %p - intf: %d]", dev->getVid(), dev->getPid(), dev, msd_intf);
zrussell3 0:b176d95bb38f 82 dev->setName("MSD", msd_intf);
zrussell3 0:b176d95bb38f 83 host->registerDriver(dev, msd_intf, this, &USBHostMSD::init);
zrussell3 0:b176d95bb38f 84
zrussell3 0:b176d95bb38f 85 dev_connected = true;
zrussell3 0:b176d95bb38f 86 return true;
zrussell3 0:b176d95bb38f 87 }
zrussell3 0:b176d95bb38f 88 } //if()
zrussell3 0:b176d95bb38f 89 } //for()
zrussell3 0:b176d95bb38f 90 init();
zrussell3 0:b176d95bb38f 91 return false;
zrussell3 0:b176d95bb38f 92 }
zrussell3 0:b176d95bb38f 93
zrussell3 0:b176d95bb38f 94 /*virtual*/ void USBHostMSD::setVidPid(uint16_t vid, uint16_t pid)
zrussell3 0:b176d95bb38f 95 {
zrussell3 0:b176d95bb38f 96 // we don't check VID/PID for MSD driver
zrussell3 0:b176d95bb38f 97 }
zrussell3 0:b176d95bb38f 98
zrussell3 0:b176d95bb38f 99 /*virtual*/ bool USBHostMSD::parseInterface(uint8_t intf_nb, uint8_t intf_class, uint8_t intf_subclass, uint8_t intf_protocol) //Must return true if the interface should be parsed
zrussell3 0:b176d95bb38f 100 {
zrussell3 0:b176d95bb38f 101 if ((msd_intf == -1) &&
zrussell3 0:b176d95bb38f 102 (intf_class == MSD_CLASS) &&
zrussell3 0:b176d95bb38f 103 (intf_subclass == 0x06) &&
zrussell3 0:b176d95bb38f 104 (intf_protocol == 0x50)) {
zrussell3 0:b176d95bb38f 105 msd_intf = intf_nb;
zrussell3 0:b176d95bb38f 106 return true;
zrussell3 0:b176d95bb38f 107 }
zrussell3 0:b176d95bb38f 108 return false;
zrussell3 0:b176d95bb38f 109 }
zrussell3 0:b176d95bb38f 110
zrussell3 0:b176d95bb38f 111 /*virtual*/ bool USBHostMSD::useEndpoint(uint8_t intf_nb, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir) //Must return true if the endpoint will be used
zrussell3 0:b176d95bb38f 112 {
zrussell3 0:b176d95bb38f 113 if (intf_nb == msd_intf) {
zrussell3 0:b176d95bb38f 114 if (type == BULK_ENDPOINT) {
zrussell3 0:b176d95bb38f 115 nb_ep++;
zrussell3 0:b176d95bb38f 116 if (nb_ep == 2)
zrussell3 0:b176d95bb38f 117 msd_device_found = true;
zrussell3 0:b176d95bb38f 118 return true;
zrussell3 0:b176d95bb38f 119 }
zrussell3 0:b176d95bb38f 120 }
zrussell3 0:b176d95bb38f 121 return false;
zrussell3 0:b176d95bb38f 122 }
zrussell3 0:b176d95bb38f 123
zrussell3 0:b176d95bb38f 124
zrussell3 0:b176d95bb38f 125 int USBHostMSD::testUnitReady() {
zrussell3 0:b176d95bb38f 126 USB_DBG("Test unit ready");
zrussell3 0:b176d95bb38f 127 return SCSITransfer(NULL, 6, DEVICE_TO_HOST, 0, 0);
zrussell3 0:b176d95bb38f 128 }
zrussell3 0:b176d95bb38f 129
zrussell3 0:b176d95bb38f 130
zrussell3 0:b176d95bb38f 131 int USBHostMSD::readCapacity() {
zrussell3 0:b176d95bb38f 132 USB_DBG("Read capacity");
zrussell3 0:b176d95bb38f 133 uint8_t cmd[10] = {0x25,0,0,0,0,0,0,0,0,0};
zrussell3 0:b176d95bb38f 134 uint8_t result[8];
zrussell3 0:b176d95bb38f 135 int status = SCSITransfer(cmd, 10, DEVICE_TO_HOST, result, 8);
zrussell3 0:b176d95bb38f 136 if (status == 0) {
zrussell3 0:b176d95bb38f 137 blockCount = (result[0] << 24) | (result[1] << 16) | (result[2] << 8) | result[3];
zrussell3 0:b176d95bb38f 138 blockSize = (result[4] << 24) | (result[5] << 16) | (result[6] << 8) | result[7];
zrussell3 0:b176d95bb38f 139 USB_INFO("MSD [dev: %p] - blockCount: %lld, blockSize: %d, Capacity: %lld\r\n", dev, blockCount, blockSize, blockCount*blockSize);
zrussell3 0:b176d95bb38f 140 }
zrussell3 0:b176d95bb38f 141 return status;
zrussell3 0:b176d95bb38f 142 }
zrussell3 0:b176d95bb38f 143
zrussell3 0:b176d95bb38f 144
zrussell3 0:b176d95bb38f 145 int USBHostMSD::SCSIRequestSense() {
zrussell3 0:b176d95bb38f 146 USB_DBG("Request sense");
zrussell3 0:b176d95bb38f 147 uint8_t cmd[6] = {0x03,0,0,0,18,0};
zrussell3 0:b176d95bb38f 148 uint8_t result[18];
zrussell3 0:b176d95bb38f 149 int status = SCSITransfer(cmd, 6, DEVICE_TO_HOST, result, 18);
zrussell3 0:b176d95bb38f 150 return status;
zrussell3 0:b176d95bb38f 151 }
zrussell3 0:b176d95bb38f 152
zrussell3 0:b176d95bb38f 153
zrussell3 0:b176d95bb38f 154 int USBHostMSD::inquiry(uint8_t lun, uint8_t page_code) {
zrussell3 0:b176d95bb38f 155 USB_DBG("Inquiry");
zrussell3 0:b176d95bb38f 156 uint8_t evpd = (page_code == 0) ? 0 : 1;
zrussell3 0:b176d95bb38f 157 uint8_t cmd[6] = {0x12, uint8_t((lun << 5) | evpd), page_code, 0, 36, 0};
zrussell3 0:b176d95bb38f 158 uint8_t result[36];
zrussell3 0:b176d95bb38f 159 int status = SCSITransfer(cmd, 6, DEVICE_TO_HOST, result, 36);
zrussell3 0:b176d95bb38f 160 if (status == 0) {
zrussell3 0:b176d95bb38f 161 char vid_pid[17];
zrussell3 0:b176d95bb38f 162 memcpy(vid_pid, &result[8], 8);
zrussell3 0:b176d95bb38f 163 vid_pid[8] = 0;
zrussell3 0:b176d95bb38f 164 USB_INFO("MSD [dev: %p] - Vendor ID: %s", dev, vid_pid);
zrussell3 0:b176d95bb38f 165
zrussell3 0:b176d95bb38f 166 memcpy(vid_pid, &result[16], 16);
zrussell3 0:b176d95bb38f 167 vid_pid[16] = 0;
zrussell3 0:b176d95bb38f 168 USB_INFO("MSD [dev: %p] - Product ID: %s", dev, vid_pid);
zrussell3 0:b176d95bb38f 169
zrussell3 0:b176d95bb38f 170 memcpy(vid_pid, &result[32], 4);
zrussell3 0:b176d95bb38f 171 vid_pid[4] = 0;
zrussell3 0:b176d95bb38f 172 USB_INFO("MSD [dev: %p] - Product rev: %s", dev, vid_pid);
zrussell3 0:b176d95bb38f 173 }
zrussell3 0:b176d95bb38f 174 return status;
zrussell3 0:b176d95bb38f 175 }
zrussell3 0:b176d95bb38f 176
zrussell3 0:b176d95bb38f 177 int USBHostMSD::checkResult(uint8_t res, USBEndpoint * ep) {
zrussell3 0:b176d95bb38f 178 // if ep stalled: send clear feature
zrussell3 0:b176d95bb38f 179 if (res == USB_TYPE_STALL_ERROR) {
zrussell3 0:b176d95bb38f 180 res = host->controlWrite( dev,
zrussell3 0:b176d95bb38f 181 USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD,
zrussell3 0:b176d95bb38f 182 CLEAR_FEATURE,
zrussell3 0:b176d95bb38f 183 0, ep->getAddress(), NULL, 0);
zrussell3 0:b176d95bb38f 184 // set state to IDLE if clear feature successful
zrussell3 0:b176d95bb38f 185 if (res == USB_TYPE_OK) {
zrussell3 0:b176d95bb38f 186 ep->setState(USB_TYPE_IDLE);
zrussell3 0:b176d95bb38f 187 }
zrussell3 0:b176d95bb38f 188 }
zrussell3 0:b176d95bb38f 189
zrussell3 0:b176d95bb38f 190 if (res != USB_TYPE_OK)
zrussell3 0:b176d95bb38f 191 return -1;
zrussell3 0:b176d95bb38f 192
zrussell3 0:b176d95bb38f 193 return 0;
zrussell3 0:b176d95bb38f 194 }
zrussell3 0:b176d95bb38f 195
zrussell3 0:b176d95bb38f 196
zrussell3 0:b176d95bb38f 197 int USBHostMSD::SCSITransfer(uint8_t * cmd, uint8_t cmd_len, int flags, uint8_t * data, uint32_t transfer_len) {
zrussell3 0:b176d95bb38f 198
zrussell3 0:b176d95bb38f 199 int res = 0;
zrussell3 0:b176d95bb38f 200
zrussell3 0:b176d95bb38f 201 cbw.Signature = CBW_SIGNATURE;
zrussell3 0:b176d95bb38f 202 cbw.Tag = 0;
zrussell3 0:b176d95bb38f 203 cbw.DataLength = transfer_len;
zrussell3 0:b176d95bb38f 204 cbw.Flags = flags;
zrussell3 0:b176d95bb38f 205 cbw.LUN = 0;
zrussell3 0:b176d95bb38f 206 cbw.CBLength = cmd_len;
zrussell3 0:b176d95bb38f 207 memset(cbw.CB,0,sizeof(cbw.CB));
zrussell3 0:b176d95bb38f 208 if (cmd) {
zrussell3 0:b176d95bb38f 209 memcpy(cbw.CB,cmd,cmd_len);
zrussell3 0:b176d95bb38f 210 }
zrussell3 0:b176d95bb38f 211
zrussell3 0:b176d95bb38f 212 // send the cbw
zrussell3 0:b176d95bb38f 213 USB_DBG("Send CBW");
zrussell3 0:b176d95bb38f 214 res = host->bulkWrite(dev, bulk_out,(uint8_t *)&cbw, 31);
zrussell3 0:b176d95bb38f 215 if (checkResult(res, bulk_out))
zrussell3 0:b176d95bb38f 216 return -1;
zrussell3 0:b176d95bb38f 217
zrussell3 0:b176d95bb38f 218 // data stage if needed
zrussell3 0:b176d95bb38f 219 if (data) {
zrussell3 0:b176d95bb38f 220 USB_DBG("data stage");
zrussell3 0:b176d95bb38f 221 if (flags == HOST_TO_DEVICE) {
zrussell3 0:b176d95bb38f 222
zrussell3 0:b176d95bb38f 223 res = host->bulkWrite(dev, bulk_out, data, transfer_len);
zrussell3 0:b176d95bb38f 224 if (checkResult(res, bulk_out))
zrussell3 0:b176d95bb38f 225 return -1;
zrussell3 0:b176d95bb38f 226
zrussell3 0:b176d95bb38f 227 } else if (flags == DEVICE_TO_HOST) {
zrussell3 0:b176d95bb38f 228
zrussell3 0:b176d95bb38f 229 res = host->bulkRead(dev, bulk_in, data, transfer_len);
zrussell3 0:b176d95bb38f 230 if (checkResult(res, bulk_in))
zrussell3 0:b176d95bb38f 231 return -1;
zrussell3 0:b176d95bb38f 232 }
zrussell3 0:b176d95bb38f 233 }
zrussell3 0:b176d95bb38f 234
zrussell3 0:b176d95bb38f 235 // status stage
zrussell3 0:b176d95bb38f 236 csw.Signature = 0;
zrussell3 0:b176d95bb38f 237 USB_DBG("Read CSW");
zrussell3 0:b176d95bb38f 238 res = host->bulkRead(dev, bulk_in,(uint8_t *)&csw, 13);
zrussell3 0:b176d95bb38f 239 if (checkResult(res, bulk_in))
zrussell3 0:b176d95bb38f 240 return -1;
zrussell3 0:b176d95bb38f 241
zrussell3 0:b176d95bb38f 242 if (csw.Signature != CSW_SIGNATURE) {
zrussell3 0:b176d95bb38f 243 return -1;
zrussell3 0:b176d95bb38f 244 }
zrussell3 0:b176d95bb38f 245
zrussell3 0:b176d95bb38f 246 USB_DBG("recv csw: status: %d", csw.Status);
zrussell3 0:b176d95bb38f 247
zrussell3 0:b176d95bb38f 248 // ModeSense?
zrussell3 0:b176d95bb38f 249 if ((csw.Status == 1) && (cmd[0] != 0x03)) {
zrussell3 0:b176d95bb38f 250 USB_DBG("request mode sense");
zrussell3 0:b176d95bb38f 251 return SCSIRequestSense();
zrussell3 0:b176d95bb38f 252 }
zrussell3 0:b176d95bb38f 253
zrussell3 0:b176d95bb38f 254 // perform reset recovery
zrussell3 0:b176d95bb38f 255 if ((csw.Status == 2) && (cmd[0] != 0x03)) {
zrussell3 0:b176d95bb38f 256
zrussell3 0:b176d95bb38f 257 // send Bulk-Only Mass Storage Reset request
zrussell3 0:b176d95bb38f 258 res = host->controlWrite( dev,
zrussell3 0:b176d95bb38f 259 USB_RECIPIENT_INTERFACE | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_CLASS,
zrussell3 0:b176d95bb38f 260 BO_MASS_STORAGE_RESET,
zrussell3 0:b176d95bb38f 261 0, msd_intf, NULL, 0);
zrussell3 0:b176d95bb38f 262
zrussell3 0:b176d95bb38f 263 // unstall both endpoints
zrussell3 0:b176d95bb38f 264 res = host->controlWrite( dev,
zrussell3 0:b176d95bb38f 265 USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD,
zrussell3 0:b176d95bb38f 266 CLEAR_FEATURE,
zrussell3 0:b176d95bb38f 267 0, bulk_in->getAddress(), NULL, 0);
zrussell3 0:b176d95bb38f 268
zrussell3 0:b176d95bb38f 269 res = host->controlWrite( dev,
zrussell3 0:b176d95bb38f 270 USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD,
zrussell3 0:b176d95bb38f 271 CLEAR_FEATURE,
zrussell3 0:b176d95bb38f 272 0, bulk_out->getAddress(), NULL, 0);
zrussell3 0:b176d95bb38f 273
zrussell3 0:b176d95bb38f 274 }
zrussell3 0:b176d95bb38f 275
zrussell3 0:b176d95bb38f 276 return csw.Status;
zrussell3 0:b176d95bb38f 277 }
zrussell3 0:b176d95bb38f 278
zrussell3 0:b176d95bb38f 279
zrussell3 0:b176d95bb38f 280 int USBHostMSD::dataTransfer(uint8_t * buf, uint32_t block, uint8_t nbBlock, int direction) {
zrussell3 0:b176d95bb38f 281 uint8_t cmd[10];
zrussell3 0:b176d95bb38f 282 memset(cmd,0,10);
zrussell3 0:b176d95bb38f 283 cmd[0] = (direction == DEVICE_TO_HOST) ? 0x28 : 0x2A;
zrussell3 0:b176d95bb38f 284
zrussell3 0:b176d95bb38f 285 cmd[2] = (block >> 24) & 0xff;
zrussell3 0:b176d95bb38f 286 cmd[3] = (block >> 16) & 0xff;
zrussell3 0:b176d95bb38f 287 cmd[4] = (block >> 8) & 0xff;
zrussell3 0:b176d95bb38f 288 cmd[5] = block & 0xff;
zrussell3 0:b176d95bb38f 289
zrussell3 0:b176d95bb38f 290 cmd[7] = (nbBlock >> 8) & 0xff;
zrussell3 0:b176d95bb38f 291 cmd[8] = nbBlock & 0xff;
zrussell3 0:b176d95bb38f 292
zrussell3 0:b176d95bb38f 293 return SCSITransfer(cmd, 10, direction, buf, blockSize*nbBlock);
zrussell3 0:b176d95bb38f 294 }
zrussell3 0:b176d95bb38f 295
zrussell3 0:b176d95bb38f 296 int USBHostMSD::getMaxLun() {
zrussell3 0:b176d95bb38f 297 uint8_t buf[1], res;
zrussell3 0:b176d95bb38f 298 res = host->controlRead( dev, USB_RECIPIENT_INTERFACE | USB_DEVICE_TO_HOST | USB_REQUEST_TYPE_CLASS,
zrussell3 0:b176d95bb38f 299 0xfe, 0, msd_intf, buf, 1);
zrussell3 0:b176d95bb38f 300 USB_DBG("max lun: %d", buf[0]);
zrussell3 0:b176d95bb38f 301 return res;
zrussell3 0:b176d95bb38f 302 }
zrussell3 0:b176d95bb38f 303
zrussell3 0:b176d95bb38f 304 int USBHostMSD::disk_initialize() {
zrussell3 0:b176d95bb38f 305 USB_DBG("FILESYSTEM: init");
zrussell3 0:b176d95bb38f 306 U16 i, timeout = 10;
zrussell3 0:b176d95bb38f 307
zrussell3 0:b176d95bb38f 308 getMaxLun();
zrussell3 0:b176d95bb38f 309
zrussell3 0:b176d95bb38f 310 for (i = 0; i < timeout; i++) {
zrussell3 0:b176d95bb38f 311 Thread::wait(100);
zrussell3 0:b176d95bb38f 312 if (!testUnitReady())
zrussell3 0:b176d95bb38f 313 break;
zrussell3 0:b176d95bb38f 314 }
zrussell3 0:b176d95bb38f 315
zrussell3 0:b176d95bb38f 316 if (i == timeout) {
zrussell3 0:b176d95bb38f 317 disk_init = false;
zrussell3 0:b176d95bb38f 318 return -1;
zrussell3 0:b176d95bb38f 319 }
zrussell3 0:b176d95bb38f 320
zrussell3 0:b176d95bb38f 321 inquiry(0, 0);
zrussell3 0:b176d95bb38f 322 disk_init = 1;
zrussell3 0:b176d95bb38f 323 return readCapacity();
zrussell3 0:b176d95bb38f 324 }
zrussell3 0:b176d95bb38f 325
zrussell3 0:b176d95bb38f 326 int USBHostMSD::disk_write(const uint8_t *buffer, uint64_t block_number) {
zrussell3 0:b176d95bb38f 327 USB_DBG("FILESYSTEM: write block: %lld", block_number);
zrussell3 0:b176d95bb38f 328 if (!disk_init) {
zrussell3 0:b176d95bb38f 329 disk_initialize();
zrussell3 0:b176d95bb38f 330 }
zrussell3 0:b176d95bb38f 331 if (!disk_init)
zrussell3 0:b176d95bb38f 332 return -1;
zrussell3 0:b176d95bb38f 333 return dataTransfer((uint8_t *)buffer, block_number, 1, HOST_TO_DEVICE);
zrussell3 0:b176d95bb38f 334 }
zrussell3 0:b176d95bb38f 335
zrussell3 0:b176d95bb38f 336 int USBHostMSD::disk_read(uint8_t * buffer, uint64_t block_number) {
zrussell3 0:b176d95bb38f 337 USB_DBG("FILESYSTEM: read block %lld", block_number);
zrussell3 0:b176d95bb38f 338 if (!disk_init) {
zrussell3 0:b176d95bb38f 339 disk_initialize();
zrussell3 0:b176d95bb38f 340 }
zrussell3 0:b176d95bb38f 341 if (!disk_init)
zrussell3 0:b176d95bb38f 342 return -1;
zrussell3 0:b176d95bb38f 343 return dataTransfer((uint8_t *)buffer, block_number, 1, DEVICE_TO_HOST);
zrussell3 0:b176d95bb38f 344 }
zrussell3 0:b176d95bb38f 345
zrussell3 0:b176d95bb38f 346 uint64_t USBHostMSD::disk_sectors() {
zrussell3 0:b176d95bb38f 347 USB_DBG("FILESYSTEM: sectors");
zrussell3 0:b176d95bb38f 348 if (!disk_init) {
zrussell3 0:b176d95bb38f 349 disk_initialize();
zrussell3 0:b176d95bb38f 350 }
zrussell3 0:b176d95bb38f 351 if (!disk_init)
zrussell3 0:b176d95bb38f 352 return 0;
zrussell3 0:b176d95bb38f 353 return blockCount;
zrussell3 0:b176d95bb38f 354 }
zrussell3 0:b176d95bb38f 355
zrussell3 0:b176d95bb38f 356 #endif