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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-07-19 13:01:45 +02:00
parent 4c69dad0ce
commit 5de9f85533
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/drivers_joypad/ctr_joypad.c
View File

@ -30,7 +30,7 @@
#include "3ds.h"
static uint32_t pad_state;
static int16_t analog_state[1][2][2];
static int16_t analog_state[DEFAULT_MAX_PADS][2][2];
extern uint64_t lifecycle_state;
static const char *ctr_joypad_name(unsigned pad)

22
input/drivers_joypad/dos_joypad.c
View File

@ -82,36 +82,26 @@ int LockCode(void *a, int size)
static void keyb_int(void)
{
static unsigned char buffer = 0;
unsigned char rawcode;
unsigned char make_break;
int scancode;
rawcode = inp(0x60); /* read scancode from keyboard controller */
make_break = !(rawcode & 0x80); /* bit 7: 0 = make, 1 = break */
scancode = rawcode & 0x7F;
unsigned char rawcode = inp(0x60);
/* read scancode from keyboard controller */
unsigned char make_break = !(rawcode & 0x80);
/* bit 7: 0 = make, 1 = break */
int scancode = rawcode & 0x7F;
if (buffer == 0xE0)
{
/* second byte of an extended key */
if (scancode < 0x60)
{
normal_keys[scancode | (1 << 8)] = make_break;
}
buffer = 0;
}
else if (buffer >= 0xE1 && buffer <= 0xE2)
{
buffer = 0; /* ignore these extended keys */
}
else if (rawcode >= 0xE0 && rawcode <= 0xE2)
{
buffer = rawcode; /* first byte of an extended key */
}
else if (scancode < 0x60)
{
normal_keys[scancode] = make_break;
}
outp(0x20, 0x20); /* must send EOI to finish interrupt */
}
@ -214,8 +204,8 @@ static void dos_joypad_poll(void)
for (i = 0; i <= DEFAULT_MAX_PADS; i++)
{
uint16_t *cur_state = dos_keyboard_state_get(i);
uint32_t key;
uint16_t *cur_state = dos_keyboard_state_get(i);
for (key = 0; key < LAST_KEYCODE; key++)
{