ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/audio/pcspk: Inline pcspk_init() 

pcspk_init() is a legacy init function, inline and remove it.

Since the device is realized using &error_fatal, use the same
error for setting the "pit" link.

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20231019073307.99608-1-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-16 12:12:39 +02:00
parent 6c9dcd8760
commit 40f8214fcd
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc.c
View File

@ -1283,7 +1283,9 @@ void pc_basic_device_init(struct PCMachineState *pcms,
/* connect PIT to output control line of the HPET */ /* connect PIT to output control line of the HPET */
qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(DEVICE(pit), 0)); qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(DEVICE(pit), 0));
} }
pcspk_init(pcms->pcspk, isa_bus, pit); object_property_set_link(OBJECT(pcms->pcspk), "pit",
OBJECT(pit), &error_fatal);
isa_realize_and_unref(pcms->pcspk, isa_bus, &error_fatal);
} }
/* Super I/O */ /* Super I/O */

5
hw/isa/i82378.c
View File

@ -67,6 +67,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
uint8_t *pci_conf; uint8_t *pci_conf;
ISABus *isabus; ISABus *isabus;
ISADevice *pit; ISADevice *pit;
ISADevice *pcspk;
pci_conf = pci->config; pci_conf = pci->config;
pci_set_word(pci_conf + PCI_COMMAND, pci_set_word(pci_conf + PCI_COMMAND,
@ -102,7 +103,9 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
pit = i8254_pit_init(isabus, 0x40, 0, NULL); pit = i8254_pit_init(isabus, 0x40, 0, NULL);
/* speaker */ /* speaker */
pcspk_init(isa_new(TYPE_PC_SPEAKER), isabus, pit); pcspk = isa_new(TYPE_PC_SPEAKER);
object_property_set_link(OBJECT(pcspk), "pit", OBJECT(pit), &error_fatal);
isa_realize_and_unref(pcspk, isabus, &error_fatal);
/* 2 82C37 (dma) */ /* 2 82C37 (dma) */
isa_create_simple(isabus, "i82374"); isa_create_simple(isabus, "i82374");

5
hw/mips/jazz.c
View File

@ -176,6 +176,7 @@ static void mips_jazz_init(MachineState *machine,
SysBusDevice *sysbus; SysBusDevice *sysbus;
ISABus *isa_bus; ISABus *isa_bus;
ISADevice *pit; ISADevice *pit;
ISADevice *pcspk;
DriveInfo *fds[MAX_FD]; DriveInfo *fds[MAX_FD];
MemoryRegion *bios = g_new(MemoryRegion, 1); MemoryRegion *bios = g_new(MemoryRegion, 1);
MemoryRegion *bios2 = g_new(MemoryRegion, 1); MemoryRegion *bios2 = g_new(MemoryRegion, 1);
@ -278,7 +279,9 @@ static void mips_jazz_init(MachineState *machine,
isa_bus_register_input_irqs(isa_bus, i8259); isa_bus_register_input_irqs(isa_bus, i8259);
i8257_dma_init(isa_bus, 0); i8257_dma_init(isa_bus, 0);
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
pcspk_init(isa_new(TYPE_PC_SPEAKER), isa_bus, pit); pcspk = isa_new(TYPE_PC_SPEAKER);
object_property_set_link(OBJECT(pcspk), "pit", OBJECT(pit), &error_fatal);
isa_realize_and_unref(pcspk, isa_bus, &error_fatal);
/* Video card */ /* Video card */
switch (jazz_model) { switch (jazz_model) {

10
include/hw/audio/pcspk.h
View File

@ -25,16 +25,6 @@
#ifndef HW_PCSPK_H #ifndef HW_PCSPK_H
#define HW_PCSPK_H #define HW_PCSPK_H
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#define TYPE_PC_SPEAKER "isa-pcspk" #define TYPE_PC_SPEAKER "isa-pcspk"
static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *pit)
{
object_property_set_link(OBJECT(isadev), "pit", OBJECT(pit), NULL);
isa_realize_and_unref(isadev, bus, &error_fatal);
}
#endif /* HW_PCSPK_H */ #endif /* HW_PCSPK_H */