On 02/10/2021 15:04, Philippe Mathieu-Daudé wrote:

On 10/2/21 13:00, Mark Cave-Ayland wrote:
Since the available resolutions and colour depths are determined by the attached
display type, add a qdev property to allow the display type to be specified.

The main resolutions of interest are high resolution 1152x870 with 8-bit colour
and SVGA resolution up to 800x600 with 32-bit colour so update the q800 machine
to allow high resolution mode if specified and otherwise fall back to SVGA.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
---
  hw/display/macfb.c         | 6 +++++-
  hw/m68k/q800.c             | 5 +++++
  include/hw/display/macfb.h | 1 +
  3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index 5c95aa4a11..023d1f0cd1 100644
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -316,7 +316,7 @@ static uint32_t macfb_sense_read(MacfbState *s)
      MacFbSense *macfb_sense;
      uint8_t sense;

What about:

        assert(s->type < ARRAY_SIZE(macfb_sense_table));

-    macfb_sense = &macfb_sense_table[MACFB_DISPLAY_VGA];
+    macfb_sense = &macfb_sense_table[s->type];

Otherwise:
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>

Agreed, I will add this in for v2.


ATB,

Mark.

Reply via email to