The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-11-15 16:05:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Forwader:

Browse Source 
- fix crash on drives with physical sector size > 512 bytes
This commit is contained in:
dimok789 2012-04-21 09:13:08 +00:00
parent a661109541
commit 1c150901e4
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -91,13 +91,13 @@ export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
export INCLUDE := $(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \ export INCLUDE := $(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD) \ -I$(CURDIR)/$(BUILD) \
-I$(LIBOGC_INC) -I$(LIBOGC_INC) -I$(PORTLIBS)/include
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of library paths # build a list of library paths
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) \ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
-L$(LIBOGC_LIB) -L$(LIBOGC_LIB) -L$(PORTLIBS)/lib
export OUTPUT := $(CURDIR)/$(TARGET) export OUTPUT := $(CURDIR)/$(TARGET)
.PHONY: $(BUILD) clean .PHONY: $(BUILD) clean

26
source/devicemounter.c
View File

@ -3,6 +3,7 @@
#include <ogc/system.h> #include <ogc/system.h>
#include <ogc/usbstorage.h> #include <ogc/usbstorage.h>
#include <ogc/lwp_watchdog.h> #include <ogc/lwp_watchdog.h>
#include <malloc.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <fat.h> #include <fat.h>
@ -13,6 +14,8 @@
#include <time.h> #include <time.h>
#include "devicemounter.h" #include "devicemounter.h"
#define MAX_SECTOR_SIZE 4096
//these are the only stable and speed is good //these are the only stable and speed is good
#define CACHE 8 #define CACHE 8
#define SECTORS 64 #define SECTORS 64
@ -54,36 +57,41 @@ int USBDevice_Init()
return -1; return -1;
int i; int i;
MASTER_BOOT_RECORD mbr; MASTER_BOOT_RECORD *mbr = (MASTER_BOOT_RECORD *) malloc(MAX_SECTOR_SIZE);
char BootSector[512]; char *BootSector = (char *) malloc(MAX_SECTOR_SIZE);
if(!mbr || !BootSector)
return -1;
__io_usbstorage.readSectors(0, 1, &mbr); __io_usbstorage.readSectors(0, 1, mbr);
for(i = 0; i < 4; ++i) for(i = 0; i < 4; ++i)
{ {
if(mbr.partitions[i].type == 0) if(mbr->partitions[i].type == 0)
continue; continue;
__io_usbstorage.readSectors(le32(mbr.partitions[i].lba_start), 1, BootSector); __io_usbstorage.readSectors(le32(mbr->partitions[i].lba_start), 1, BootSector);
if(*((u16 *) (BootSector + 0x1FE)) == 0x55AA) if(*((u16 *) (BootSector + 0x1FE)) == 0x55AA)
{ {
//! Partition typ can be missleading the correct partition format. Stupid lazy ass Partition Editors. //! Partition typ can be missleading the correct partition format. Stupid lazy ass Partition Editors.
if(memcmp(BootSector + 0x36, "FAT", 3) == 0 || memcmp(BootSector + 0x52, "FAT", 3) == 0) if(memcmp(BootSector + 0x36, "FAT", 3) == 0 || memcmp(BootSector + 0x52, "FAT", 3) == 0)
{ {
fatMount(DeviceName[USB1+i], &__io_usbstorage, le32(mbr.partitions[i].lba_start), CACHE, SECTORS); fatMount(DeviceName[USB1+i], &__io_usbstorage, le32(mbr->partitions[i].lba_start), CACHE, SECTORS);
} }
else if (memcmp(BootSector + 0x03, "NTFS", 4) == 0) else if (memcmp(BootSector + 0x03, "NTFS", 4) == 0)
{ {
ntfsMount(DeviceName[USB1+i], &__io_usbstorage, le32(mbr.partitions[i].lba_start), CACHE, SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER | NTFS_IGNORE_CASE); ntfsMount(DeviceName[USB1+i], &__io_usbstorage, le32(mbr->partitions[i].lba_start), CACHE, SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER | NTFS_IGNORE_CASE);
} }
} }
else if(mbr.partitions[i].type == PARTITION_TYPE_LINUX) else if(mbr->partitions[i].type == PARTITION_TYPE_LINUX)
{ {
ext2Mount(DeviceName[USB1+i], &__io_usbstorage, le32(mbr.partitions[i].lba_start), CACHE, SECTORS, EXT2_FLAG_DEFAULT); ext2Mount(DeviceName[USB1+i], &__io_usbstorage, le32(mbr->partitions[i].lba_start), CACHE, SECTORS, EXT2_FLAG_DEFAULT);
} }
} }
free(mbr);
free(BootSector);
return -1; return -1;
} }