[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] hw/input/stellaris_gamepad: Rename structs to our usual conv
From: |
Peter Maydell |
Subject: |
[PATCH 2/6] hw/input/stellaris_gamepad: Rename structs to our usual convention |
Date: |
Tue, 17 Oct 2023 13:22:58 +0100 |
Rename the structs in stellaris_gamepad.c to our now-standard
CamelCase convention.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/input/stellaris_gamepad.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/input/stellaris_gamepad.c b/hw/input/stellaris_gamepad.c
index 3bab557cab3..377101a4035 100644
--- a/hw/input/stellaris_gamepad.c
+++ b/hw/input/stellaris_gamepad.c
@@ -17,17 +17,17 @@ typedef struct {
qemu_irq irq;
int keycode;
uint8_t pressed;
-} gamepad_button;
+} StellarisGamepadButton;
typedef struct {
- gamepad_button *buttons;
+ StellarisGamepadButton *buttons;
int num_buttons;
int extension;
-} gamepad_state;
+} StellarisGamepad;
static void stellaris_gamepad_put_key(void * opaque, int keycode)
{
- gamepad_state *s = (gamepad_state *)opaque;
+ StellarisGamepad *s = (StellarisGamepad *)opaque;
int i;
int down;
@@ -55,7 +55,7 @@ static const VMStateDescription vmstate_stellaris_button = {
.version_id = 0,
.minimum_version_id = 0,
.fields = (VMStateField[]) {
- VMSTATE_UINT8(pressed, gamepad_button),
+ VMSTATE_UINT8(pressed, StellarisGamepadButton),
VMSTATE_END_OF_LIST()
}
};
@@ -65,11 +65,11 @@ static const VMStateDescription vmstate_stellaris_gamepad =
{
.version_id = 2,
.minimum_version_id = 2,
.fields = (VMStateField[]) {
- VMSTATE_INT32(extension, gamepad_state),
- VMSTATE_STRUCT_VARRAY_POINTER_INT32(buttons, gamepad_state,
+ VMSTATE_INT32(extension, StellarisGamepad),
+ VMSTATE_STRUCT_VARRAY_POINTER_INT32(buttons, StellarisGamepad,
num_buttons,
vmstate_stellaris_button,
- gamepad_button),
+ StellarisGamepadButton),
VMSTATE_END_OF_LIST()
}
};
@@ -77,11 +77,11 @@ static const VMStateDescription vmstate_stellaris_gamepad =
{
/* Returns an array of 5 output slots. */
void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode)
{
- gamepad_state *s;
+ StellarisGamepad *s;
int i;
- s = g_new0(gamepad_state, 1);
- s->buttons = g_new0(gamepad_button, n);
+ s = g_new0(StellarisGamepad, 1);
+ s->buttons = g_new0(StellarisGamepadButton, n);
for (i = 0; i < n; i++) {
s->buttons[i].irq = irq[i];
s->buttons[i].keycode = keycode[i];
--
2.34.1
- [PATCH 1/6] hw/input/stellaris_input: Rename to stellaris_gamepad, (continued)
- [PATCH 3/6] qdev: Add qdev_prop_set_array(), Peter Maydell, 2023/10/17
- [PATCH 6/6] hw/input/stellaris_gamepad: Convert to qemu_input_handler_register(), Peter Maydell, 2023/10/17
- [PATCH 2/6] hw/input/stellaris_gamepad: Rename structs to our usual convention,
Peter Maydell <=
- [PATCH 5/6] hw/input/stellaris_input: Convert to qdev, Peter Maydell, 2023/10/17
- Re: [PATCH 0/6] arm/stellaris: convert gamepad input device to qdev, Philippe Mathieu-Daudé, 2023/10/30