1
0
Fork 0

correct video startup mode field

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2352
This commit is contained in:
Sebastian Strohhäcker 2005-10-22 10:28:57 +00:00
parent aec4e8489f
commit 9175b74b13
2 changed files with 6 additions and 5 deletions

View file

@ -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;

View file

@ -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);