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

Timestamp:

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

Author:

coas-nagasima

Message:

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

File:

• uKadecot/trunk/pfatfs/pff.c (modified) (15 diffs)

uKadecot/trunk/pfatfs/pff.c

@@ -58 +58 @@
 #define ABORT(err)      {fs->flag = 0; return err;}
 
-#if _USE_LFN
-static WCHAR LfnBuf[_MAX_LFN+1];
-#endif
-
 /*--------------------------------------------------------*/
 /* DBCS code ranges and SBCS extend char conversion table */
@@ -509 +505 @@
                 ofs = bc % 512; bc /= 512;
                 if (ofs != 511) {
-                        if (disk_readp(buf, fs->fatbase + bc, ofs, 2)) break;
+                        if (fs->disk_readp(buf, fs->fatbase + bc, ofs, 2)) break;
                 } else {
-                        if (disk_readp(buf, fs->fatbase + bc, 511, 1)) break;
-                        if (disk_readp(buf+1, fs->fatbase + bc + 1, 0, 1)) break;
+                        if (fs->disk_readp(buf, fs->fatbase + bc, 511, 1)) break;
+                        if (fs->disk_readp(buf+1, fs->fatbase + bc + 1, 0, 1)) break;
                 }
                 wc = LD_WORD(buf);
@@ -520 +516 @@
 #if _FS_FAT16
         case FS_FAT16 :
-                if (disk_readp(buf, fs->fatbase + clst / 256, ((UINT)clst % 256) * 2, 2)) break;
+                if (fs->disk_readp(buf, fs->fatbase + clst / 256, ((UINT)clst % 256) * 2, 2)) break;
                 return LD_WORD(buf);
 #endif
 #if _FS_FAT32
         case FS_FAT32 :
-                if (disk_readp(buf, fs->fatbase + clst / 128, ((UINT)clst % 128) * 4, 4)) break;
+                if (fs->disk_readp(buf, fs->fatbase + clst / 128, ((UINT)clst % 128) * 4, 4)) break;
                 return LD_DWORD(buf) & 0x0FFFFFFF;
 #endif
@@ -673 +669 @@
         BYTE a, ord, sum;
 #endif
+        FATFS *fs = dj->fs;
 
         res = dir_rewind(dj);                   /* Rewind directory object */
@@ -681 +678 @@
 #endif
         do {
-                res = disk_readp(dir, dj->sect, (dj->index % 16) * 32, 32)      /* Read an entry */
+                res = fs->disk_readp(dir, dj->sect, (dj->index % 16) * 32, 32)  /* Read an entry */
                         ? FR_DISK_ERR : FR_OK;
                 if (res != FR_OK) break;
@@ -735 +732 @@
         BYTE ord = 0xFF, sum = 0xFF;
 #endif
+        FATFS *fs = dj->fs;
 
         res = FR_NO_FILE;
         while (dj->sect) {
-                res = disk_readp(dir, dj->sect, (dj->index % 16) * 32, 32)      /* Read an entry */
+                res = fs->disk_readp(dir, dj->sect, (dj->index % 16) * 32, 32)  /* Read an entry */
                         ? FR_DISK_ERR : FR_OK;
                 if (res != FR_OK) break;
@@ -1072 +1070 @@
 )
 {
-        if (disk_readp(buf, sect, 510, 2))              /* Read the boot record */
+        if (fs->disk_readp(buf, sect, 510, 2))          /* Read the boot record */
                 return 3;
         if (LD_WORD(buf) != 0xAA55)                             /* Check record signature */
                 return 2;
 
-        if (!_FS_32ONLY && !disk_readp(buf, sect, BS_FilSysType, 2) && LD_WORD(buf) == 0x4146)  /* Check FAT12/16 */
+        if (!_FS_32ONLY && !fs->disk_readp(buf, sect, BS_FilSysType, 2) && LD_WORD(buf) == 0x4146)      /* Check FAT12/16 */
                 return 0;
-        if (_FS_FAT32 && !disk_readp(buf, sect, BS_FilSysType32, 2) && LD_WORD(buf) == 0x4146)  /* Check FAT32 */
+        if (_FS_FAT32 && !fs->disk_readp(buf, sect, BS_FilSysType32, 2) && LD_WORD(buf) == 0x4146)      /* Check FAT32 */
                 return 0;
         return 1;
@@ -1106 +1104 @@
         DWORD bsect, fsize, tsect, mclst;
 
-        if (disk_get_status() & STA_NOINIT)     /* Check if the drive is ready or not */
+        if (fs->disk_get_status() & STA_NOINIT) /* Check if the drive is ready or not */
                 return FR_NOT_READY;
 
@@ -1114 +1112 @@
         if (fmt == 1) {                                         /* Not an FAT boot record, it may be FDISK format */
                 /* Check a partition listed in top of the partition table */
-                if (disk_readp(buf, bsect, MBR_Table, 16)) {    /* 1st partition entry */
+                if (fs->disk_readp(buf, bsect, MBR_Table, 16)) {        /* 1st partition entry */
                         fmt = 3;
                 } else {
@@ -1127 +1125 @@
 
         /* Initialize the file system object */
-        if (disk_readp(buf, bsect, 13, sizeof (buf))) return FR_DISK_ERR;
+        if (fs->disk_readp(buf, bsect, 13, sizeof (buf))) return FR_DISK_ERR;
 
         fsize = LD_WORD(buf+BPB_FATSz16-13);                            /* Number of sectors per FAT */
@@ -1187 +1185 @@
         dj.fn = sp;
 #if _USE_LFN
-        dj.lfn = LfnBuf;
+        dj.lfn = fs->LfnBuf;
 #endif
         res = follow_path(&dj, dir, path);      /* Follow the file path */
@@ -1249 +1247 @@
                 rcnt = 512 - (UINT)fs->fptr % 512;                      /* Get partial sector data from sector buffer */
                 if (rcnt > btr) rcnt = btr;
-                dr = disk_readp(!buff ? 0 : rbuff, fs->dsect, (UINT)fs->fptr % 512, rcnt);
+                dr = fs->disk_readp(!buff ? 0 : rbuff, fs->dsect, (UINT)fs->fptr % 512, rcnt);
                 if (dr) ABORT(FR_DISK_ERR);
                 fs->fptr += rcnt; rbuff += rcnt;                        /* Update pointers and counters */
@@ -1286 +1284 @@
 
         if (!btw) {             /* Finalize request */
-                if ((fs->flag & FA__WIP) && disk_writep(0, 0)) ABORT(FR_DISK_ERR);
+                if ((fs->flag & FA__WIP) && fs->disk_writep(0, 0)) ABORT(FR_DISK_ERR);
                 fs->flag &= ~FA__WIP;
                 return FR_OK;
@@ -1310 +1308 @@
                         if (!sect) ABORT(FR_DISK_ERR);
                         fs->dsect = sect + cs;
-                        if (disk_writep(0, fs->dsect)) ABORT(FR_DISK_ERR);      /* Initiate a sector write operation */
+                        if (fs->disk_writep(0, fs->dsect)) ABORT(FR_DISK_ERR);  /* Initiate a sector write operation */
                         fs->flag |= FA__WIP;
                 }
                 wcnt = 512 - (UINT)fs->fptr % 512;                      /* Number of bytes to write to the sector */
                 if (wcnt > btw) wcnt = btw;
-                if (disk_writep(p, wcnt)) ABORT(FR_DISK_ERR);   /* Send data to the sector */
+                if (fs->disk_writep(p, wcnt)) ABORT(FR_DISK_ERR);       /* Send data to the sector */
                 fs->fptr += wcnt; p += wcnt;                            /* Update pointers and counters */
                 btw -= wcnt; *bw += wcnt;
                 if ((UINT)fs->fptr % 512 == 0) {
-                        if (disk_writep(0, 0)) ABORT(FR_DISK_ERR);      /* Finalize the currtent secter write operation */
+                        if (fs->disk_writep(0, 0)) ABORT(FR_DISK_ERR);  /* Finalize the currtent secter write operation */
                         fs->flag &= ~FA__WIP;
                 }
@@ -1401 +1399 @@
                 dj->fn = sp;
 #if _USE_LFN
-                dj->lfn = LfnBuf;
+                dj->lfn = fs->LfnBuf;
 #endif
                 res = follow_path(dj, dir, path);               /* Follow the path to the directory */