Ensure that the LED status is updated by calling next_scr2_led_update() whenever
the SC2 register is written.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/m68k/next-cube.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index d53f73fb8b..fd707b4b54 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -124,6 +124,18 @@ static const uint8_t rtc_ram2[32] = {
#define SCR2_RTDATA 0x4
#define SCR2_TOBCD(x) (((x / 10) << 4) + (x % 10))
+static void next_scr2_led_update(NeXTPC *s)
+{
+ if (s->scr2 & 0x1) {
+ DPRINTF("fault!\n");
+ s->led++;
+ if (s->led == 10) {
+ DPRINTF("LED flashing, possible fault!\n");
+ s->led = 0;
+ }
+ }
+}
+
static void nextscr2_write(NeXTPC *s, uint32_t val, int size)
{
uint8_t old_scr2, scr2_2;
@@ -135,15 +147,6 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, int size)
scr2_2 = val & 0xFF;
}
- if (val & 0x1) {
- DPRINTF("fault!\n");
- s->led++;
- if (s->led == 10) {
- DPRINTF("LED flashing, possible fault!\n");
- s->led = 0;
- }
- }
-
old_scr2 = (s->old_scr2 >> 8) & 0xff;
if (scr2_2 & 0x1) {
@@ -321,6 +324,7 @@ static void next_mmio_write(void *opaque, hwaddr addr, uint64_t val,
case 0xd000 ... 0xd003:
s->scr2 = deposit32(s->scr2, (4 - (addr - 0xd000) - size) << 3,
size << 3, val);
+ next_scr2_led_update(s);
nextscr2_write(s, val, size);
s->old_scr2 = s->scr2;
break;
--
2.39.2