Commit 8498bb8d authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

ps2: add and use PS2State typedef 



Cleanup: Create and use a typedef for PS2State and stop passing void
pointers.  No functional change.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20170606112105.13331-2-kraxel@redhat.com
parent 85970a62

hw/input/ps2.c

+5 −7
Original line number Diff line number Diff line
@@ -85,12 +85,12 @@ typedef struct { 
    int rptr, wptr, count;

} PS2Queue;



typedef struct {

struct PS2State {

    PS2Queue queue;

    int32_t write_cmd;

    void (*update_irq)(void *, int);

    void *update_arg;

} PS2State;

};



typedef struct {

    PS2State common;
@@ -551,9 +551,8 @@ static uint8_t translate_table[256] = { 
    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,

};



void ps2_queue(void *opaque, int b)

void ps2_queue(PS2State *s, int b)

{

    PS2State *s = (PS2State *)opaque;

    PS2Queue *q = &s->queue;



    if (q->count >= PS2_QUEUE_SIZE - 1)
@@ -692,13 +691,12 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src, 
    }

}



uint32_t ps2_read_data(void *opaque)

uint32_t ps2_read_data(PS2State *s)

{

    PS2State *s = (PS2State *)opaque;

    PS2Queue *q;

    int val, index;



    trace_ps2_read_data(opaque);

    trace_ps2_read_data(s);

    q = &s->queue;

    if (q->count == 0) {

        /* NOTE: if no data left, we return the last keyboard one

include/hw/input/ps2.h

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg); 
void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);

void ps2_write_mouse(void *, int val);

void ps2_write_keyboard(void *, int val);

uint32_t ps2_read_data(void *);

void ps2_queue(void *, int b);

uint32_t ps2_read_data(PS2State *s);

void ps2_queue(PS2State *s, int b);

void ps2_keyboard_set_translation(void *opaque, int mode);

void ps2_mouse_fake_event(void *opaque);

include/qemu/typedefs.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ typedef struct PixelFormat PixelFormat; 
typedef struct PostcopyDiscardState PostcopyDiscardState;

typedef struct Property Property;

typedef struct PropertyInfo PropertyInfo;

typedef struct PS2State PS2State;

typedef struct QEMUBH QEMUBH;

typedef struct QemuConsole QemuConsole;

typedef struct QEMUFile QEMUFile;