ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6323 from geky/revert-fat-errors 

fatfs: Revert "Update error code mapping"
pull/6338/head
Cruz Monrreal 2018-03-12 11:52:18 -05:00 committed by GitHub
parent f67fe4a7a3 17f7c8cd5b
commit 190cd986f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
features/filesystem/fat/FATFileSystem.cpp
View File

@ -35,48 +35,39 @@
static int fat_error_remap(FRESULT res) static int fat_error_remap(FRESULT res)
{ {
switch(res) { switch(res) {
case FR_OK: // (0) Succeeded case FR_OK: /* (0) Succeeded */
return 0; return 0; /* no error */
case FR_DISK_ERR: // (1) A hard error occurred in the low level disk I/O layer case FR_DISK_ERR: /* (1) A hard error occurred in the low level disk I/O layer */
return -EIO; case FR_NOT_READY: /* (3) The physical drive cannot work */
case FR_INT_ERR: // (2) Assertion failed return -EIO; /* I/O error */
return -1; case FR_NO_FILE: /* (4) Could not find the file */
case FR_NOT_READY: // (3) The physical drive cannot work case FR_NO_PATH: /* (5) Could not find the path */
return -EIO; case FR_INVALID_NAME: /* (6) The path name format is invalid */
case FR_NO_FILE: // (4) Could not find the file case FR_INVALID_DRIVE: /* (11) The logical drive number is invalid */
return -ENOENT; case FR_NO_FILESYSTEM: /* (13) There is no valid FAT volume */
case FR_NO_PATH: // (5) Could not find the path return -ENOENT; /* No such file or directory */
return -ENOTDIR; case FR_DENIED: /* (7) Access denied due to prohibited access or directory full */
case FR_INVALID_NAME: // (6) The path name format is invalid return -EACCES; /* Permission denied */
return -EINVAL; case FR_EXIST: /* (8) Access denied due to prohibited access */
case FR_DENIED: // (7) Access denied due to prohibited access or directory full return -EEXIST; /* File exists */
return -EACCES; case FR_WRITE_PROTECTED: /* (10) The physical drive is write protected */
case FR_EXIST: // (8) Access denied due to prohibited access case FR_LOCKED: /* (16) The operation is rejected according to the file sharing policy */
return -EEXIST; return -EACCES; /* Permission denied */
case FR_INVALID_OBJECT: // (9) The file/directory object is invalid case FR_INVALID_OBJECT: /* (9) The file/directory object is invalid */
return -EFAULT; /* Bad address */
case FR_NOT_ENABLED: /* (12) The volume has no work area */
return -ENXIO; /* No such device or address */
case FR_NOT_ENOUGH_CORE: /* (17) LFN working buffer could not be allocated */
return -ENOMEM; /* Not enough space */
case FR_TOO_MANY_OPEN_FILES: /* (18) Number of open files > _FS_LOCK */
return -ENFILE; /* Too many open files in system */
case FR_INVALID_PARAMETER: /* (19) Given parameter is invalid */
return -ENOEXEC; /* Exec format error */
case FR_INT_ERR: /* (2) Assertion failed */
case FR_MKFS_ABORTED: /* (14) The f_mkfs() aborted due to any parameter error */
case FR_TIMEOUT: /* (15) Could not get a grant to access the volume within defined period */
default: /* Bad file number */
return -EBADF; return -EBADF;
case FR_WRITE_PROTECTED: // (10) The physical drive is write protected
return -EACCES;
case FR_INVALID_DRIVE: // (11) The logical drive number is invalid
return -ENODEV;
case FR_NOT_ENABLED: // (12) The volume has no work area
return -ENODEV;
case FR_NO_FILESYSTEM: // (13) There is no valid FAT volume
return -EINVAL;
case FR_MKFS_ABORTED: // (14) The f_mkfs() aborted due to any problem
return -EIO;
case FR_TIMEOUT: // (15) Could not get a grant to access the volume within defined period
return -ETIMEDOUT;
case FR_LOCKED: // (16) The operation is rejected according to the file sharing policy
return -EBUSY;
case FR_NOT_ENOUGH_CORE: // (17) LFN working buffer could not be allocated
return -ENOMEM;
case FR_TOO_MANY_OPEN_FILES: // (18) Number of open files > FF_FS_LOCK
return -ENFILE;
case FR_INVALID_PARAMETER: // (19) Given parameter is invalid
return -EINVAL;
default:
return -res;
} }
} }