Diff: main.cpp

Revision:

14:48124641f4b1

Parent:

13:a21bfa48c651

Child:

15:3bfbb557020e

diff -r a21bfa48c651 -r 48124641f4b1 main.cpp
--- a/main.cpp	Fri Feb 01 23:53:03 2013 +0000
+++ b/main.cpp	Sat Feb 02 00:11:10 2013 +0000
@@ -2,20 +2,7 @@
 #include "SDFileSystem.h"
 #include "hx8340bs.h"
 
-void superSd(unsigned char*buffer,int offset,const char *path)
-{
-     SDFileSystem sd(p11, p12, p13, p8, "sd"); // the pinout on the mbed Cool Components workshop board
-     FILE *fp =fopen("/sd/mydir/rose.bmp", "r");
-   
-    if(fp == NULL) {
-        error("Could not open file\c\n");
-    }
-    //fprintf(fp, "Hello fun SD Card World!\c\n");
-    //fread ( void * ptr, size_t size, size_t count, FILE * stream );
-    fread((char*)buffer,1,100,fp);
-    fclose(fp); 
-     
-}
+
 
  
 int main() {
@@ -23,15 +10,25 @@
  
     //mkdir("/sd/mydir", 0777);
     
-    
+    SDFileSystem sd(p11, p12, p13, p8, "sd"); // the pinout on the mbed Cool Components workshop board
     unsigned char bitmap[100];
+    unsigned int bytesRead;
     int i=0;
-    superSd(bitmap,0,"/sd/mydir/rose.bmp");
+    FILE *fp =fopen("/sd/mydir/rose.bmp", "r");
+   
+    if(fp == NULL) {
+        error("Could not open file\c\n");
+    }
+    //fprintf(fp, "Hello fun SD Card World!\c\n");
+    //fread ( void * ptr, size_t size, size_t count, FILE * stream );
+    fread((char*)bitmap,1,100,fp);
     while(i<100)
     {
         printf("%x\n",bitmap[i]);
         i++;
     }
+    printf("%d\n",bytesRead);
+    fclose(fp); 
     HX8340S_LCD lcd( p9, p14, p13, p11);
     lcd.Initialize();
     lcd.ClearScreen();
@@ -39,13 +36,6 @@
     lcd.Print( "Hello, World!", CENTER, 25 );
     lcd.DrawBitmap(0,0,(bitmap_t*)bitmap,1);
     
-    superSd(bitmap,0,"/sd/mydir/rose.bmp");
-    i=0;
-    while(i<100)
-    {
-        printf("%x\n",bitmap[i]);
-        i++;
-    }
  
     printf("Goodbye World!\c\n");
 }
\ No newline at end of file