return it->second->store(addr - -it->first, len, bytes);
}
-bus_t::descriptor bus_t::find_device(reg_t addr)
+std::pair<reg_t, abstract_device_t*> bus_t::find_device(reg_t addr)
{
auto it = devices.lower_bound(-addr);
- if (it == devices.end()) {
- bus_t::descriptor desc = {0, 0};
- return desc;
- }
- bus_t::descriptor desc = {-it->first, it->second};
- return desc;
+ if (it == devices.end() || addr < -it->first)
+ return std::make_pair((reg_t)0, (abstract_device_t*)NULL);
+ return std::make_pair(-it->first, it->second);
}