[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 15/31] ppc4xx: Rename ppc405-ebc to ppc4xx-ebc
From: |
BALATON Zoltan |
Subject: |
[PATCH v2 15/31] ppc4xx: Rename ppc405-ebc to ppc4xx-ebc |
Date: |
Wed, 17 Aug 2022 17:08:33 +0200 (CEST) |
This device is shared between different 4xx socs.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/ppc/ppc405.h | 2 +-
hw/ppc/ppc405_uc.c | 2 +-
hw/ppc/ppc4xx_devs.c | 12 ++++++------
hw/ppc/sam460ex.c | 2 +-
include/hw/ppc/ppc4xx.h | 6 +++---
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/hw/ppc/ppc405.h b/hw/ppc/ppc405.h
index 57e1494b05..343a84c98e 100644
--- a/hw/ppc/ppc405.h
+++ b/hw/ppc/ppc405.h
@@ -214,7 +214,7 @@ struct Ppc405SoCState {
Ppc405OcmState ocm;
Ppc405GpioState gpio;
Ppc405DmaState dma;
- Ppc405EbcState ebc;
+ Ppc4xxEbcState ebc;
Ppc405OpbaState opba;
Ppc405PobState pob;
Ppc4xxPlbState plb;
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index c4268e4c40..e817f00ad1 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -1091,7 +1091,7 @@ static void ppc405_soc_instance_init(Object *obj)
object_initialize_child(obj, "dma", &s->dma, TYPE_PPC405_DMA);
- object_initialize_child(obj, "ebc", &s->ebc, TYPE_PPC405_EBC);
+ object_initialize_child(obj, "ebc", &s->ebc, TYPE_PPC4xx_EBC);
object_initialize_child(obj, "opba", &s->opba, TYPE_PPC405_OPBA);
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index 00bb3fe974..fbfb21c8e8 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -756,7 +756,7 @@ enum {
static uint32_t dcr_read_ebc(void *opaque, int dcrn)
{
- Ppc405EbcState *ebc = opaque;
+ Ppc4xxEbcState *ebc = opaque;
uint32_t ret;
switch (dcrn) {
@@ -840,7 +840,7 @@ static uint32_t dcr_read_ebc(void *opaque, int dcrn)
static void dcr_write_ebc(void *opaque, int dcrn, uint32_t val)
{
- Ppc405EbcState *ebc = opaque;
+ Ppc4xxEbcState *ebc = opaque;
switch (dcrn) {
case EBC0_CFGADDR:
@@ -899,7 +899,7 @@ static void dcr_write_ebc(void *opaque, int dcrn, uint32_t
val)
static void ppc405_ebc_reset(DeviceState *dev)
{
- Ppc405EbcState *ebc = PPC405_EBC(dev);
+ Ppc4xxEbcState *ebc = PPC4xx_EBC(dev);
int i;
ebc->addr = 0x00000000;
@@ -916,7 +916,7 @@ static void ppc405_ebc_reset(DeviceState *dev)
static void ppc405_ebc_realize(DeviceState *dev, Error **errp)
{
- Ppc405EbcState *ebc = PPC405_EBC(dev);
+ Ppc4xxEbcState *ebc = PPC4xx_EBC(dev);
Ppc4xxDcrDeviceState *dcr = PPC4xx_DCR_DEVICE(dev);
ppc4xx_dcr_register(dcr, EBC0_CFGADDR, ebc, &dcr_read_ebc, &dcr_write_ebc);
@@ -975,9 +975,9 @@ static const TypeInfo ppc4xx_types[] = {
.instance_size = sizeof(Ppc4xxPlbState),
.class_init = ppc405_plb_class_init,
}, {
- .name = TYPE_PPC405_EBC,
+ .name = TYPE_PPC4xx_EBC,
.parent = TYPE_PPC4xx_DCR_DEVICE,
- .instance_size = sizeof(Ppc405EbcState),
+ .instance_size = sizeof(Ppc4xxEbcState),
.class_init = ppc405_ebc_class_init,
}, {
.name = TYPE_PPC4xx_DCR_DEVICE,
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 6b1c843eeb..0d9259f0f2 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -372,7 +372,7 @@ static void sam460ex_init(MachineState *machine)
qdev_get_gpio_in(uic[0], 3));
/* External bus controller */
- dev = qdev_new(TYPE_PPC405_EBC);
+ dev = qdev_new(TYPE_PPC4xx_EBC);
ppc4xx_dcr_realize(PPC4xx_DCR_DEVICE(dev), cpu, &error_fatal);
object_unref(OBJECT(dev));
diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h
index 4472ec254e..a1781afa8e 100644
--- a/include/hw/ppc/ppc4xx.h
+++ b/include/hw/ppc/ppc4xx.h
@@ -95,9 +95,9 @@ struct Ppc4xxPlbState {
};
/* Peripheral controller */
-#define TYPE_PPC405_EBC "ppc405-ebc"
-OBJECT_DECLARE_SIMPLE_TYPE(Ppc405EbcState, PPC405_EBC);
-struct Ppc405EbcState {
+#define TYPE_PPC4xx_EBC "ppc4xx-ebc"
+OBJECT_DECLARE_SIMPLE_TYPE(Ppc4xxEbcState, PPC4xx_EBC);
+struct Ppc4xxEbcState {
Ppc4xxDcrDeviceState parent_obj;
uint32_t addr;
--
2.30.4
- [PATCH v2 00/31] QOMify PPC4xx devices and minor clean ups, BALATON Zoltan, 2022/08/17
- [PATCH v2 03/31] ppc/ppc405: QOM'ify GPT, BALATON Zoltan, 2022/08/17
- [PATCH v2 01/31] ppc/ppc4xx: Introduce a DCR device model, BALATON Zoltan, 2022/08/17
- [PATCH v2 04/31] ppc/ppc405: QOM'ify OCM, BALATON Zoltan, 2022/08/17
- [PATCH v2 06/31] ppc/ppc405: QOM'ify DMA, BALATON Zoltan, 2022/08/17
- [PATCH v2 09/31] ppc/ppc405: QOM'ify POB, BALATON Zoltan, 2022/08/17
- [PATCH v2 10/31] ppc/ppc405: QOM'ify PLB, BALATON Zoltan, 2022/08/17
- [PATCH v2 12/31] ppc4xx: Move PLB model to ppc4xx_devs.c, BALATON Zoltan, 2022/08/17
- [PATCH v2 11/31] ppc/ppc405: QOM'ify MAL, BALATON Zoltan, 2022/08/17
- [PATCH v2 15/31] ppc4xx: Rename ppc405-ebc to ppc4xx-ebc,
BALATON Zoltan <=
- [PATCH v2 14/31] ppc4xx: Move EBC model to ppc4xx_devs.c, BALATON Zoltan, 2022/08/17
- [PATCH v2 17/31] hw/intc/ppc-uic: Convert ppc-uic to a PPC4xx DCR device, BALATON Zoltan, 2022/08/17
- [PATCH v2 05/31] ppc/ppc405: QOM'ify GPIO, BALATON Zoltan, 2022/08/17
- [PATCH v2 02/31] ppc/ppc405: QOM'ify CPC, BALATON Zoltan, 2022/08/17
- [PATCH v2 13/31] ppc4xx: Rename ppc405-plb to ppc4xx-plb, BALATON Zoltan, 2022/08/17
- [PATCH v2 21/31] hw/ppc/Kconfig: Remove PPC405 dependency from sam460ex, BALATON Zoltan, 2022/08/17
- [PATCH v2 18/31] ppc/ppc405: Use an explicit I2C object, BALATON Zoltan, 2022/08/17
- [PATCH v2 07/31] ppc/ppc405: QOM'ify EBC, BALATON Zoltan, 2022/08/17
- [PATCH v2 22/31] hw/ppc/Kconfig: Move imply before select, BALATON Zoltan, 2022/08/17