Revision 41:18e91028dd16, committed 2017-09-28

Comitter:

Login10

Date:

Thu Sep 28 01:20:52 2017 +0000

Parent:

9:7671b6a8c363

Commit message:

Production Ver

Changed in this revision

diff -r 7671b6a8c363 -r 18e91028dd16 FATFileSystem.lib
--- a/FATFileSystem.lib	Thu Mar 14 14:20:03 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/mbed_official/code/FATFileSystem/#b6669c987c8e

diff -r 7671b6a8c363 -r 18e91028dd16 USBHostMSD/USBHostMSD.cpp
--- a/USBHostMSD/USBHostMSD.cpp	Thu Mar 14 14:20:03 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,356 +0,0 @@
-/* mbed USBHost Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "USBHostMSD.h"
-
-#if USBHOST_MSD
-
-#include "dbg.h"
-
-#define CBW_SIGNATURE   0x43425355
-#define CSW_SIGNATURE   0x53425355
-
-#define DEVICE_TO_HOST  0x80
-#define HOST_TO_DEVICE  0x00
-
-#define GET_MAX_LUN             (0xFE)
-#define BO_MASS_STORAGE_RESET   (0xFF)
-
-USBHostMSD::USBHostMSD(const char * rootdir) : FATFileSystem(rootdir)
-{
-    host = USBHost::getHostInst();
-    init();
-}
-
-void USBHostMSD::init() {
-    dev_connected = false;
-    dev = NULL;
-    bulk_in = NULL;
-    bulk_out = NULL;
-    dev_connected = false;
-    blockSize = 0;
-    blockCount = 0;
-    msd_intf = -1;
-    msd_device_found = false;
-    disk_init = false;
-    dev_connected = false;
-    nb_ep = 0;
-}
-
-
-bool USBHostMSD::connected()
-{
-    return dev_connected;
-}
-
-bool USBHostMSD::connect()
-{
-
-    if (dev_connected) {
-        return true;
-    }
-
-    for (uint8_t i = 0; i < MAX_DEVICE_CONNECTED; i++) {
-        if ((dev = host->getDevice(i)) != NULL) {
-            
-            USB_DBG("Trying to connect MSD device\r\n");
-            
-            if(host->enumerate(dev, this))
-                break;
-
-            if (msd_device_found) {
-                bulk_in = dev->getEndpoint(msd_intf, BULK_ENDPOINT, IN);
-                bulk_out = dev->getEndpoint(msd_intf, BULK_ENDPOINT, OUT);
-                
-                if (!bulk_in || !bulk_out)
-                    continue;
-                
-                USB_INFO("New MSD device: VID:%04x PID:%04x [dev: %p - intf: %d]", dev->getVid(), dev->getPid(), dev, msd_intf);
-                dev->setName("MSD", msd_intf);
-                host->registerDriver(dev, msd_intf, this, &USBHostMSD::init);
-
-                dev_connected = true;
-                return true;
-            }
-        } //if()
-    } //for()
-    init();
-    return false;
-}
-
-/*virtual*/ void USBHostMSD::setVidPid(uint16_t vid, uint16_t pid)
-{
-    // we don't check VID/PID for MSD driver
-}
-
-/*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
-{
-    if ((msd_intf == -1) &&
-        (intf_class == MSD_CLASS) &&
-        (intf_subclass == 0x06) &&
-        (intf_protocol == 0x50)) {
-        msd_intf = intf_nb;
-        return true;
-    }
-    return false;
-}
-
-/*virtual*/ bool USBHostMSD::useEndpoint(uint8_t intf_nb, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir) //Must return true if the endpoint will be used
-{
-    if (intf_nb == msd_intf) {
-        if (type == BULK_ENDPOINT) {
-            nb_ep++;
-            if (nb_ep == 2)
-                msd_device_found = true;
-            return true;
-        }
-    }
-    return false;
-}
-
-
-int USBHostMSD::testUnitReady() {
-    USB_DBG("Test unit ready");
-    return SCSITransfer(NULL, 6, DEVICE_TO_HOST, 0, 0);
-}
-
-
-int USBHostMSD::readCapacity() {
-    USB_DBG("Read capacity");
-    uint8_t cmd[10] = {0x25,0,0,0,0,0,0,0,0,0};
-    uint8_t result[8];
-    int status = SCSITransfer(cmd, 10, DEVICE_TO_HOST, result, 8);
-    if (status == 0) {
-        blockCount = (result[0] << 24) | (result[1] << 16) | (result[2] << 8) | result[3];
-        blockSize = (result[4] << 24) | (result[5] << 16) | (result[6] << 8) | result[7];
-        USB_INFO("MSD [dev: %p] - blockCount: %lld, blockSize: %d, Capacity: %lld\r\n", dev, blockCount, blockSize, blockCount*blockSize);
-    }
-    return status;
-}
-
-
-int USBHostMSD::SCSIRequestSense() {
-    USB_DBG("Request sense");
-    uint8_t cmd[6] = {0x03,0,0,0,18,0};
-    uint8_t result[18];
-    int status = SCSITransfer(cmd, 6, DEVICE_TO_HOST, result, 18);
-    return status;
-}
-
-
-int USBHostMSD::inquiry(uint8_t lun, uint8_t page_code) {
-    USB_DBG("Inquiry");
-    uint8_t evpd = (page_code == 0) ? 0 : 1;
-    uint8_t cmd[6] = {0x12, (lun << 5) | evpd, page_code, 0, 36, 0};
-    uint8_t result[36];
-    int status = SCSITransfer(cmd, 6, DEVICE_TO_HOST, result, 36);
-    if (status == 0) {
-        char vid_pid[17];
-        memcpy(vid_pid, &result[8], 8);
-        vid_pid[8] = 0;
-        USB_INFO("MSD [dev: %p] - Vendor ID: %s", dev, vid_pid);
-
-        memcpy(vid_pid, &result[16], 16);
-        vid_pid[16] = 0;
-        USB_INFO("MSD [dev: %p] - Product ID: %s", dev, vid_pid);
-
-        memcpy(vid_pid, &result[32], 4);
-        vid_pid[4] = 0;
-        USB_INFO("MSD [dev: %p] - Product rev: %s", dev, vid_pid);
-    }
-    return status;
-}
-
-int USBHostMSD::checkResult(uint8_t res, USBEndpoint * ep) {
-    // if ep stalled: send clear feature
-    if (res == USB_TYPE_STALL_ERROR) {
-        res = host->controlWrite(   dev,
-                                    USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD,
-                                    CLEAR_FEATURE,
-                                    0, ep->getAddress(), NULL, 0);
-        // set state to IDLE if clear feature successful
-        if (res == USB_TYPE_OK) {
-            ep->setState(USB_TYPE_IDLE);
-        }
-    }
-
-    if (res != USB_TYPE_OK)
-        return -1;
-
-    return 0;
-}
-
-
-int USBHostMSD::SCSITransfer(uint8_t * cmd, uint8_t cmd_len, int flags, uint8_t * data, uint32_t transfer_len) {
-
-    int res = 0;
-
-    cbw.Signature = CBW_SIGNATURE;
-    cbw.Tag = 0;
-    cbw.DataLength = transfer_len;
-    cbw.Flags = flags;
-    cbw.LUN = 0;
-    cbw.CBLength = cmd_len;
-    memset(cbw.CB,0,sizeof(cbw.CB));
-    if (cmd) {
-        memcpy(cbw.CB,cmd,cmd_len);
-    }
-
-    // send the cbw
-    USB_DBG("Send CBW");
-    res = host->bulkWrite(dev, bulk_out,(uint8_t *)&cbw, 31);
-    if (checkResult(res, bulk_out))
-        return -1;
-
-    // data stage if needed
-    if (data) {
-        USB_DBG("data stage");
-        if (flags == HOST_TO_DEVICE) {
-            
-            res = host->bulkWrite(dev, bulk_out, data, transfer_len);
-            if (checkResult(res, bulk_out))
-                return -1;
-
-        } else if (flags == DEVICE_TO_HOST) {
-
-            res = host->bulkRead(dev, bulk_in, data, transfer_len);
-            if (checkResult(res, bulk_in))
-                return -1;
-        }
-    }
-
-    // status stage
-    csw.Signature = 0;
-    USB_DBG("Read CSW");
-    res = host->bulkRead(dev, bulk_in,(uint8_t *)&csw, 13);
-    if (checkResult(res, bulk_in))
-        return -1;
-
-    if (csw.Signature != CSW_SIGNATURE) {
-        return -1;
-    }
-    
-    USB_DBG("recv csw: status: %d", csw.Status);
-
-    // ModeSense?
-    if ((csw.Status == 1) && (cmd[0] != 0x03)) {
-        USB_DBG("request mode sense");
-        return SCSIRequestSense();
-    }
-    
-    // perform reset recovery
-    if ((csw.Status == 2) && (cmd[0] != 0x03)) {
-        
-        // send Bulk-Only Mass Storage Reset request
-        res = host->controlWrite(   dev,
-                                    USB_RECIPIENT_INTERFACE | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_CLASS,
-                                    BO_MASS_STORAGE_RESET,
-                                    0, msd_intf, NULL, 0);
-        
-        // unstall both endpoints
-        res = host->controlWrite(   dev,
-                                    USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD,
-                                    CLEAR_FEATURE,
-                                    0, bulk_in->getAddress(), NULL, 0);
-        
-        res = host->controlWrite(   dev,
-                                    USB_RECIPIENT_ENDPOINT | USB_HOST_TO_DEVICE | USB_REQUEST_TYPE_STANDARD,
-                                    CLEAR_FEATURE,
-                                    0, bulk_out->getAddress(), NULL, 0);
-        
-    }
-
-    return csw.Status;
-}
-
-
-int USBHostMSD::dataTransfer(uint8_t * buf, uint32_t block, uint8_t nbBlock, int direction) {
-    uint8_t cmd[10];
-    memset(cmd,0,10);
-    cmd[0] = (direction == DEVICE_TO_HOST) ? 0x28 : 0x2A;
-
-    cmd[2] = (block >> 24) & 0xff;
-    cmd[3] = (block >> 16) & 0xff;
-    cmd[4] = (block >> 8) & 0xff;
-    cmd[5] =  block & 0xff;
-
-    cmd[7] = (nbBlock >> 8) & 0xff;
-    cmd[8] = nbBlock & 0xff;
-
-    return SCSITransfer(cmd, 10, direction, buf, blockSize*nbBlock);
-}
-
-int USBHostMSD::getMaxLun() {
-    uint8_t buf[1], res;
-    res = host->controlRead(    dev, USB_RECIPIENT_INTERFACE | USB_DEVICE_TO_HOST | USB_REQUEST_TYPE_CLASS,
-                                0xfe, 0, msd_intf, buf, 1);
-    USB_DBG("max lun: %d", buf[0]);
-    return res;
-}
-
-int USBHostMSD::disk_initialize() {
-    USB_DBG("FILESYSTEM: init");
-    U16 i, timeout = 10;
-    
-    getMaxLun();
-    
-    for (i = 0; i < timeout; i++) {
-        Thread::wait(100);
-        if (!testUnitReady())
-            break;
-    }
-    
-    if (i == timeout) {
-        disk_init = false;
-        return -1;
-    }
-    
-    inquiry(0, 0);
-    disk_init = 1;
-    return readCapacity();
-}
-
-int USBHostMSD::disk_write(const uint8_t *buffer, uint64_t block_number) {
-    USB_DBG("FILESYSTEM: write block: %lld", block_number);
-    if (!disk_init) {
-        disk_initialize();
-    }
-    if (!disk_init)
-        return -1;
-    return dataTransfer((uint8_t *)buffer, block_number, 1, HOST_TO_DEVICE);
-}
-
-int USBHostMSD::disk_read(uint8_t * buffer, uint64_t block_number) {
-    USB_DBG("FILESYSTEM: read block %lld", block_number);
-    if (!disk_init) {
-        disk_initialize();
-    }
-    if (!disk_init)
-        return -1;
-    return dataTransfer((uint8_t *)buffer, block_number, 1, DEVICE_TO_HOST);
-}
-
-uint64_t USBHostMSD::disk_sectors() {
-    USB_DBG("FILESYSTEM: sectors");
-    if (!disk_init) {
-        disk_initialize();
-    }
-    if (!disk_init)
-        return 0;
-    return blockCount;
-}
-
-#endif

diff -r 7671b6a8c363 -r 18e91028dd16 USBHostMSD/USBHostMSD.h
--- a/USBHostMSD/USBHostMSD.h	Thu Mar 14 14:20:03 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/* mbed USBHost Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef USBHOSTMSD_H
-#define USBHOSTMSD_H
-
-#include "USBHostConf.h"
-
-#if USBHOST_MSD
-
-#include "USBHost.h"
-#include "FATFileSystem.h"
-
-/** 
- * A class to communicate a USB flash disk
- */
-class USBHostMSD : public IUSBEnumerator, public FATFileSystem {
-public:
-    /**
-    * Constructor
-    *
-    * @param rootdir mount name
-    */
-    USBHostMSD(const char * rootdir);
-
-    /**
-    * Check if a MSD device is connected
-    *
-    * @return true if a MSD device is connected
-    */
-    bool connected();
-
-    /**
-     * Try to connect to a MSD device
-     *
-     * @return true if connection was successful
-     */
-    bool connect();
-
-protected:
-    //From IUSBEnumerator
-    virtual void setVidPid(uint16_t vid, uint16_t pid);
-    virtual bool 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
-    virtual bool useEndpoint(uint8_t intf_nb, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir); //Must return true if the endpoint will be used
-
-    // From FATFileSystem
-    virtual int disk_initialize();
-    virtual int disk_status() {return 0;};
-    virtual int disk_read(uint8_t * buffer, uint64_t sector);
-    virtual int disk_write(const uint8_t * buffer, uint64_t sector);
-    virtual int disk_sync() {return 0;};
-    virtual uint64_t disk_sectors();
-
-private:
-    USBHost * host;
-    USBDeviceConnected * dev;
-    bool dev_connected;
-    USBEndpoint * bulk_in;
-    USBEndpoint * bulk_out;
-    uint8_t nb_ep;
-
-    // Bulk-only CBW
-    typedef __packed struct {
-        uint32_t Signature;
-        uint32_t Tag;
-        uint32_t DataLength;
-        uint8_t  Flags;
-        uint8_t  LUN;
-        uint8_t  CBLength;
-        uint8_t  CB[16];
-    } CBW;
-
-    // Bulk-only CSW
-    typedef __packed struct {
-        uint32_t Signature;
-        uint32_t Tag;
-        uint32_t DataResidue;
-        uint8_t  Status;
-    } CSW;
-
-    CBW cbw;
-    CSW csw;
-
-    int SCSITransfer(uint8_t * cmd, uint8_t cmd_len, int flags, uint8_t * data, uint32_t transfer_len);
-    int testUnitReady();
-    int readCapacity();
-    int inquiry(uint8_t lun, uint8_t page_code);
-    int SCSIRequestSense();
-    int dataTransfer(uint8_t * buf, uint32_t block, uint8_t nbBlock, int direction);
-    int checkResult(uint8_t res, USBEndpoint * ep);
-    int getMaxLun();
-
-    int blockSize;
-    uint64_t blockCount;
-
-    int msd_intf;
-    bool msd_device_found;
-    bool disk_init;
-    
-    void init();
-
-};
-
-#endif
-
-#endif