diff options
Diffstat (limited to 'riscv/abstract_device.h')
-rw-r--r-- | riscv/abstract_device.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/riscv/abstract_device.h b/riscv/abstract_device.h index d6097c1..0726cd7 100644 --- a/riscv/abstract_device.h +++ b/riscv/abstract_device.h @@ -24,18 +24,13 @@ class abstract_device_t { // parameterized by parsing the DTS class device_factory_t { public: - virtual abstract_device_t* parse_from_fdt(const void* fdt, const sim_t* sim, reg_t* base) const = 0; - virtual std::string generate_dts(const sim_t* sim) const = 0; + virtual abstract_device_t* parse_from_fdt(const void* fdt, const sim_t* sim, reg_t* base, const std::vector<std::string>& sargs) const = 0; + virtual std::string generate_dts(const sim_t* sim, const std::vector<std::string>& sargs) const = 0; virtual ~device_factory_t() {} - void set_sargs(std::vector<std::string> sargs) { this->sargs = sargs; } - std::vector<std::string> get_sargs() { return sargs; } - -protected: - std::vector<std::string> sargs; }; // Type for holding all registered MMIO plugins by name. -using mmio_device_map_t = std::map<std::string, device_factory_t*>; +using mmio_device_map_t = std::map<std::string, const device_factory_t*>; mmio_device_map_t& mmio_device_map(); @@ -46,8 +41,8 @@ mmio_device_map_t& mmio_device_map(); std::string str(#name); \ if (!mmio_device_map().emplace(str, this).second) throw std::runtime_error("Plugin \"" + str + "\" already registered"); \ }; \ - name##_t* parse_from_fdt(const void* fdt, const sim_t* sim, reg_t* base) const override { return parse(fdt, sim, base, sargs); } \ - std::string generate_dts(const sim_t* sim) const override { return generate(sim); } \ + name##_t* parse_from_fdt(const void* fdt, const sim_t* sim, reg_t* base, const std::vector<std::string>& sargs) const override { return parse(fdt, sim, base, sargs); } \ + std::string generate_dts(const sim_t* sim, const std::vector<std::string>& sargs) const override { return generate(sim, sargs); } \ }; device_factory_t *name##_factory = new name##_factory_t(); #endif |