mirror of
https://github.com/libretro/RetroArch.git
synced 2024-06-02 19:57:24 -04:00
Small cleanups
This commit is contained in:
parent
c8fb30ebe5
commit
207dfe170c
|
@ -192,16 +192,10 @@ float dingux_set_video_refresh_rate(enum dingux_refresh_rate refresh_rate)
|
||||||
const char *refresh_rate_str = "60";
|
const char *refresh_rate_str = "60";
|
||||||
|
|
||||||
/* Check filter type */
|
/* Check filter type */
|
||||||
switch (refresh_rate)
|
if (refresh_rate == DINGUX_REFRESH_RATE_50HZ)
|
||||||
{
|
{
|
||||||
case DINGUX_REFRESH_RATE_50HZ:
|
refresh_rate_float = 50.0f;
|
||||||
refresh_rate_float = 50.0f;
|
refresh_rate_str = "50";
|
||||||
refresh_rate_str = "50";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
/* Refresh rate is already set to 60 Hz
|
|
||||||
* by default */
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (setenv(DINGUX_VIDEO_REFRESHRATE_ENVAR, refresh_rate_str, 1) != 0)
|
if (setenv(DINGUX_VIDEO_REFRESHRATE_ENVAR, refresh_rate_str, 1) != 0)
|
||||||
|
@ -215,22 +209,16 @@ float dingux_set_video_refresh_rate(enum dingux_refresh_rate refresh_rate)
|
||||||
bool dingux_get_video_refresh_rate(enum dingux_refresh_rate *refresh_rate)
|
bool dingux_get_video_refresh_rate(enum dingux_refresh_rate *refresh_rate)
|
||||||
{
|
{
|
||||||
const char *refresh_rate_str = getenv(DINGUX_VIDEO_REFRESHRATE_ENVAR);
|
const char *refresh_rate_str = getenv(DINGUX_VIDEO_REFRESHRATE_ENVAR);
|
||||||
|
|
||||||
/* If environment variable is unset, refresh
|
/* If environment variable is unset, refresh
|
||||||
* rate defaults to 60 Hz */
|
* rate defaults to 60 Hz */
|
||||||
if (!refresh_rate_str)
|
if (!refresh_rate_str)
|
||||||
{
|
|
||||||
*refresh_rate = DINGUX_REFRESH_RATE_60HZ;
|
*refresh_rate = DINGUX_REFRESH_RATE_60HZ;
|
||||||
return true;
|
else if (string_is_equal(refresh_rate_str, "60"))
|
||||||
}
|
|
||||||
|
|
||||||
if (string_is_equal(refresh_rate_str, "60"))
|
|
||||||
*refresh_rate = DINGUX_REFRESH_RATE_60HZ;
|
*refresh_rate = DINGUX_REFRESH_RATE_60HZ;
|
||||||
else if (string_is_equal(refresh_rate_str, "50"))
|
else if (string_is_equal(refresh_rate_str, "50"))
|
||||||
*refresh_rate = DINGUX_REFRESH_RATE_50HZ;
|
*refresh_rate = DINGUX_REFRESH_RATE_50HZ;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -243,11 +231,13 @@ bool dingux_ipu_reset(void)
|
||||||
unsetenv(DINGUX_SCALING_MODE_ENVAR);
|
unsetenv(DINGUX_SCALING_MODE_ENVAR);
|
||||||
unsetenv(DINGUX_SCALING_SHARPNESS_ENVAR);
|
unsetenv(DINGUX_SCALING_SHARPNESS_ENVAR);
|
||||||
unsetenv(DINGUX_VIDEO_REFRESHRATE_ENVAR);
|
unsetenv(DINGUX_VIDEO_REFRESHRATE_ENVAR);
|
||||||
return true;
|
|
||||||
#else
|
#else
|
||||||
return dingux_ipu_set_scaling_mode(true, false) &&
|
if (!dingux_ipu_set_scaling_mode(true, false))
|
||||||
dingux_ipu_set_filter_type(DINGUX_IPU_FILTER_BICUBIC);
|
return false;
|
||||||
|
if (!dingux_ipu_set_filter_type(DINGUX_IPU_FILTER_BICUBIC))
|
||||||
|
return false;
|
||||||
#endif
|
#endif
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(RETROFW)
|
#if defined(RETROFW)
|
||||||
|
@ -307,7 +297,7 @@ int retrofw_get_battery_level(enum frontend_powerstate *state)
|
||||||
if (voltage_now > 3520)
|
if (voltage_now > 3520)
|
||||||
return 20 + (voltage_now - 3520) / 9;
|
return 20 + (voltage_now - 3520) / 9;
|
||||||
if (voltage_now > 3330)
|
if (voltage_now > 3330)
|
||||||
return 1 + (voltage_now - 3330) * 10;
|
return 1 + (voltage_now - 3330) * 10;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
@ -319,13 +309,21 @@ static int dingux_read_battery_sys_file(const char *path)
|
||||||
|
|
||||||
/* Check whether file exists */
|
/* Check whether file exists */
|
||||||
if (!path_is_valid(path))
|
if (!path_is_valid(path))
|
||||||
goto error;
|
return -1;
|
||||||
|
|
||||||
/* Read file */
|
/* Read file */
|
||||||
if (!filestream_read_file(path, (void**)&file_buf, &file_len) ||
|
if (!filestream_read_file(path, (void**)&file_buf, &file_len) ||
|
||||||
(file_len == 0) ||
|
(file_len == 0) ||
|
||||||
!file_buf)
|
!file_buf)
|
||||||
goto error;
|
{
|
||||||
|
if (file_buf)
|
||||||
|
{
|
||||||
|
free(file_buf);
|
||||||
|
file_buf = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
/* Convert to integer */
|
/* Convert to integer */
|
||||||
sys_file_value = atoi(file_buf);
|
sys_file_value = atoi(file_buf);
|
||||||
|
@ -333,15 +331,6 @@ static int dingux_read_battery_sys_file(const char *path)
|
||||||
file_buf = NULL;
|
file_buf = NULL;
|
||||||
|
|
||||||
return sys_file_value;
|
return sys_file_value;
|
||||||
|
|
||||||
error:
|
|
||||||
if (file_buf)
|
|
||||||
{
|
|
||||||
free(file_buf);
|
|
||||||
file_buf = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Fetches internal battery level */
|
/* Fetches internal battery level */
|
||||||
|
@ -368,8 +357,8 @@ int dingux_get_battery_level(void)
|
||||||
if (voltage_now < 0)
|
if (voltage_now < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if ((voltage_max <= voltage_min) ||
|
if ( (voltage_max <= voltage_min)
|
||||||
(voltage_now < voltage_min))
|
|| (voltage_now < voltage_min))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
return (int)(((voltage_now - voltage_min) * 100) / (voltage_max - voltage_min));
|
return (int)(((voltage_now - voltage_min) * 100) / (voltage_max - voltage_min));
|
||||||
|
@ -443,9 +432,9 @@ void dingux_get_base_path(char *path, size_t len)
|
||||||
int dir_type = dir_list->elems[i].attr.i;
|
int dir_type = dir_list->elems[i].attr.i;
|
||||||
|
|
||||||
/* Skip files and invalid entries */
|
/* Skip files and invalid entries */
|
||||||
if ((dir_type != RARCH_DIRECTORY) ||
|
if ( (dir_type != RARCH_DIRECTORY)
|
||||||
string_is_empty(dir_path) ||
|
|| string_is_empty(dir_path)
|
||||||
string_is_equal(dir_path, DINGUX_RS90_DATA_PATH))
|
|| string_is_equal(dir_path, DINGUX_RS90_DATA_PATH))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* Build 'retroarch' subdirectory path */
|
/* Build 'retroarch' subdirectory path */
|
||||||
|
@ -456,8 +445,8 @@ void dingux_get_base_path(char *path, size_t len)
|
||||||
* - Directory corresponds to an unlabelled
|
* - Directory corresponds to an unlabelled
|
||||||
* microsd card
|
* microsd card
|
||||||
* - Subdirectory already exists */
|
* - Subdirectory already exists */
|
||||||
if (string_is_equal(dir_path, DINGUX_RS90_DEFAULT_SD_PATH) ||
|
if ( string_is_equal(dir_path, DINGUX_RS90_DEFAULT_SD_PATH)
|
||||||
path_is_directory(path))
|
|| path_is_directory(path))
|
||||||
{
|
{
|
||||||
path_found = true;
|
path_found = true;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -85,8 +85,8 @@ void strftime_am_pm(char *s, size_t len, const char* format,
|
||||||
#if !(defined(__linux__) && !defined(ANDROID))
|
#if !(defined(__linux__) && !defined(ANDROID))
|
||||||
if ((local = local_to_utf8_string_alloc(s)))
|
if ((local = local_to_utf8_string_alloc(s)))
|
||||||
{
|
{
|
||||||
if (!string_is_empty(local))
|
if (!string_is_empty(local))
|
||||||
strlcpy(s, local, len);
|
strlcpy(s, local, len);
|
||||||
|
|
||||||
free(local);
|
free(local);
|
||||||
local = NULL;
|
local = NULL;
|
||||||
|
|
Loading…
Reference in a new issue