Revision 10:d32bc246a8b2, committed 2013-08-28

Comitter:

jakowisp

Date:

Wed Aug 28 07:39:28 2013 +0000

Parent:

9:e1d96a4eec51

Commit message:

USB Device Interface, Architecture, Protocols, and Programming, HW 7

Changed in this revision

diff -r e1d96a4eec51 -r d32bc246a8b2 main.cpp
--- a/main.cpp	Tue Aug 13 09:45:50 2013 +0000
+++ b/main.cpp	Wed Aug 28 07:39:28 2013 +0000
@@ -3,41 +3,90 @@
 
 DigitalOut led(LED1);
 
+int writeFile(int numFiles=10,int size=1000){
+    char fname[80];
+    uint32_t data;
+    FILE *fp;
+    
+    for (int j=0;j<numFiles;j++) {
+        sprintf(fname,"/usb/test%d.txt",j);
+        fp = fopen(fname, "wb");
+        if (fp != NULL) {
+            for(int i=0; i<size;i++) {
+              data=rand();
+              fwrite(&data,sizeof(uint32_t),1,fp);
+            }
+            fclose(fp);
+        } else {
+            printf("FILE == NULL\r\n");
+        }
+    }
+    return 0;
+}
+
+int readFile(int numFiles=10,int size=1000){
+    char fname[80];
+    uint32_t data;
+    FILE *fp;
+    
+    for (int j=0;j<numFiles;j++) {
+        sprintf(fname,"/usb/test%d.txt",j);
+        fp = fopen(fname, "rb");
+        if (fp != NULL) {
+            
+            for(int i=0; i<size;i++) {
+              fread(&data,sizeof(uint32_t),1,fp);
+            }
+            fclose(fp);
+        } else {
+            printf("FILE == NULL\r\n");
+        }
+    }
+     return 0;
+}
+
+
 void msd_task(void const *) {
     
     USBHostMSD msd("usb");
-    int i = 0;
+    Timer t;
     
-    while(1) {
+    
         
-        // try to connect a MSD device
-        while(!msd.connect()) {
-            Thread::wait(500);
-        }
-        
-        // in a loop, append a file
-        // if the device is disconnected, we try to connect it again
-        while(1) {
-            
-            // append a file
-            FILE * fp = fopen("/usb/test1.txt", "a");
+    // try to connect a MSD device
+    while(!msd.connect()) {
+        Thread::wait(500);
+    }
         
-            if (fp != NULL) {
-                fprintf(fp, "Hello fun SD Card World: %d!\r\n", i++);
-                printf("Goodbye World!\r\n");
-                fclose(fp);
-            } else {
-                printf("FILE == NULL\r\n");
-            }
-            
-            Thread::wait(500);
-        
-            // if device disconnected, try to connect again
-            if (!msd.connected())
-                break;
-        }
-            
-    }
+ 
+    printf("Start Writing\n\r");
+    t.reset();
+    t.start();
+    writeFile(1,10000000);
+    t.stop();
+    printf("Large File Write: The time taken was %f seconds\n\r", t.read());
+    
+    printf("Start Writing\r\n");
+    t.reset();
+    t.start();
+    readFile(1,10000000);
+    t.stop();
+    printf("Large File read: The time taken was %f seconds\r\n", t.read());
+
+    printf("Start Writing\r\n");
+    t.reset();
+    t.start();
+    writeFile(100,100000);
+    t.stop();
+    printf("Small Files Write: The time taken was %f seconds\r\n", t.read());
+    
+    printf("Start Writing\r\n");
+    t.reset();
+    t.start();
+    readFile(100,100000);
+    t.stop();
+    printf("Small File read: The time taken was %f seconds\r\n", t.read());
+
 }
 
 
@@ -47,4 +96,30 @@
         led=!led;
         Thread::wait(500);
     }
-}
\ No newline at end of file
+}
+
+/*
+[USB_INFO: /src/USBHost/USBHost/USBHost.cpp:158]New device connected: 100038ac [hub: 0 - port: 1]
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:81]New MSD device: VID:058f PID:6387 [dev: 100038ac - intf: 0]
+Start Writing
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:164]MSD [dev: 100038ac] - Vendor ID: TRON:
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:168]MSD [dev: 100038ac] - Product ID: Legacy
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:172]MSD [dev: 100038ac] - Product rev: 8.07
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:139]MSD [dev: 100038ac] - blockCount: 8269823, blockSize: 512, Capacity: 4234149376
+
+[USB_INFO: /src/USBHost/USBHost/USBHost.cpp:158]New device connected: 100038ac [hub: 0 - port: 1]
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:81]New MSD device: VID:058f PID:6387 [dev: 100038ac - intf: 0]
+Start Writing
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:164]MSD [dev: 100038ac] - Vendor ID: TRON:
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:168]MSD [dev: 100038ac] - Product ID: Legacy
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:172]MSD [dev: 100038ac] - Product rev: 8.07
+[USB_INFO: /src/USBHost/USBHostMSD/USBHostMSD.cpp:139]MSD [dev: 100038ac] - blockCount: 8269823, blockSize: 512, Capacity: 4234149376
+
+Large File Write: The time taken was 740.766541 seconds
+Start Writing
+Large File read: The time taken was 470.112549 seconds
+Start Writing
+Small Files Write: The time taken was 962.334229 seconds
+Start Writing
+Small File read: The time taken was 562.649902 seconds
+*/
\ No newline at end of file