ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

foc: re-dimension UTCB area in core (fixes #927) 

Take the whole UTCB area out of core's region map to circumvent mapping errors.
With this fix, the HDMI quirks are getting unnecessary.
This commit is contained in:
Stefan Kalkowski 2013-10-21 15:52:03 +02:00 committed by Christian Helmuth
parent 2329184ddb
commit fc1005c7ee
5 changed files with 1 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base-foc/src/core/platform.cc
View File

@ -388,7 +388,7 @@ void Platform::_setup_basics()
Native_config::context_area_virtual_size());
/* preserve utcb- area in core's virtual address space */
_region_alloc.remove_range((addr_t)l4_utcb(), L4_PAGESIZE);
_region_alloc.remove_range((addr_t)l4_utcb(), L4_PAGESIZE * 16);
/* I/O memory could be the whole user address space */
/* FIXME if the kernel helps to find out max address - use info here */

5
os/src/drivers/framebuffer/exynos5/driver.cc
View File

@ -1107,14 +1107,9 @@ static Hdmi * hdmi()
** Framebuffer::Driver **
*************************/
void prepare_fb_driver_init(Mmio::Delayer * const d);
int Framebuffer::Driver::init_drv(size_t width, size_t height, Format format,
Output output, addr_t fb_phys)
{
/* FIXME: hook for scenario/platform dependent quirks */
prepare_fb_driver_init(delayer());
_fb_width = width;
_fb_height = height;
_fb_format = format;

23
os/src/drivers/framebuffer/exynos5/foc_usb/quirks.cc
View File

@ -1,23 +0,0 @@
/*
* \brief Framebuffer driver quirks for FOC with USB
* \author Martin Stein
* \date 2013-08-09
*/
/*
* Copyright (C) 2013 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2.
*/
/* Genode includes */
#include <util/mmio.h>
using namespace Genode;
void prepare_fb_driver_init(Mmio::Delayer * const d)
{
/* FIXME: on Fiasco.OC USB HID gets stuck if HDMI starts simulatnously */
d->usleep(1000000);
}

19
os/src/drivers/framebuffer/exynos5/quirks.cc
View File

@ -1,19 +0,0 @@
/*
* \brief Dummies for framebuffer-driver quirks
* \author Martin Stein
* \date 2013-08-09
*/
/*
* Copyright (C) 2013 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2.
*/
/* Genode includes */
#include <util/mmio.h>
using namespace Genode;
void prepare_fb_driver_init(Mmio::Delayer * const) { }

12
os/src/drivers/framebuffer/exynos5/target.mk
View File

@ -1,17 +1,5 @@
TARGET = fb_drv
REQUIRES = exynos5
SRC_CC += main.cc driver.cc
SRC_CC += quirks.cc
LIBS += base config
INC_DIR += $(PRG_DIR)
ifneq ($(filter foc_arm, $(SPECS)),)
ifneq ($(filter usb, $(SPECS)),)
SPECS += exynos5_fb_foc_usb_quirk
endif
endif
ifneq ($(filter exynos5_fb_foc_usb_quirk, $(SPECS)),)
vpath quirks.cc $(PRG_DIR)/foc_usb
else
vpath quirks.cc $(PRG_DIR)
endif