Remove deprecated Attached_mmio constructor

This commit is contained in:
Christian Helmuth 2017-03-20 11:46:58 +01:00
parent d3884c67ad
commit 19703e6617
6 changed files with 6 additions and 18 deletions

View File

@ -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<void>()) { }
/**
* 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<void>()) { }
};
#endif /* _INCLUDE__OS__ATTACHED_MMIO_H_ */

View File

@ -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();

View File

@ -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");

View File

@ -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();

View File

@ -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 };

View File

@ -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");