diff options
| author | Jerry Zhao <jerryz123@berkeley.edu> | 2023-06-02 20:56:00 -0700 |
|---|---|---|
| committer | Jerry Zhao <jerryz123@berkeley.edu> | 2023-06-20 12:23:47 -0700 |
| commit | 81218a2e0201e3ec3d7520fbe2f3466609bd613f (patch) | |
| tree | 5921e6f0eaee372b01c63f7d356bde766e07afb2 | |
| parent | cd0bd1bda701f5004f9667d0c87a8b65f54d30e3 (diff) | |
| download | riscv-isa-sim-81218a2e0201e3ec3d7520fbe2f3466609bd613f.zip riscv-isa-sim-81218a2e0201e3ec3d7520fbe2f3466609bd613f.tar.gz riscv-isa-sim-81218a2e0201e3ec3d7520fbe2f3466609bd613f.tar.bz2 | |
ns16550_t: remove unused bus_t member
| -rw-r--r-- | riscv/devices.h | 3 | ||||
| -rw-r--r-- | riscv/ns16550.cc | 4 | ||||
| -rw-r--r-- | riscv/sim.cc | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/riscv/devices.h b/riscv/devices.h index a62509a..fe19f74 100644 --- a/riscv/devices.h +++ b/riscv/devices.h @@ -127,14 +127,13 @@ class plic_t : public abstract_device_t, public abstract_interrupt_controller_t class ns16550_t : public abstract_device_t { public: - ns16550_t(class bus_t *bus, abstract_interrupt_controller_t *intctrl, + ns16550_t(abstract_interrupt_controller_t *intctrl, uint32_t interrupt_id, uint32_t reg_shift, uint32_t reg_io_width); bool load(reg_t addr, size_t len, uint8_t* bytes) override; bool store(reg_t addr, size_t len, const uint8_t* bytes) override; void tick(reg_t rtc_ticks) override; size_t size() { return NS16550_SIZE; } private: - class bus_t *bus; abstract_interrupt_controller_t *intctrl; uint32_t interrupt_id; uint32_t reg_shift; diff --git a/riscv/ns16550.cc b/riscv/ns16550.cc index d21983b..475d5ec 100644 --- a/riscv/ns16550.cc +++ b/riscv/ns16550.cc @@ -69,9 +69,9 @@ #define UART_SCR 7 /* I/O: Scratch Register */ -ns16550_t::ns16550_t(class bus_t *bus, abstract_interrupt_controller_t *intctrl, +ns16550_t::ns16550_t(abstract_interrupt_controller_t *intctrl, uint32_t interrupt_id, uint32_t reg_shift, uint32_t reg_io_width) - : bus(bus), intctrl(intctrl), interrupt_id(interrupt_id), reg_shift(reg_shift), reg_io_width(reg_io_width), backoff_counter(0) + : intctrl(intctrl), interrupt_id(interrupt_id), reg_shift(reg_shift), reg_io_width(reg_io_width), backoff_counter(0) { ier = 0; iir = UART_IIR_NO_INT; diff --git a/riscv/sim.cc b/riscv/sim.cc index 877d5c2..858ace3 100644 --- a/riscv/sim.cc +++ b/riscv/sim.cc @@ -146,7 +146,7 @@ sim_t::sim_t(const cfg_t *cfg, bool halted, if (fdt_parse_ns16550(fdt, &ns16550_base, &ns16550_shift, &ns16550_io_width, "ns16550a") == 0) { assert(intctrl); - std::shared_ptr<ns16550_t> ns16550(new ns16550_t(&bus, intctrl, NS16550_INTERRUPT_ID, + std::shared_ptr<ns16550_t> ns16550(new ns16550_t(intctrl, NS16550_INTERRUPT_ID, ns16550_shift, ns16550_io_width)); bus.add_device(ns16550_base, ns16550.get()); devices.push_back(ns16550); |