pcspk: Convert to qdev
Convert the PC speaker device to a qdev ISA model. Move the public interface to a dedicated header file at this chance. CC: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
ce967e2f33
commit
302fe51b59
|
@ -42,6 +42,7 @@
|
||||||
#include "gdbstub.h"
|
#include "gdbstub.h"
|
||||||
#include "hw/smbios.h"
|
#include "hw/smbios.h"
|
||||||
#include "exec-memory.h"
|
#include "exec-memory.h"
|
||||||
|
#include "hw/pcspk.h"
|
||||||
|
|
||||||
#ifdef TARGET_SPARC
|
#ifdef TARGET_SPARC
|
||||||
int graphic_width = 1024;
|
int graphic_width = 1024;
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "pci.h"
|
#include "pci.h"
|
||||||
#include "pc.h"
|
#include "pc.h"
|
||||||
#include "i8254.h"
|
#include "i8254.h"
|
||||||
|
#include "pcspk.h"
|
||||||
|
|
||||||
//#define DEBUG_I82378
|
//#define DEBUG_I82378
|
||||||
|
|
||||||
|
@ -195,7 +196,7 @@ static void i82378_init(DeviceState *dev, I82378State *s)
|
||||||
pit = pit_init(isabus, 0x40, 0, NULL);
|
pit = pit_init(isabus, 0x40, 0, NULL);
|
||||||
|
|
||||||
/* speaker */
|
/* speaker */
|
||||||
pcspk_init(pit);
|
pcspk_init(isabus, pit);
|
||||||
|
|
||||||
/* 2 82C37 (dma) */
|
/* 2 82C37 (dma) */
|
||||||
DMA_init(1, &s->out[1]);
|
DMA_init(1, &s->out[1]);
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
#include "loader.h"
|
#include "loader.h"
|
||||||
#include "mc146818rtc.h"
|
#include "mc146818rtc.h"
|
||||||
#include "i8254.h"
|
#include "i8254.h"
|
||||||
|
#include "pcspk.h"
|
||||||
#include "blockdev.h"
|
#include "blockdev.h"
|
||||||
#include "sysbus.h"
|
#include "sysbus.h"
|
||||||
#include "exec-memory.h"
|
#include "exec-memory.h"
|
||||||
|
@ -193,7 +194,7 @@ static void mips_jazz_init(MemoryRegion *address_space,
|
||||||
cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);
|
cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);
|
||||||
DMA_init(0, cpu_exit_irq);
|
DMA_init(0, cpu_exit_irq);
|
||||||
pit = pit_init(isa_bus, 0x40, 0, NULL);
|
pit = pit_init(isa_bus, 0x40, 0, NULL);
|
||||||
pcspk_init(pit);
|
pcspk_init(isa_bus, pit);
|
||||||
|
|
||||||
/* ISA IO space at 0x90000000 */
|
/* ISA IO space at 0x90000000 */
|
||||||
isa_mmio_init(0x90000000, 0x01000000);
|
isa_mmio_init(0x90000000, 0x01000000);
|
||||||
|
|
3
hw/pc.c
3
hw/pc.c
|
@ -37,6 +37,7 @@
|
||||||
#include "multiboot.h"
|
#include "multiboot.h"
|
||||||
#include "mc146818rtc.h"
|
#include "mc146818rtc.h"
|
||||||
#include "i8254.h"
|
#include "i8254.h"
|
||||||
|
#include "pcspk.h"
|
||||||
#include "msi.h"
|
#include "msi.h"
|
||||||
#include "sysbus.h"
|
#include "sysbus.h"
|
||||||
#include "sysemu.h"
|
#include "sysemu.h"
|
||||||
|
@ -1172,7 +1173,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
|
||||||
/* 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(&pit->qdev, 0));
|
qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(&pit->qdev, 0));
|
||||||
}
|
}
|
||||||
pcspk_init(pit);
|
pcspk_init(isa_bus, pit);
|
||||||
|
|
||||||
for(i = 0; i < MAX_SERIAL_PORTS; i++) {
|
for(i = 0; i < MAX_SERIAL_PORTS; i++) {
|
||||||
if (serial_hds[i]) {
|
if (serial_hds[i]) {
|
||||||
|
|
4
hw/pc.h
4
hw/pc.h
|
@ -149,10 +149,6 @@ void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
|
||||||
/* hpet.c */
|
/* hpet.c */
|
||||||
extern int no_hpet;
|
extern int no_hpet;
|
||||||
|
|
||||||
/* pcspk.c */
|
|
||||||
void pcspk_init(ISADevice *pit);
|
|
||||||
int pcspk_audio_init(ISABus *bus);
|
|
||||||
|
|
||||||
/* piix_pci.c */
|
/* piix_pci.c */
|
||||||
struct PCII440FXState;
|
struct PCII440FXState;
|
||||||
typedef struct PCII440FXState PCII440FXState;
|
typedef struct PCII440FXState PCII440FXState;
|
||||||
|
|
69
hw/pcspk.c
69
hw/pcspk.c
|
@ -28,6 +28,7 @@
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
#include "qemu-timer.h"
|
#include "qemu-timer.h"
|
||||||
#include "i8254.h"
|
#include "i8254.h"
|
||||||
|
#include "pcspk.h"
|
||||||
|
|
||||||
#define PCSPK_BUF_LEN 1792
|
#define PCSPK_BUF_LEN 1792
|
||||||
#define PCSPK_SAMPLE_RATE 32000
|
#define PCSPK_SAMPLE_RATE 32000
|
||||||
|
@ -35,10 +36,13 @@
|
||||||
#define PCSPK_MIN_COUNT ((PIT_FREQ + PCSPK_MAX_FREQ - 1) / PCSPK_MAX_FREQ)
|
#define PCSPK_MIN_COUNT ((PIT_FREQ + PCSPK_MAX_FREQ - 1) / PCSPK_MAX_FREQ)
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
ISADevice dev;
|
||||||
|
MemoryRegion ioport;
|
||||||
|
uint32_t iobase;
|
||||||
uint8_t sample_buf[PCSPK_BUF_LEN];
|
uint8_t sample_buf[PCSPK_BUF_LEN];
|
||||||
QEMUSoundCard card;
|
QEMUSoundCard card;
|
||||||
SWVoiceOut *voice;
|
SWVoiceOut *voice;
|
||||||
ISADevice *pit;
|
void *pit;
|
||||||
unsigned int pit_count;
|
unsigned int pit_count;
|
||||||
unsigned int samples;
|
unsigned int samples;
|
||||||
unsigned int play_pos;
|
unsigned int play_pos;
|
||||||
|
@ -47,7 +51,7 @@ typedef struct {
|
||||||
} PCSpkState;
|
} PCSpkState;
|
||||||
|
|
||||||
static const char *s_spk = "pcspk";
|
static const char *s_spk = "pcspk";
|
||||||
static PCSpkState pcspk_state;
|
static PCSpkState *pcspk_state;
|
||||||
|
|
||||||
static inline void generate_samples(PCSpkState *s)
|
static inline void generate_samples(PCSpkState *s)
|
||||||
{
|
{
|
||||||
|
@ -99,7 +103,7 @@ static void pcspk_callback(void *opaque, int free)
|
||||||
|
|
||||||
int pcspk_audio_init(ISABus *bus)
|
int pcspk_audio_init(ISABus *bus)
|
||||||
{
|
{
|
||||||
PCSpkState *s = &pcspk_state;
|
PCSpkState *s = pcspk_state;
|
||||||
struct audsettings as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0};
|
struct audsettings as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0};
|
||||||
|
|
||||||
AUD_register_card(s_spk, &s->card);
|
AUD_register_card(s_spk, &s->card);
|
||||||
|
@ -113,7 +117,8 @@ int pcspk_audio_init(ISABus *bus)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t pcspk_ioport_read(void *opaque, uint32_t addr)
|
static uint64_t pcspk_io_read(void *opaque, target_phys_addr_t addr,
|
||||||
|
unsigned size)
|
||||||
{
|
{
|
||||||
PCSpkState *s = opaque;
|
PCSpkState *s = opaque;
|
||||||
int out;
|
int out;
|
||||||
|
@ -124,7 +129,8 @@ static uint32_t pcspk_ioport_read(void *opaque, uint32_t addr)
|
||||||
return pit_get_gate(s->pit, 2) | (s->data_on << 1) | s->dummy_refresh_clock | out;
|
return pit_get_gate(s->pit, 2) | (s->data_on << 1) | s->dummy_refresh_clock | out;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pcspk_ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
static void pcspk_io_write(void *opaque, target_phys_addr_t addr, uint64_t val,
|
||||||
|
unsigned size)
|
||||||
{
|
{
|
||||||
PCSpkState *s = opaque;
|
PCSpkState *s = opaque;
|
||||||
const int gate = val & 1;
|
const int gate = val & 1;
|
||||||
|
@ -138,11 +144,52 @@ static void pcspk_ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void pcspk_init(ISADevice *pit)
|
static const MemoryRegionOps pcspk_io_ops = {
|
||||||
{
|
.read = pcspk_io_read,
|
||||||
PCSpkState *s = &pcspk_state;
|
.write = pcspk_io_write,
|
||||||
|
.impl = {
|
||||||
|
.min_access_size = 1,
|
||||||
|
.max_access_size = 1,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
s->pit = pit;
|
static int pcspk_initfn(ISADevice *dev)
|
||||||
register_ioport_read(0x61, 1, 1, pcspk_ioport_read, s);
|
{
|
||||||
register_ioport_write(0x61, 1, 1, pcspk_ioport_write, s);
|
PCSpkState *s = DO_UPCAST(PCSpkState, dev, dev);
|
||||||
|
|
||||||
|
memory_region_init_io(&s->ioport, &pcspk_io_ops, s, "elcr", 1);
|
||||||
|
isa_register_ioport(dev, &s->ioport, s->iobase);
|
||||||
|
|
||||||
|
pcspk_state = s;
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Property pcspk_properties[] = {
|
||||||
|
DEFINE_PROP_HEX32("iobase", PCSpkState, iobase, -1),
|
||||||
|
DEFINE_PROP_PTR("pit", PCSpkState, pit),
|
||||||
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
};
|
||||||
|
|
||||||
|
static void pcspk_class_initfn(ObjectClass *klass, void *data)
|
||||||
|
{
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
|
||||||
|
|
||||||
|
ic->init = pcspk_initfn;
|
||||||
|
dc->no_user = 1;
|
||||||
|
dc->props = pcspk_properties;
|
||||||
|
}
|
||||||
|
|
||||||
|
static TypeInfo pcspk_info = {
|
||||||
|
.name = "isa-pcspk",
|
||||||
|
.parent = TYPE_ISA_DEVICE,
|
||||||
|
.instance_size = sizeof(PCSpkState),
|
||||||
|
.class_init = pcspk_class_initfn,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void pcspk_register(void)
|
||||||
|
{
|
||||||
|
type_register_static(&pcspk_info);
|
||||||
|
}
|
||||||
|
type_init(pcspk_register)
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* QEMU PC speaker emulation
|
||||||
|
*
|
||||||
|
* Copyright (c) 2006 Joachim Henke
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef HW_PCSPK_H
|
||||||
|
#define HW_PCSPK_H
|
||||||
|
|
||||||
|
#include "hw.h"
|
||||||
|
#include "isa.h"
|
||||||
|
|
||||||
|
static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit)
|
||||||
|
{
|
||||||
|
ISADevice *dev;
|
||||||
|
|
||||||
|
dev = isa_create(bus, "isa-pcspk");
|
||||||
|
qdev_prop_set_uint32(&dev->qdev, "iobase", 0x61);
|
||||||
|
qdev_prop_set_ptr(&dev->qdev, "pit", pit);
|
||||||
|
qdev_init_nofail(&dev->qdev);
|
||||||
|
|
||||||
|
return dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
int pcspk_audio_init(ISABus *bus);
|
||||||
|
|
||||||
|
#endif /* !HW_PCSPK_H */
|
Loading…
Reference in New Issue