[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 49/60] ppc4xx: Rename ppc405-plb to ppc4xx-plb
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 49/60] ppc4xx: Rename ppc405-plb to ppc4xx-plb |
Date: |
Wed, 31 Aug 2022 15:50:23 -0300 |
From: BALATON Zoltan <balaton@eik.bme.hu>
This device is shared between different 4xx socs.
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id:
<5b13ebfd12a71a28035bed5a915cbeee81cf21d1.1660746880.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
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 d85c595f9d..8521be317d 100644
--- a/hw/ppc/ppc405.h
+++ b/hw/ppc/ppc405.h
@@ -232,7 +232,7 @@ struct Ppc405SoCState {
Ppc405EbcState ebc;
Ppc405OpbaState opba;
Ppc405PobState pob;
- Ppc405PlbState plb;
+ Ppc4xxPlbState plb;
Ppc4xxMalState mal;
};
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index 3382ed3252..b7f6d1c9c1 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -1286,7 +1286,7 @@ static void ppc405_soc_instance_init(Object *obj)
object_initialize_child(obj, "pob", &s->pob, TYPE_PPC405_POB);
- object_initialize_child(obj, "plb", &s->plb, TYPE_PPC405_PLB);
+ object_initialize_child(obj, "plb", &s->plb, TYPE_PPC4xx_PLB);
object_initialize_child(obj, "mal", &s->mal, TYPE_PPC4xx_MAL);
}
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index 843d759b1b..3baa2fa2b3 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -671,7 +671,7 @@ enum {
static uint32_t dcr_read_plb(void *opaque, int dcrn)
{
- Ppc405PlbState *plb = opaque;
+ Ppc4xxPlbState *plb = opaque;
uint32_t ret;
switch (dcrn) {
@@ -695,7 +695,7 @@ static uint32_t dcr_read_plb(void *opaque, int dcrn)
static void dcr_write_plb(void *opaque, int dcrn, uint32_t val)
{
- Ppc405PlbState *plb = opaque;
+ Ppc4xxPlbState *plb = opaque;
switch (dcrn) {
case PLB0_ACR:
@@ -717,7 +717,7 @@ static void dcr_write_plb(void *opaque, int dcrn, uint32_t
val)
static void ppc405_plb_reset(DeviceState *dev)
{
- Ppc405PlbState *plb = PPC405_PLB(dev);
+ Ppc4xxPlbState *plb = PPC4xx_PLB(dev);
plb->acr = 0x00000000;
plb->bear = 0x00000000;
@@ -726,7 +726,7 @@ static void ppc405_plb_reset(DeviceState *dev)
static void ppc405_plb_realize(DeviceState *dev, Error **errp)
{
- Ppc405PlbState *plb = PPC405_PLB(dev);
+ Ppc4xxPlbState *plb = PPC4xx_PLB(dev);
Ppc4xxDcrDeviceState *dcr = PPC4xx_DCR_DEVICE(dev);
ppc4xx_dcr_register(dcr, PLB3A0_ACR, plb, &dcr_read_plb, &dcr_write_plb);
@@ -784,9 +784,9 @@ static const TypeInfo ppc4xx_types[] = {
.instance_finalize = ppc4xx_mal_finalize,
.class_init = ppc4xx_mal_class_init,
}, {
- .name = TYPE_PPC405_PLB,
+ .name = TYPE_PPC4xx_PLB,
.parent = TYPE_PPC4xx_DCR_DEVICE,
- .instance_size = sizeof(Ppc405PlbState),
+ .instance_size = sizeof(Ppc4xxPlbState),
.class_init = ppc405_plb_class_init,
}, {
.name = TYPE_PPC4xx_DCR_DEVICE,
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index c16303462d..6b1c843eeb 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -308,7 +308,7 @@ static void sam460ex_init(MachineState *machine)
ppc_dcr_init(env, NULL, NULL);
/* PLB arbitrer */
- dev = qdev_new(TYPE_PPC405_PLB);
+ dev = qdev_new(TYPE_PPC4xx_PLB);
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 e696e159f3..b19e59271b 100644
--- a/include/hw/ppc/ppc4xx.h
+++ b/include/hw/ppc/ppc4xx.h
@@ -84,9 +84,9 @@ struct Ppc4xxMalState {
};
/* Peripheral local bus arbitrer */
-#define TYPE_PPC405_PLB "ppc405-plb"
-OBJECT_DECLARE_SIMPLE_TYPE(Ppc405PlbState, PPC405_PLB);
-struct Ppc405PlbState {
+#define TYPE_PPC4xx_PLB "ppc4xx-plb"
+OBJECT_DECLARE_SIMPLE_TYPE(Ppc4xxPlbState, PPC4xx_PLB);
+struct Ppc4xxPlbState {
Ppc4xxDcrDeviceState parent_obj;
uint32_t acr;
--
2.37.2
- [PULL 38/60] ppc/ppc405: QOM'ify CPC, (continued)
- [PULL 38/60] ppc/ppc405: QOM'ify CPC, Daniel Henrique Barboza, 2022/08/31
- [PULL 39/60] ppc/ppc405: QOM'ify GPT, Daniel Henrique Barboza, 2022/08/31
- [PULL 40/60] ppc/ppc405: QOM'ify OCM, Daniel Henrique Barboza, 2022/08/31
- [PULL 41/60] ppc/ppc405: QOM'ify GPIO, Daniel Henrique Barboza, 2022/08/31
- [PULL 42/60] ppc/ppc405: QOM'ify DMA, Daniel Henrique Barboza, 2022/08/31
- [PULL 43/60] ppc/ppc405: QOM'ify EBC, Daniel Henrique Barboza, 2022/08/31
- [PULL 44/60] ppc/ppc405: QOM'ify OPBA, Daniel Henrique Barboza, 2022/08/31
- [PULL 45/60] ppc/ppc405: QOM'ify POB, Daniel Henrique Barboza, 2022/08/31
- [PULL 46/60] ppc/ppc405: QOM'ify PLB, Daniel Henrique Barboza, 2022/08/31
- [PULL 47/60] ppc/ppc405: QOM'ify MAL, Daniel Henrique Barboza, 2022/08/31
- [PULL 49/60] ppc4xx: Rename ppc405-plb to ppc4xx-plb,
Daniel Henrique Barboza <=
- [PULL 48/60] ppc4xx: Move PLB model to ppc4xx_devs.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 50/60] ppc4xx: Move EBC model to ppc4xx_devs.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 51/60] ppc4xx: Rename ppc405-ebc to ppc4xx-ebc, Daniel Henrique Barboza, 2022/08/31
- [PULL 52/60] ppc/ppc405: Use an embedded PPCUIC model in SoC state, Daniel Henrique Barboza, 2022/08/31
- [PULL 53/60] hw/intc/ppc-uic: Convert ppc-uic to a PPC4xx DCR device, Daniel Henrique Barboza, 2022/08/31
- [PULL 54/60] ppc/ppc405: Use an explicit I2C object, Daniel Henrique Barboza, 2022/08/31
- [PULL 55/60] ppc/ppc405: QOM'ify FPGA, Daniel Henrique Barboza, 2022/08/31
- [PULL 56/60] ppc405: Move machine specific code to ppc405_boards.c, Daniel Henrique Barboza, 2022/08/31
- [PULL 57/60] hw/ppc/sam3460ex: Remove PPC405 dependency from sam460ex, Daniel Henrique Barboza, 2022/08/31
- [PULL 58/60] hw/ppc/Kconfig: Move imply before select, Daniel Henrique Barboza, 2022/08/31