vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac_dbdma: QOMify 

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
master
Mark Cave-Ayland 2017-09-24 15:47:41 +01:00 committed by David Gibson
parent 2bb4a98f90
commit 1d27f351af
2 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
hw/misc/macio/mac_dbdma.c
View File

@ -851,13 +851,14 @@ static const VMStateDescription vmstate_dbdma = {
}
};
static void dbdma_reset(void *opaque)
static void mac_dbdma_reset(DeviceState *d)
{
DBDMAState *s = opaque;
DBDMAState *s = MAC_DBDMA(d);
int i;
for (i = 0; i < DBDMA_CHANNELS; i++)
for (i = 0; i < DBDMA_CHANNELS; i++) {
memset(s->channels[i].regs, 0, DBDMA_SIZE);
}
}
static void dbdma_unassigned_rw(DBDMA_io *io)
@ -888,9 +889,22 @@ static void dbdma_unassigned_flush(DBDMA_io *io)
void* DBDMA_init (MemoryRegion **dbdma_mem)
{
DBDMAState *s;
int i;
SysBusDevice *sbd;
s = g_malloc0(sizeof(DBDMAState));
s = MAC_DBDMA(object_new(TYPE_MAC_DBDMA));
object_property_set_bool(OBJECT(s), true, "realized", NULL);
sbd = SYS_BUS_DEVICE(s);
*dbdma_mem = sysbus_mmio_get_region(sbd, 0);
return s;
}
static void mac_dbdma_init(Object *obj)
{
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
DBDMAState *s = MAC_DBDMA(obj);
int i;
for (i = 0; i < DBDMA_CHANNELS; i++) {
DBDMA_channel *ch = &s->channels[i];
@ -901,12 +915,37 @@ void* DBDMA_init (MemoryRegion **dbdma_mem)
ch->io.channel = ch;
}
memory_region_init_io(&s->mem, NULL, &dbdma_ops, s, "dbdma", 0x1000);
*dbdma_mem = &s->mem;
vmstate_register(NULL, -1, &vmstate_dbdma, s);
qemu_register_reset(dbdma_reset, s);
memory_region_init_io(&s->mem, obj, &dbdma_ops, s, "dbdma", 0x1000);
sysbus_init_mmio(sbd, &s->mem);
}
static void mac_dbdma_realize(DeviceState *dev, Error **errp)
{
DBDMAState *s = MAC_DBDMA(dev);
s->bh = qemu_bh_new(DBDMA_run_bh, s);
return s;
}
static void mac_dbdma_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
dc->realize = mac_dbdma_realize;
dc->reset = mac_dbdma_reset;
dc->vmsd = &vmstate_dbdma;
}
static const TypeInfo mac_dbdma_type_info = {
.name = TYPE_MAC_DBDMA,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(DBDMAState),
.instance_init = mac_dbdma_init,
.class_init = mac_dbdma_class_init
};
static void mac_dbdma_register_types(void)
{
type_register_static(&mac_dbdma_type_info);
}
type_init(mac_dbdma_register_types)

6
include/hw/ppc/mac_dbdma.h
View File

@ -26,6 +26,7 @@
#include "exec/memory.h"
#include "qemu/iov.h"
#include "sysemu/dma.h"
#include "hw/sysbus.h"
typedef struct DBDMA_io DBDMA_io;
@ -160,6 +161,8 @@ typedef struct DBDMA_channel {
} DBDMA_channel;
typedef struct {
SysBusDevice parent_obj;
MemoryRegion mem;
DBDMA_channel channels[DBDMA_CHANNELS];
QEMUBH *bh;
@ -173,4 +176,7 @@ void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,
void DBDMA_kick(DBDMAState *dbdma);
void* DBDMA_init (MemoryRegion **dbdma_mem);
#define TYPE_MAC_DBDMA "mac-dbdma"
#define MAC_DBDMA(obj) OBJECT_CHECK(DBDMAState, (obj), TYPE_MAC_DBDMA)
#endif