mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-09 00:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some globals

Browse Source
This commit is contained in:
twinaphex 2019-07-12 00:20:44 +02:00
parent 91c6bb4e78
commit 27a65714f2
4 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -195,7 +195,7 @@ endif
retroarch: $(RARCH_OBJ) retroarch: $(RARCH_OBJ)
@$(if $(Q), $(shell echo echo LD $@),) @$(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 $(OBJDIR)/%.o: %.c config.h config.mk
@mkdir -p $(dir $@) @mkdir -p $(dir $@)

2
configuration.h
View File

@ -596,6 +596,7 @@ typedef struct settings
char network_buildbot_url[255]; char network_buildbot_url[255];
char network_buildbot_assets_url[255]; char network_buildbot_assets_url[255];
char browse_url[4096]; char browse_url[4096];
char path_stream_url[8192];
char path_menu_xmb_font[PATH_MAX_LENGTH]; char path_menu_xmb_font[PATH_MAX_LENGTH];
char menu_content_show_settings_password[PATH_MAX_LENGTH]; char menu_content_show_settings_password[PATH_MAX_LENGTH];
@ -608,7 +609,6 @@ typedef struct settings
#endif #endif
char path_record_config[PATH_MAX_LENGTH]; char path_record_config[PATH_MAX_LENGTH];
char path_stream_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_menu_wallpaper[PATH_MAX_LENGTH];
char path_audio_dsp_plugin[PATH_MAX_LENGTH]; char path_audio_dsp_plugin[PATH_MAX_LENGTH];
char path_softfilter_plugin[PATH_MAX_LENGTH]; char path_softfilter_plugin[PATH_MAX_LENGTH];

2
gfx/drivers/caca_gfx.c
View File

@ -320,7 +320,7 @@ static void caca_gfx_get_poke_interface(void *data,
*iface = &caca_poke_interface; *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) unsigned viewport_height, bool force_full, bool allow_rotate)
{ {
} }

36
input/connect/connect_wiiupro.c
View File

@ -54,11 +54,6 @@ struct wiiupro
struct wiiupro_buttons btn; struct wiiupro_buttons btn;
}; };
struct wiiupro_calib
{
int32_t hatvalue_calib[4];
uint16_t calib_round;
};
struct hidpad_wiiupro_data struct hidpad_wiiupro_data
{ {
@ -68,10 +63,13 @@ struct hidpad_wiiupro_data
uint32_t slot; uint32_t slot;
bool have_led; bool have_led;
uint16_t motors[2]; 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) static void hidpad_wiiupro_send_control(struct hidpad_wiiupro_data* device)
{ {
/* 0x12 = Set data report; 0x34 = All buttons and analogs */ /* 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 pad_connection* connection = (struct pad_connection*)data;
struct hidpad_wiiupro_data* device = (struct hidpad_wiiupro_data*) struct hidpad_wiiupro_data* device = (struct hidpad_wiiupro_data*)
calloc(1, sizeof(struct hidpad_wiiupro_data)); calloc(1, sizeof(struct hidpad_wiiupro_data));
calib_data = (struct wiiupro_calib*)
calloc(1, sizeof(struct wiiupro_calib));
if (!device) if (!device)
goto error; goto error;
@ -99,7 +95,7 @@ static void* hidpad_wiiupro_init(void *data,
device->slot = slot; device->slot = slot;
device->driver = driver; device->driver = driver;
calib_data->calib_round = 0; device->calib.calib_round = 0;
/* Without this, the digital buttons won't be reported. */ /* Without this, the digital buttons won't be reported. */
hidpad_wiiupro_send_control(device); 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; 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)); device->calib.hatvalue_calib[0] = (packet[4] | (packet[4 + 1] << 8));
calib_data->hatvalue_calib[1] = (packet[8] | (packet[8 + 1] << 8)); device->calib.hatvalue_calib[1] = (packet[8] | (packet[8 + 1] << 8));
calib_data->hatvalue_calib[2] = (packet[6] | (packet[6 + 1] << 8)); device->calib.hatvalue_calib[2] = (packet[6] | (packet[6 + 1] << 8));
calib_data->hatvalue_calib[3] = (packet[10] | (packet[10 + 1] << 8)); device->calib.hatvalue_calib[3] = (packet[10] | (packet[10 + 1] << 8));
calib_data->calib_round++; device->calib.calib_round++;
} }
else else
{ {
device->data.hatvalue[0] = (packet[4] | (packet[4 + 1] << 8)) 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)) 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)) 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)) device->data.hatvalue[3] = (packet[10] | (packet[10 + 1] << 8))
- calib_data->hatvalue_calib[3]; - device->calib.hatvalue_calib[3];
} }
} }