haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pflash-cfi01: QOM'ify some more

Browse source 
Introduce type constant and replace FROM_SYSBUS().

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
[AF: Renamed parent field]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Hu Tao 2013-07-01 18:18:26 +08:00 committed by Andreas Färber
parent dd3be74207
commit f1b44f0e41
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hw/block/pflash_cfi01.c
View file

@ -60,8 +60,14 @@ do { \
#define DPRINTF(fmt, ...) do { } while (0) #define DPRINTF(fmt, ...) do { } while (0)
#endif #endif
#define TYPE_CFI_PFLASH01 "cfi.pflash01"
#define CFI_PFLASH01(obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH01)
struct pflash_t { struct pflash_t {
SysBusDevice busdev; /*< private >*/
SysBusDevice parent_obj;
/*< public >*/
BlockDriverState *bs; BlockDriverState *bs;
uint32_t nb_blocs; uint32_t nb_blocs;
uint64_t sector_len; uint64_t sector_len;
@ -565,7 +571,7 @@ static const MemoryRegionOps pflash_cfi01_ops_le = {
static int pflash_cfi01_init(SysBusDevice *dev) static int pflash_cfi01_init(SysBusDevice *dev)
{ {
pflash_t *pfl = FROM_SYSBUS(typeof(*pfl), dev); pflash_t *pfl = CFI_PFLASH01(dev);
uint64_t total_len; uint64_t total_len;
int ret; int ret;
@ -720,7 +726,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)
static const TypeInfo pflash_cfi01_info = { static const TypeInfo pflash_cfi01_info = {
.name = "cfi.pflash01", .name = TYPE_CFI_PFLASH01,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(struct pflash_t), .instance_size = sizeof(struct pflash_t),
.class_init = pflash_cfi01_class_init, .class_init = pflash_cfi01_class_init,
@ -741,10 +747,7 @@ pflash_t *pflash_cfi01_register(hwaddr base,
uint16_t id0, uint16_t id1, uint16_t id0, uint16_t id1,
uint16_t id2, uint16_t id3, int be) uint16_t id2, uint16_t id3, int be)
{ {
DeviceState *dev = qdev_create(NULL, "cfi.pflash01"); DeviceState *dev = qdev_create(NULL, TYPE_CFI_PFLASH01);
SysBusDevice *busdev = SYS_BUS_DEVICE(dev);
pflash_t *pfl = (pflash_t *)object_dynamic_cast(OBJECT(dev),
"cfi.pflash01");
if (bs && qdev_prop_set_drive(dev, "drive", bs)) { if (bs && qdev_prop_set_drive(dev, "drive", bs)) {
abort(); abort();
@ -760,8 +763,8 @@ pflash_t *pflash_cfi01_register(hwaddr base,
qdev_prop_set_string(dev, "name", name); qdev_prop_set_string(dev, "name", name);
qdev_init_nofail(dev); qdev_init_nofail(dev);
sysbus_mmio_map(busdev, 0, base); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
return pfl; return CFI_PFLASH01(dev);
} }
MemoryRegion *pflash_cfi01_get_memory(pflash_t *fl) MemoryRegion *pflash_cfi01_get_memory(pflash_t *fl)