Merge pull request #355 from negativeExponent/updates

Updates

Makefile.libretro

@@ -726,7 +726,7 @@ ifneq (,$(findstring msvc,$(platform)))
 COREDEFINES += -DINLINE=_inline
 endif
 
-CFLAGS += -DWANT_GRIFFIN
+CFLAGS += -DWANT_GRIFFIN -Werror=implicit-function-declaration
 
 OBJECTS := $(SOURCES_C:.c=.o)
 OBJECTS += $(RETROARCH_OBJECTS)

src/drivers/libretro/libretro.c

@@ -5,6 +5,9 @@
 #include <stdarg.h>
 
 #include <libretro.h>
+#include <streams/memory_stream.h>
+#include <libretro_dipswitch.h>
+#include <libretro_core_options.h>
 
 #include "../../fceu.h"
 #include "../../fceu-endian.h"
@@ -28,18 +31,6 @@
 #include "libretro-common/include/libretro_gskit_ps2.h"
 #endif
 
-#include "libretro-common/include/streams/memory_stream.h"
-#include "libretro_dipswitch.h"
-
-#ifdef HAVE_NTSC_FILTER
-#define NTSC_SCANLINES /* enables scanline effect and doubles height(required) */
-#if defined(VITA) /* do no disable double-height for these devices */
-#undef NTSC_SCANLINES
-#endif
-#endif
-
-#include "libretro_core_options.h"
-
 #define MAX_PLAYERS 4 /* max supported players */
 #define MAX_PORTS 2   /* max controller ports,
                        * port 0 for player 1/3, port 1 for player 2/4 */
@@ -80,16 +71,67 @@ static bool use_overscan;
 static bool overscan_h;
 static bool overscan_v;
 #endif
-static bool up_down_allowed = false;
+
 static bool use_raw_palette;
 static bool use_par;
-static bool enable_4player = false;
+
-static unsigned turbo_enabler[MAX_PLAYERS] = {0};
+/*
-static unsigned turbo_delay = 0;
+ * Flags to keep track of whether turbo
-static unsigned input_type[MAX_PLAYERS + 1] = {0}; /* 4-players + famicom expansion */
+ * buttons toggled on or off.
+ *
+ * There are two values in array
+ * for Turbo A and Turbo B for
+ * each player
+ */
+
+#define MAX_BUTTONS 8
+#define TURBO_BUTTONS 2
+unsigned char turbo_button_toggle[MAX_PLAYERS][TURBO_BUTTONS] = { {0} };
+
+typedef struct
+{
+   unsigned retro;
+   unsigned nes;
+} keymap;
+
+static const keymap turbomap[] = {
+   { RETRO_DEVICE_ID_JOYPAD_X, JOY_A },
+   { RETRO_DEVICE_ID_JOYPAD_Y, JOY_B },
+};
+
+static const keymap bindmap[] = {
+   { RETRO_DEVICE_ID_JOYPAD_A, JOY_A },
+   { RETRO_DEVICE_ID_JOYPAD_B, JOY_B },
+   { RETRO_DEVICE_ID_JOYPAD_SELECT, JOY_SELECT },
+   { RETRO_DEVICE_ID_JOYPAD_START, JOY_START },
+   { RETRO_DEVICE_ID_JOYPAD_UP, JOY_UP },
+   { RETRO_DEVICE_ID_JOYPAD_DOWN, JOY_DOWN },
+   { RETRO_DEVICE_ID_JOYPAD_LEFT, JOY_LEFT },
+   { RETRO_DEVICE_ID_JOYPAD_RIGHT, JOY_RIGHT },
+};
+
+typedef struct {
+   bool enable_4player;                /* four-score / 4-player adapter used */
+   bool up_down_allowed;               /* disabled simultaneous up+down and left+right dpad combinations */
+
+   /* turbo related */
+   uint32_t turbo_enabler[MAX_PLAYERS];
+   uint32_t turbo_delay;
+
+   uint32_t type[MAX_PLAYERS + 1];     /* 4-players + famicom expansion */
+
+   /* input data */
+   uint8_t JSReturn[MAX_PLAYERS];      /* 1-4 player data */
+   uint32_t MouseData[MAX_PORTS][3];   /* nes mouse data */
+   uint32_t FamicomData;               /* Famicom expansion port data */
+} NES_INPUT_T;
+
+static NES_INPUT_T nes_input = { 0 };
 enum RetroZapperInputModes{RetroLightgun, RetroMouse, RetroPointer};
 static enum RetroZapperInputModes zappermode = RetroLightgun;
 
+static bool libretro_supports_bitmasks = false;
+
 /* emulator-specific variables */
 
 const size_t PPU_BIT = 1ULL << 31ULL;
@@ -133,12 +175,8 @@ static unsigned sndvolume;
 unsigned swapDuty;
 
 static int32_t *sound = 0;
-static uint32_t JSReturn = 0;
 static uint32_t Dummy = 0;
-static uint32_t MouseData[MAX_PORTS][3] = { {0} };
-static uint32_t fc_MouseData[3] = {0};
 static uint32_t current_palette = 0;
-
 static unsigned serialize_size;
 
 int PPUViewScanline=0;
@@ -595,7 +633,6 @@ struct st_palettes palettes[] = {
 #define NTSC_WIDTH      602
 
 static unsigned use_ntsc = 0;
-static unsigned use_ntsc_scanlines = 0;
 static unsigned burst_phase;
 static nes_ntsc_t nes_ntsc;
 static nes_ntsc_setup_t ntsc_setup;
@@ -661,8 +698,6 @@ static void ResetPalette(void)
 #endif
 }
 
-static bool libretro_supports_bitmasks = false;
-
 unsigned retro_api_version(void)
 {
    return RETRO_API_VERSION;
@@ -693,7 +728,7 @@ void retro_set_input_state(retro_input_state_t cb)
 
 static void update_nes_controllers(unsigned port, unsigned device)
 {
-   input_type[port] = device;
+   nes_input.type[port] = device;
 
    if (port < 4)
    {
@@ -704,17 +739,17 @@ static void update_nes_controllers(unsigned port, unsigned device)
          FCEU_printf(" Player %u: None Connected\n", port + 1);
          break;
       case RETRO_DEVICE_ZAPPER:
-         FCEUI_SetInput(port, SI_ZAPPER, MouseData[port], 1);
+         FCEUI_SetInput(port, SI_ZAPPER, nes_input.MouseData[port], 1);
          FCEU_printf(" Player %u: Zapper\n", port + 1);
          break;
       case RETRO_DEVICE_ARKANOID:
-         FCEUI_SetInput(port, SI_ARKANOID, MouseData[port], 0);
+         FCEUI_SetInput(port, SI_ARKANOID, nes_input.MouseData[port], 0);
          FCEU_printf(" Player %u: Arkanoid\n", port + 1);
          break;
       case RETRO_DEVICE_GAMEPAD:
       default:
-         input_type[port] = RETRO_DEVICE_GAMEPAD;
+         nes_input.type[port] = RETRO_DEVICE_GAMEPAD;
-         FCEUI_SetInput(port, SI_GAMEPAD, &JSReturn, 0);
+         FCEUI_SetInput(port, SI_GAMEPAD, (uint32_t*)nes_input.JSReturn, 0);
          FCEU_printf(" Player %u: Gamepad\n", port + 1);
          break;
       }
@@ -725,19 +760,19 @@ static void update_nes_controllers(unsigned port, unsigned device)
       switch (device)
       {
       case RETRO_DEVICE_FC_ARKANOID:
-         FCEUI_SetInputFC(SIFC_ARKANOID, fc_MouseData, 0);
+         FCEUI_SetInputFC(SIFC_ARKANOID, &nes_input.FamicomData, 0);
          FCEU_printf(" Famicom Expansion: Arkanoid\n");
          break;
       case RETRO_DEVICE_FC_SHADOW:
-         FCEUI_SetInputFC(SIFC_SHADOW, fc_MouseData, 1);
+         FCEUI_SetInputFC(SIFC_SHADOW, &nes_input.FamicomData, 1);
          FCEU_printf(" Famicom Expansion: (Bandai) Hyper Shot\n");
          break;
       case RETRO_DEVICE_FC_OEKAKIDS:
-         FCEUI_SetInputFC(SIFC_OEKAKIDS, fc_MouseData, 1);
+         FCEUI_SetInputFC(SIFC_OEKAKIDS, &nes_input.FamicomData, 1);
          FCEU_printf(" Famicom Expansion: Oeka Kids Tablet\n");
          break;
       case RETRO_DEVICE_FC_4PLAYERS:
-         FCEUI_SetInputFC(SIFC_4PLAYER, &JSReturn, 0);
+         FCEUI_SetInputFC(SIFC_4PLAYER, (uint32_t*)nes_input.JSReturn, 0);
          FCEU_printf(" Famicom Expansion: Famicom 4-Player Adapter\n");
          break;
       case RETRO_DEVICE_NONE:
@@ -805,18 +840,18 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
             /* This section automatically enables 4players support
              * when player 3 or 4 used */
 
-            input_type[port] = RETRO_DEVICE_NONE;
+            nes_input.type[port] = RETRO_DEVICE_NONE;
 
             if (device == RETRO_DEVICE_AUTO)
             {
-               if (enable_4player)
+               if (nes_input.enable_4player)
-                  input_type[port] = RETRO_DEVICE_GAMEPAD;
+                  nes_input.type[port] = RETRO_DEVICE_GAMEPAD;
             }
             else if (device == RETRO_DEVICE_GAMEPAD)
-               input_type[port] = RETRO_DEVICE_GAMEPAD;
+               nes_input.type[port] = RETRO_DEVICE_GAMEPAD;
 
             FCEU_printf(" Player %u: %s\n", port + 1,
-               (input_type[port] == RETRO_DEVICE_NONE) ? "None Connected" : "Gamepad");
+               (nes_input.type[port] == RETRO_DEVICE_NONE) ? "None Connected" : "Gamepad");
          }
          else /* do famicom controllers here */
          {
@@ -826,14 +861,14 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
                update_nes_controllers(4, fc_to_libretro(GameInfo->inputfc));
          }
 
-         if (input_type[2] == RETRO_DEVICE_GAMEPAD
+         if (nes_input.type[2] == RETRO_DEVICE_GAMEPAD
-         || input_type[3] == RETRO_DEVICE_GAMEPAD)
+         || nes_input.type[3] == RETRO_DEVICE_GAMEPAD)
             FCEUI_DisableFourScore(0);
          else
             FCEUI_DisableFourScore(1);
 
          /* check if famicom 4player adapter is used */
-         if (input_type[4] == RETRO_DEVICE_FC_4PLAYERS)
+         if (nes_input.type[4] == RETRO_DEVICE_FC_4PLAYERS)
             FCEUI_DisableFourScore(1);
       }
    }
@@ -926,28 +961,17 @@ void retro_get_system_info(struct retro_system_info *info)
 
 void retro_get_system_av_info(struct retro_system_av_info *info)
 {
-   unsigned width, height, maxwidth, maxheight;
 #ifdef PSP
-   width  = NES_WIDTH - (use_overscan ? 16 : 0);
+   unsigned width  = NES_WIDTH - (use_overscan ? 16 : 0);
-   height = NES_HEIGHT - (use_overscan ? 16 : 0);
+   unsigned height = NES_HEIGHT - (use_overscan ? 16 : 0);
 #else
-   width  = NES_WIDTH - (overscan_h ? 16 : 0);
+   unsigned width  = NES_WIDTH - (overscan_h ? 16 : 0);
-   height = NES_HEIGHT - (overscan_v ? 16 : 0);
+   unsigned height = NES_HEIGHT - (overscan_v ? 16 : 0);
-#endif
-#ifdef HAVE_NTSC_FILTER
-   maxwidth = NTSC_WIDTH;
-   maxheight = NES_HEIGHT;
-#ifdef NTSC_SCANLINES
-   maxheight = NES_HEIGHT * 2;
-#endif
-#else
-   maxwidth = NES_WIDTH;
-   maxheight = NES_HEIGHT;
 #endif
    info->geometry.base_width = width;
    info->geometry.base_height = height;
-   info->geometry.max_width = maxwidth;
+   info->geometry.max_width = (use_ntsc ? NTSC_WIDTH : NES_WIDTH);
-   info->geometry.max_height = maxheight;
+   info->geometry.max_height = NES_HEIGHT;
    info->geometry.aspect_ratio = (float)(use_par ? NES_8_7_PAR : NES_4_3);
    info->timing.sample_rate = (float)sndsamplerate;
    if (FSettings.PAL || dendy)
@@ -1102,18 +1126,6 @@ void retro_reset(void)
    ResetNES();
 }
 
-typedef struct
-{
-   unsigned retro;
-   unsigned nes;
-} keymap;
-
-
-static const keymap turbomap[] = {
-   { RETRO_DEVICE_ID_JOYPAD_X, JOY_A },
-   { RETRO_DEVICE_ID_JOYPAD_Y, JOY_B },
-};
-
 static void set_apu_channels(int chan)
 {
    FSettings.SquareVolume[1] = (chan & 1) ? 256 : 0;
@@ -1126,12 +1138,14 @@ static void set_apu_channels(int chan)
 static void check_variables(bool startup)
 {
    struct retro_variable var = {0};
-   struct retro_system_av_info av_info;
-   bool geometry_update = false;
    bool palette_updated = false;
    char key[256];
    int i, enable_apu;
 
+   /* 1 = Performs only geometry update: e.g. overscans */
+   /* 2 = Performs video/geometry update when needed and timing changes: e.g. region and filter change */
+   int audio_video_updated = 0;
+
    var.key = "fceumm_ramstate";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -1161,21 +1175,11 @@ static void check_variables(bool startup)
       else if (strcmp(var.value, "monochrome") == 0)
          use_ntsc = NTSC_MONOCHROME;
       if (use_ntsc != orig_value)
-         palette_updated = true;
+      {
+         ResetPalette();
+         audio_video_updated = 2;
+      }
    }
-
-#ifdef NTSC_SCANLINES
-   var.key = "fceumm_ntsc_scanlines";
-
-   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-   {
-      unsigned orig_value = use_ntsc_scanlines;
-      if (strcmp(var.value, "enabled") == 0)
-         use_ntsc_scanlines = 1;
-      else
-         use_ntsc_scanlines = 0;
-   }
-#endif /* NTSC_SCANLINES */
 #endif /* HAVE_NTSC_FILTER */
 
    var.key = "fceumm_palette";
@@ -1224,20 +1228,18 @@ static void check_variables(bool startup)
          current_palette = 15;
 
       if (current_palette != orig_value)
-         palette_updated = true;
+      {
+         audio_video_updated = 1;
+         ResetPalette();
+      }  
    }
 
-   if (palette_updated)
-      ResetPalette();
-
    var.key = "fceumm_up_down_allowed";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-   {
+      nes_input.up_down_allowed = (!strcmp(var.value, "enabled")) ? true : false;
-      up_down_allowed = (!strcmp(var.value, "enabled")) ? true : false;
-   }
    else
-      up_down_allowed = false;
+      nes_input.up_down_allowed = false;
 
    var.key = "fceumm_nospritelimit";
 
@@ -1315,7 +1317,7 @@ static void check_variables(bool startup)
       if (newval != use_overscan)
       {
          use_overscan = newval;
-         geometry_update = true;
+         audio_video_updated = 1;
       }
    }
 
@@ -1328,7 +1330,7 @@ static void check_variables(bool startup)
       if (newval != overscan_h)
       {
          overscan_h = newval;
-         geometry_update = true;
+         audio_video_updated = 1;
       }
    }
 
@@ -1340,41 +1342,44 @@ static void check_variables(bool startup)
       if (newval != overscan_v)
       {
          overscan_v = newval;
-         geometry_update = true;
+         audio_video_updated = 1;
       }
    }
 #endif
+   var.key = "fceumm_aspect";
+
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+   {
+      bool newval = (!strcmp(var.value, "8:7 PAR"));
+      if (newval != use_par)
+      {
+         use_par = newval;
+         audio_video_updated = 1;
+      }
+   }
 
    var.key = "fceumm_turbo_enable";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
-      turbo_enabler[0] = 0;
+      nes_input.turbo_enabler[0] = 0;
-      turbo_enabler[1] = 0;
+      nes_input.turbo_enabler[1] = 0;
 
       if (!strcmp(var.value, "Player 1"))
-      {
+         nes_input.turbo_enabler[0] = 1;
-         turbo_enabler[0] = 1;
-         turbo_enabler[1] = 0;
-      }
       else if (!strcmp(var.value, "Player 2"))
-      {
+         nes_input.turbo_enabler[1] = 1;
-         turbo_enabler[0] = 0;
-         turbo_enabler[1] = 1;
-      }
       else if (!strcmp(var.value, "Both"))
       {
-         turbo_enabler[0] = 1;
+         nes_input.turbo_enabler[0] = 1;
-         turbo_enabler[1] = 1;
+         nes_input.turbo_enabler[1] = 1;
       }
    }
 
    var.key = "fceumm_turbo_delay";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-   {
+      nes_input.turbo_delay = atoi(var.value);
-      turbo_delay = atoi(var.value);
-   }
 
    var.key = "fceumm_region";
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -1389,18 +1394,9 @@ static void check_variables(bool startup)
       else if (!strcmp(var.value, "Dendy"))
          opt_region = 3;
       if (opt_region != oldval)
-         FCEUD_RegionOverride(opt_region);
-   }
-
-   var.key = "fceumm_aspect";
-
-   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-   {
-      bool newval = (!strcmp(var.value, "8:7 PAR"));
-      if (newval != use_par)
       {
-         use_par = newval;
+         FCEUD_RegionOverride(opt_region);
-         geometry_update = true;
+         audio_video_updated = 2;
       }
    }
 
@@ -1428,10 +1424,14 @@ static void check_variables(bool startup)
       FCEUD_SoundToggle();
    }
 
-   if (geometry_update)
+   if (audio_video_updated && !startup)
    {
+      struct retro_system_av_info av_info;
       retro_get_system_av_info(&av_info);
-      environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info);
+      if (audio_video_updated == 2)  
+         environ_cb(RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO, &av_info);
+      else
+         environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &av_info);
    }
 
    var.key = "fceumm_swapduty";
@@ -1440,9 +1440,7 @@ static void check_variables(bool startup)
    {
       bool newval = (!strcmp(var.value, "enabled"));
       if (newval != swapDuty)
-      {
          swapDuty = newval;
-      }
    }
 
    var.key = key;
@@ -1455,9 +1453,7 @@ static void check_variables(bool startup)
       key[strlen("fceumm_apu_")] = '1' + i;
       var.value = NULL;
       if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && !strcmp(var.value, "disabled"))
-      {
          enable_apu &= ~(1 << i);
-      }
    }
    set_apu_channels(enable_apu);
 
@@ -1623,33 +1619,18 @@ void get_mouse_input(unsigned port, uint32_t *zapdata)
    }
 }
 
-/*
- * Flags to keep track of whether turbo
- * buttons toggled on or off.
- *
- * There are two values in array
- * for Turbo A and Turbo B for
- * each player
- */
-
-#define MAX_BUTTONS 8
-#define TURBO_BUTTONS 2
-unsigned char turbo_button_toggle[MAX_PLAYERS][TURBO_BUTTONS] = { {0} };
-
 static void FCEUD_UpdateInput(void)
 {
    unsigned player, port;
 
    poll_cb();
 
-   JSReturn = 0;
-
    /* nes gamepad */
    for (player = 0; player < MAX_PLAYERS; player++)
    {
       int i              = 0;
       uint8_t input_buf  = 0;
-      int player_enabled = (input_type[player] == RETRO_DEVICE_GAMEPAD) || (input_type[player] == RETRO_DEVICE_JOYPAD);
+      int player_enabled = (nes_input.type[player] == RETRO_DEVICE_GAMEPAD) || (nes_input.type[player] == RETRO_DEVICE_JOYPAD);
 
       if (player_enabled)
       {
@@ -1678,16 +1659,6 @@ static void FCEUD_UpdateInput(void)
          }
          else
          {
-            static const keymap bindmap[] = {
-               { RETRO_DEVICE_ID_JOYPAD_A, JOY_A },
-               { RETRO_DEVICE_ID_JOYPAD_B, JOY_B },
-               { RETRO_DEVICE_ID_JOYPAD_SELECT, JOY_SELECT },
-               { RETRO_DEVICE_ID_JOYPAD_START, JOY_START },
-               { RETRO_DEVICE_ID_JOYPAD_UP, JOY_UP },
-               { RETRO_DEVICE_ID_JOYPAD_DOWN, JOY_DOWN },
-               { RETRO_DEVICE_ID_JOYPAD_LEFT, JOY_LEFT },
-               { RETRO_DEVICE_ID_JOYPAD_RIGHT, JOY_RIGHT },
-            };
             for (i = 0; i < MAX_BUTTONS; i++)
                input_buf |= input_cb(player, RETRO_DEVICE_JOYPAD, 0,
                      bindmap[i].retro) ? bindmap[i].nes : 0;
@@ -1704,7 +1675,7 @@ static void FCEUD_UpdateInput(void)
           * been reached.
           */
 
-         if (turbo_enabler[player])
+         if (nes_input.turbo_enabler[player])
          {
             /* Handle Turbo A & B buttons */
             for (i = 0; i < TURBO_BUTTONS; i++)
@@ -1714,7 +1685,7 @@ static void FCEUD_UpdateInput(void)
                   if (!turbo_button_toggle[player][i])
                      input_buf |= turbomap[i].nes;
                   turbo_button_toggle[player][i]++;
-                  turbo_button_toggle[player][i] %= turbo_delay + 1;
+                  turbo_button_toggle[player][i] %= nes_input.turbo_delay + 1;
                }
                else
                   /* If the button is not pressed, just reset the toggle */
@@ -1723,7 +1694,7 @@ static void FCEUD_UpdateInput(void)
          }
       }
 
-      if (!up_down_allowed)
+      if (!nes_input.up_down_allowed)
       {
          if (input_buf & (JOY_UP))
             if (input_buf & (JOY_DOWN))
@@ -1733,28 +1704,28 @@ static void FCEUD_UpdateInput(void)
                input_buf &= ~((JOY_LEFT ) | (JOY_RIGHT));
       }
 
-      JSReturn |= (input_buf & 0xff) << (player << 3);
+      nes_input.JSReturn[player] = input_buf;
    }
 
    /* other inputs*/
    for (port = 0; port < MAX_PORTS; port++)
    {
-      switch (input_type[port])
+      switch (nes_input.type[port])
       {
          case RETRO_DEVICE_ARKANOID:
          case RETRO_DEVICE_ZAPPER:
-            get_mouse_input(port, MouseData[port]);
+            get_mouse_input(port, nes_input.MouseData[port]);
             break;
       }
    }
 
    /* famicom inputs */
-   switch (input_type[4])
+   switch (nes_input.type[4])
    {
       case RETRO_DEVICE_FC_ARKANOID:
       case RETRO_DEVICE_FC_OEKAKIDS:
       case RETRO_DEVICE_FC_SHADOW:
-         get_mouse_input(0, fc_MouseData);
+         get_mouse_input(0, &nes_input.FamicomData);
          break;
    }
 
@@ -1867,7 +1838,7 @@ static void retro_run_blit(uint8_t *gfx)
       if (ntsc_setup.merge_fields)
          burst_phase = 0;
 
-      nes_ntsc_blit(&nes_ntsc, (NES_NTSC_IN_T *)gfx, (NES_NTSC_IN_T *)XDBuf,
+      nes_ntsc_blit(&nes_ntsc, (NES_NTSC_IN_T const*)gfx, (NES_NTSC_IN_T *)XDBuf,
           NES_WIDTH, burst_phase, NES_WIDTH, NES_HEIGHT,
           ntsc_video_out, NTSC_WIDTH * sizeof(uint16));
 
@@ -1877,9 +1848,6 @@ static void retro_run_blit(uint8_t *gfx)
       height   = overscan_v ? 224 : 240;
       pitch    = width * sizeof(uint16_t);
 
-#ifdef NTSC_SCANLINES
-      if (use_ntsc_scanlines == 0)
-#endif
       {
          const uint16_t *in = ntsc_video_out + h_offset + NTSC_WIDTH * v_offset;
          uint16_t *out = fceu_video_out;
@@ -1892,31 +1860,6 @@ static void retro_run_blit(uint8_t *gfx)
             out += width;
          }
       }
-#ifdef NTSC_SCANLINES
-      else
-      {
-         int y;
-         height <<= 1;
-         for (y = (NES_HEIGHT - v_offset); --y >= v_offset;)
-         {
-            uint16_t const *in = ntsc_video_out + y * NTSC_WIDTH;
-            uint16_t *out = fceu_video_out + (y - v_offset) * 2 * width;
-            int n;
-            for (n = width; n; --n)
-            {
-               unsigned prev = *(in + h_offset);
-               unsigned next = *(in + h_offset + NTSC_WIDTH);
-               /* mix 16-bit rgb without losing low bits */
-               unsigned mixed = prev + next + ((prev ^ next) & 0x0821);
-               /* darken by 12% */
-               *out = prev;
-               *(out + width) = (mixed >> 1) - (mixed >> 4 & 0x18E3);
-               in++;
-               out++;
-            }
-         }
-      }
-#endif /* NTSC_SCANLINES */
    }
    else
 #endif /* HAVE_NTSC_FILTER */
@@ -2381,15 +2324,11 @@ bool retro_load_game(const struct retro_game_info *game)
    fceu_video_out = (uint16_t*)linearMemAlign(256 * 240 * sizeof(uint16_t), 128);
 #elif !defined(PSP)
 #ifdef HAVE_NTSC_FILTER
-#define FB_WIDTH 602
+#define FB_WIDTH NTSC_WIDTH
-#ifdef NTSC_SCANLINES
+#define FB_HEIGHT NES_HEIGHT
-#define FB_HEIGHT 480
-#else
-#define FB_HEIGHT 240
-#endif
 #else /* !HAVE_NTSC_FILTER */
-#define FB_WIDTH 256
+#define FB_WIDTH NES_WIDTH
-#define FB_HEIGHT 240
+#define FB_HEIGHT NES_HEIGHT
 #endif
    fceu_video_out = (uint16_t*)malloc(FB_WIDTH * FB_HEIGHT * sizeof(uint16_t));
 #endif
@@ -2423,8 +2362,8 @@ bool retro_load_game(const struct retro_game_info *game)
    }
 
    for (i = 0; i < MAX_PORTS; i++) {
-      FCEUI_SetInput(i, SI_GAMEPAD, &JSReturn, 0);
+      FCEUI_SetInput(i, SI_GAMEPAD, (uint32_t*)nes_input.JSReturn, 0);
-      input_type[i] = RETRO_DEVICE_JOYPAD;
+      nes_input.type[i] = RETRO_DEVICE_JOYPAD;
    }
 
    external_palette_exist = ipalette;
@@ -2449,7 +2388,7 @@ bool retro_load_game(const struct retro_game_info *game)
       if (fourscore_db_list[i].crc == iNESCart.CRC32)
       {
          FCEUI_DisableFourScore(0);
-         enable_4player = true;
+         nes_input.enable_4player = true;
          break;
       }
    }
@@ -2459,8 +2398,8 @@ bool retro_load_game(const struct retro_game_info *game)
       if (famicom_4p_db_list[i].crc == iNESCart.CRC32)
       {
          GameInfo->inputfc = SIFC_4PLAYER;
-         FCEUI_SetInputFC(SIFC_4PLAYER, &JSReturn, 0);
+         FCEUI_SetInputFC(SIFC_4PLAYER, (uint32_t*)nes_input.JSReturn, 0);
-         enable_4player = true;
+         nes_input.enable_4player = true;
          break;
       }
    }

src/drivers/libretro/libretro_core_options.h

@@ -92,19 +92,6 @@ struct retro_core_option_definition option_defs_common[] = {
       },
       "disabled"
    },
-#ifdef NTSC_SCANLINES
-   {
-      "fceumm_ntsc_scanlines",
-      "NTSC Scanlines",
-      "Enable scanlines when using NTSC filters.",
-      {
-         { "disabled", NULL },
-         { "enabled",  NULL },
-         { NULL, NULL },
-      },
-      "disabled"
-   },
-#endif /* NTSC_SCANLINES */
 #endif
    {
       "fceumm_palette",

src/ines.c

@@ -415,7 +415,7 @@ typedef struct {
 
 #define INES_BOARD_BEGIN()  static BMAPPINGLocal bmap[] = {
 #define INES_BOARD_END()    { (uint8_t*)"", 0, NULL} };
-#define INES_BOARD(a, b, c) { a, b, c },
+#define INES_BOARD(a, b, c) { (uint8_t*)a, b, c },
 
 INES_BOARD_BEGIN()
 	INES_BOARD( "NROM",                       0, NROM_Init              )
@@ -841,6 +841,7 @@ static void rom_load_ines2(void) {
 }
 
 int iNESLoad(const char *name, FCEUFILE *fp) {
+	const char *tv_region[] = { "NTSC", "PAL", "Multi-region", "Dendy" };
 	struct md5_context md5;
 	char* mappername        = NULL;
 	uint64 filesize         = FCEU_fgetsize(fp);
@@ -946,38 +947,49 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 		}
 	}
 
+	if (iNESCart.iNES2 == 0) {
+		if (strstr(name, "(E)") || strstr(name, "(e)") ||
+			strstr(name, "(Europe)") || strstr(name, "(PAL)") ||
+			strstr(name, "(F)") || strstr(name, "(f)") ||
+			strstr(name, "(G)") || strstr(name, "(g)") ||
+			strstr(name, "(I)") || strstr(name, "(i)") ||
+			strstr(name, "(S)") || strstr(name, "(s)") ||
+			strstr(name, "(France)") || strstr(name, "(Germany)") ||
+			strstr(name, "(Italy)") || strstr(name, "(Spain)") ||
+			strstr(name, "(Sweden)") || strstr(name, "(Sw)") ||
+			strstr(name, "(Australia)") || strstr(name, "(A)") ||
+			strstr(name, "(a)")) {
+				iNESCart.region = 1;
+		}
+	}
+
 	FCEU_printf(" PRG-ROM CRC32:  0x%08X\n", iNESCart.PRGCRC32);
 	FCEU_printf(" PRG+CHR CRC32:  0x%08X\n", iNESCart.CRC32);
 	FCEU_printf(" PRG+CHR MD5:    0x%s\n", md5_asciistr(iNESCart.MD5));
 	FCEU_printf(" PRG-ROM:  %3d x 16KiB\n", ROM_size);
 	FCEU_printf(" CHR-ROM:  %3d x  8KiB\n", VROM_size);
+	FCEU_printf(" Mapper #: %3d\n", iNESCart.mapper);
+	FCEU_printf(" Mapper name: %s\n", mappername);
+	FCEU_printf(" Mirroring: %s\n", iNESCart.mirror == 2 ? "None (Four-screen)" : iNESCart.mirror ? "Vertical" : "Horizontal");
+	FCEU_printf(" Battery: %s\n", (head.ROM_type & 2) ? "Yes" : "No");
+	FCEU_printf(" System: %s\n", tv_region[iNESCart.region]);
+	FCEU_printf(" Trained: %s\n", (head.ROM_type & 4) ? "Yes" : "No");
 
 	if (iNESCart.iNES2) {
-		const char *tv_region[] = { "NTSC", "PAL", "Multi-region", "Dendy" };
 		unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize;
 		unsigned CHRRAM = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize;
 
 		FCEU_printf(" NES 2.0 extended iNES.\n");
-		FCEU_printf(" Mapper #: %3d\n", iNESCart.mapper);
 		FCEU_printf(" Sub Mapper #: %3d\n", iNESCart.submapper);
-		FCEU_printf(" Mapper name: %s\n", mappername);
 		if (PRGRAM || CHRRAM) {
-			FCEU_printf(" PRG RAM: %d KB\n", PRGRAM / 1024);
-			FCEU_printf(" CHR RAM: %d KB\n", CHRRAM / 1024);
 			if (head.ROM_type & 0x02) {
-				FCEU_printf(" PRG RAM backed by battery: %d KiB\n", iNESCart.PRGRamSaveSize / 1024);
+				FCEU_printf(" PRG RAM: %d KB (%d KB battery-backed)\n", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024);
-				FCEU_printf(" CHR RAM backed by battery: %d KiB\n", iNESCart.CHRRamSaveSize / 1024);
+				FCEU_printf(" CHR RAM: %d KB (%d KB battery-backed)\n", CHRRAM / 1024, iNESCart.CHRRamSaveSize / 1024);
+			} else {
+				FCEU_printf(" PRG RAM: %d KB\n", PRGRAM / 1024);
+				FCEU_printf(" CHR RAM: %d KB\n", CHRRAM / 1024);
 			}
-		}
+		}		
-		FCEU_printf(" Mirroring: %s\n", iNESCart.mirror == 2 ? "None (Four-screen)" : iNESCart.mirror ? "Vertical" : "Horizontal");
-		FCEU_printf(" System: %s\n", tv_region[iNESCart.region]);
-		FCEU_printf(" Trained: %s\n", (head.ROM_type & 4) ? "Yes" : "No");
-	} else {
-		FCEU_printf(" Mapper #: %3d\n", iNESCart.mapper);
-		FCEU_printf(" Mapper name: %s\n", mappername);
-		FCEU_printf(" Mirroring: %s\n", iNESCart.mirror == 2 ? "None (Four-screen)" : iNESCart.mirror ? "Vertical" : "Horizontal");
-		FCEU_printf(" Battery-backed: %s\n", (head.ROM_type & 2) ? "Yes" : "No");
-		FCEU_printf(" Trained: %s\n", (head.ROM_type & 4) ? "Yes" : "No");
 	}
 
 	ResetCartMapping();
@@ -1035,40 +1047,12 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
 
 	GameInterface = iNESGI;
 
-	/* if not ines2 header and no region override was set, then use filename keywords to set cpu/ppu timing */ 
-	if (iNESCart.iNES2 == 0 && iNESCart.region == 0) {
-		if (strstr(name, "(E)") || strstr(name, "(e)") ||
-			strstr(name, "(Europe)") || strstr(name, "(PAL)") ||
-			strstr(name, "(F)") || strstr(name, "(f)") ||
-			strstr(name, "(G)") || strstr(name, "(g)") ||
-			strstr(name, "(I)") || strstr(name, "(i)") ||
-			strstr(name, "(S)") || strstr(name, "(s)") ||
-			strstr(name, "(France)") || strstr(name, "(Germany)") ||
-			strstr(name, "(Italy)") || strstr(name, "(Spain)") ||
-			strstr(name, "(Sweden)") || strstr(name, "(Sw)") ||
-			strstr(name, "(Australia)") || strstr(name, "(A)") ||
-			strstr(name, "(a)")) {
-				iNESCart.region = 1;
-		}
-	}
-
-	switch (iNESCart.region) {
 	/* 0: RP2C02 ("NTSC NES")
 	 * 1: RP2C07 ("Licensed PAL NES")
 	 * 2: Multiple-region
-	 * 3: UMC 6527P ("Dendy")
+	 * 3: UMC 6527P ("Dendy") */
-	 */
+	if (iNESCart.region == 3) dendy = 1;
-	case 1:
+	FCEUI_SetVidSystem((iNESCart.region == 1) ? 1 : 0);
-		FCEUI_SetVidSystem(1);
-		break;
-	case 3:
-		dendy = 1;
-	/* fallthrough */
-	case 0:
-	case 2:
-		FCEUI_SetVidSystem(0);
-		break;
-	}
 
 	return 1;
 }