From 9175b74b13f22cac5c9d530b91093f0345635e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?=
 <c2woody@users.sourceforge.net>
Date: Sat, 22 Oct 2005 10:28:57 +0000
Subject: [PATCH] correct video startup mode field

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2352
---
 src/ints/bios.cpp      | 5 +++--
 src/ints/bios_disk.cpp | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ints/bios.cpp b/src/ints/bios.cpp
index 1abdfef9..28dddbd5 100644
--- a/src/ints/bios.cpp
+++ b/src/ints/bios.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: bios.cpp,v 1.46 2005-09-21 11:37:35 c2woody Exp $ */
+/* $Id: bios.cpp,v 1.47 2005-10-22 10:28:57 c2woody Exp $ */
 
 #include "dosbox.h"
 #include "mem.h"
@@ -735,7 +735,8 @@ public:
 			//Startup monochrome
 			config|=0x30;
 			break;
-		case MCH_CGA:	
+		case MCH_VGA:
+		case MCH_CGA:
 		case MCH_TANDY:
 			//Startup 80x25 color
 			config|=0x20;
diff --git a/src/ints/bios_disk.cpp b/src/ints/bios_disk.cpp
index 1a244c65..6608ad6b 100644
--- a/src/ints/bios_disk.cpp
+++ b/src/ints/bios_disk.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: bios_disk.cpp,v 1.22 2005-09-11 13:06:00 qbix79 Exp $ */
+/* $Id: bios_disk.cpp,v 1.23 2005-10-22 10:28:57 c2woody Exp $ */
 
 #include "dosbox.h"
 #include "callback.h"
@@ -202,11 +202,11 @@ imageDisk::imageDisk(FILE *imgFile, Bit8u *imgName, Bit32u imgSizeK, bool isHard
 		} else {
 			Bit16u equipment=mem_readw(BIOS_CONFIGURATION);
 			if(equipment&1) {
-				Bitu numofdisks = (equipment>>5)&3;
+				Bitu numofdisks = (equipment>>6)&3;
 				numofdisks++;
 				if(numofdisks > 1) numofdisks=1;//max 2 floppies at the moment
 				equipment&=~0x00C0;
-				equipment|=(numofdisks<<5);
+				equipment|=(numofdisks<<6);
 			} else equipment|=1;
 			mem_writew(BIOS_CONFIGURATION,equipment);
 			CMOS_SetRegister(0x14, equipment);