From aa933688eb13ebf0162cdd7cd224e947d959dac9 Mon Sep 17 00:00:00 2001 From: SarahW Date: Sun, 12 May 2019 18:00:19 +0100 Subject: [PATCH] Fix reads of 3C6 on SDAC (Bahamas 64) when not returning command register or RAMDAC ID. --- src/vid_sdac_ramdac.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vid_sdac_ramdac.c b/src/vid_sdac_ramdac.c index 2ced27f..6d29120 100644 --- a/src/vid_sdac_ramdac.c +++ b/src/vid_sdac_ramdac.c @@ -96,7 +96,6 @@ void sdac_ramdac_out(uint16_t addr, uint8_t val, sdac_ramdac_t *ramdac, svga_t * uint8_t sdac_ramdac_in(uint16_t addr, sdac_ramdac_t *ramdac, svga_t *svga) { - uint8_t temp; // /*if (CS!=0xC000) */pclog("IN RAMDAC %04X %04X:%04X %i %i %i\n",addr,CS,cpu_state.pc, ramdac->rs2, ramdac->rindex, ramdac->windex); switch (addr) { @@ -105,15 +104,15 @@ uint8_t sdac_ramdac_in(uint16_t addr, sdac_ramdac_t *ramdac, svga_t *svga) ramdac->magic_count++; if (ramdac->magic_count == 4) { - temp = 0x70; /*SDAC ID*/ ramdac->rs2 = 1; + return 0x70; /*SDAC ID*/ } if (ramdac->magic_count == 5) { - temp = ramdac->command; ramdac->magic_count = 0; + return ramdac->command; } - return temp; + break; case 3: ramdac->magic_count=0; break;