diff --git a/gems/src/server/http_blk/main.cc b/gems/src/server/http_blk/main.cc index 6ea76f0ac6..baf280b41b 100644 --- a/gems/src/server/http_blk/main.cc +++ b/gems/src/server/http_blk/main.cc @@ -39,9 +39,8 @@ class Driver : public Block::Driver ** Block::Driver interface ** *******************************/ - Genode::size_t block_size() { return _block_size; } - Genode::size_t block_count() { - return _http.file_size() / _block_size; } + Genode::size_t block_size() { return _block_size; } + Genode::size_t block_count() { return _http.file_size() / _block_size; } Block::Session::Operations ops() { @@ -50,25 +49,15 @@ class Driver : public Block::Driver return o; } - void read(Genode::size_t block_nr, - Genode::size_t block_count, - char *buffer) { + void read(Genode::size_t block_nr, + Genode::size_t block_count, + char *buffer, + Block::Packet_descriptor &packet) + { _http.cmd_get(block_nr * _block_size, block_count * _block_size, - (addr_t)buffer); } - - void write(Genode::size_t, Genode::size_t, char const*) { - throw Io_error(); } - void read_dma(Genode::size_t, Genode::size_t, Genode::addr_t) { - throw Io_error(); } - void write_dma(Genode::size_t, Genode::size_t, Genode::addr_t) { - throw Io_error(); } - - bool dma_enabled() { return false; } - - Genode::Ram_dataspace_capability alloc_dma_buffer(Genode::size_t size) { - return Genode::env()->ram_session()->alloc(size, false); } - - void sync() {} + (addr_t)buffer); + session->complete_packet(packet); + } }; @@ -92,8 +81,8 @@ class Factory : public Block::Driver_factory PINF("Using file=%s as device with block size %zx.", _uri, _blk_sz); } - Block::Driver *create() { - return new (env()->heap()) Driver(_blk_sz, _uri); } + Block::Driver *create() { + return new (env()->heap()) Driver(_blk_sz, _uri); } void destroy(Block::Driver *driver) { Genode::destroy(env()->heap(), driver); } diff --git a/os/include/block/component.h b/os/include/block/component.h index 1fdfdd97cf..541760b656 100644 --- a/os/include/block/component.h +++ b/os/include/block/component.h @@ -30,6 +30,21 @@ namespace Block { class Block::Session_component : public Block::Session_rpc_object { + public: + + void complete_packet(Packet_descriptor &packet, bool success = true) + { + packet.succeeded(success); + + /* acknowledge packet to the client */ + if (!tx_sink()->ready_to_ack()) { + PWRN("need to wait until ready-for-ack"); + return; + } + + tx_sink()->acknowledge_packet(packet); + } + private: Driver_factory &_driver_factory; @@ -60,40 +75,34 @@ class Block::Session_component : public Block::Session_rpc_object if (_driver.dma_enabled()) _driver.read_dma(packet.block_number(), packet.block_count(), - _rq_phys + packet.offset()); + _rq_phys + packet.offset(), + packet); else _driver.read(packet.block_number(), packet.block_count(), - tx_sink()->packet_content(packet)); + tx_sink()->packet_content(packet), + packet); break; case Block::Packet_descriptor::WRITE: if (_driver.dma_enabled()) _driver.write_dma(packet.block_number(), packet.block_count(), - _rq_phys + packet.offset()); + _rq_phys + packet.offset(), + packet); else _driver.write(packet.block_number(), packet.block_count(), - tx_sink()->packet_content(packet)); + tx_sink()->packet_content(packet), + packet); break; default: - PWRN("received invalid packet"); - packet.succeeded(false); - continue; + throw Driver::Io_error(); } } catch (Driver::Io_error) { - packet.succeeded(false); + complete_packet(packet, false); } - - /* acknowledge packet to the client */ - if (!tx_sink()->ready_to_ack()) { - PWRN("need to wait until ready-for-ack"); - return; - } - - tx_sink()->acknowledge_packet(packet); } } @@ -121,6 +130,8 @@ class Block::Session_component : public Block::Session_rpc_object { _tx.sigh_ready_to_ack(_sink_ack); _tx.sigh_packet_avail(_sink_submit); + + driver.session = this; } /** diff --git a/os/include/block/driver.h b/os/include/block/driver.h index 184171a588..cacf04f553 100644 --- a/os/include/block/driver.h +++ b/os/include/block/driver.h @@ -2,6 +2,7 @@ * \brief Block-driver interface * \author Christian Helmuth * \author Sebastian Sumpf + * \author Stefan kalkowski * \date 2011-05-23 */ @@ -17,115 +18,132 @@ #include #include +#include #include #include namespace Block { + class Session_component; + struct Driver; + struct Driver_factory; +}; + + +/** + * Interface to be implemented by the device-specific driver code + */ +struct Block::Driver +{ + Session_component *session; /** - * Interface to be implemented by the device-specific driver code + * Exceptions */ - struct Driver - { - /** - * Exceptions - */ - class Io_error : public ::Genode::Exception { }; - - /** - * Request block size for driver and medium - */ - virtual Genode::size_t block_size() = 0; - - /** - * Request capacity of medium in blocks - */ - virtual Genode::size_t block_count() = 0; - - /** - * Request operations supported by the device - */ - virtual Session::Operations ops() = 0; - - /** - * Read from medium - * - * \param block_number number of first block to read - * \param block_count number of blocks to read - * \param out_buffer output buffer for read request - */ - virtual void read(Genode::size_t block_number, - Genode::size_t block_count, - char *out_buffer) = 0; - - /** - * Write to medium - * - * \param block_number number of first block to write - * \param block_count number of blocks to write - * \param buffer buffer for write request - */ - virtual void write(Genode::size_t block_number, - Genode::size_t block_count, - char const *buffer) = 0; - - /** - * Read from medium using DMA - * - * \param block_number number of first block to read - * \param block_count number of blocks to read - * \param phys phyiscal address of read buffer - */ - virtual void read_dma(Genode::size_t block_number, - Genode::size_t block_count, - Genode::addr_t phys) = 0; - - /** - * Write to medium using DMA - * - * \param block_number number of first block to write - * \param block_count number of blocks to write - * \param phys physical address of write buffer - */ - virtual void write_dma(Genode::size_t block_number, - Genode::size_t block_count, - Genode::addr_t phys) = 0; - - /** - * Check if DMA is enabled for driver - * - * \return true if DMA is enabled, false otherwise - */ - virtual bool dma_enabled() = 0; - - /** - * Allocate buffer which is suitable for DMA. - */ - virtual Genode::Ram_dataspace_capability alloc_dma_buffer(Genode::size_t) = 0; - - /** - * Synchronize with with device. - */ - virtual void sync() = 0; - }; - + class Io_error : public ::Genode::Exception { }; /** - * Interface for constructing the driver object + * Request block size for driver and medium */ - struct Driver_factory - { - /** - * Construct new driver - */ - virtual Driver *create() = 0; + virtual Genode::size_t block_size() = 0; - /** - * Destroy driver - */ - virtual void destroy(Driver *driver) = 0; - }; -} + /** + * Request capacity of medium in blocks + */ + virtual Genode::size_t block_count() = 0; + + /** + * Request operations supported by the device + */ + virtual Session::Operations ops() = 0; + + /** + * Read from medium + * + * \param block_number number of first block to read + * \param block_count number of blocks to read + * \param buffer output buffer for read request + */ + virtual void read(Genode::size_t block_number, + Genode::size_t block_count, + char * buffer, + Packet_descriptor &packet) { + throw Io_error(); } + + /** + * Write to medium + * + * \param block_number number of first block to write + * \param block_count number of blocks to write + * \param buffer buffer for write request + */ + virtual void write(Genode::size_t block_number, + Genode::size_t block_count, + const char * buffer, + Packet_descriptor &packet) { + throw Io_error(); } + + /** + * Read from medium using DMA + * + * \param block_number number of first block to read + * \param block_count number of blocks to read + * \param phys phyiscal address of read buffer + */ + virtual void read_dma(Genode::size_t block_number, + Genode::size_t block_count, + Genode::addr_t phys, + Packet_descriptor &packet) { + throw Io_error(); } + + /** + * Write to medium using DMA + * + * \param block_number number of first block to write + * \param block_count number of blocks to write + * \param phys physical address of write buffer + */ + virtual void write_dma(Genode::size_t block_number, + Genode::size_t block_count, + Genode::addr_t phys, + Packet_descriptor &packet) { + throw Io_error(); } + + /** + * Check if DMA is enabled for driver + * + * \return true if DMA is enabled, false otherwise + */ + virtual bool dma_enabled() { return false; } + + /** + * Allocate buffer which is suitable for DMA. + */ + virtual Genode::Ram_dataspace_capability + alloc_dma_buffer(Genode::size_t size) { + return Genode::env()->ram_session()->alloc(size, false); } + + /** + * Synchronize with with device. + */ + virtual void sync() {} +}; + + +/** + * Interface for constructing the driver object + */ +struct Block::Driver_factory +{ + /** + * Construct new driver + */ + virtual Driver *create() = 0; + + /** + * Destroy driver + */ + virtual void destroy(Driver *driver) = 0; +}; #endif /* _BLOCK__DRIVER_H_ */ diff --git a/os/src/drivers/ahci/exynos5/ahci_driver.cc b/os/src/drivers/ahci/exynos5/ahci_driver.cc index faf3e7fa66..5f7620895d 100644 --- a/os/src/drivers/ahci/exynos5/ahci_driver.cc +++ b/os/src/drivers/ahci/exynos5/ahci_driver.cc @@ -1949,19 +1949,3 @@ int Ahci_driver::_ncq_command(uint64_t lba, unsigned cnt, addr_t phys, bool w) size_t Ahci_driver::block_count() { return sata_ahci()->block_cnt; } size_t Ahci_driver::block_size() { return Sata_ahci::BLOCK_SIZE; } - -Ram_dataspace_capability Ahci_driver::alloc_dma_buffer(size_t size) { - return env()->ram_session()->alloc(size, 0); } - -void Ahci_driver::read(size_t, size_t, char *) -{ - PERR("Not implemented"); - throw Io_error(); -} - -void Ahci_driver::write(size_t, size_t, char const *) -{ - PERR("Not implemented"); - throw Io_error(); -} - diff --git a/os/src/drivers/ahci/exynos5/ahci_driver.h b/os/src/drivers/ahci/exynos5/ahci_driver.h index 628b2b6827..7f60b1c9b1 100644 --- a/os/src/drivers/ahci/exynos5/ahci_driver.h +++ b/os/src/drivers/ahci/exynos5/ahci_driver.h @@ -15,7 +15,7 @@ #define _AHCI_DRIVER_H_ /* Genode includes */ -#include +#include #include /** @@ -29,7 +29,6 @@ class Ahci_driver : public Block::Driver typedef Genode::size_t size_t; typedef Genode::uint64_t uint64_t; typedef Genode::addr_t addr_t; - typedef Genode::Ram_dataspace_capability Ram_dataspace_capability; int _ncq_command(uint64_t lba, unsigned cnt, addr_t phys, bool w); @@ -40,28 +39,37 @@ class Ahci_driver : public Block::Driver */ Ahci_driver(); + /***************************** ** Block::Driver interface ** *****************************/ + Block::Session::Operations ops() + { + Block::Session::Operations o; + o.set_operation(Block::Packet_descriptor::READ); + o.set_operation(Block::Packet_descriptor::WRITE); + return o; + } + size_t block_size(); size_t block_count(); - bool dma_enabled() { return 1; } - void write(size_t, size_t, char const *); - void read(size_t, size_t, char *); + bool dma_enabled() { return true; } - Ram_dataspace_capability alloc_dma_buffer(size_t size); - - void read_dma(size_t block_nr, size_t block_cnt, addr_t phys) + void read_dma(size_t block_nr, size_t block_cnt, addr_t phys, + Block::Packet_descriptor &packet) { if (_ncq_command(block_nr, block_cnt, phys, 0)) throw Io_error(); + session->complete_packet(packet); } - void write_dma(size_t block_nr, size_t block_cnt, addr_t phys) + void write_dma(size_t block_nr, size_t block_cnt, addr_t phys, + Block::Packet_descriptor &packet) { if (_ncq_command(block_nr, block_cnt, phys, 1)) throw Io_error(); + session->complete_packet(packet); } }; diff --git a/os/src/drivers/ahci/exynos5/bench/main.cc b/os/src/drivers/ahci/exynos5/bench/main.cc index e1d5fedc32..9bac77a278 100644 --- a/os/src/drivers/ahci/exynos5/bench/main.cc +++ b/os/src/drivers/ahci/exynos5/bench/main.cc @@ -151,10 +151,11 @@ int main(int argc, char **argv) void operator () (Block::Driver &driver, addr_t number, size_t count, addr_t phys, char *virt) { + Block::Packet_descriptor packet; if (driver.dma_enabled()) - driver.read_dma(number, count, phys); + driver.read_dma(number, count, phys, packet); else - driver.read(number, count, virt); + driver.read(number, count, virt, packet); } } read_operation; @@ -178,10 +179,11 @@ int main(int argc, char **argv) void operator () (Block::Driver &driver, addr_t number, size_t count, addr_t phys, char *virt) { + Block::Packet_descriptor packet; if (driver.dma_enabled()) - driver.write_dma(number, count, phys); + driver.write_dma(number, count, phys, packet); else - driver.write(number, count, virt); + driver.write(number, count, virt, packet); } } write_operation; diff --git a/os/src/drivers/ahci/include/ahci_driver_base.h b/os/src/drivers/ahci/include/ahci_driver_base.h index 6b1656783e..519dbcc998 100644 --- a/os/src/drivers/ahci/include/ahci_driver_base.h +++ b/os/src/drivers/ahci/include/ahci_driver_base.h @@ -34,7 +34,8 @@ class Ahci_driver_base : public Block::Driver throw Io_error(); } - Ahci_driver_base(Ahci_device * const device) : _device(device) { } + Ahci_driver_base(Ahci_device * const device) + : _device(device) { } public: @@ -55,40 +56,30 @@ class Ahci_driver_base : public Block::Driver return o; } - bool dma_enabled() { return true; } + bool dma_enabled() { return true; } void read_dma(size_t block_number, size_t block_count, - addr_t phys) + addr_t phys, + Block::Packet_descriptor &packet) { _sanity_check(block_number, block_count); _device->read(block_number, block_count, phys); + if (session) session->complete_packet(packet); } void write_dma(size_t block_number, size_t block_count, - addr_t phys) + addr_t phys, + Block::Packet_descriptor &packet) { _sanity_check(block_number, block_count); _device->write(block_number, block_count, phys); - } - - void read(size_t, size_t, char *) - { - PERR("%s should not be called", __PRETTY_FUNCTION__); - throw Io_error(); - } - - void write(size_t, size_t, char const *) - { - PERR("%s should not be called", __PRETTY_FUNCTION__); - throw Io_error(); + if (session) session->complete_packet(packet); } Ram_dataspace_capability alloc_dma_buffer(size_t size) { return _device->alloc_dma_buffer(size); } - - void sync() {} }; #endif /* _AHCI_DRIVER_BASE_H_ */ diff --git a/os/src/drivers/atapi/ata_device.h b/os/src/drivers/atapi/ata_device.h index d59fe81fdc..dfd96316b5 100644 --- a/os/src/drivers/atapi/ata_device.h +++ b/os/src/drivers/atapi/ata_device.h @@ -16,7 +16,7 @@ #include #include -#include +#include namespace Genode { class Io_port_session; @@ -120,27 +120,41 @@ namespace Ata { void read(Genode::size_t block_number, Genode::size_t block_count, - char *buffer) { - _read(block_number, block_count, buffer, false); } + char *buffer, + Block::Packet_descriptor &packet) + { + _read(block_number, block_count, buffer, false); + session->complete_packet(packet); + } + void write(Genode::size_t block_number, Genode::size_t block_count, - char const *buffer) { - _write(block_number, block_count, buffer, false); } + char const *buffer, + Block::Packet_descriptor &packet) + { + _write(block_number, block_count, buffer, false); + session->complete_packet(packet); + } + void read_dma(Genode::size_t block_number, Genode::size_t block_count, - Genode::addr_t phys) { - _read(block_number, block_count, (char*)phys, true); } + Genode::addr_t phys, + Block::Packet_descriptor &packet) + { + _read(block_number, block_count, (char*)phys, true); + session->complete_packet(packet); + } + void write_dma(Genode::size_t block_number, Genode::size_t block_count, - Genode::addr_t phys) { - _write(block_number, block_count, (char*)phys, true); } + Genode::addr_t phys, + Block::Packet_descriptor &packet) + { + _write(block_number, block_count, (char*)phys, true); + session->complete_packet(packet); + } bool dma_enabled() { return _dma; } - - Genode::Ram_dataspace_capability alloc_dma_buffer(Genode::size_t size) { - return Genode::env()->ram_session()->alloc(size, false); } - - void sync() {} }; diff --git a/os/src/drivers/atapi/atapi_device.cc b/os/src/drivers/atapi/atapi_device.cc index 989dcb6a3b..a4ceadb1a5 100644 --- a/os/src/drivers/atapi/atapi_device.cc +++ b/os/src/drivers/atapi/atapi_device.cc @@ -36,8 +36,7 @@ enum Commands { Atapi_device::Atapi_device(unsigned base_cmd, unsigned base_ctrl) - : Device(base_cmd, base_ctrl) -{ } +: Device(base_cmd, base_ctrl) { } int Atapi_device::read_sense(unsigned char *sense, int length) diff --git a/os/src/drivers/atapi/main.cc b/os/src/drivers/atapi/main.cc index e4cfa38881..f935fd8b39 100644 --- a/os/src/drivers/atapi/main.cc +++ b/os/src/drivers/atapi/main.cc @@ -16,7 +16,6 @@ #include #include #include -#include /* local includes */ #include "ata_device.h" diff --git a/os/src/drivers/sd_card/exynos5/driver.h b/os/src/drivers/sd_card/exynos5/driver.h index 1ce8b2773d..9dabab4b45 100644 --- a/os/src/drivers/sd_card/exynos5/driver.h +++ b/os/src/drivers/sd_card/exynos5/driver.h @@ -97,44 +97,47 @@ class Block::Exynos5_driver : public Block::Driver return o; } - void read(Genode::size_t block_number, - Genode::size_t block_count, - char *out_buffer) + void read(Genode::size_t block_number, + Genode::size_t block_count, + char *out_buffer, + Packet_descriptor &packet) { if (!_controller.read_blocks(block_number, block_count, out_buffer)) throw Io_error(); + session->complete_packet(packet); } - void write(Genode::size_t block_number, - Genode::size_t block_count, - char const *buffer) + void write(Genode::size_t block_number, + Genode::size_t block_count, + char const *buffer, + Packet_descriptor &packet) { if (!_controller.write_blocks(block_number, block_count, buffer)) throw Io_error(); + session->complete_packet(packet); } - void read_dma(Genode::size_t block_number, - Genode::size_t block_count, - Genode::addr_t phys) + void read_dma(Genode::size_t block_number, + Genode::size_t block_count, + Genode::addr_t phys, + Packet_descriptor &packet) { if (!_controller.read_blocks_dma(block_number, block_count, phys)) throw Io_error(); + session->complete_packet(packet); } - void write_dma(Genode::size_t block_number, - Genode::size_t block_count, - Genode::addr_t phys) + void write_dma(Genode::size_t block_number, + Genode::size_t block_count, + Genode::addr_t phys, + Packet_descriptor &packet) { if (!_controller.write_blocks_dma(block_number, block_count, phys)) throw Io_error(); + session->complete_packet(packet); } bool dma_enabled() { return _use_dma; } - - Ram_dataspace_capability alloc_dma_buffer(size_t size) { - return Genode::env()->ram_session()->alloc(size, false); } - - void sync() {} }; #endif /* _DRIVER_H_ */ diff --git a/os/src/drivers/sd_card/omap4/bench/main.cc b/os/src/drivers/sd_card/omap4/bench/main.cc index 2561e0ba76..38e0e6ed74 100644 --- a/os/src/drivers/sd_card/omap4/bench/main.cc +++ b/os/src/drivers/sd_card/omap4/bench/main.cc @@ -111,10 +111,11 @@ int main(int argc, char **argv) void operator () (Block::Driver &driver, addr_t number, size_t count, addr_t phys, char *virt) { + Block::Packet_descriptor p; if (driver.dma_enabled()) - driver.read_dma(number, count, phys); + driver.read_dma(number, count, phys, p); else - driver.read(number, count, virt); + driver.read(number, count, virt, p); } } read_operation; @@ -137,10 +138,11 @@ int main(int argc, char **argv) void operator () (Block::Driver &driver, addr_t number, size_t count, addr_t phys, char *virt) { + Block::Packet_descriptor p; if (driver.dma_enabled()) - driver.write_dma(number, count, phys); + driver.write_dma(number, count, phys, p); else - driver.write(number, count, virt); + driver.write(number, count, virt, p); } } write_operation; diff --git a/os/src/drivers/sd_card/omap4/driver.h b/os/src/drivers/sd_card/omap4/driver.h index fb274c6481..8d5b140ed5 100644 --- a/os/src/drivers/sd_card/omap4/driver.h +++ b/os/src/drivers/sd_card/omap4/driver.h @@ -90,44 +90,47 @@ class Block::Omap4_driver : public Block::Driver return o; } - void read(Genode::size_t block_number, - Genode::size_t block_count, - char *out_buffer) + void read(Genode::size_t block_number, + Genode::size_t block_count, + char *out_buffer, + Packet_descriptor &packet) { if (!_controller.read_blocks(block_number, block_count, out_buffer)) throw Io_error(); + session->complete_packet(packet); } - void write(Genode::size_t block_number, - Genode::size_t block_count, - char const *buffer) + void write(Genode::size_t block_number, + Genode::size_t block_count, + char const *buffer, + Packet_descriptor &packet) { if (!_controller.write_blocks(block_number, block_count, buffer)) throw Io_error(); + session->complete_packet(packet); } - void read_dma(Genode::size_t block_number, - Genode::size_t block_count, - Genode::addr_t phys) + void read_dma(Genode::size_t block_number, + Genode::size_t block_count, + Genode::addr_t phys, + Packet_descriptor &packet) { if (!_controller.read_blocks_dma(block_number, block_count, phys)) throw Io_error(); + session->complete_packet(packet); } - void write_dma(Genode::size_t block_number, - Genode::size_t block_count, - Genode::addr_t phys) + void write_dma(Genode::size_t block_number, + Genode::size_t block_count, + Genode::addr_t phys, + Packet_descriptor &packet) { if (!_controller.write_blocks_dma(block_number, block_count, phys)) throw Io_error(); + session->complete_packet(packet); } bool dma_enabled() { return _use_dma; } - - Ram_dataspace_capability alloc_dma_buffer(size_t size) { - return Genode::env()->ram_session()->alloc(size, false); } - - void sync() {} }; #endif /* _DRIVER_H_ */ diff --git a/os/src/drivers/sd_card/pl180/sd_card.h b/os/src/drivers/sd_card/pl180/sd_card.h index 37d16fa387..0d8cfb56fa 100644 --- a/os/src/drivers/sd_card/pl180/sd_card.h +++ b/os/src/drivers/sd_card/pl180/sd_card.h @@ -29,7 +29,8 @@ class Sd_card : public Block::Driver public: - Sd_card(Host_driver &host_driver) : _hd(host_driver) + Sd_card(Host_driver &host_driver) + : _hd(host_driver) { unsigned resp; @@ -89,7 +90,8 @@ class Sd_card : public Block::Driver void read(Genode::size_t block_number, Genode::size_t block_count, - char *out_buffer) + char *out_buffer, + Block::Packet_descriptor &packet) { unsigned resp; unsigned length = BLOCK_SIZE; @@ -105,11 +107,13 @@ class Sd_card : public Block::Driver length, &resp); _hd.read_data(length, out_buffer + (i * BLOCK_SIZE)); } + session->complete_packet(packet); } void write(Genode::size_t block_number, Genode::size_t block_count, - char const *buffer) + char const *buffer, + Block::Packet_descriptor &packet) { unsigned resp; unsigned length = BLOCK_SIZE; @@ -125,26 +129,8 @@ class Sd_card : public Block::Driver length, &resp); _hd.write_data(length, buffer + (i * BLOCK_SIZE)); } + session->complete_packet(packet); } - - /* - * This driver does not support DMA operation, currently. - */ - - void read_dma(Genode::size_t, Genode::size_t, Genode::addr_t) { - throw Io_error(); } - - void write_dma(Genode::size_t, Genode::size_t, Genode::addr_t) { - throw Io_error(); } - - bool dma_enabled() { return false; } - - Genode::Ram_dataspace_capability alloc_dma_buffer(Genode::size_t size) - { - return Genode::env()->ram_session()->alloc(size, false); - } - - void sync() {} }; #endif /* _SD_CARD_H_ */ diff --git a/os/src/server/rom_blk/main.cc b/os/src/server/rom_blk/main.cc index 4559427a98..ca82111935 100644 --- a/os/src/server/rom_blk/main.cc +++ b/os/src/server/rom_blk/main.cc @@ -57,9 +57,10 @@ class Rom_blk : public Block::Driver return o; } - void read(Genode::size_t block_number, - Genode::size_t block_count, - char *out_buffer) + void read(Genode::size_t block_number, + Genode::size_t block_count, + char* buffer, + Block::Packet_descriptor &packet) { /* sanity check block number */ if ((block_number + block_count > _file_sz / _blk_sz) @@ -73,32 +74,10 @@ class Rom_blk : public Block::Driver size_t size = block_count * _blk_sz; /* copy file content to packet payload */ - memcpy(out_buffer, (void*)(_file_addr + offset), size); + memcpy((void*)buffer, (void*)(_file_addr + offset), size); + + session->complete_packet(packet); } - - void write(Genode::size_t block_number, - Genode::size_t block_count, - char const *buffer) - { - PWRN("write attempt on read-only device"); - } - - /* - * This driver does not support DMA operation, currently. - */ - - void read_dma(Genode::size_t, Genode::size_t, Genode::addr_t) { - throw Io_error(); } - - void write_dma(Genode::size_t, Genode::size_t, Genode::addr_t) { - throw Io_error(); } - - bool dma_enabled() { return false; } - - Genode::Ram_dataspace_capability alloc_dma_buffer(Genode::size_t size) { - return Genode::env()->ram_session()->alloc(size, false); } - - void sync() {} }; @@ -118,8 +97,7 @@ struct Factory : Block::Driver_factory PINF("Using file=%s as device with block size %zx.", file, blk_sz); try { - Rom_blk *driver = new (Genode::env()->heap()) Rom_blk(file, blk_sz); - return driver; + return new (Genode::env()->heap()) Rom_blk(file, blk_sz); } catch(Rom_connection::Rom_connection_failed) { PERR("Cannot open file %s.", file); } diff --git a/os/src/test/fb_block_adapter/main.cc b/os/src/test/fb_block_adapter/main.cc index d2b29987f1..49637e846e 100644 --- a/os/src/test/fb_block_adapter/main.cc +++ b/os/src/test/fb_block_adapter/main.cc @@ -58,9 +58,10 @@ class Driver : public Block::Driver return ops; } - void read(Genode::size_t block_number, - Genode::size_t block_count, - char *buffer) + void read(Genode::size_t block_number, + Genode::size_t block_count, + char *buffer, + Block::Packet_descriptor &packet) { /* sanity check block number */ if (block_number + block_count > _fb_size / BLOCK_SIZE) { @@ -73,11 +74,13 @@ class Driver : public Block::Driver Genode::size_t size = block_count * BLOCK_SIZE; Genode::memcpy((void*)buffer, (void*)(_fb_addr + offset), size); + session->complete_packet(packet); } - void write(Genode::size_t block_number, - Genode::size_t block_count, - char const *buffer) + void write(Genode::size_t block_number, + Genode::size_t block_count, + char const *buffer, + Block::Packet_descriptor &packet) { /* sanity check block number */ if (block_number + block_count > _fb_size / BLOCK_SIZE) { @@ -91,26 +94,14 @@ class Driver : public Block::Driver Genode::memcpy((void*)(_fb_addr + offset), (void*)buffer, size); _fb.refresh(0, 0, _fb_mode.width(), _fb_mode.height()); + session->complete_packet(packet); } - - void read_dma(Genode::size_t block_number, - Genode::size_t block_count, - Genode::addr_t phys) { - throw Io_error(); } - void write_dma(Genode::size_t block_number, - Genode::size_t block_count, - Genode::addr_t phys) { - throw Io_error(); } - bool dma_enabled() { return false; } - Genode::Ram_dataspace_capability alloc_dma_buffer(Genode::size_t size) { - return Genode::env()->ram_session()->alloc(size, false); } - void sync() {} }; struct Factory : Block::Driver_factory { - Block::Driver *create() { + Block::Driver *create() { return new (Genode::env()->heap()) Driver(); } void destroy(Block::Driver *driver) {