Skip to content

Commit

Permalink
next-cube.c: move LED logic to new next_scr2_led_update() function
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20231220131641.592826-10-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
  • Loading branch information
mcayland authored and huth committed Dec 22, 2023
1 parent 22cf5ee commit 3deafd1
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions hw/m68k/next-cube.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 3deafd1

Please sign in to comment.