diff options
| author | Ha Thach <[email protected]> | 2021-08-29 21:49:10 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-08-29 21:49:10 +0700 |
| commit | 4492a7021cb33cb3079f2e949d6e22ddd3d33f49 (patch) | |
| tree | b14be02e6d0a7d632e320431cc3543e123de78fa /lib | |
| parent | 61592526928be9626317ef82bbe42d0edaf7fa14 (diff) | |
| parent | 31959295965f6b19c35bb770b1e430bdfa7b4606 (diff) | |
Merge branch 'master' into merge-waveshare-h7
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. */ |