(Wii) Wii port updates - broken right now -

exits to HBC right after loading a ROM

Makefile.wii

@@ -19,20 +19,20 @@ ELF_TARGET := ssnes.elf
 INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 
-MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
+MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 CXXFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
-LIBS := -lfat -lretro -lwiiuse -logc -lbte
+LIBS := -lfat -lretro -lwiiuse -logc -lbte -lfreetype
 
-OBJ = wii/main.o fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o wii/audio.o wii/input.o wii/video.o console/sgui/sgui.o console/sgui/list.o console/sgui/font.bmpobj console/console_ext.o console/szlib/szlib.o
+OBJ = wii/main.o fifo_buffer.o ssnes.o driver.o gfx/fonts.o file.o settings.o message.o rewind.o movie.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o wii/audio.o wii/input.o wii/video.o console/sgui/sgui.o console/sgui/list.o console/font.bmpobj console/console_ext.o console/szlib/szlib.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 OBJ += console/logger/logger.o
 endif
 
-CFLAGS += -std=gnu99 -DSSNES_CONSOLE -DHAVE_CONFIGFILE=1 -DHW_RVL -DHAVE_GETOPT_LONG -DPACKAGE_VERSION=\"0.9.5\" -Dmain=ssnes_main -Wno-char-subscripts -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+CFLAGS += -std=gnu99 -DSSNES_CONSOLE -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DHAVE_ZLIB -DHAVE_GETOPT_LONG -DHAVE_FREETYPE -DPACKAGE_VERSION=\"0.9.5\" -Dmain=ssnes_main -Wno-char-subscripts -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g

console/console_ext.c

@@ -411,6 +411,54 @@ static const struct platform_bind platform_keys[] = {
    { XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_RSTICK_UP_MASK, "RStick D-Pad Up" },
    { XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_RSTICK_DOWN_MASK, "RStick D-Pad Down" },
 };
+#elif defined(GEKKO)
+static const struct platform_bind platform_keys[] = {
+   { PAD_BUTTON_B, "(NGC) B button" },
+   { PAD_BUTTON_A, "(NGC) A button" },
+   { PAD_BUTTON_Y, "(NGC) Y button" },
+   { PAD_BUTTON_X, "(NGC) X button" },
+   { PAD_BUTTON_UP, "(NGC) D-Pad Up" },
+   { PAD_BUTTON_DOWN, "(NGC) D-Pad Down" },
+   { PAD_BUTTON_LEFT, "(NGC) D-Pad Left" },
+   { PAD_BUTTON_RIGHT, "(NGC) D-Pad Right" },
+   { PAD_TRIGGER_Z, "(NGC) Z trigger" },
+   { PAD_BUTTON_START, "(NGC) Start button" },
+   { PAD_TRIGGER_L, "(NGC) Left Trigger" },
+   { PAD_TRIGGER_R, "(NGC) Right Trigger" },
+   //{ XINPUT_GAMEPAD_LSTICK_LEFT_MASK, "LStick Left" },
+   //{ XINPUT_GAMEPAD_LSTICK_RIGHT_MASK, "LStick Right" },
+   //{ XINPUT_GAMEPAD_LSTICK_UP_MASK, "LStick Up" },
+   //{ XINPUT_GAMEPAD_LSTICK_DOWN_MASK, "LStick Down" },
+   //{ XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_LSTICK_LEFT_MASK, "LStick D-Pad Left" },
+   //{ XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_LSTICK_RIGHT_MASK, "LStick D-Pad Right" },
+   //{ XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_LSTICK_UP_MASK, "LStick D-Pad Up" },
+   //{ XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_LSTICK_DOWN_MASK, "LStick D-Pad Down" },
+   //{ XINPUT_GAMEPAD_RSTICK_LEFT_MASK, "RStick Left" },
+   //{ XINPUT_GAMEPAD_RSTICK_RIGHT_MASK, "RStick Right" },
+   //{ XINPUT_GAMEPAD_RSTICK_UP_MASK, "RStick Up" },
+   //{ XINPUT_GAMEPAD_RSTICK_DOWN_MASK, "RStick Down" },
+   //{ XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_RSTICK_LEFT_MASK, "RStick D-Pad Left" },
+   //{ XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_RSTICK_RIGHT_MASK, "RStick D-Pad Right" },
+   //{ XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_RSTICK_UP_MASK, "RStick D-Pad Up" },
+   //{ XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_RSTICK_DOWN_MASK, "RStick D-Pad Down" },
+#ifdef HW_RVL
+   { WPAD_CLASSIC_BUTTON_B, "(Wii Classici) B button" },
+   { WPAD_CLASSIC_BUTTON_A, "(Wii Classic) A button" },
+   { WPAD_CLASSIC_BUTTON_Y, "(Wii Classic) Y button" },
+   { WPAD_CLASSIC_BUTTON_X, "(Wii Classic) X button" },
+   { WPAD_CLASSIC_BUTTON_UP, "(Wii Classic) D-Pad Up" },
+   { WPAD_CLASSIC_BUTTON_DOWN, "(Wii Classic) D-Pad Down" },
+   { WPAD_CLASSIC_BUTTON_LEFT, "(Wii Classic) D-Pad Left" },
+   { WPAD_CLASSIC_BUTTON_RIGHT, "(Wii Classic) D-Pad Right" },
+   { WPAD_CLASSIC_BUTTON_MINUS, "(Wii Classic) Select/Minus button" },
+   { WPAD_CLASSIC_BUTTON_PLUS, "(Wii Classic) Start/Plus button" },
+   { WPAD_CLASSIC_BUTTON_HOME, "(Wii Classic) Home button" },
+   { WPAD_CLASSIC_BUTTON_FULL_L, "(Wii Classic) Left Trigger" },
+   { WPAD_CLASSIC_BUTTON_FULL_R, "(Wii Classic) Right Trigger" },
+   { WPAD_CLASSIC_BUTTON_ZL, "(Wii Classic) ZL button" },
+   { WPAD_CLASSIC_BUTTON_ZR, "(Wii Classic) ZR button" },
+#endif
+};
 #endif
 
 uint64_t ssnes_input_find_previous_platform_key(uint64_t joykey)

console/console_ext_input.h

@@ -99,6 +99,11 @@ enum xdk360_device_id
 
    SSNES_LAST_PLATFORM_KEY
 };
+#elif defined(GEKKO)
+#include <ogc/pad.h>
+#ifdef HW_RVL
+#include <wiiuse/wpad.h>
+#endif
 #endif
 
 extern uint64_t ssnes_default_keybind_lut[SSNES_FIRST_META_KEY];

ssnes.c

@@ -2483,7 +2483,7 @@ void ssnes_main_deinit(void)
    uninit_libretro_sym();
 }
 
-#ifndef SSNES_CONSOLE
+#if !defined(SSNES_CONSOLE) || defined(GEKKO)
 // Consoles use the higher level API.
 int main(int argc, char *argv[])
 {

wii/input.c

@@ -90,7 +90,6 @@ static void wii_input_poll(void *data)
 
       pad_state[i][RETRO_DEVICE_ID_JOYPAD_B] = down & PAD_BUTTON_B;
       pad_state[i][RETRO_DEVICE_ID_JOYPAD_Y] = down & PAD_BUTTON_Y;
-      pad_state[i][RETRO_DEVICE_ID_JOYPAD_Y] = down & PAD_BUTTON_Y;
       pad_state[i][RETRO_DEVICE_ID_JOYPAD_SELECT] = down & PAD_TRIGGER_Z;
       pad_state[i][RETRO_DEVICE_ID_JOYPAD_START] = down & PAD_BUTTON_START;
       pad_state[i][RETRO_DEVICE_ID_JOYPAD_UP] = down & PAD_BUTTON_UP;