diff options
| author | Adrian Hesketh <[email protected]> | 2021-08-26 15:44:50 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-08-26 15:44:50 +0100 |
| commit | 138e77f3b575d641e07a9f068790ba2d854c6061 (patch) | |
| tree | bf7d6f6d840d6540026c4d000ad5ed2cc612c2b3 /lib | |
| parent | 49bcbf0f5dc57cb11b77800ae7b31ea5e91ab18f (diff) | |
| parent | 8d97f0e81f775d8c7646dfc75ee59b7e938bbf8d (diff) | |
Merge branch 'hathach:master' into master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fatfs/diskio.c | 4 | ||||
| -rw-r--r-- | lib/fatfs/diskio.h | 2 | ||||
| -rw-r--r-- | lib/fatfs/ffconf.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/fatfs/diskio.c b/lib/fatfs/diskio.c index 401f583a2..a6132f27b 100644 --- a/lib/fatfs/diskio.c +++ b/lib/fatfs/diskio.c @@ -36,7 +36,7 @@ // MACRO CONSTANT TYPEDEF //--------------------------------------------------------------------+ // TODO change it to portable init -static DSTATUS disk_state[CFG_TUSB_HOST_DEVICE_MAX]; +static DSTATUS disk_state[CFG_TUH_DEVICE_MAX]; //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION @@ -61,7 +61,7 @@ static DRESULT wait_for_io_complete(uint8_t usb_addr) void diskio_init(void) { - memset(disk_state, STA_NOINIT, CFG_TUSB_HOST_DEVICE_MAX); + memset(disk_state, STA_NOINIT, CFG_TUH_DEVICE_MAX); } //pdrv Specifies the physical drive number. diff --git a/lib/fatfs/diskio.h b/lib/fatfs/diskio.h index 99743538a..f1f4bd327 100644 --- a/lib/fatfs/diskio.h +++ b/lib/fatfs/diskio.h @@ -83,7 +83,7 @@ DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff); static inline bool disk_is_ready(BYTE pdrv); static inline bool disk_is_ready(BYTE pdrv) { - return (pdrv < CFG_TUSB_HOST_DEVICE_MAX) && + return (pdrv < CFG_TUH_DEVICE_MAX) && ( (disk_status(pdrv) & (STA_NOINIT | STA_NODISK)) == 0 ); } diff --git a/lib/fatfs/ffconf.h b/lib/fatfs/ffconf.h index bc132d2c3..782057ea4 100644 --- a/lib/fatfs/ffconf.h +++ b/lib/fatfs/ffconf.h @@ -128,7 +128,7 @@ / Physical Drive Configurations /----------------------------------------------------------------------------*/ -#define _VOLUMES CFG_TUSB_HOST_DEVICE_MAX +#define _VOLUMES CFG_TUH_DEVICE_MAX /* Number of volumes (logical drives) to be used. */ |