From 27d76f77d14798bdb40c66b54f84094a9c9514ce Mon Sep 17 00:00:00 2001 From: Bernhard Kauer Date: Sun, 21 Sep 2014 23:25:54 +0200 Subject: [PATCH] seoul: update branch to using vbios emulators * use seoul branch containing vbios emulator * report the memory model in the VBE mode info as otherwise the Genode framebuffer driver will ignore this mode Fixes #1261 --- repos/ports/ports/seoul.hash | 2 +- repos/ports/ports/seoul.port | 4 ++-- repos/ports/src/app/seoul/console.cc | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/repos/ports/ports/seoul.hash b/repos/ports/ports/seoul.hash index 127b8cfd3d..73893850df 100644 --- a/repos/ports/ports/seoul.hash +++ b/repos/ports/ports/seoul.hash @@ -1 +1 @@ -f9a8e04cc3b086d8cbdff95cd5fcd1f7a3fdaad7 +738b9e1298cbf6f99d9882c926cb6c102292c0f5 diff --git a/repos/ports/ports/seoul.port b/repos/ports/ports/seoul.port index a08f1297c6..e010a26872 100644 --- a/repos/ports/ports/seoul.port +++ b/repos/ports/ports/seoul.port @@ -3,8 +3,8 @@ VERSION := git DOWNLOADS := seoul.git URL(seoul) := https://github.com/alex-ab/seoul.git -# branch genode_virtualsmp -REV(seoul) := 86c743a519abb87d3a729db07137222d836420a6 +# branch vbios +REV(seoul) := 04dcb10ecf51463eebcc303e82eb900110a91aef DIR(seoul) := src/app/seoul # diff --git a/repos/ports/src/app/seoul/console.cc b/repos/ports/src/app/seoul/console.cc index e677ef35fd..f0230a7d3c 100644 --- a/repos/ports/src/app/seoul/console.cc +++ b/repos/ports/src/app/seoul/console.cc @@ -130,6 +130,11 @@ bool Vancouver_console::receive(MessageConsole &msg) /* XXX: For now, we only have one view. */ } else if (msg.type == MessageConsole::TYPE_GET_MODEINFO) { + enum { + MEMORY_MODEL_TEXT = 0, + MEMORY_MODEL_DIRECT_COLOR = 6, + }; + /* * We supply two modes to the guest, text mode and one * configured graphics mode 16-bit. @@ -142,6 +147,7 @@ bool Vancouver_console::receive(MessageConsole &msg) msg.info->bytes_per_scanline = 80*2; msg.info->bytes_scanline = 80*2; msg.info->bpp = 4; + msg.info->memory_model = MEMORY_MODEL_TEXT; msg.info->phys_base = 0xb8000; msg.info->_phys_size = 0x8000; return true; @@ -159,6 +165,7 @@ bool Vancouver_console::receive(MessageConsole &msg) msg.info->bytes_per_scanline = _fb_mode.width()*2; msg.info->bytes_scanline = _fb_mode.width()*2; msg.info->bpp = 16; + msg.info->memory_model = MEMORY_MODEL_DIRECT_COLOR; msg.info->vbe1[0] = 0x5; /* red mask size */ msg.info->vbe1[1] = 0xb; /* red field position */ msg.info->vbe1[2] = 0x6; /* green mask size */