From 6a08c92ada9214ecb6a010e19b1bc9233a3fdc87 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 17 Aug 2012 17:43:23 +0200 Subject: [PATCH] (Xbox 1) Cut down on some static variables --- audio/dsound.c | 4 ++-- console/rmenu/rmenu.c | 8 ++++---- console/rzlib/rzlib.c | 26 +++++++++++++------------- xdk/xdk_xinput_input.c | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/audio/dsound.c b/audio/dsound.c index 370e6d8f88..77bde9a507 100644 --- a/audio/dsound.c +++ b/audio/dsound.c @@ -22,7 +22,7 @@ // succeed #define DSERR_PRIOLEVELNEEDED MAKE_DSHRESULT(70) // Send the audio signal (stereo, without attenuation) to all existing speakers -static DSMIXBINVOLUMEPAIR dsmbvp[8] = { +DSMIXBINVOLUMEPAIR dsmbvp[8] = { { DSMIXBIN_FRONT_LEFT, DSBVOLUME_MAX }, { DSMIXBIN_FRONT_RIGHT, DSBVOLUME_MAX }, { DSMIXBIN_FRONT_CENTER, DSBVOLUME_MAX }, @@ -33,7 +33,7 @@ static DSMIXBINVOLUMEPAIR dsmbvp[8] = { { DSMIXBIN_LOW_FREQUENCY, DSBVOLUME_MAX }, }; -static DSMIXBINS dsmb; +DSMIXBINS dsmb; #endif #include "../driver.h" diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c index 62d42e1c12..1d3d775310 100644 --- a/console/rmenu/rmenu.c +++ b/console/rmenu/rmenu.c @@ -92,7 +92,7 @@ static bool set_libretro_core_as_launch; filebrowser_t browser; filebrowser_t tmpBrowser; unsigned set_shader = 0; -static unsigned currently_selected_controller_menu = 0; +unsigned currently_selected_controller_menu = 0; char m_title[256]; static uint64_t old_state = 0; @@ -2077,7 +2077,7 @@ static void ingame_menu(item *items, menu *current_menu, uint64_t input) { char comment[256], overscan_msg[64]; char strw_buffer[256]; - static unsigned menuitem_colors[MENU_ITEM_LAST]; + unsigned menuitem_colors[MENU_ITEM_LAST]; DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data; float x_position = POSITION_X; @@ -2374,7 +2374,7 @@ void menu_loop(void) input_ptr.poll(NULL); - static const struct retro_keybind *binds[MAX_PLAYERS] = { + const struct retro_keybind *binds[MAX_PLAYERS] = { g_settings.input.binds[0], g_settings.input.binds[1], g_settings.input.binds[2], @@ -2385,7 +2385,7 @@ void menu_loop(void) g_settings.input.binds[7], }; - static const struct retro_keybind _analog_binds[] = { + const struct retro_keybind _analog_binds[] = { { 0, 0, (enum retro_key)0, (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_LEFT), 0 }, { 0, 0, (enum retro_key)0, (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_RIGHT), 0 }, { 0, 0, (enum retro_key)0, (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_UP), 0 }, diff --git a/console/rzlib/rzlib.c b/console/rzlib/rzlib.c index f3e88eec82..d7b09e1f68 100644 --- a/console/rzlib/rzlib.c +++ b/console/rzlib/rzlib.c @@ -59,8 +59,7 @@ struct internal_state inflate_blocks_statef *blocks; /* current inflate_blocks state */ }; -static const unsigned int border[] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - +const unsigned int border[] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; typedef enum { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */ START, /* x: set up for LEN */ @@ -88,18 +87,18 @@ static int huft_build ( unsigned int * ); /* space for values */ /* Tables for deflate from PKZIP's appnote.txt. */ -static const unsigned int cplens[31] = { /* Copy lengths for literal codes 257..285 */ +const unsigned int cplens[31] = { /* Copy lengths for literal codes 257..285 */ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; /* see note #13 above about 258 */ -static const unsigned int cplext[31] = { /* Extra bits for literal codes 257..285 */ +const unsigned int cplext[31] = { /* Extra bits for literal codes 257..285 */ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */ -static const unsigned int cpdist[30] = { /* Copy offsets for distance codes 0..29 */ +const unsigned int cpdist[30] = { /* Copy offsets for distance codes 0..29 */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; -static const unsigned int cpdext[30] = { /* Extra bits for distance codes */ +const unsigned int cpdext[30] = { /* Extra bits for distance codes */ 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; @@ -736,9 +735,10 @@ int inflate_trees_dynamic(unsigned int nl, unsigned int nd, unsigned int *c, uns return Z_OK; } -static unsigned int fixed_bl = 9; -static unsigned int fixed_bd = 5; -static inflate_huft fixed_tl[] = { +unsigned int fixed_bl = 9; +unsigned int fixed_bd = 5; + +inflate_huft fixed_tl[] = { {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115}, {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192}, {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160}, @@ -869,7 +869,7 @@ static inflate_huft fixed_tl[] = { {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255} }; -static inflate_huft fixed_td[] = { +inflate_huft fixed_td[] = { {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097}, {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385}, {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193}, @@ -1284,7 +1284,7 @@ void zcfree (voidpf opaque, voidpf ptr) * For conditions of distribution and use, see copyright notice in zlib.h */ -static const unsigned long crc_table[256] = { +const unsigned long crc_table[256] = { 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, @@ -1466,7 +1466,7 @@ int inflateInit2_(z_streamp z, int w, const char * version, int stream_size) } -int inflateInit_(z_streamp z, const char * version, int stream_size) +int inflateInit_(z_streamp z, const char * version, int stream_size) { return inflateInit2_(z, DEF_WBITS, version, stream_size); } @@ -1616,7 +1616,7 @@ int inflate(z_streamp z, int f) # define Z_PRINTF_BUFSIZE 4096 #endif -static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ +int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ /* gzip flag byte */ #define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ diff --git a/xdk/xdk_xinput_input.c b/xdk/xdk_xinput_input.c index 2499bab532..5e6b51e9b2 100644 --- a/xdk/xdk_xinput_input.c +++ b/xdk/xdk_xinput_input.c @@ -29,7 +29,7 @@ #include "xdk_xinput_input.h" static uint64_t state[MAX_PADS]; -static unsigned pads_connected; +unsigned pads_connected; #ifdef _XBOX1 HANDLE gamepads[MAX_PADS];