Revision 8:c65b3b101292, committed 2016-03-12

Comitter:

WiredHome

Date:

Sat Mar 12 23:59:02 2016 +0000

Parent:

7:f80d1f58be90

Child:

9:de4ea8f3349b

Commit message:

Changed to support simultaneous SD and USB FileSystem

Changed in this revision

--- a/MSCFileSystem.cpp	Thu Apr 18 14:01:37 2013 +0000
+++ b/MSCFileSystem.cpp	Sat Mar 12 23:59:02 2016 +0000
@@ -1,113 +1,114 @@
-/* USB Mass Storage device file system
- * Copyrigh (c) 2010, Igor Skochinsky
- * based on SDFileStorage
- * Copyright (c) 2008-2009, sford
- */
- 
-/* Introduction
- * ------------
- * TODO: write one
- * we're basically using NXP's USBHotLite sample code, just plugging in our own FAT library
- */
- 
-#include "MSCFileSystem.h"
-#include "usbhost_inc.h"
-
-MSCFileSystem::MSCFileSystem(const char* name) :
-  FATFileSystem(name)
-{
-}
-
-void print_inquiry(USB_INT08U *inqReply)
-{
-    // see USB Mass Storage Class – UFI Command Specification,
-    // 4.2 INQUIRY Command
-    printf("Inquiry reply:\n");
-    uint8_t tmp = inqReply[0]&0x1F;
-    printf("Peripheral device type: %02Xh\n", tmp);
-    if ( tmp == 0 )
-        printf("\t- Direct access (floppy)\n");
-    else if ( tmp == 0x1F )
-        printf("\t- none (no FDD connected)\n");
-    else
-        printf("\t- unknown type\n");
-    tmp = inqReply[1] >> 7;
-    printf("Removable Media Bit: %d\n", tmp);
-    tmp = inqReply[2] & 3;
-    printf("ANSI Version: %02Xh\n", tmp);
-    if ( tmp != 0 )
-        printf("\t- warning! must be 0\n");
-    tmp = (inqReply[2]>>3) & 3;
-    printf("ECMA Version: %02Xh\n", tmp);
-    if ( tmp != 0 )
-        printf("\t- warning! should be 0\n");
-    tmp = inqReply[2]>>6;
-    printf("ISO Version: %02Xh\n", tmp);
-    if ( tmp != 0 )
-        printf("\t- warning! should be 0\n");
-    tmp = inqReply[3] & 0xF;
-    printf("Response Data Format: %02Xh\n", tmp);
-    if ( tmp != 1 )
-        printf("\t- warning! should be 1\n");
-    tmp = inqReply[4];
-    printf("Additional length: %02Xh\n", tmp);
-    if ( tmp != 0x1F )
-        printf("\t- warning! should be 1Fh\n");
-    printf("Vendor Information: '%.8s'\n", &inqReply[8]);
-    printf("Product Identification: '%.16s'\n", &inqReply[16]);
-    printf("Product Revision: '%.4s'\n", &inqReply[32]);        
-}
-
-int MSCFileSystem::initialise_msc()
-{
-    USB_INT32S  rc;
-    USB_INT08U  inquiryResult[INQUIRY_LENGTH];
-    
-    //print_clock();
-    Host_Init();               /* Initialize the  host controller                                    */
-    rc = Host_EnumDev();       /* Enumerate the device connected                                            */
-    if (rc != OK)
-    {
-        fprintf(stderr, "Could not enumerate device: %d\n", rc);
-        return rc;
-    }
-        
-    
-    /* Initialize the mass storage and scsi interfaces */
-    rc = MS_Init( &_blkSize, &_numBlks, inquiryResult );
-    if (rc != OK)
-    {
-        fprintf(stderr, "Could not initialize mass storage interface: %d\n", rc);
-        return rc;
-    }
-    printf("Successfully initialized mass storage interface; %d blocks of size %d\n", _numBlks, _blkSize);
-    print_inquiry(inquiryResult);
-    // FATFileSystem supports only 512-byte blocks
-    return _blkSize == 512 ? OK : 1;
-}
-
-int MSCFileSystem::disk_initialize()
-{
-    if ( initialise_msc() != OK )
-        return 1;
-        
-    return 0;
-}
-
-int MSCFileSystem::disk_write(const char *buffer, int block_number)
-{
-    if ( OK == MS_BulkSend(block_number, 1, (USB_INT08U *)buffer) )
-        return 0;
-    return 1;
-}
-
-int MSCFileSystem::disk_read(char *buffer, int block_number)
-{
-    if ( OK == MS_BulkRecv(block_number, 1, (USB_INT08U *)buffer) )
-        return 0;
-    return 1;
-}
-
-int MSCFileSystem::disk_status() { return 0; }
-int MSCFileSystem::disk_sync() { return 0; }
-int MSCFileSystem::disk_sectors() { return _numBlks; }
+/* USB Mass Storage device file system
+ * Copyrigh (c) 2010, Igor Skochinsky
+ * based on SDFileStorage
+ * Copyright (c) 2008-2009, sford
+ */
+ 
+/* Introduction
+ * ------------
+ * TODO: write one
+ * we're basically using NXP's USBHotLite sample code, just plugging in our own FAT library
+ */
+ 
+#include "MSCFileSystem.h"
+#include "usbhost_inc.h"
+
+MSCFileSystem::MSCFileSystem(const char* name) :
+  FATFileSystem(name)
+{
+}
+
+void print_inquiry(USB_INT08U *inqReply)
+{
+    // see USB Mass Storage Class – UFI Command Specification,
+    // 4.2 INQUIRY Command
+    printf("Inquiry reply:\r\n");
+    uint8_t tmp = inqReply[0]&0x1F;
+    printf("Peripheral device type: %02Xh\r\n", tmp);
+    if ( tmp == 0 )
+        printf("\t- Direct access (floppy)\r\n");
+    else if ( tmp == 0x1F )
+        printf("\t- none (no FDD connected)\r\n");
+    else
+        printf("\t- unknown type\r\n");
+    tmp = inqReply[1] >> 7;
+    printf("Removable Media Bit: %d\r\n", tmp);
+    tmp = inqReply[2] & 3;
+    printf("ANSI Version: %02Xh\r\n", tmp);
+    if ( tmp != 0 )
+        printf("\t- warning! must be 0\r\n");
+    tmp = (inqReply[2]>>3) & 3;
+    printf("ECMA Version: %02Xh\r\n", tmp);
+    if ( tmp != 0 )
+        printf("\t- warning! should be 0\r\n");
+    tmp = inqReply[2]>>6;
+    printf("ISO Version: %02Xh\r\n", tmp);
+    if ( tmp != 0 )
+        printf("\t- warning! should be 0\r\n");
+    tmp = inqReply[3] & 0xF;
+    printf("Response Data Format: %02Xh\r\n", tmp);
+    if ( tmp != 1 )
+        printf("\t- warning! should be 1\r\n");
+    tmp = inqReply[4];
+    printf("Additional length: %02Xh\r\n", tmp);
+    if ( tmp != 0x1F )
+        printf("\t- warning! should be 1Fh\r\n");
+    printf("Vendor Information: '%.8s'\r\n", &inqReply[8]);
+    printf("Product Identification: '%.16s'\r\n", &inqReply[16]);
+    printf("Product Revision: '%.4s'\r\n", &inqReply[32]);        
+}
+
+int MSCFileSystem::initialise_msc()
+{
+    USB_INT32S  rc;
+    USB_INT08U  inquiryResult[INQUIRY_LENGTH];
+    
+    //print_clock();
+    Host_Init();               /* Initialize the  host controller                                    */
+    rc = Host_EnumDev();       /* Enumerate the device connected                                            */
+    if (rc != OK)
+    {
+        fprintf(stderr, "Could not enumerate device: %d\r\n", rc);
+        return rc;
+    }
+        
+    
+    /* Initialize the mass storage and scsi interfaces */
+    rc = MS_Init( &_blkSize, &_numBlks, inquiryResult );
+    if (rc != OK)
+    {
+        fprintf(stderr, "Could not initialize mass storage interface: %d\r\n", rc);
+        return rc;
+    }
+    printf("Successfully initialized mass storage interface; %d blocks of size %d\r\n", _numBlks, _blkSize);
+    print_inquiry(inquiryResult);
+    // FATFileSystem supports only 512-byte blocks
+    return _blkSize == 512 ? OK : 1;
+}
+
+int MSCFileSystem::disk_initialize()
+{
+    if ( initialise_msc() != OK )
+        return 1;
+        
+    return 0;
+}
+                                
+int MSCFileSystem::disk_write(const uint8_t *buffer, uint32_t block_number, uint32_t count)
+{
+    if ( OK == MS_BulkSend(block_number, 1, (USB_INT08U *)buffer) )
+        return 0;
+    return 1;
+}
+
+int MSCFileSystem::disk_read(uint8_t *buffer, uint32_t block_number, uint32_t count)
+{
+    if ( OK == MS_BulkRecv(block_number, 1, (USB_INT08U *)buffer) )
+        return 0;
+    return 1;
+}
+
+int MSCFileSystem::disk_status() { return 0; }
+int MSCFileSystem::disk_sync() { return 0; }
+uint32_t MSCFileSystem::disk_sectors() { return _numBlks; }
+

--- a/MSCFileSystem.h	Thu Apr 18 14:01:37 2013 +0000
+++ b/MSCFileSystem.h	Sat Mar 12 23:59:02 2016 +0000
@@ -33,11 +33,11 @@
      */
     MSCFileSystem(const char* name);
     virtual int disk_initialize();
-    virtual int disk_write(const char *buffer, int block_number);
-    virtual int disk_read(char *buffer, int block_number);    
+    virtual int disk_write(const uint8_t *buffer, uint32_t sector, uint32_t count);
+    virtual int disk_read(uint8_t *buffer, uint32_t sector, uint32_t count);    
     virtual int disk_status();
     virtual int disk_sync();
-    virtual int disk_sectors();
+    virtual uint32_t disk_sectors();
 
 protected:
 

--- a/USBHostLite/usbhost_lpc17xx.h	Thu Apr 18 14:01:37 2013 +0000
+++ b/USBHostLite/usbhost_lpc17xx.h	Sat Mar 12 23:59:02 2016 +0000
@@ -33,7 +33,7 @@
 **************************************************************************************************************
 */
 
-#define  PRINT_ENABLE         1
+#define  PRINT_ENABLE         0
 
 #if PRINT_ENABLE
 #define  PRINT_Log(...)       printf(__VA_ARGS__)