[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 071/126] hw/audio/es1370: Avoid forward-declaring ES1370State
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 071/126] hw/audio/es1370: Avoid forward-declaring ES1370State |
Date: |
Mon, 27 Feb 2023 15:01:18 +0100 |
To avoid forward-declaring ES1370State, declare ES1370 QOM
definitions before its use in the chan_bits structure.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230220131837.26292-3-philmd@linaro.org>
---
hw/audio/es1370.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index 54cc19a637..ea76c9a734 100644
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -256,6 +256,9 @@ static void print_sctl (uint32_t val)
#define lwarn(...)
#endif
+#define TYPE_ES1370 "ES1370"
+OBJECT_DECLARE_SIMPLE_TYPE(ES1370State, ES1370)
+
struct chan {
uint32_t shift;
uint32_t leftover;
@@ -278,7 +281,6 @@ struct ES1370State {
uint32_t codec;
uint32_t sctl;
};
-typedef struct ES1370State ES1370State;
struct chan_bits {
uint32_t ctl_en;
@@ -292,9 +294,6 @@ struct chan_bits {
uint32_t *old_freq, uint32_t *new_freq);
};
-#define TYPE_ES1370 "ES1370"
-OBJECT_DECLARE_SIMPLE_TYPE(ES1370State, ES1370)
-
static void es1370_dac1_calc_freq (ES1370State *s, uint32_t ctl,
uint32_t *old_freq, uint32_t *new_freq);
static void es1370_dac2_and_adc_calc_freq (ES1370State *s, uint32_t ctl,
--
2.38.1
- [PULL 061/126] hw/isa: Rename isa_bus_irqs() -> isa_bus_register_input_irqs(), (continued)
- [PULL 061/126] hw/isa: Rename isa_bus_irqs() -> isa_bus_register_input_irqs(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 062/126] hw/isa: Use isa_address_space_io() to reduce access on global 'isabus', Philippe Mathieu-Daudé, 2023/02/27
- [PULL 063/126] hw/isa: Rename isa_get_dma() -> isa_bus_get_dma(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 066/126] hw/rtc/mc146818rtc: Rename RTCState -> MC146818RtcState, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 064/126] hw/isa: Factor isa_bus_get_irq() out of isa_get_irq(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 068/126] hw/rtc: Rename rtc_[get|set]_memory -> mc146818rtc_[get|set]_cmos_data, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 065/126] hw: Replace isa_get_irq() by isa_bus_get_irq() when ISABus is available, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 067/126] hw/rtc/mc146818rtc: Pass MC146818RtcState instead of ISADevice argument, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 069/126] hw/timer/hpet: Include missing 'hw/qdev-properties.h' header, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 070/126] hw/audio/hda-codec: Avoid forward-declaring HDAAudioState, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 071/126] hw/audio/es1370: Avoid forward-declaring ES1370State,
Philippe Mathieu-Daudé <=
- [PULL 072/126] hw/audio/es1370: Replace container_of() by ES1370() QOM cast macro, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 073/126] hw/audio/ac97: Replace container_of() by AC97() QOM cast macro, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 075/126] hw/usb/dev-smartcard-reader: Avoid forward-declaring CCIDBus, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 074/126] hw/audio/ac97: Split off some definitions to a header, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 076/126] hw/usb/u2f: Declare QOM macros using OBJECT_DECLARE_TYPE(), Philippe Mathieu-Daudé, 2023/02/27
- [PULL 077/126] hw/usb/ohci: Include missing 'sysbus.h' header, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 078/126] hw/usb/ohci: Use OHCIState type definition, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 080/126] hw/usb/ohci: Code style fix white space errors, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 081/126] hw/usb/ohci: Code style fix missing braces and extra parenthesis, Philippe Mathieu-Daudé, 2023/02/27
- [PULL 082/126] hw/usb/ohci: Move a function next to where it is used, Philippe Mathieu-Daudé, 2023/02/27