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

(LED drivers) Miscellaneous cleanups

Browse Source
This commit is contained in:
LibretroAdmin 2022-08-23 08:11:22 +02:00
parent e87db6f0a2
commit 0e5b2ff280
4 changed files with 40 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
led/drivers/led_overlay.c
View File

@ -43,9 +43,7 @@ static void overlay_set(int led, int state)
if ((led < 0) || (led >= MAX_LEDS)) if ((led < 0) || (led >= MAX_LEDS))
return; return;
gpio = ledoverlay_cur->map[led]; if ((gpio = ledoverlay_cur->map[led]) < 0)
if (gpio < 0)
return; return;
input_overlay_set_visibility(gpio, input_overlay_set_visibility(gpio,

21
led/drivers/led_rpi.c
View File

@ -13,6 +13,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <compat/strl.h>
#include "../led_driver.h" #include "../led_driver.h"
#include "../led_defines.h" #include "../led_defines.h"
@ -46,6 +47,13 @@ static void rpi_init(void)
static void rpi_free(void) static void rpi_free(void)
{ {
int i;
for (i = 0; i < MAX_LEDS; i++)
{
rpi_cur->setup[i] = 0;
rpi_cur->map[i] = 0;
}
} }
static int set_gpio(int gpio, int value) static int set_gpio(int gpio, int value)
@ -53,10 +61,9 @@ static int set_gpio(int gpio, int value)
FILE *fp; FILE *fp;
char buf[256]; char buf[256];
snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/value", gpio); snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/value", gpio);
fp = fopen(buf, "w");
/* Failed to set GPIO? */ /* Failed to set GPIO? */
if (!fp) if (!(fp = fopen(buf, "w")))
return -1; return -1;
fprintf(fp, "%d\n", value ? 1 : 0); fprintf(fp, "%d\n", value ? 1 : 0);
@ -69,15 +76,13 @@ static int setup_gpio(int gpio)
FILE *fp; FILE *fp;
char buf[256]; char buf[256];
snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/direction", gpio); snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/direction", gpio);
fp = fopen(buf, "w");
if (!(fp = fopen(buf, "w")))
if(!fp)
{ {
snprintf(buf, sizeof(buf), "/sys/class/gpio/export"); strlcpy(buf, "/sys/class/gpio/export", sizeof(buf));
fp = fopen(buf, "w");
/* Failed to export GPIO? */ /* Failed to export GPIO? */
if (!fp) if (!(fp = fopen(buf, "w")))
return -1; return -1;
fprintf(fp,"%d\n", gpio); fprintf(fp,"%d\n", gpio);

45
led/drivers/led_win32_keyboard.c
View File

@ -7,23 +7,21 @@
#include <windows.h> #include <windows.h>
static void key_translate(int *key) static int key_translate(int key)
{ {
switch (*key) switch (key)
{ {
case 0: case 0:
*key = VK_NUMLOCK; return VK_NUMLOCK;
break;
case 1: case 1:
*key = VK_CAPITAL; return VK_CAPITAL;
break;
case 2: case 2:
*key = VK_SCROLL; return VK_SCROLL;
break;
default: default:
*key = 0;
break; break;
} }
return 0;
} }
typedef struct typedef struct
@ -38,17 +36,6 @@ typedef struct
static keyboard_led_t win32kb_curins; static keyboard_led_t win32kb_curins;
static keyboard_led_t *win32kb_cur = &win32kb_curins; static keyboard_led_t *win32kb_cur = &win32kb_curins;
static int get_led(int key)
{
return GetKeyState(key);
}
static void set_led(int key)
{
keybd_event(key, 0x45, KEYEVENTF_EXTENDEDKEY | 0, 0);
keybd_event(key, 0x45, KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0);
}
static int keyboard_led(int led, int state) static int keyboard_led(int led, int state)
{ {
int status; int status;
@ -57,19 +44,19 @@ static int keyboard_led(int led, int state)
if ((led < 0) || (led >= MAX_LEDS)) if ((led < 0) || (led >= MAX_LEDS))
return -1; return -1;
key_translate(&key); if (!(key = key_translate(key)))
if (!key)
return -1; return -1;
status = get_led(key); status = GetKeyState(key);
if (state == -1) if (state == -1)
return status; return status;
if ((state && !status) || if ( ( state && !status)
(!state && status)) || (!state && status))
{ {
set_led(key); keybd_event(key, 0x45, KEYEVENTF_EXTENDEDKEY | 0, 0);
keybd_event(key, 0x45, KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0);
win32kb_cur->state[led] = state; win32kb_cur->state[led] = state;
} }
return -1; return -1;
@ -85,9 +72,9 @@ static void keyboard_init(void)
for (i = 0; i < MAX_LEDS; i++) for (i = 0; i < MAX_LEDS; i++)
{ {
win32kb_cur->setup[i] = keyboard_led(i, -1); win32kb_cur->setup[i] = keyboard_led(i, -1);
win32kb_cur->state[i] = -1; win32kb_cur->state[i] = -1;
win32kb_cur->map[i] = settings->uints.led_map[i]; win32kb_cur->map[i] = settings->uints.led_map[i];
if (win32kb_cur->map[i] < 0) if (win32kb_cur->map[i] < 0)
win32kb_cur->map[i] = i; win32kb_cur->map[i] = i;
} }

23
led/drivers/led_x11_keyboard.c
View File

@ -18,23 +18,21 @@
#define XM_CAPSLOCK 1 #define XM_CAPSLOCK 1
#define XM_SCROLLLOCK 4 #define XM_SCROLLLOCK 4
static void key_translate(int *key) static int key_translate(int key)
{ {
switch (*key) switch (key)
{ {
case 0: case 0:
*key = XK_NUMLOCK; return XK_NUMLOCK;
break;
case 1: case 1:
*key = XK_CAPSLOCK; return XK_CAPSLOCK;
break;
case 2: case 2:
*key = XK_SCROLLLOCK; return XK_SCROLLLOCK;
break;
default: default:
*key = 0;
break; break;
} }
return 0;
} }
typedef struct typedef struct
@ -91,8 +89,7 @@ static int keyboard_led(int led, int state)
if ((led < 0) || (led >= MAX_LEDS)) if ((led < 0) || (led >= MAX_LEDS))
return -1; return -1;
key_translate(&key); if (!(key = key_translate(key)))
if (!key)
return -1; return -1;
status = get_led(key); status = get_led(key);
@ -100,8 +97,8 @@ static int keyboard_led(int led, int state)
if (state == -1) if (state == -1)
return status; return status;
if ((state && !status) || if ( ( state && !status)
(!state && status)) || (!state && status))
{ {
set_led(key, state); set_led(key, state);
x11kb_cur->state[led] = state; x11kb_cur->state[led] = state;