[ftpii] r294 committed - SEEPROM filesystem

[codesite...@google.com]

Revision: 294
Author: joe.g...@psychlaw.com.au
Date: Fri Feb 12 16:43:48 2010
Log: SEEPROM filesystem

http://code.google.com/p/ftpii/source/detail?r=294

Modified:
/branches/0.0.21/Makefile
/branches/0.0.21/README.txt
/branches/0.0.21/source/fs.c
/branches/0.0.21/source/fs.h

=======================================
--- /branches/0.0.21/Makefile Sun Dec 20 07:24:37 2009
+++ /branches/0.0.21/Makefile Fri Feb 12 16:43:48 2010
@@ -11,7 +11,7 @@
BUILD = build

CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE)
-LDFLAGS = -L$(LIBOGC_LIB) -lotp -lisfs -lnandimg -lfst -lwod -liso -ldi
-lwiiuse -lbte -lfat -logc -lm -g $(MACHDEP) -Wl,-Map,$(notdir
$@).map,--section-start,.init=0x80a00000
+LDFLAGS = -L$(LIBOGC_LIB) -lseeprom -lotp -lisfs -lnandimg -lfst -lwod
-liso -ldi -lwiiuse -lbte -lfat -logc -lm -g $(MACHDEP) -Wl,-Map,$(notdir
$@).map,--section-start,.init=0x80a00000
PRELOADER_LDFLAGS = -L$(LIBOGC_LIB) -logc -g $(MACHDEP) -Wl,-Map,$(notdir
$@).map

ifneq ($(BUILD),$(notdir $(CURDIR)))
=======================================
--- /branches/0.0.21/README.txt Fri Feb 12 16:37:18 2010
+++ /branches/0.0.21/README.txt Fri Feb 12 16:43:48 2010
@@ -33,7 +33,8 @@

For subversion changes since 0.0.6, see
http://code.google.com/p/ftpii/source/list

-20100213 0.0.21 Fixed active-mode transfers. (thanks closms!)
+20100213 0.0.21 Added SEEPROM filesystem support at /seeprom (libseeprom).
+ Fixed active-mode transfers. (thanks closms!)
20091221 0.0.20 Make release ZIP structure compatible with HBC's new
wiiload.
Attempt to reinitialise network after failure.
Added OTP filesystem support at /otp (libotp).
=======================================
--- /branches/0.0.21/source/fs.c Sun Dec 20 07:24:37 2009
+++ /branches/0.0.21/source/fs.c Fri Feb 12 16:43:48 2010
@@ -34,6 +34,7 @@
#include <otp/otp.h>
#include <sdcard/gcsd.h>
#include <sdcard/wiisd_io.h>
+#include <seeprom/seeprom.h>
#include <stdio.h>
#include <string.h>
#include <sys/dir.h>
@@ -57,20 +58,22 @@
{ "Wii disc filesystem", "/fst", "fst", "fst:/", false, false, NULL },
{ "NAND images", "/nand", "nand", "nand:/", false, false, NULL },
{ "NAND filesystem", "/isfs", "isfs", "isfs:/", false, false, NULL },
- { "OTP filesystem", "/otp", "otp", "otp:/", false, false, NULL }
+ { "OTP filesystem", "/otp", "otp", "otp:/", false, false, NULL },
+ { "SEEPROM filesystem", "/seeprom", "seeprom", "seeprom:/", false,
false, NULL }
};
const u32 MAX_VIRTUAL_PARTITIONS = (sizeof(VIRTUAL_PARTITIONS) /
sizeof(VIRTUAL_PARTITION));

-VIRTUAL_PARTITION *PA_GCSDA = VIRTUAL_PARTITIONS + 0;
-VIRTUAL_PARTITION *PA_GCSDB = VIRTUAL_PARTITIONS + 1;
-VIRTUAL_PARTITION *PA_SD = VIRTUAL_PARTITIONS + 2;
-VIRTUAL_PARTITION *PA_USB = VIRTUAL_PARTITIONS + 3;
-VIRTUAL_PARTITION *PA_DVD = VIRTUAL_PARTITIONS + 4;
-VIRTUAL_PARTITION *PA_WOD = VIRTUAL_PARTITIONS + 5;
-VIRTUAL_PARTITION *PA_FST = VIRTUAL_PARTITIONS + 6;
-VIRTUAL_PARTITION *PA_NAND = VIRTUAL_PARTITIONS + 7;
-VIRTUAL_PARTITION *PA_ISFS = VIRTUAL_PARTITIONS + 8;
-VIRTUAL_PARTITION *PA_OTP = VIRTUAL_PARTITIONS + 9;
+VIRTUAL_PARTITION *PA_GCSDA = VIRTUAL_PARTITIONS + 0;
+VIRTUAL_PARTITION *PA_GCSDB = VIRTUAL_PARTITIONS + 1;
+VIRTUAL_PARTITION *PA_SD = VIRTUAL_PARTITIONS + 2;
+VIRTUAL_PARTITION *PA_USB = VIRTUAL_PARTITIONS + 3;
+VIRTUAL_PARTITION *PA_DVD = VIRTUAL_PARTITIONS + 4;
+VIRTUAL_PARTITION *PA_WOD = VIRTUAL_PARTITIONS + 5;
+VIRTUAL_PARTITION *PA_FST = VIRTUAL_PARTITIONS + 6;
+VIRTUAL_PARTITION *PA_NAND = VIRTUAL_PARTITIONS + 7;
+VIRTUAL_PARTITION *PA_ISFS = VIRTUAL_PARTITIONS + 8;
+VIRTUAL_PARTITION *PA_OTP = VIRTUAL_PARTITIONS + 9;
+VIRTUAL_PARTITION *PA_SEEPROM = VIRTUAL_PARTITIONS + 10;

static VIRTUAL_PARTITION *to_virtual_partition(const char *virtual_prefix)
{
u32 i;
@@ -171,6 +174,8 @@
success = ISFS_Mount();
} else if (partition == PA_OTP) {
success = OTP_Mount();
+ } else if (partition == PA_SEEPROM) {
+ success = SEEPROM_Mount();
}
printf(success ? "succeeded.\n" : "failed.\n");
if (success && is_gecko(partition)) partition->geckofail = false;
@@ -201,6 +206,8 @@
success = ISFS_Unmount();
} else if (partition == PA_OTP) {
success = OTP_Unmount();
+ } else if (partition == PA_SEEPROM) {
+ success = SEEPROM_Unmount();
}
printf(success ? "succeeded.\n" : "failed.\n");

@@ -299,6 +306,7 @@
void initialise_fs() {
NANDIMG_Mount();
OTP_Mount();
+ SEEPROM_Mount();
ISFS_SU();
if (ISFS_Initialize() == IPC_OK) ISFS_Mount();
initialise_fat();
=======================================
--- /branches/0.0.21/source/fs.h Sun Dec 20 07:24:37 2009
+++ /branches/0.0.21/source/fs.h Fri Feb 12 16:43:48 2010
@@ -36,7 +36,7 @@
const DISC_INTERFACE *disc;
} VIRTUAL_PARTITION;

-VIRTUAL_PARTITION VIRTUAL_PARTITIONS[10];
+VIRTUAL_PARTITION VIRTUAL_PARTITIONS[11];
const u32 MAX_VIRTUAL_PARTITIONS;
VIRTUAL_PARTITION *PA_GCSDA;
VIRTUAL_PARTITION *PA_GCSDB;
@@ -48,6 +48,7 @@
VIRTUAL_PARTITION *PA_NAND;
VIRTUAL_PARTITION *PA_ISFS;
VIRTUAL_PARTITION *PA_OTP;
+VIRTUAL_PARTITION *PA_SEEPROM;

void initialise_fs();