From 6cd5f84466b7276cbd3b76f4392621ed982be00d Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Sat, 28 Dec 2019 20:28:35 +0100 Subject: [PATCH] Silence switch warnings for int10 scanline --- src/ints/int10_modes.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ints/int10_modes.cpp b/src/ints/int10_modes.cpp index a06beb62..f956ab18 100644 --- a/src/ints/int10_modes.cpp +++ b/src/ints/int10_modes.cpp @@ -557,10 +557,9 @@ bool INT10_SetVideoMode_OTHER(Bit16u mode,bool clearmem) { IO_WriteW(crtc_base,0x06 | (CurMode->vdispend) << 8); //Vertical sync position IO_WriteW(crtc_base,0x07 | (CurMode->vdispend + ((CurMode->vtotal - CurMode->vdispend)/2)-1) << 8); - //Maximum scanline - Bit8u scanline,crtpage; - scanline=8; - switch(CurMode->type) { + // Maximum scanline + uint8_t scanline; + switch (CurMode->type) { case M_TEXT: if (machine==MCH_HERC) scanline=14; else scanline=8; @@ -576,6 +575,9 @@ bool INT10_SetVideoMode_OTHER(Bit16u mode,bool clearmem) { if (CurMode->mode!=0x9) scanline=2; else scanline=4; break; + default: + scanline = 8; + break; } IO_WriteW(crtc_base,0x09 | (scanline-1) << 8); //Setup the CGA palette using VGA DAC palette @@ -594,6 +596,7 @@ bool INT10_SetVideoMode_OTHER(Bit16u mode,bool clearmem) { 0x1a,0x1b,0x0b //8-a }; Bit8u mode_control,color_select; + uint8_t crtpage; switch (machine) { case MCH_HERC: IO_WriteB(0x3b8,0x28); // TEXT mode and blinking characters