diff options
| author | Eugene Sandulenko | 2014-04-28 21:20:42 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-04-28 21:20:42 +0300 |
| commit | c3ffbd884a2d917aede6020c4ae1ee4a13d7f861 (patch) | |
| tree | eef69449accc9a020cf1be49703a0dd698340c11 /backends/platform/ps2/iop/rpckbd | |
| parent | 3d5dee897ef785e3f0c48ae3d857181f314700d1 (diff) | |
| parent | 4592e0b586829fade4a5c800672849e693a0d151 (diff) | |
| download | scummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.tar.gz scummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.tar.bz2 scummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.zip | |
Merge pull request #426 from sunmax/master
PS2: Pull request to master for latest PS2 code
Diffstat (limited to 'backends/platform/ps2/iop/rpckbd')
| -rw-r--r-- | backends/platform/ps2/iop/rpckbd/include/ps2kbd.h | 4 | ||||
| -rw-r--r-- | backends/platform/ps2/iop/rpckbd/src/ps2kbd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h b/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h index 07d9c3d7f9..6bef7caefa 100644 --- a/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h +++ b/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h @@ -87,8 +87,8 @@ typedef struct _kbd_keymap #define KBD_RPC_SETSPECIALMAP 7 /* Sets the special key mapping */ #define KBD_RPC_FLUSHBUFFER 9 /* Flush the internal buffer, probably best after a keymap change */ #define KBD_RPC_RESETKEYMAP 10 /* Reset keymaps to default states */ -#define KBD_RPC_READKEY 11 -#define KBD_RPC_READRAW 12 +#define KBD_RPC_READKEY 11 +#define KBD_RPC_READRAW 12 /* Note on keymaps. In normal keymap a 0 would indicate no key */ /* Key maps are represented by 3 256*8bit tables. First table maps USB key to a char when not shifted */ diff --git a/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c b/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c index 7266afdce5..838ce9fe85 100644 --- a/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c +++ b/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c @@ -1089,7 +1089,7 @@ void *ps2kbd_rpc_server(int fno, void *data, int size) { ps2kbd_rpc_flushbuffer(); break; case KBD_RPC_SETLEDS: - ps2kbd_rpc_setleds(*(u8*) data); + ps2kbd_rpc_setleds(*(u8 *) data); break; case KBD_RPC_RESETKEYMAP: ps2kbd_rpc_resetkeymap(); @@ -1129,7 +1129,7 @@ int ps2kbd_init_rpc(void) { int th; param.attr = 0x02000000; - param.thread = (void*)ps2kbd_start_rpc; + param.thread = (void *)ps2kbd_start_rpc; param.priority = 40; param.stacksize = 0x800; param.option = 0; |