integratorcp: QOM cast cleanup for integratorcm_state
Rename to IntegratorCMState, introduce type constant and use QOM cast. Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
426533faed
commit
257ec289b2
|
@ -15,8 +15,15 @@
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
|
|
||||||
typedef struct {
|
#define TYPE_INTEGRATOR_CM "integrator_core"
|
||||||
SysBusDevice busdev;
|
#define INTEGRATOR_CM(obj) \
|
||||||
|
OBJECT_CHECK(IntegratorCMState, (obj), TYPE_INTEGRATOR_CM)
|
||||||
|
|
||||||
|
typedef struct IntegratorCMState {
|
||||||
|
/*< private >*/
|
||||||
|
SysBusDevice parent_obj;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
MemoryRegion iomem;
|
MemoryRegion iomem;
|
||||||
uint32_t memsz;
|
uint32_t memsz;
|
||||||
MemoryRegion flash;
|
MemoryRegion flash;
|
||||||
|
@ -31,7 +38,7 @@ typedef struct {
|
||||||
uint32_t int_level;
|
uint32_t int_level;
|
||||||
uint32_t irq_enabled;
|
uint32_t irq_enabled;
|
||||||
uint32_t fiq_enabled;
|
uint32_t fiq_enabled;
|
||||||
} integratorcm_state;
|
} IntegratorCMState;
|
||||||
|
|
||||||
static uint8_t integrator_spd[128] = {
|
static uint8_t integrator_spd[128] = {
|
||||||
128, 8, 4, 11, 9, 1, 64, 0, 2, 0xa0, 0xa0, 0, 0, 8, 0, 1,
|
128, 8, 4, 11, 9, 1, 64, 0, 2, 0xa0, 0xa0, 0, 0, 8, 0, 1,
|
||||||
|
@ -41,7 +48,7 @@ static uint8_t integrator_spd[128] = {
|
||||||
static uint64_t integratorcm_read(void *opaque, hwaddr offset,
|
static uint64_t integratorcm_read(void *opaque, hwaddr offset,
|
||||||
unsigned size)
|
unsigned size)
|
||||||
{
|
{
|
||||||
integratorcm_state *s = (integratorcm_state *)opaque;
|
IntegratorCMState *s = opaque;
|
||||||
if (offset >= 0x100 && offset < 0x200) {
|
if (offset >= 0x100 && offset < 0x200) {
|
||||||
/* CM_SPD */
|
/* CM_SPD */
|
||||||
if (offset >= 0x180)
|
if (offset >= 0x180)
|
||||||
|
@ -108,7 +115,7 @@ static uint64_t integratorcm_read(void *opaque, hwaddr offset,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void integratorcm_do_remap(integratorcm_state *s)
|
static void integratorcm_do_remap(IntegratorCMState *s)
|
||||||
{
|
{
|
||||||
/* Sync memory region state with CM_CTRL REMAP bit:
|
/* Sync memory region state with CM_CTRL REMAP bit:
|
||||||
* bit 0 => flash at address 0; bit 1 => RAM
|
* bit 0 => flash at address 0; bit 1 => RAM
|
||||||
|
@ -116,7 +123,7 @@ static void integratorcm_do_remap(integratorcm_state *s)
|
||||||
memory_region_set_enabled(&s->flash, !(s->cm_ctrl & 4));
|
memory_region_set_enabled(&s->flash, !(s->cm_ctrl & 4));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value)
|
static void integratorcm_set_ctrl(IntegratorCMState *s, uint32_t value)
|
||||||
{
|
{
|
||||||
if (value & 8) {
|
if (value & 8) {
|
||||||
qemu_system_reset_request();
|
qemu_system_reset_request();
|
||||||
|
@ -133,7 +140,7 @@ static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value)
|
||||||
integratorcm_do_remap(s);
|
integratorcm_do_remap(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void integratorcm_update(integratorcm_state *s)
|
static void integratorcm_update(IntegratorCMState *s)
|
||||||
{
|
{
|
||||||
/* ??? The CPU irq/fiq is raised when either the core module or base PIC
|
/* ??? The CPU irq/fiq is raised when either the core module or base PIC
|
||||||
are active. */
|
are active. */
|
||||||
|
@ -144,7 +151,7 @@ static void integratorcm_update(integratorcm_state *s)
|
||||||
static void integratorcm_write(void *opaque, hwaddr offset,
|
static void integratorcm_write(void *opaque, hwaddr offset,
|
||||||
uint64_t value, unsigned size)
|
uint64_t value, unsigned size)
|
||||||
{
|
{
|
||||||
integratorcm_state *s = (integratorcm_state *)opaque;
|
IntegratorCMState *s = opaque;
|
||||||
switch (offset >> 2) {
|
switch (offset >> 2) {
|
||||||
case 2: /* CM_OSC */
|
case 2: /* CM_OSC */
|
||||||
if (s->cm_lock == 0xa05f)
|
if (s->cm_lock == 0xa05f)
|
||||||
|
@ -226,7 +233,7 @@ static const MemoryRegionOps integratorcm_ops = {
|
||||||
|
|
||||||
static int integratorcm_init(SysBusDevice *dev)
|
static int integratorcm_init(SysBusDevice *dev)
|
||||||
{
|
{
|
||||||
integratorcm_state *s = FROM_SYSBUS(integratorcm_state, dev);
|
IntegratorCMState *s = INTEGRATOR_CM(dev);
|
||||||
|
|
||||||
s->cm_osc = 0x01000048;
|
s->cm_osc = 0x01000048;
|
||||||
/* ??? What should the high bits of this value be? */
|
/* ??? What should the high bits of this value be? */
|
||||||
|
@ -474,7 +481,7 @@ static void integratorcp_init(QEMUMachineInitArgs *args)
|
||||||
memory_region_init_alias(ram_alias, NULL, "ram.alias", ram, 0, ram_size);
|
memory_region_init_alias(ram_alias, NULL, "ram.alias", ram, 0, ram_size);
|
||||||
memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias);
|
memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias);
|
||||||
|
|
||||||
dev = qdev_create(NULL, "integrator_core");
|
dev = qdev_create(NULL, TYPE_INTEGRATOR_CM);
|
||||||
qdev_prop_set_uint32(dev, "memsz", ram_size >> 20);
|
qdev_prop_set_uint32(dev, "memsz", ram_size >> 20);
|
||||||
qdev_init_nofail(dev);
|
qdev_init_nofail(dev);
|
||||||
sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000);
|
sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000);
|
||||||
|
@ -524,7 +531,7 @@ static void integratorcp_machine_init(void)
|
||||||
machine_init(integratorcp_machine_init);
|
machine_init(integratorcp_machine_init);
|
||||||
|
|
||||||
static Property core_properties[] = {
|
static Property core_properties[] = {
|
||||||
DEFINE_PROP_UINT32("memsz", integratorcm_state, memsz, 0),
|
DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -538,9 +545,9 @@ static void core_class_init(ObjectClass *klass, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo core_info = {
|
static const TypeInfo core_info = {
|
||||||
.name = "integrator_core",
|
.name = TYPE_INTEGRATOR_CM,
|
||||||
.parent = TYPE_SYS_BUS_DEVICE,
|
.parent = TYPE_SYS_BUS_DEVICE,
|
||||||
.instance_size = sizeof(integratorcm_state),
|
.instance_size = sizeof(IntegratorCMState),
|
||||||
.class_init = core_class_init,
|
.class_init = core_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue