From 7d783baa3d45e3350fdd356ec85684442920269c Mon Sep 17 00:00:00 2001 From: Alan Steremberg Date: Sat, 3 Jul 2021 15:37:10 -0400 Subject: [PATCH] fixes for mac / linux --- verilator/sim/sim_input.cpp | 4 ++-- verilator/sim_main.cpp | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/verilator/sim/sim_input.cpp b/verilator/sim/sim_input.cpp index 313777a..8165aeb 100644 --- a/verilator/sim/sim_input.cpp +++ b/verilator/sim/sim_input.cpp @@ -507,11 +507,11 @@ static const int ev2ps2[] = NONE, //222 NONE, //223 NONE, //224 - LSHIFT | 0x12, //225 KEY_LEFTSHIFT + 0x2A, //LSHIFT | 0x12, //225 KEY_LEFTSHIFT LALT | 0x11, //226 KEY_LEFTALT NONE, //227 RCTRL | EXT | 0x14, //228 KEY_RIGHTCTRL - RSHIFT | 0x59, //229 KEY_RIGHTSHIFT + 0x36, //RSHIFT | 0x59, //229 KEY_RIGHTSHIFT RALT | EXT | 0x11, //230 KEY_RIGHTALT }; diff --git a/verilator/sim_main.cpp b/verilator/sim_main.cpp index 6bad272..9c17ea5 100644 --- a/verilator/sim_main.cpp +++ b/verilator/sim_main.cpp @@ -173,13 +173,14 @@ int main(int argc, char** argv, char** env) { input.SetMapping(input_right, SDL_SCANCODE_RIGHT); input.SetMapping(input_down, SDL_SCANCODE_DOWN); input.SetMapping(input_left, SDL_SCANCODE_LEFT); - input.SetMapping(input_fire1, SDL_SCANCODE_SPACE); - input.SetMapping(input_start_1, SDL_SCANCODE_1); - input.SetMapping(input_start_2, SDL_SCANCODE_2); - input.SetMapping(input_coin_1, SDL_SCANCODE_3); - input.SetMapping(input_coin_2, SDL_SCANCODE_4); - input.SetMapping(input_coin_3, SDL_SCANCODE_5); - input.SetMapping(input_pause, SDL_SCANCODE_P); + input.SetMapping(input_a, SDL_SCANCODE_A); + input.SetMapping(input_b, SDL_SCANCODE_B); + input.SetMapping(input_x, SDL_SCANCODE_X); + input.SetMapping(input_y, SDL_SCANCODE_Y); + input.SetMapping(input_l, SDL_SCANCODE_L); + input.SetMapping(input_r, SDL_SCANCODE_R); + input.SetMapping(input_select, SDL_SCANCODE_1); + input.SetMapping(input_start, SDL_SCANCODE_2); #endif // Setup video output if (video.Initialise(windowTitle) == 1) { return 1; }