Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

versal: use object_declare_type where possible #22

Merged
merged 2 commits into from
Dec 10, 2024
Merged

versal: use object_declare_type where possible #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0bfc4d
versal: use OBJECT_DECLARE_SIMPLE_TYPE
ho28 Dec 10, 2024
55098f9
versal: use OBJECT_DECLARE_TYPE in LPD IOU SLCR
ho28 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hw/arm/xlnx-versal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ static void versal_create_lpd_iou_slcr(Versal *s)
MemoryRegion *mr;

object_initialize_child(OBJECT(s), "lpd_iou_slcr", &s->lpd.iou.slcr,
TYPE_XLNX_LPD_IOU_SLCR);
TYPE_XILINX_LPD_IOU_SLCR);
sbd = SYS_BUS_DEVICE(&s->lpd.iou.slcr);
sysbus_realize(sbd, &error_fatal);

Expand Down
6 changes: 3 additions & 3 deletions hw/misc/xlnx-versal-lpd-iou-slcr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ static void lpd_iou_slcr_init(Object *obj)
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
RegisterInfoArray *reg_array;

memory_region_init(&s->iomem, obj, TYPE_XLNX_LPD_IOU_SLCR, LPD_IOU_SLCR_R_MAX * 4);
memory_region_init(&s->iomem, obj, TYPE_XILINX_LPD_IOU_SLCR, LPD_IOU_SLCR_R_MAX * 4);
reg_array =
register_init_block32(DEVICE(obj), lpd_iou_slcr_regs_info,
ARRAY_SIZE(lpd_iou_slcr_regs_info),
Expand All @@ -702,7 +702,7 @@ static void lpd_iou_slcr_init(Object *obj)
}

static const VMStateDescription vmstate_lpd_iou_slcr = {
.name = TYPE_XLNX_LPD_IOU_SLCR,
.name = TYPE_XILINX_LPD_IOU_SLCR,
.version_id = 1,
.minimum_version_id = 1,
.fields = (VMStateField[]) {
Expand All @@ -721,7 +721,7 @@ static void lpd_iou_slcr_class_init(ObjectClass *klass, void *data)
}

static const TypeInfo lpd_iou_slcr_info = {
.name = TYPE_XLNX_LPD_IOU_SLCR,
.name = TYPE_XILINX_LPD_IOU_SLCR,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LPD_IOU_SLCR),
.class_init = lpd_iou_slcr_class_init,
Expand Down
4 changes: 1 addition & 3 deletions include/hw/misc/xlnx-versal-intlpd-config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
#include "qom/object.h"

#define TYPE_XILINX_INTLPD_CONFIG "xlnx-intlpd-config"

#define XILINX_INTLPD_CONFIG(obj) \
OBJECT_CHECK(INTLPD_CONFIG, (obj), TYPE_XILINX_INTLPD_CONFIG)
OBJECT_DECLARE_SIMPLE_TYPE(INTLPD_CONFIG, XILINX_INTLPD_CONFIG)

#define AFIFS_SERBS_ID 1

Expand Down
7 changes: 2 additions & 5 deletions include/hw/misc/xlnx-versal-lpd-iou-slcr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,9 @@

#include "qom/object.h"

#define TYPE_XLNX_LPD_IOU_SLCR "xlnx.versal-lpd-iou-slcr"
#define TYPE_XILINX_LPD_IOU_SLCR "xlnx.versal-lpd-iou-slcr"

OBJECT_DECLARE_SIMPLE_TYPE(LPD_IOU_SLCR, XLNX_LPD_IOU_SLCR)

#define XILINX_LPD_IOU_SLCR(obj) \
OBJECT_CHECK(LPD_IOU_SLCR, (obj), TYPE_XLNX_LPD_IOU_SLCR)
OBJECT_DECLARE_SIMPLE_TYPE(LPD_IOU_SLCR, XILINX_LPD_IOU_SLCR)

#define LPD_IOU_SLCR_R_MAX 459

Expand Down
4 changes: 1 addition & 3 deletions include/hw/misc/xlnx-versal-lpd-slcr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
#include "qom/object.h"

#define TYPE_XILINX_LPD_SLCR "xlnx.versal-lpd-slcr"

#define XILINX_LPD_SLCR(obj) \
OBJECT_CHECK(LPD_SLCR, (obj), TYPE_XILINX_LPD_SLCR)
OBJECT_DECLARE_SIMPLE_TYPE(LPD_SLCR, XILINX_LPD_SLCR)

#define LPD_SLCR_R_MAX 83

Expand Down
3 changes: 0 additions & 3 deletions include/hw/misc/xlnx-versal-pmc-int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
#define TYPE_XILINX_PMC_INT_REGS "xlnx.versal-pmc-int"
OBJECT_DECLARE_SIMPLE_TYPE(PMC_INT_REGS, XILINX_PMC_INT_REGS)

#define XILINX_PMC_INT_REGS(obj) \
OBJECT_CHECK(PMC_INT_REGS, (obj), TYPE_XILINX_PMC_INT_REGS)

#define PMC_INT_REGS_R_MAX 44

typedef struct PMC_INT_REGS {
Expand Down
Loading