diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-10-22 13:13:17 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-10-22 13:13:17 +0200 |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/osd/modules/input | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (diff) |
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8
also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/osd/modules/input')
-rw-r--r-- | src/osd/modules/input/input_common.h | 12 | ||||
-rw-r--r-- | src/osd/modules/input/input_dinput.cpp | 14 | ||||
-rw-r--r-- | src/osd/modules/input/input_rawinput.cpp | 6 | ||||
-rw-r--r-- | src/osd/modules/input/input_sdl.cpp | 8 | ||||
-rw-r--r-- | src/osd/modules/input/input_sdlcommon.h | 18 | ||||
-rw-r--r-- | src/osd/modules/input/input_win32.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_windows.h | 6 | ||||
-rw-r--r-- | src/osd/modules/input/input_winhybrid.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_x11.cpp | 8 | ||||
-rw-r--r-- | src/osd/modules/input/input_xinput.h | 2 |
10 files changed, 39 insertions, 39 deletions
diff --git a/src/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h index f59ee472758..1fc495e44ce 100644 --- a/src/osd/modules/input/input_common.h +++ b/src/osd/modules/input/input_common.h @@ -373,14 +373,14 @@ private: std::unique_ptr<key_trans_entry[]> m_custom_table; key_trans_entry * m_table; - UINT32 m_table_size; + uint32_t m_table_size; public: // constructor keyboard_trans_table(std::unique_ptr<key_trans_entry[]> table, unsigned int size); // getters/setters - UINT32 size() const { return m_table_size; } + uint32_t size() const { return m_table_size; } // public methods input_item_id lookup_mame_code(const char * scode) const; @@ -558,9 +558,9 @@ const char *const default_axis_name[] = "RY", "RZ", "SL1", "SL2" }; -inline static INT32 normalize_absolute_axis(INT32 raw, INT32 rawmin, INT32 rawmax) +inline static int32_t normalize_absolute_axis(int32_t raw, int32_t rawmin, int32_t rawmax) { - INT32 center = (rawmax + rawmin) / 2; + int32_t center = (rawmax + rawmin) / 2; // make sure we have valid data if (rawmin >= rawmax) @@ -569,14 +569,14 @@ inline static INT32 normalize_absolute_axis(INT32 raw, INT32 rawmin, INT32 rawma // above center if (raw >= center) { - INT32 result = (INT64)(raw - center) * (INT64)INPUT_ABSOLUTE_MAX / (INT64)(rawmax - center); + int32_t result = (int64_t)(raw - center) * (int64_t)INPUT_ABSOLUTE_MAX / (int64_t)(rawmax - center); return std::min(result, INPUT_ABSOLUTE_MAX); } // below center else { - INT32 result = -((INT64)(center - raw) * (INT64)-INPUT_ABSOLUTE_MIN / (INT64)(center - rawmin)); + int32_t result = -((int64_t)(center - raw) * (int64_t)-INPUT_ABSOLUTE_MIN / (int64_t)(center - rawmin)); return std::max(result, INPUT_ABSOLUTE_MIN); } } diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index 694bf80b984..b47a7f86e7d 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -41,7 +41,7 @@ using namespace Microsoft::WRL; -static INT32 dinput_joystick_pov_get_state(void *device_internal, void *item_internal); +static int32_t dinput_joystick_pov_get_state(void *device_internal, void *item_internal); //============================================================ // dinput_set_dword_property @@ -239,7 +239,7 @@ public: { HRESULT result = m_dinput_helper->enum_attached_devices(dinput_devclass(), this, &machine); if (result != DI_OK) - fatalerror("DirectInput: Unable to enumerate keyboards (result=%08X)\n", static_cast<UINT32>(result)); + fatalerror("DirectInput: Unable to enumerate keyboards (result=%08X)\n", static_cast<uint32_t>(result)); } static std::string device_item_name(dinput_device * devinfo, int offset, const char * defstring, const TCHAR * suffix) @@ -457,7 +457,7 @@ void dinput_joystick_device::poll() int dinput_joystick_device::configure() { HRESULT result; - UINT32 axisnum, axiscount; + uint32_t axisnum, axiscount; auto devicelist = static_cast<input_module_base&>(module()).devicelist(); @@ -514,7 +514,7 @@ int dinput_joystick_device::configure() } // populate the POVs - for (UINT32 povnum = 0; povnum < dinput.caps.dwPOVs; povnum++) + for (uint32_t povnum = 0; povnum < dinput.caps.dwPOVs; povnum++) { std::string name; @@ -536,7 +536,7 @@ int dinput_joystick_device::configure() } // populate the buttons - for (UINT32 butnum = 0; butnum < dinput.caps.dwButtons; butnum++) + for (uint32_t butnum = 0; butnum < dinput.caps.dwButtons; butnum++) { uintptr_t offset = reinterpret_cast<uintptr_t>(&static_cast<DIJOYSTATE2 *>(nullptr)->rgbButtons[butnum]); std::string name = dinput_module::device_item_name(this, offset, default_button_name(butnum), nullptr); @@ -603,12 +603,12 @@ public: // dinput_joystick_pov_get_state //============================================================ -static INT32 dinput_joystick_pov_get_state(void *device_internal, void *item_internal) +static int32_t dinput_joystick_pov_get_state(void *device_internal, void *item_internal) { dinput_joystick_device *devinfo = static_cast<dinput_joystick_device *>(device_internal); int povnum = reinterpret_cast<uintptr_t>(item_internal) / 4; int povdir = reinterpret_cast<uintptr_t>(item_internal) % 4; - INT32 result = 0; + int32_t result = 0; DWORD pov; // get the current state diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp index 6d5cca778e8..287ff9b6a45 100644 --- a/src/osd/modules/input/input_rawinput.cpp +++ b/src/osd/modules/input/input_rawinput.cpp @@ -322,7 +322,7 @@ public: void process_event(RAWINPUT &rawinput) override { // determine the full DIK-compatible scancode - UINT8 scancode = (rawinput.data.keyboard.MakeCode & 0x7f) | ((rawinput.data.keyboard.Flags & RI_KEY_E0) ? 0x80 : 0x00); + uint8_t scancode = (rawinput.data.keyboard.MakeCode & 0x7f) | ((rawinput.data.keyboard.Flags & RI_KEY_E0) ? 0x80 : 0x00); // scancode 0xaa is a special shift code we need to ignore if (scancode == 0xaa) @@ -376,7 +376,7 @@ public: // update zaxis if (rawinput.data.mouse.usButtonFlags & RI_MOUSE_WHEEL) - mouse.lZ += static_cast<INT16>(rawinput.data.mouse.usButtonData) * INPUT_RELATIVE_PER_PIXEL; + mouse.lZ += static_cast<int16_t>(rawinput.data.mouse.usButtonData) * INPUT_RELATIVE_PER_PIXEL; // update the button states; always update the corresponding mouse buttons if (rawinput.data.mouse.usButtonFlags & RI_MOUSE_BUTTON_1_DOWN) mouse.rgbButtons[0] = 0x80; @@ -434,7 +434,7 @@ public: // update zaxis if (rawinput.data.mouse.usButtonFlags & RI_MOUSE_WHEEL) - lightgun.lZ += static_cast<INT16>(rawinput.data.mouse.usButtonData) * INPUT_RELATIVE_PER_PIXEL; + lightgun.lZ += static_cast<int16_t>(rawinput.data.mouse.usButtonData) * INPUT_RELATIVE_PER_PIXEL; // update the button states; always update the corresponding mouse buttons if (rawinput.data.mouse.usButtonFlags & RI_MOUSE_BUTTON_1_DOWN) lightgun.rgbButtons[0] = 0x80; diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp index d42e17274eb..93e14313de8 100644 --- a/src/osd/modules/input/input_sdl.cpp +++ b/src/osd/modules/input/input_sdl.cpp @@ -320,10 +320,10 @@ public: // state information for a joystick struct sdl_joystick_state { - INT32 axes[MAX_AXES]; - INT32 buttons[MAX_BUTTONS]; - INT32 hatsU[MAX_HATS], hatsD[MAX_HATS], hatsL[MAX_HATS], hatsR[MAX_HATS]; - INT32 balls[MAX_AXES]; + int32_t axes[MAX_AXES]; + int32_t buttons[MAX_BUTTONS]; + int32_t hatsU[MAX_HATS], hatsD[MAX_HATS], hatsL[MAX_HATS], hatsR[MAX_HATS]; + int32_t balls[MAX_AXES]; }; struct sdl_api_state diff --git a/src/osd/modules/input/input_sdlcommon.h b/src/osd/modules/input/input_sdlcommon.h index 9e271985997..377b04d71c9 100644 --- a/src/osd/modules/input/input_sdlcommon.h +++ b/src/osd/modules/input/input_sdlcommon.h @@ -20,16 +20,16 @@ // state information for a keyboard struct keyboard_state { - INT32 state[0x3ff]; // must be INT32! - INT8 oldkey[MAX_KEYS]; - INT8 currkey[MAX_KEYS]; + int32_t state[0x3ff]; // must be int32_t! + int8_t oldkey[MAX_KEYS]; + int8_t currkey[MAX_KEYS]; }; // state information for a mouse struct mouse_state { - INT32 lX, lY; - INT32 buttons[MAX_BUTTONS]; + int32_t lX, lY; + int32_t buttons[MAX_BUTTONS]; }; @@ -37,10 +37,10 @@ struct mouse_state struct joystick_state { SDL_Joystick *device; - INT32 axes[MAX_AXES]; - INT32 buttons[MAX_BUTTONS]; - INT32 hatsU[MAX_HATS], hatsD[MAX_HATS], hatsL[MAX_HATS], hatsR[MAX_HATS]; - INT32 balls[MAX_AXES]; + int32_t axes[MAX_AXES]; + int32_t buttons[MAX_BUTTONS]; + int32_t hatsU[MAX_HATS], hatsD[MAX_HATS], hatsL[MAX_HATS], hatsR[MAX_HATS]; + int32_t balls[MAX_AXES]; }; struct device_map_t diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp index ccae2be2861..232bbc2c4af 100644 --- a/src/osd/modules/input/input_win32.cpp +++ b/src/osd/modules/input/input_win32.cpp @@ -277,7 +277,7 @@ public: { event_based_device::poll(); - INT32 xpos = 0, ypos = 0; + int32_t xpos = 0, ypos = 0; POINT mousepos; // if we are using the shared axis hack, the data is updated via Windows messages only diff --git a/src/osd/modules/input/input_windows.h b/src/osd/modules/input/input_windows.h index 0a0e30ac808..381945e761e 100644 --- a/src/osd/modules/input/input_windows.h +++ b/src/osd/modules/input/input_windows.h @@ -24,9 +24,9 @@ // state information for a keyboard struct keyboard_state { - UINT8 state[MAX_KEYS]; - INT8 oldkey[MAX_KEYS]; - INT8 currkey[MAX_KEYS]; + uint8_t state[MAX_KEYS]; + int8_t oldkey[MAX_KEYS]; + int8_t currkey[MAX_KEYS]; }; // state information for a mouse (matches DIMOUSESTATE exactly) diff --git a/src/osd/modules/input/input_winhybrid.cpp b/src/osd/modules/input/input_winhybrid.cpp index 51c3346e4fa..dae3c4bc3bf 100644 --- a/src/osd/modules/input/input_winhybrid.cpp +++ b/src/osd/modules/input/input_winhybrid.cpp @@ -241,7 +241,7 @@ protected: // Enumerate all the directinput joysticks and add them if they aren't xinput compatible result = m_dinput_helper->enum_attached_devices(DI8DEVCLASS_GAMECTRL, this, &machine); if (result != DI_OK) - fatalerror("DirectInput: Unable to enumerate keyboards (result=%08X)\n", static_cast<UINT32>(result)); + fatalerror("DirectInput: Unable to enumerate keyboards (result=%08X)\n", static_cast<uint32_t>(result)); xinput_joystick_device *devinfo; diff --git a/src/osd/modules/input/input_x11.cpp b/src/osd/modules/input/input_x11.cpp index 312f3c5f0c8..0762b5ae35d 100644 --- a/src/osd/modules/input/input_x11.cpp +++ b/src/osd/modules/input/input_x11.cpp @@ -52,15 +52,15 @@ static int proximity_out_type = INVALID_EVENT_TYPE; // state information for a lightgun struct lightgun_state { - INT32 lX, lY; - INT32 buttons[MAX_BUTTONS]; + int32_t lX, lY; + int32_t buttons[MAX_BUTTONS]; }; struct x11_api_state { XID deviceid; // X11 device id - INT32 maxx, maxy; - INT32 minx, miny; + int32_t maxx, maxy; + int32_t minx, miny; }; //============================================================ diff --git a/src/osd/modules/input/input_xinput.h b/src/osd/modules/input/input_xinput.h index 68b5bbeca27..2cd8f15a250 100644 --- a/src/osd/modules/input/input_xinput.h +++ b/src/osd/modules/input/input_xinput.h @@ -85,7 +85,7 @@ struct gamepad_state // state information for a gamepad; state must be first element struct xinput_api_state { - UINT32 player_index; + uint32_t player_index; XINPUT_STATE xstate; XINPUT_CAPABILITIES caps; }; |