Skip to content

Commit c5eeebe

Browse files
committed
[ot] hw/riscv: dtm: remove legacy API
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
1 parent cee86f4 commit c5eeebe

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

hw/riscv/dtm.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ static const char *RISCVDMI_RUNSTATE_NAMES[] = {
173173
/* DTM API */
174174
/* -------------------------------------------------------------------------- */
175175

176-
static bool riscv_dtm_register_dm_(DeviceState *dev,
177-
RISCVDebugDeviceState *dbgdev,
178-
hwaddr base_addr, hwaddr size, bool enable)
176+
static bool riscv_dtm_register_dm(DeviceState *dev,
177+
RISCVDebugDeviceState *dbgdev,
178+
hwaddr base_addr, hwaddr size, bool enable)
179179
{
180180
RISCVDTMState *s = RISCV_DTM(dev);
181181

@@ -266,12 +266,6 @@ static void riscv_dtm_enable_dm(DeviceState *dev, RISCVDebugDeviceState *dbgdev,
266266
}
267267
}
268268

269-
bool riscv_dtm_register_dm(DeviceState *dev, RISCVDebugDeviceState *dbgdev,
270-
hwaddr base_addr, hwaddr size)
271-
{
272-
return riscv_dtm_register_dm_(dev, dbgdev, base_addr, size, true);
273-
}
274-
275269
/* -------------------------------------------------------------------------- */
276270
/* DTMCS/DMI implementation */
277271
/* -------------------------------------------------------------------------- */
@@ -565,7 +559,7 @@ static void riscv_dtm_class_init(ObjectClass *klass, void *data)
565559
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
566560

567561
RISCVDTMClass *dmc = RISCV_DTM_CLASS(klass);
568-
dmc->register_dm = &riscv_dtm_register_dm_;
562+
dmc->register_dm = &riscv_dtm_register_dm;
569563
dmc->enable_dm = &riscv_dtm_enable_dm;
570564
}
571565

include/hw/riscv/dtm.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,4 @@ struct RISCVDTMClass {
6161
bool enable);
6262
};
6363

64-
/*
65-
* Register a debug module on the Debug Transport Module.
66-
* Compatibility wrapper for RISCVDTMClass.register_dm
67-
*/
68-
bool riscv_dtm_register_dm(DeviceState *dev, RISCVDebugDeviceState *dmif,
69-
hwaddr base_addr, hwaddr size);
70-
7164
#endif /* HW_RISCV_DTM_H */

0 commit comments

Comments
 (0)