Explorar el Código

pckbd: Move QOM macro to header

Move the I8042 macro close to the TYPE_I8042 define.

This will make future conversion to OBJECT_DECLARE* easier.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-34-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Eduardo Habkost hace 5 años
padre
commit
41ea82055c
Se han modificado 2 ficheros con 1 adiciones y 2 borrados
  1. 0 2
      hw/input/pckbd.c
  2. 1 0
      include/hw/input/i8042.h

+ 0 - 2
hw/input/pckbd.c

@@ -481,8 +481,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
     qemu_register_reset(kbd_reset, s);
     qemu_register_reset(kbd_reset, s);
 }
 }
 
 
-#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
-
 struct ISAKBDState {
 struct ISAKBDState {
     ISADevice parent_obj;
     ISADevice parent_obj;
 
 

+ 1 - 0
include/hw/input/i8042.h

@@ -11,6 +11,7 @@
 #include "hw/isa/isa.h"
 #include "hw/isa/isa.h"
 
 
 #define TYPE_I8042 "i8042"
 #define TYPE_I8042 "i8042"
+#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
 
 
 #define I8042_A20_LINE "a20"
 #define I8042_A20_LINE "a20"