From f7bc76e7ca085f2186220bbfb4c248177ccc3f77 Mon Sep 17 00:00:00 2001 From: Melissa Goad Date: Sat, 8 Oct 2016 13:06:30 -0500 Subject: [PATCH] Fix text mode brightness on RIVA TNT --- src/vid_nv_rivatnt.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/vid_nv_rivatnt.c b/src/vid_nv_rivatnt.c index 298b4d1fe..722823bad 100644 --- a/src/vid_nv_rivatnt.c +++ b/src/vid_nv_rivatnt.c @@ -1012,15 +1012,8 @@ static void rivatnt_out(uint16_t addr, uint8_t val, void *p) switch(svga->crtcreg) { case 0x1a: -#if 0 - if((svga->crtc[0x28] & 3) != 0) - { - if(svga->crtc[0x1a] & 2) svga_set_ramdac_type(svga, RAMDAC_6BIT); - else svga_set_ramdac_type(svga, RAMDAC_8BIT); - } + if((svga->crtc[0x28] & 3) != 0) svga_set_ramdac_type(svga, (val & 2) ? RAMDAC_6BIT : RAMDAC_8BIT); else svga_set_ramdac_type(svga, RAMDAC_6BIT); -#endif - svga_set_ramdac_type(svga, (val & 2) ? RAMDAC_6BIT : RAMDAC_8BIT); svga_recalctimings(svga); break; case 0x1e: @@ -1288,16 +1281,8 @@ static void rivatnt_recalctimings(svga_t *svga) break; } -#if 0 - if((svga->crtc[0x28] & 3) != 0) - { - if(svga->crtc[0x1a] & 2) svga_set_ramdac_type(svga, RAMDAC_6BIT); - else svga_set_ramdac_type(svga, RAMDAC_8BIT); - } + if((svga->crtc[0x28] & 3) != 0) svga_set_ramdac_type(svga, (svga->crtc[0x1a] & 2) ? RAMDAC_6BIT : RAMDAC_8BIT); else svga_set_ramdac_type(svga, RAMDAC_6BIT); -#endif - - svga_set_ramdac_type(svga, (svga->crtc[0x1a] & 2) ? RAMDAC_6BIT : RAMDAC_8BIT); if (((svga->miscout >> 2) & 2) == 2) {