From 679f66667cefd94d92937ea9bc77245a29775aab Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Mon, 2 Mar 2015 14:33:18 +0100 Subject: [PATCH] l4lx: don't request framebuffer dataspace twice Fixes #1427 --- repos/ports-foc/src/lib/l4lx/genode_framebuffer.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/repos/ports-foc/src/lib/l4lx/genode_framebuffer.cc b/repos/ports-foc/src/lib/l4lx/genode_framebuffer.cc index cd57b0ff7..bca235c3a 100644 --- a/repos/ports-foc/src/lib/l4lx/genode_framebuffer.cc +++ b/repos/ports-foc/src/lib/l4lx/genode_framebuffer.cc @@ -37,6 +37,12 @@ static Framebuffer::Connection *framebuffer() { } +static Genode::Dataspace_capability fb_ds() { + static Genode::Dataspace_capability ds = framebuffer()->dataspace(); + return ds; +} + + extern "C" { int genode_screen_count() @@ -51,7 +57,7 @@ extern "C" { { Linux::Irq_guard guard; - return Genode::Dataspace_client(framebuffer()->dataspace()).size(); + return Genode::Dataspace_client(fb_ds()).size(); } @@ -59,8 +65,7 @@ extern "C" { { Linux::Irq_guard guard; - return L4lx::Env::env()->rm()->attach(framebuffer()->dataspace(), - "framebuffer"); + return L4lx::Env::env()->rm()->attach(fb_ds(), "framebuffer"); }