diff options
Diffstat (limited to 'firmware/export/storage.h')
-rw-r--r-- | firmware/export/storage.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/firmware/export/storage.h b/firmware/export/storage.h index ee1423c93a..e2ae4056be 100644 --- a/firmware/export/storage.h +++ b/firmware/export/storage.h | |||
@@ -107,7 +107,7 @@ int ramdisk_event(long id, intptr_t data); | |||
107 | struct storage_info | 107 | struct storage_info |
108 | { | 108 | { |
109 | unsigned int sector_size; | 109 | unsigned int sector_size; |
110 | unsigned int num_sectors; | 110 | sector_t num_sectors; |
111 | char *vendor; | 111 | char *vendor; |
112 | char *product; | 112 | char *product; |
113 | char *revision; | 113 | char *revision; |
@@ -227,7 +227,7 @@ static inline void storage_sleep(void) {}; | |||
227 | #define storage_last_disk_activity() mmc_last_disk_activity() | 227 | #define storage_last_disk_activity() mmc_last_disk_activity() |
228 | #define storage_spinup_time() 0 | 228 | #define storage_spinup_time() 0 |
229 | #define storage_get_identify() mmc_get_identify() | 229 | #define storage_get_identify() mmc_get_identify() |
230 | 230 | ||
231 | #ifdef STORAGE_GET_INFO | 231 | #ifdef STORAGE_GET_INFO |
232 | #define storage_get_info(drive, info) mmc_get_info(IF_MD(drive,) info) | 232 | #define storage_get_info(drive, info) mmc_get_info(IF_MD(drive,) info) |
233 | #endif | 233 | #endif |
@@ -251,7 +251,7 @@ static inline void storage_sleep(void) {}; | |||
251 | #define storage_last_disk_activity() nand_last_disk_activity() | 251 | #define storage_last_disk_activity() nand_last_disk_activity() |
252 | #define storage_spinup_time() 0 | 252 | #define storage_spinup_time() 0 |
253 | #define storage_get_identify() nand_get_identify() | 253 | #define storage_get_identify() nand_get_identify() |
254 | 254 | ||
255 | #ifdef STORAGE_GET_INFO | 255 | #ifdef STORAGE_GET_INFO |
256 | #define storage_get_info(drive, info) nand_get_info(IF_MD(drive,) info) | 256 | #define storage_get_info(drive, info) nand_get_info(IF_MD(drive,) info) |
257 | #endif | 257 | #endif |
@@ -275,7 +275,7 @@ static inline void storage_sleep(void) {}; | |||
275 | #define storage_last_disk_activity() ramdisk_last_disk_activity() | 275 | #define storage_last_disk_activity() ramdisk_last_disk_activity() |
276 | #define storage_spinup_time() 0 | 276 | #define storage_spinup_time() 0 |
277 | #define storage_get_identify() ramdisk_get_identify() | 277 | #define storage_get_identify() ramdisk_get_identify() |
278 | 278 | ||
279 | #ifdef STORAGE_GET_INFO | 279 | #ifdef STORAGE_GET_INFO |
280 | #define storage_get_info(drive, info) ramdisk_get_info(IF_MD(drive,) info) | 280 | #define storage_get_info(drive, info) ramdisk_get_info(IF_MD(drive,) info) |
281 | #endif | 281 | #endif |
@@ -310,11 +310,14 @@ void storage_get_info(int drive, struct storage_info *info); | |||
310 | #ifdef HAVE_HOTSWAP | 310 | #ifdef HAVE_HOTSWAP |
311 | bool storage_removable(int drive); | 311 | bool storage_removable(int drive); |
312 | bool storage_present(int drive); | 312 | bool storage_present(int drive); |
313 | #else | ||
314 | #define storage_removable(x) 0 | ||
315 | #define storage_present(x) 1 | ||
313 | #endif | 316 | #endif |
314 | int storage_driver_type(int drive); | 317 | int storage_driver_type(int drive); |
315 | 318 | ||
316 | #endif /* NOT CONFIG_STORAGE_MULTI and NOT SIMULATOR*/ | 319 | #endif /* NOT CONFIG_STORAGE_MULTI and NOT SIMULATOR*/ |
317 | 320 | ||
318 | int storage_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf); | 321 | int storage_read_sectors(IF_MD(int drive,) sector_t start, int count, void* buf); |
319 | int storage_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf); | 322 | int storage_write_sectors(IF_MD(int drive,) sector_t start, int count, const void* buf); |
320 | #endif | 323 | #endif |