Changeset 154 for uKadecot/trunk/pfatfs/diskio.c

Timestamp:

Feb 2, 2016, 9:54:35 PM (8 years ago)

Author:

coas-nagasima

Message:

SDカードの中身を/~/でアクセスできるよう変更

File:

• uKadecot/trunk/pfatfs/diskio.c (modified) (7 diffs)

uKadecot/trunk/pfatfs/diskio.c

@@ -21 +21 @@
 #define RamDisk         ((unsigned char *)0xfff00000)
 #else
-#include <windows.h>
-#include <tchar.h>
-#include <winioctl.h>
-
 unsigned char RamDisk[SZ_RAMDISK * 1024];
+extern void win_disk_initialize(void *ramDisk, int size);
 #endif
 
@@ -34 +31 @@
         DWORD wip;
         DWORD n_sectors;
-} STAT;
+} RD_STAT;
 
 static volatile
-STAT Stat[MAX_DRIVES];
+RD_STAT Stat[MAX_DRIVES];
 
 static
@@ -43 +40 @@
 
 static
-int get_status(volatile STAT *stat) {
+int get_status(volatile RD_STAT *stat) {
         stat->sz_sector = SS_RAMDISK;
         if(stat->sz_sector < _MIN_SS || stat->sz_sector > _MAX_SS) return 0;
@@ -54 +51 @@
 /* Initialize Disk Drive                                                 */
 /*-----------------------------------------------------------------------*/
-DSTATUS disk_initialize (void)
+DSTATUS ramdisk_initialize (void)
 {
         DSTATUS sta;
 #ifdef _MSC_VER
-        HANDLE h;
-        DWORD br;
-
-        h = CreateFile(_T("..\\..\\..\\..\\uip\\apps\\webserver\\httpd-fs.bin"), GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
-        if (h != INVALID_HANDLE_VALUE) {
-                ReadFile(h, RamDisk, sizeof(RamDisk), &br, 0);
-                CloseHandle(h);
-        }
+        win_disk_initialize(RamDisk, sizeof(RamDisk));
 #endif
         get_status(&Stat[0]);
@@ -77 +67 @@
 /* Get Disk Status                                                       */
 /*-----------------------------------------------------------------------*/
-DSTATUS disk_get_status (void)
+DSTATUS ramdisk_get_status (void)
 {
         return Stat[0].status;
@@ -85 +75 @@
 /* Read Partial Sector                                                   */
 /*-----------------------------------------------------------------------*/
-DRESULT disk_readp (
+DRESULT ramdisk_readp (
         BYTE* buff,             /* Data read buffer */
         DWORD sector,   /* Sector number (LBA) */
@@ -118 +108 @@
 /* Write Partial Sector                                                  */
 /*-----------------------------------------------------------------------*/
-DRESULT disk_writep (
+DRESULT ramdisk_writep (
         const BYTE* buff,       /* Pointer to the write data */
         DWORD sc                        /* Sector number (LBA), Number of bytes to send */