From 27a65714f2c36076e72f388fd724152e1865c45e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 12 Jul 2019 00:20:44 +0200
Subject: [PATCH] Remove some globals

---
 Makefile                        |  2 +-
 configuration.h                 |  2 +-
 gfx/drivers/caca_gfx.c          |  2 +-
 input/connect/connect_wiiupro.c | 36 +++++++++++++++------------------
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 3c12c1ed22..24ed03126a 100644
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,7 @@ endif
 
 retroarch: $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS) -Wl,-Map=output.map
 
 $(OBJDIR)/%.o: %.c config.h config.mk
 	@mkdir -p $(dir $@)
diff --git a/configuration.h b/configuration.h
index 4681839850..705a50a30b 100644
--- a/configuration.h
+++ b/configuration.h
@@ -596,6 +596,7 @@ typedef struct settings
       char network_buildbot_url[255];
       char network_buildbot_assets_url[255];
       char browse_url[4096];
+      char path_stream_url[8192];
 
       char path_menu_xmb_font[PATH_MAX_LENGTH];
       char menu_content_show_settings_password[PATH_MAX_LENGTH];
@@ -608,7 +609,6 @@ typedef struct settings
 #endif
       char path_record_config[PATH_MAX_LENGTH];
       char path_stream_config[PATH_MAX_LENGTH];
-      char path_stream_url[8192];
       char path_menu_wallpaper[PATH_MAX_LENGTH];
       char path_audio_dsp_plugin[PATH_MAX_LENGTH];
       char path_softfilter_plugin[PATH_MAX_LENGTH];
diff --git a/gfx/drivers/caca_gfx.c b/gfx/drivers/caca_gfx.c
index 482a7f6213..ef827760e6 100644
--- a/gfx/drivers/caca_gfx.c
+++ b/gfx/drivers/caca_gfx.c
@@ -320,7 +320,7 @@ static void caca_gfx_get_poke_interface(void *data,
    *iface = &caca_poke_interface;
 }
 
-void caca_gfx_set_viewport(void *data, unsigned viewport_width,
+static void caca_gfx_set_viewport(void *data, unsigned viewport_width,
       unsigned viewport_height, bool force_full, bool allow_rotate)
 {
 }
diff --git a/input/connect/connect_wiiupro.c b/input/connect/connect_wiiupro.c
index a6194fb922..01e20252c5 100644
--- a/input/connect/connect_wiiupro.c
+++ b/input/connect/connect_wiiupro.c
@@ -54,11 +54,6 @@ struct wiiupro
    struct wiiupro_buttons btn;
 };
 
-struct wiiupro_calib
-{
-    int32_t hatvalue_calib[4];
-    uint16_t calib_round;
-};
 
 struct hidpad_wiiupro_data
 {
@@ -68,10 +63,13 @@ struct hidpad_wiiupro_data
    uint32_t slot;
    bool have_led;
    uint16_t motors[2];
+   struct
+   {
+      int32_t hatvalue_calib[4];
+      uint16_t calib_round;
+   } calib;
 };
 
-struct wiiupro_calib* calib_data;
-
 static void hidpad_wiiupro_send_control(struct hidpad_wiiupro_data* device)
 {
    /* 0x12 = Set data report; 0x34 = All buttons and analogs */
@@ -86,8 +84,6 @@ static void* hidpad_wiiupro_init(void *data,
    struct pad_connection* connection = (struct pad_connection*)data;
    struct hidpad_wiiupro_data* device    = (struct hidpad_wiiupro_data*)
       calloc(1, sizeof(struct hidpad_wiiupro_data));
-   calib_data = (struct wiiupro_calib*)
-      calloc(1, sizeof(struct wiiupro_calib));
 
    if (!device)
       goto error;
@@ -99,7 +95,7 @@ static void* hidpad_wiiupro_init(void *data,
    device->slot       = slot;
    device->driver     = driver;
 
-   calib_data->calib_round = 0;
+   device->calib.calib_round = 0;
    /* Without this, the digital buttons won't be reported. */
    hidpad_wiiupro_send_control(device);
 
@@ -225,25 +221,25 @@ static void hidpad_wiiupro_packet_handler(void *data,
 
    device->data.btn.home    = (packet[0x0C] & 0x8)  ? 1 : 0;
 
-   if(calib_data->calib_round < 5)
+   if(device->calib.calib_round < 5)
    {
-       calib_data->hatvalue_calib[0] = (packet[4] |  (packet[4 + 1] << 8));
-       calib_data->hatvalue_calib[1] = (packet[8] |  (packet[8 + 1] << 8));
-       calib_data->hatvalue_calib[2] = (packet[6] |  (packet[6 + 1] << 8));
-       calib_data->hatvalue_calib[3] = (packet[10] | (packet[10 + 1] << 8));
+       device->calib.hatvalue_calib[0] = (packet[4] |  (packet[4 + 1] << 8));
+       device->calib.hatvalue_calib[1] = (packet[8] |  (packet[8 + 1] << 8));
+       device->calib.hatvalue_calib[2] = (packet[6] |  (packet[6 + 1] << 8));
+       device->calib.hatvalue_calib[3] = (packet[10] | (packet[10 + 1] << 8));
 
-       calib_data->calib_round++;
+       device->calib.calib_round++;
    }
    else
    {
        device->data.hatvalue[0] = (packet[4] |  (packet[4 + 1] << 8))
-          - calib_data->hatvalue_calib[0];
+          - device->calib.hatvalue_calib[0];
        device->data.hatvalue[1] = (packet[8] |  (packet[8 + 1] << 8))
-          - calib_data->hatvalue_calib[1];
+          - device->calib.hatvalue_calib[1];
        device->data.hatvalue[2] = (packet[6] |  (packet[6 + 1] << 8))
-          - calib_data->hatvalue_calib[2];
+          - device->calib.hatvalue_calib[2];
        device->data.hatvalue[3] = (packet[10] | (packet[10 + 1] << 8))
-          - calib_data->hatvalue_calib[3];
+          - device->calib.hatvalue_calib[3];
    }
 }