diff options
Diffstat (limited to 'bootloader/main-pp.c')
| -rw-r--r-- | bootloader/main-pp.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index 38760a0e58..562cf17ca4 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c @@ -33,6 +33,7 @@ #include "lcd.h" #include "font.h" #include "storage.h" +#include "file_internal.h" #include "adc.h" #include "button.h" #include "disk.h" @@ -291,7 +292,7 @@ void* main(void) int btn; int rc; int num_partitions; - struct partinfo* pinfo; + struct partinfo pinfo; #if !(CONFIG_STORAGE & STORAGE_SD) char buf[256]; unsigned short* identify_info; @@ -370,7 +371,7 @@ void* main(void) } #endif - disk_init(IF_MV(0)); + filesystem_init(); num_partitions = disk_mount_all(); if (num_partitions<=0) { @@ -381,9 +382,9 @@ void* main(void) that have more than that */ for(i=0; i<NUM_PARTITIONS; i++) { - pinfo = disk_partinfo(i); + disk_partinfo(i, &pinfo); printf("Partition %d: 0x%02x %ld MB", - i, pinfo->type, pinfo->size / 2048); + i, pinfo.type, pinfo.size / 2048); } /* Now that storage is initialized, check for USB connection */ @@ -430,10 +431,10 @@ void* main(void) #if (CONFIG_STORAGE & STORAGE_SD) /* First try a (hidden) firmware partition */ printf("Trying firmware partition"); - pinfo = disk_partinfo(1); - if(pinfo->type == PARTITION_TYPE_OS2_HIDDEN_C_DRIVE) + disk_partinfo(1, &pinfo); + if(pinfo.type == PARTITION_TYPE_OS2_HIDDEN_C_DRIVE) { - rc = load_mi4_part(loadbuffer, pinfo, MAX_LOADSIZE, + rc = load_mi4_part(loadbuffer, &pinfo, MAX_LOADSIZE, usb == USB_INSERTED); if (rc <= EFILE_EMPTY) { printf("Can't load from partition"); |