diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-01-12 12:14:12 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-03-01 08:19:07 +0100 |
| commit | f22d0af076b159426c50a7a76ce2a42b8de95b52 (patch) | |
| tree | 2efcba028adb92ddb0f6a6f86796978f23e14815 /hw | |
| parent | b98d26e33327cf3009be5ead5d6dc8bc0c65dea8 (diff) | |
qapi: rename input buttons
All lowercase, use-dash instead of CamelCase.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/input/hid.c | 4 | ||||
| -rw-r--r-- | hw/input/ps2.c | 4 | ||||
| -rw-r--r-- | hw/input/virtio-input-hid.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hw/input/hid.c b/hw/input/hid.c index b41efbb451..81a85fbdd2 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -140,9 +140,9 @@ static void hid_pointer_event(DeviceState *dev, QemuConsole *src, case INPUT_EVENT_KIND_BTN: if (evt->u.btn->down) { e->buttons_state |= bmap[evt->u.btn->button]; - if (evt->u.btn->button == INPUT_BUTTON_WHEELUP) { + if (evt->u.btn->button == INPUT_BUTTON_WHEEL_UP) { e->dz--; - } else if (evt->u.btn->button == INPUT_BUTTON_WHEELDOWN) { + } else if (evt->u.btn->button == INPUT_BUTTON_WHEEL_DOWN) { e->dz++; } } else { diff --git a/hw/input/ps2.c b/hw/input/ps2.c index b6f0e8d8eb..1bd0ddef81 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -406,9 +406,9 @@ static void ps2_mouse_event(DeviceState *dev, QemuConsole *src, case INPUT_EVENT_KIND_BTN: if (evt->u.btn->down) { s->mouse_buttons |= bmap[evt->u.btn->button]; - if (evt->u.btn->button == INPUT_BUTTON_WHEELUP) { + if (evt->u.btn->button == INPUT_BUTTON_WHEEL_UP) { s->mouse_dz--; - } else if (evt->u.btn->button == INPUT_BUTTON_WHEELDOWN) { + } else if (evt->u.btn->button == INPUT_BUTTON_WHEEL_DOWN) { s->mouse_dz++; } } else { diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index c4af0be9ac..9ca5395739 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -143,8 +143,8 @@ static const unsigned int keymap_button[INPUT_BUTTON__MAX] = { [INPUT_BUTTON_LEFT] = BTN_LEFT, [INPUT_BUTTON_RIGHT] = BTN_RIGHT, [INPUT_BUTTON_MIDDLE] = BTN_MIDDLE, - [INPUT_BUTTON_WHEELUP] = BTN_GEAR_UP, - [INPUT_BUTTON_WHEELDOWN] = BTN_GEAR_DOWN, + [INPUT_BUTTON_WHEEL_UP] = BTN_GEAR_UP, + [INPUT_BUTTON_WHEEL_DOWN] = BTN_GEAR_DOWN, }; static const unsigned int axismap_rel[INPUT_AXIS__MAX] = { |