diff options
Diffstat (limited to 'hw/avr')
-rw-r--r-- | hw/avr/arduino.c | 8 | ||||
-rw-r--r-- | hw/avr/atmega.c | 6 | ||||
-rw-r--r-- | hw/avr/atmega.h | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/hw/avr/arduino.c b/hw/avr/arduino.c index c24183c..3c83884 100644 --- a/hw/avr/arduino.c +++ b/hw/avr/arduino.c @@ -36,12 +36,8 @@ typedef struct ArduinoMachineClass ArduinoMachineClass; #define TYPE_ARDUINO_MACHINE \ MACHINE_TYPE_NAME("arduino") -#define ARDUINO_MACHINE(obj) \ - OBJECT_CHECK(ArduinoMachineState, (obj), TYPE_ARDUINO_MACHINE) -#define ARDUINO_MACHINE_CLASS(klass) \ - OBJECT_CLASS_CHECK(ArduinoMachineClass, (klass), TYPE_ARDUINO_MACHINE) -#define ARDUINO_MACHINE_GET_CLASS(obj) \ - OBJECT_GET_CLASS(ArduinoMachineClass, (obj), TYPE_ARDUINO_MACHINE) +DECLARE_OBJ_CHECKERS(ArduinoMachineState, ArduinoMachineClass, + ARDUINO_MACHINE, TYPE_ARDUINO_MACHINE) static void arduino_machine_init(MachineState *machine) { diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index c3b8e05..44c6afe 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -63,10 +63,8 @@ struct AtmegaMcuClass { }; typedef struct AtmegaMcuClass AtmegaMcuClass; -#define ATMEGA_MCU_CLASS(klass) \ - OBJECT_CLASS_CHECK(AtmegaMcuClass, (klass), TYPE_ATMEGA_MCU) -#define ATMEGA_MCU_GET_CLASS(obj) \ - OBJECT_GET_CLASS(AtmegaMcuClass, (obj), TYPE_ATMEGA_MCU) +DECLARE_CLASS_CHECKERS(AtmegaMcuClass, ATMEGA_MCU, + TYPE_ATMEGA_MCU) static const peripheral_cfg dev168_328[PERIFMAX] = { [USART0] = { 0xc0, POWER0, 1 }, diff --git a/hw/avr/atmega.h b/hw/avr/atmega.h index 2c46ecb..a99ee15 100644 --- a/hw/avr/atmega.h +++ b/hw/avr/atmega.h @@ -24,7 +24,8 @@ #define TYPE_ATMEGA2560_MCU "ATmega2560" typedef struct AtmegaMcuState AtmegaMcuState; -#define ATMEGA_MCU(obj) OBJECT_CHECK(AtmegaMcuState, (obj), TYPE_ATMEGA_MCU) +DECLARE_INSTANCE_CHECKER(AtmegaMcuState, ATMEGA_MCU, + TYPE_ATMEGA_MCU) #define POWER_MAX 2 #define USART_MAX 4 |