diff --git a/repos/os/include/os/attached_mmio.h b/repos/os/include/os/attached_mmio.h index af04fb4c1e..8c2e4919ab 100644 --- a/repos/os/include/os/attached_mmio.h +++ b/repos/os/include/os/attached_mmio.h @@ -51,18 +51,6 @@ class Genode::Attached_mmio : public Attached_io_mem_dataspace, bool write_combined = false) : Attached_io_mem_dataspace(env, base, size, write_combined), Mmio((addr_t)local_addr()) { } - - /** - * Constructor - * - * \noapi - * \deprecated Use the constructor with 'Env &' as first - * argument instead - */ - Attached_mmio(addr_t base, size_t size, - bool write_combined = false) - : Attached_io_mem_dataspace(base, size, write_combined), - Mmio((addr_t)local_addr()) { } }; #endif /* _INCLUDE__OS__ATTACHED_MMIO_H_ */ diff --git a/repos/os/src/drivers/sd_card/spec/exynos5/driver.cc b/repos/os/src/drivers/sd_card/spec/exynos5/driver.cc index 79f468abeb..bfb51d3017 100644 --- a/repos/os/src/drivers/sd_card/spec/exynos5/driver.cc +++ b/repos/os/src/drivers/sd_card/spec/exynos5/driver.cc @@ -22,7 +22,7 @@ using namespace Sd_card; Driver::Driver(Env &env) : Driver_base(env.ram()), - Attached_mmio(MSH_BASE, MSH_SIZE), _env(env) + Attached_mmio(env, MSH_BASE, MSH_SIZE), _env(env) { _irq.sigh(_irq_handler); _irq.ack_irq(); diff --git a/repos/os/src/drivers/sd_card/spec/imx/driver.cc b/repos/os/src/drivers/sd_card/spec/imx/driver.cc index 8197e8399b..533bcf72bf 100644 --- a/repos/os/src/drivers/sd_card/spec/imx/driver.cc +++ b/repos/os/src/drivers/sd_card/spec/imx/driver.cc @@ -237,7 +237,7 @@ void Driver::write_dma(Block::sector_t blk_nr, Driver::Driver(Env &env) : Driver_base(env.ram()), - Attached_mmio(Board_base::SDHC_MMIO_BASE, Board_base::SDHC_MMIO_SIZE), + Attached_mmio(env, Board_base::SDHC_MMIO_BASE, Board_base::SDHC_MMIO_SIZE), _env(env) { log("SD card detected"); diff --git a/repos/os/src/drivers/sd_card/spec/omap4/driver.cc b/repos/os/src/drivers/sd_card/spec/omap4/driver.cc index bd90364a7f..d3b77516fa 100644 --- a/repos/os/src/drivers/sd_card/spec/omap4/driver.cc +++ b/repos/os/src/drivers/sd_card/spec/omap4/driver.cc @@ -387,7 +387,7 @@ Csd Driver::_read_csd() Driver::Driver(Env &env) : Driver_base(env.ram()), - Attached_mmio(MMCHS1_MMIO_BASE, MMCHS1_MMIO_SIZE), _ep(env.ep()) + Attached_mmio(env, MMCHS1_MMIO_BASE, MMCHS1_MMIO_SIZE), _ep(env.ep()) { _irq.sigh(_irq_handler); _irq.ack_irq(); diff --git a/repos/os/src/drivers/sd_card/spec/pl180/driver.cc b/repos/os/src/drivers/sd_card/spec/pl180/driver.cc index 7f126da3e7..b14bd9a6fc 100644 --- a/repos/os/src/drivers/sd_card/spec/pl180/driver.cc +++ b/repos/os/src/drivers/sd_card/spec/pl180/driver.cc @@ -138,8 +138,8 @@ void Driver::_write_data(unsigned length, } -Driver::Driver(Env &env) : Block::Driver(env.ram()), - Attached_mmio(PL180_PHYS, PL180_SIZE), _timer(env) +Driver::Driver(Env &env) +: Block::Driver(env.ram()), Attached_mmio(env, PL180_PHYS, PL180_SIZE), _timer(env) { enum { POWER_UP = 2, POWER_ON = 3 }; diff --git a/repos/os/src/drivers/sd_card/spec/rpi/driver.cc b/repos/os/src/drivers/sd_card/spec/rpi/driver.cc index 3018308094..935374e6a1 100644 --- a/repos/os/src/drivers/sd_card/spec/rpi/driver.cc +++ b/repos/os/src/drivers/sd_card/spec/rpi/driver.cc @@ -24,7 +24,7 @@ using namespace Sd_card; Driver::Driver(Env &env) : Driver_base(env.ram()), - Attached_mmio(Board_base::SDHCI_BASE, Board_base::SDHCI_SIZE), + Attached_mmio(env, Board_base::SDHCI_BASE, Board_base::SDHCI_SIZE), _ram(env.ram()) { log("SD card detected");