ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-21 00:23:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ATAPI driver support for re-opening sessions

Browse Source 
The probing and I/O resource allocation is done only once at the
creation time of the first session. When closing and re-opening the
session, the '_device' object is simply reused. This patch fixes #92.
This commit is contained in:
Norman Feske
2012-01-25 12:58:41 +01:00
parent b1b59fe8a6
commit 834f433222
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
os/src/drivers/atapi/main.cc
View File

@ -147,7 +147,6 @@ namespace Block {
_startup_sema.down(); _startup_sema.down();
} }
void info(Genode::size_t *blk_count, Genode::size_t *blk_size, void info(Genode::size_t *blk_count, Genode::size_t *blk_size,
Operations *ops) Operations *ops)
{ {
@ -183,6 +182,7 @@ namespace Block {
private: private:
Genode::Rpc_entrypoint &_ep; Genode::Rpc_entrypoint &_ep;
Ata::Device *_device;
protected: protected:
@ -223,31 +223,33 @@ namespace Block {
catch (...) {} catch (...) {}
int type = probe_ata ? REG_CONFIG_TYPE_ATA : REG_CONFIG_TYPE_ATAPI; int type = probe_ata ? REG_CONFIG_TYPE_ATA : REG_CONFIG_TYPE_ATAPI;
/*
* Probe for ATA(PI) device
*/
Ata::Device *device = Ata::Device::probe_legacy(type);
if (!device) { /*
* Probe for ATA(PI) device, but only once
*/
if (!_device)
_device = Ata::Device::probe_legacy(type);
if (!_device) {
PERR("No device present"); PERR("No device present");
throw Root::Unavailable(); throw Root::Unavailable();
} }
if (Atapi_device *atapi_device = dynamic_cast<Atapi_device *>(device)) if (Atapi_device *atapi_device = dynamic_cast<Atapi_device *>(_device))
if (!atapi_device->test_unit_ready()) { if (!atapi_device->test_unit_ready()) {
PERR("No disc present"); PERR("No disc present");
throw Root::Unavailable(); throw Root::Unavailable();
} }
return new (md_alloc()) return new (md_alloc())
Session_component(env()->ram_session()->alloc(tx_buf_size), _ep, device); Session_component(env()->ram_session()->alloc(tx_buf_size), _ep, _device);
} }
public: public:
Root(Genode::Rpc_entrypoint *session_ep, Root(Genode::Rpc_entrypoint *session_ep,
Genode::Allocator *md_alloc) Genode::Allocator *md_alloc)
: Root_component(session_ep, md_alloc), _ep(*session_ep) { } : Root_component(session_ep, md_alloc), _ep(*session_ep), _device(0) { }
}; };
} }