Browse Source

ns16550_t: remove unused bus_t member

pull/1374/head
Jerry Zhao 3 years ago
parent
commit
81218a2e02
  1. 3
      riscv/devices.h
  2. 4
      riscv/ns16550.cc
  3. 2
      riscv/sim.cc

3
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;

4
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;

2
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);

Loading…
Cancel
Save