summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input/input_rawinput.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/input/input_rawinput.cpp')
-rw-r--r--src/osd/modules/input/input_rawinput.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp
index c4f84642b2f..f16d79cbe7a 100644
--- a/src/osd/modules/input/input_rawinput.cpp
+++ b/src/osd/modules/input/input_rawinput.cpp
@@ -617,7 +617,7 @@ protected:
name = utf8_from_tstring(keyname);
// add the item to the device
- devinfo->device()->add_item(name, itemid, generic_button_get_state, &devinfo->keyboard.state[keynum]);
+ devinfo->device()->add_item(name, itemid, generic_button_get_state<std::uint8_t>, &devinfo->keyboard.state[keynum]);
osd_free(name);
}
}
@@ -652,13 +652,21 @@ protected:
// populate the axes
for (int axisnum = 0; axisnum < 3; axisnum++)
{
- devinfo->device()->add_item(default_axis_name[axisnum], static_cast<input_item_id>(ITEM_ID_XAXIS + axisnum), generic_axis_get_state, &devinfo->mouse.lX + axisnum);
+ devinfo->device()->add_item(
+ default_axis_name[axisnum],
+ static_cast<input_item_id>(ITEM_ID_XAXIS + axisnum),
+ generic_axis_get_state<LONG>,
+ &devinfo->mouse.lX + axisnum);
}
// populate the buttons
for (int butnum = 0; butnum < 5; butnum++)
{
- devinfo->device()->add_item(default_button_name(butnum), static_cast<input_item_id>(ITEM_ID_BUTTON1 + butnum), generic_button_get_state, &devinfo->mouse.rgbButtons[butnum]);
+ devinfo->device()->add_item(
+ default_button_name(butnum),
+ static_cast<input_item_id>(ITEM_ID_BUTTON1 + butnum),
+ generic_button_get_state<BYTE>,
+ &devinfo->mouse.rgbButtons[butnum]);
}
}
};
rtions'>+7 * modernized speaker device. [Fabio Priuli] Fabio Priuli2013-06-041-1/+1 * moving some static functions in driver state for MESS drivers plus some other... Miodrag Milanovic2013-04-181-2/+1 * various cpu lookup cleanup (nw) Miodrag Milanovic2013-04-151-1/+1 * Cleanups and version bumpmame0148u1 Miodrag Milanovic2013-02-111-1/+1 * (MESS) lisa: Removed runtime tagmap lookups. (nw) Curt Coder2013-01-261-218/+182 * output of new srcclean changes that are relatively small [smf] smf-2013-01-111-3/+0 * Cleanups and version bumpmame0148 Miodrag Milanovic2013-01-111-156/+155 * Better devicification of the Apple II FDC/IWM/SWIM