Simplify Framebuffer::Session interface

This patch removes the 'Framebuffer::Session::release()' function from
the interface to make the mode-change protocol consistent with the way
the Rom_session interface handles ROM-module changes. That is, the
client acknowledges the release of its current dataspace by requesting a
new dataspace via the 'Framebuffer::Session::dataspace()' function.

Fixes #1057
This commit is contained in:
Norman Feske 2014-02-11 17:17:55 +01:00
parent a61e278cec
commit 6525ec5951
16 changed files with 12 additions and 54 deletions

View File

@ -287,8 +287,6 @@ namespace Framebuffer
return _window_content.fb_ds_cap(); return _window_content.fb_ds_cap();
} }
void release() { }
Mode mode() const Mode mode() const
{ {
return Mode(_window_content.mode_size().w(), return Mode(_window_content.mode_size().w(),

View File

@ -64,12 +64,6 @@ namespace Framebuffer {
} }
void Session_component::release()
{
_framebuffer.release();
}
Mode Session_component::mode() const Mode Session_component::mode() const
{ {
return _framebuffer.mode(); return _framebuffer.mode();

View File

@ -46,7 +46,6 @@ namespace Framebuffer {
int max_height = 0); int max_height = 0);
Genode::Dataspace_capability dataspace(); Genode::Dataspace_capability dataspace();
void release();
Mode mode() const; Mode mode() const;
void mode_sigh(Genode::Signal_context_capability sigh_cap); void mode_sigh(Genode::Signal_context_capability sigh_cap);
void refresh(int x, int y, int w, int h); void refresh(int x, int y, int w, int h);

View File

@ -99,8 +99,6 @@ class Window_slave_policy : public Genode::Slave_policy
if (_framebuffer) if (_framebuffer)
Genode::env()->rm_session()->detach(_framebuffer); Genode::env()->rm_session()->detach(_framebuffer);
session_client.release();
Dataspace_capability framebuffer_ds = session_client.dataspace(); Dataspace_capability framebuffer_ds = session_client.dataspace();
if (framebuffer_ds.valid()) { if (framebuffer_ds.valid()) {
_framebuffer = Genode::env()->rm_session()->attach(framebuffer_ds); _framebuffer = Genode::env()->rm_session()->attach(framebuffer_ds);

View File

@ -27,8 +27,6 @@ namespace Framebuffer {
Genode::Dataspace_capability dataspace() { Genode::Dataspace_capability dataspace() {
return call<Rpc_dataspace>(); } return call<Rpc_dataspace>(); }
void release() { call<Rpc_release>(); }
Mode mode() const { return call<Rpc_mode>(); } Mode mode() const { return call<Rpc_mode>(); }
void mode_sigh(Genode::Signal_context_capability sigh) { void mode_sigh(Genode::Signal_context_capability sigh) {

View File

@ -70,21 +70,18 @@ namespace Framebuffer {
/** /**
* Request dataspace representing the logical frame buffer * Request dataspace representing the logical frame buffer
*
* By calling this function, the framebuffer client enables the server
* to reallocate the framebuffer dataspace (e.g., on mode changes).
* Hence, prior calling this function, the client should make sure to
* have detached the previously requested dataspace from its local
* address space.
*/ */
virtual Genode::Dataspace_capability dataspace() = 0; virtual Genode::Dataspace_capability dataspace() = 0;
/** /**
* Release framebuffer, free dataspace * Request display-mode properties of the framebuffer ready to be
* * obtained via the 'dataspace()' function
* By calling this function, the framebuffer client enables the server
* to reallocate the framebuffer dataspace on mode changes. Prior
* calling this function, the client should have detached the dataspace
* from its local address space.
*/
virtual void release() = 0;
/**
* Request current display-mode properties
*/ */
virtual Mode mode() const = 0; virtual Mode mode() const = 0;
@ -95,11 +92,9 @@ namespace Framebuffer {
* fly. For example, a virtual framebuffer presented in a window may * fly. For example, a virtual framebuffer presented in a window may
* get resized according to the window dimensions. By installing a * get resized according to the window dimensions. By installing a
* signal handler for mode changes, the framebuffer client can respond * signal handler for mode changes, the framebuffer client can respond
* to such changes. From the client's perspective, the original mode * to such changes. The new mode can be obtained using the 'mode()'
* stays in effect until the client calls 'release()'. After having * function. However, from the client's perspective, the original mode
* released the framebuffer, the new mode can be obtained using the * stays in effect until the it calls 'dataspace()' again.
* 'mode()' function and a new framebuffer dataspace can be requested
* by calling 'dataspace()'.
*/ */
virtual void mode_sigh(Genode::Signal_context_capability sigh) = 0; virtual void mode_sigh(Genode::Signal_context_capability sigh) = 0;
@ -116,13 +111,11 @@ namespace Framebuffer {
*********************/ *********************/
GENODE_RPC(Rpc_dataspace, Genode::Dataspace_capability, dataspace); GENODE_RPC(Rpc_dataspace, Genode::Dataspace_capability, dataspace);
GENODE_RPC(Rpc_release, void, release);
GENODE_RPC(Rpc_mode, Mode, mode); GENODE_RPC(Rpc_mode, Mode, mode);
GENODE_RPC(Rpc_refresh, void, refresh, int, int, int, int); GENODE_RPC(Rpc_refresh, void, refresh, int, int, int, int);
GENODE_RPC(Rpc_mode_sigh, void, mode_sigh, Genode::Signal_context_capability); GENODE_RPC(Rpc_mode_sigh, void, mode_sigh, Genode::Signal_context_capability);
GENODE_RPC_INTERFACE(Rpc_dataspace, Rpc_release, Rpc_mode, GENODE_RPC_INTERFACE(Rpc_dataspace, Rpc_mode, Rpc_mode_sigh, Rpc_refresh);
Rpc_mode_sigh, Rpc_refresh);
}; };
} }

View File

@ -28,8 +28,6 @@ namespace Framebuffer {
Genode::Dataspace_capability dataspace() { Genode::Dataspace_capability dataspace() {
return call<Rpc_dataspace>(); } return call<Rpc_dataspace>(); }
void release() { call<Rpc_release>(); }
Mode mode() const { return call<Rpc_mode>(); } Mode mode() const { return call<Rpc_mode>(); }
void mode_sigh(Genode::Signal_context_capability sigh) { void mode_sigh(Genode::Signal_context_capability sigh) {

View File

@ -90,8 +90,6 @@ class Framebuffer::Session_component
Dataspace_capability dataspace() { return _ds; } Dataspace_capability dataspace() { return _ds; }
void release() { }
Mode mode() const Mode mode() const
{ {
return Mode(_width, _height, _convert_format(_format)); return Mode(_width, _height, _convert_format(_format));

View File

@ -69,7 +69,6 @@ class Framebuffer::Session_component :
**************************************/ **************************************/
Dataspace_capability dataspace() { return _buffered ? _bb_ds : _fb_ds; } Dataspace_capability dataspace() { return _buffered ? _bb_ds : _fb_ds; }
void release() { }
Mode mode() const { return _mode; } Mode mode() const { return _mode; }
void mode_sigh(Genode::Signal_context_capability) { } void mode_sigh(Genode::Signal_context_capability) { }

View File

@ -77,8 +77,6 @@ class Framebuffer::Session_component : public Genode::Rpc_object<Framebuffer::Se
Dataspace_capability dataspace() { return _ds; } Dataspace_capability dataspace() { return _ds; }
void release() { }
Mode mode() const Mode mode() const
{ {
return Mode(_width, return Mode(_width,

View File

@ -157,8 +157,6 @@ namespace Framebuffer
Genode::Dataspace_capability dataspace() { return _fb_ds_cap; } Genode::Dataspace_capability dataspace() { return _fb_ds_cap; }
void release() { }
Mode mode() const { return Mode(SCR_WIDTH, SCR_HEIGHT, Mode::RGB565); } Mode mode() const { return Mode(SCR_WIDTH, SCR_HEIGHT, Mode::RGB565); }
void mode_sigh(Genode::Signal_context_capability) { } void mode_sigh(Genode::Signal_context_capability) { }

View File

@ -47,8 +47,6 @@ class Framebuffer::Session_component : public Genode::Rpc_object<Framebuffer::Se
Dataspace_capability dataspace() { return _fb_mem.cap(); } Dataspace_capability dataspace() { return _fb_mem.cap(); }
void release() { }
Mode mode() const Mode mode() const
{ {
return Mode(_width, _height, Mode::RGB565); return Mode(_width, _height, Mode::RGB565);

View File

@ -61,8 +61,6 @@ namespace Framebuffer {
Genode::Dataspace_capability dataspace() { return fb_ds_cap; } Genode::Dataspace_capability dataspace() { return fb_ds_cap; }
void release() { }
Mode mode() const { return _mode; } Mode mode() const { return _mode; }
void mode_sigh(Genode::Signal_context_capability) { } void mode_sigh(Genode::Signal_context_capability) { }

View File

@ -369,8 +369,6 @@ class Framebuffer::Session_component : public Genode::Rpc_object<Session>
return _buffer ? _buffer->ds_cap() : Genode::Ram_dataspace_capability(); return _buffer ? _buffer->ds_cap() : Genode::Ram_dataspace_capability();
} }
void release() { }
Mode mode() const Mode mode() const
{ {
return _mode; return _mode;

View File

@ -64,12 +64,6 @@ namespace Framebuffer {
} }
void Session_component::release()
{
_framebuffer.release();
}
Mode Session_component::mode() const Mode Session_component::mode() const
{ {
return _framebuffer.mode(); return _framebuffer.mode();

View File

@ -46,7 +46,6 @@ namespace Framebuffer {
int max_height = 0); int max_height = 0);
Genode::Dataspace_capability dataspace(); Genode::Dataspace_capability dataspace();
void release();
Mode mode() const; Mode mode() const;
void mode_sigh(Genode::Signal_context_capability sigh_cap); void mode_sigh(Genode::Signal_context_capability sigh_cap);
void refresh(int x, int y, int w, int h); void refresh(int x, int y, int w, int h);