1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-23 02:36:41 +00:00

Use LIBUSBHSFS_FS_TYPE_STR() macro from libusbhsfs instead of our own one.

This commit is contained in:
Pablo Curiel 2020-12-24 07:16:16 -04:00
parent 48c084481a
commit 232fe05587
2 changed files with 2 additions and 6 deletions

View file

@ -876,9 +876,9 @@ int main(int argc, char *argv[])
{ {
if (ums_device->product_id[0]) if (ums_device->product_id[0])
{ {
sprintf(device_info, "%s, LUN %u, FS #%u, %s", ums_device->product_id, ums_device->lun, ums_device->fs_idx, UMS_FS_TYPE(ums_device->fs_type)); sprintf(device_info, "%s, LUN %u, FS #%u, %s", ums_device->product_id, ums_device->lun, ums_device->fs_idx, LIBUSBHSFS_FS_TYPE_STR(ums_device->fs_type));
} else { } else {
sprintf(device_info, "LUN %u, FS #%u, %s", ums_device->lun, ums_device->fs_idx, UMS_FS_TYPE(ums_device->fs_type)); sprintf(device_info, "LUN %u, FS #%u, %s", ums_device->lun, ums_device->fs_idx, LIBUSBHSFS_FS_TYPE_STR(ums_device->fs_type));
} }
device_retrieved_info = true; device_retrieved_info = true;

View file

@ -25,10 +25,6 @@
#include <usbhsfs.h> #include <usbhsfs.h>
#define UMS_FS_TYPE(x) ((x) == UsbHsFsDeviceFileSystemType_FAT12 ? "FAT12" : ((x) == UsbHsFsDeviceFileSystemType_FAT16 ? "FAT16" : ((x) == UsbHsFsDeviceFileSystemType_FAT32 ? "FAT32" : \
((x) == UsbHsFsDeviceFileSystemType_exFAT ? "exFAT" : ((x) == UsbHsFsDeviceFileSystemType_NTFS ? "NTFS" : ((x) == UsbHsFsDeviceFileSystemType_EXT2 ? "EXT2" : \
((x) == UsbHsFsDeviceFileSystemType_EXT3 ? "EXT3" : ((x) == UsbHsFsDeviceFileSystemType_EXT4 ? "EXT4" : "Invalid"))))))))
/// Initializes the USB Mass Storage interface. /// Initializes the USB Mass Storage interface.
bool umsInitialize(void); bool umsInitialize(void);