The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-27 13:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #343 from kcpants/master

Browse Source 
Ignore USB storage devices with unknown partition types
This commit is contained in:
Fledge68 2023-03-17 06:03:35 -05:00 committed by GitHub
commit d77459ad2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/devicemounter/usbstorage_libogc.c
View File

@ -44,6 +44,7 @@ distribution.
#include <ogc/disc_io.h>
#include <ogc/lwp_watchdog.h>
#include "usbstorage_libogc.h"
#include "gecko/gecko.hpp"
#define ROUNDDOWN32(v) (((u32)(v)-0x1f)&~0x1f)
@ -95,6 +96,33 @@ distribution.
#define DEVLIST_MAXSIZE 8
static inline const char *PartFromType(u8 type)
{
switch (type)
{
case 0x00: return "Unused";
case 0x01: return "FAT12";
case 0x04: return "FAT16";
case 0x05: return "Extended";
case 0x06: return "FAT16";
case 0x07: return "NTFS";
case 0x0b: return "FAT32";
case 0x0c: return "FAT32";
case 0x0e: return "FAT16";
case 0x0f: return "Extended";
case 0x82: return "LxSWP";
case 0x83: return "LINUX";
case 0x8e: return "LxLVM";
case 0xa8: return "OSX";
case 0xab: return "OSXBT";
case 0xaf: return "OSXHF";
case 0xbf: return "WBFS";
case 0xe8: return "LUKS";
default: return "Unknown";
}
}
static heap_cntrl __heap;
static bool __inited = false;
static u64 usb_last_used = 0;
@ -899,6 +927,25 @@ static bool __usbstorage_ogc_IsInserted(void)
continue;
}
u8* mbr = (u8*)__lwp_heap_allocate(&__heap, 512);
USBStorage_OGC_Read(&__usbfd, j, 0, 1, mbr);
bool readablePartition = false;
for (u8 i = 0; i < 4; i++)
{
u8 rawPartitionType = mbr[450 + i * 16];
const char* partitionType = PartFromType(rawPartitionType);
if (strcmp(partitionType, "Unknown") != 0) {
readablePartition = true;
}
}
__lwp_heap_free(&__heap, mbr);
if (!readablePartition) {
gprintf("USB storage device with vid %lu pid %lu has no readable partitions. Skipping...\n", vid, pid);
__usbstorage_ogc_reset(&__usbfd);
continue;
}
__mounted = true;
__lun = j;
__vid = vid;