Use fatInit default.

This commit is contained in:
Themaister 2011-12-14 19:11:46 +01:00
parent 8a2c5bf9e1
commit 4f04c1288b
3 changed files with 6 additions and 10 deletions

View File

@ -20,9 +20,9 @@ MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
LDFLAGS := $(MACHDEP)
LIBS := -logc -lsnes -lfat
LIBS := -lfat -logc -lsnes
OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o wii/audio.o wii/main.o wii/input.o wii/video.o
OBJ = wii/main.o fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o wii/audio.o wii/input.o wii/video.o
CFLAGS += -std=gnu99 -DHAVE_CONFIGFILE=1 -DHAVE_GETOPT_LONG -DPACKAGE_VERSION=\"0.9.3\" -Dmain=ssnes_main -Wno-char-subscripts
CXXFLAGS += -std=gnu99 -DHAVE_CONFIGFILE=1 -DHAVE_GETOPT_LONG -DPACKAGE_VERSION=\"0.9.3\" -Dmain=ssnes_main -Wno-char-subscripts
@ -41,7 +41,7 @@ all: $(DOL_TARGET)
elf2dol $< $@
$(ELF_TARGET): $(OBJ)
$(CXX) -o $@ $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS)
$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
%.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<

View File

@ -32,9 +32,8 @@ int main(void)
char arg2[] = "-v";
char *argv[] = { arg0, arg1, arg2, NULL };
fatMountSimple("sd", &__io_wiisd);
fatInitDefault();
int ret = ssnes_main(sizeof(argv) / sizeof(argv[0]) - 1, argv);
fatUnmount("sd:");
return ret;
}

View File

@ -133,12 +133,9 @@ static void *wii_init(const video_info_t *video,
inited = true;
}
GXRModeObj *mode = VIDEO_GetPreferredMode(NULL);
for (unsigned i = 0; i < 2; i++)
{
g_framebuf[i] = memalign(32, 640 * 528 * 6);
DCInvalidateRange(g_framebuf[i], 640 * 528 * 6);
g_framebuf[i] = MEM_K0_TO_K1(g_framebuf[i]);
}
g_framebuf[i] = MEM_K0_TO_K1(SYS_AllocateFramebuffer(mode));
setup_video_mode(VIDEO_GetPreferredMode(NULL), g_framebuf);