diff --git a/repos/pc/src/driver/framebuffer/intel/pc/README b/repos/pc/src/driver/framebuffer/intel/pc/README index e5f3e53e9e..5c7d49827a 100644 --- a/repos/pc/src/driver/framebuffer/intel/pc/README +++ b/repos/pc/src/driver/framebuffer/intel/pc/README @@ -31,14 +31,14 @@ The exported report has the following format: ! ! -! +! ! ... ! ! -! -! -! -! +! +! +! +! ! ... ! ! @@ -54,12 +54,13 @@ whether it should be enabled or not. This looks like the following: ! ! -! +! ! -The resolution can be configured exactly by the reported mode_id or by -the width/height/hz attributes. In the latter case the driver will take the -first matching mode out of multiple matching modes potentially. +The resolution can be configured exactly by setting the 'mode' attribute +to one of the 'id' values of the reported modes or by setting the +width/height/hz attributes. In the latter case the driver will take the first +matching mode out of multiple matching modes potentially. The brightness value is in percent and takes effect only if supported by the hardware. @@ -70,7 +71,7 @@ The maximal physical resolution across all connectors can be restricted by: ! Note: All larger modes still will be reported, but are marked as unusable - by an additional attribute 'unavailable' set to true. + by an additional attribute 'usable' set to false. The amount of memory used by the driver for the accounting of its available buffer space is set by: diff --git a/repos/pc/src/driver/framebuffer/intel/pc/main.cc b/repos/pc/src/driver/framebuffer/intel/pc/main.cc index e28f5857f9..f7ca46bde4 100644 --- a/repos/pc/src/driver/framebuffer/intel/pc/main.cc +++ b/repos/pc/src/driver/framebuffer/intel/pc/main.cc @@ -398,7 +398,7 @@ void Framebuffer::Driver::lookup_config(char const * const name, mode.width = node.attribute_value("width" , 0U); mode.height = node.attribute_value("height" , 0U); mode.hz = node.attribute_value("hz" , 0U); - mode.id = node.attribute_value("mode_id", 0U); + mode.id = node.attribute_value("mode" , 0U); mode.brightness = node.attribute_value("brightness", unsigned(MAX_BRIGHTNESS + 1)); }; @@ -546,17 +546,17 @@ void lx_emul_i915_report_modes(void * genode_xml, struct genode_mode *mode) xml.node("mode", [&] () { - xml.attribute("width", mode->width); - xml.attribute("height", mode->height); - xml.attribute("hz", mode->hz); - xml.attribute("mode_id", mode->id); - xml.attribute("mode_name", mode->name); + xml.attribute("width", mode->width); + xml.attribute("height", mode->height); + xml.attribute("hz", mode->hz); + xml.attribute("id", mode->id); + xml.attribute("name", mode->name); if (mode->width_mm) xml.attribute("width_mm", mode->width_mm); if (mode->height_mm) xml.attribute("height_mm", mode->height_mm); if (!mode->enabled) - xml.attribute("unavailable", true); + xml.attribute("usable", false); if (mode->preferred) xml.attribute("preferred", true); if (mode->inuse)