1
0
Fork 0

update equipment word in RTC on changes

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2308
This commit is contained in:
Peter Veenstra 2005-09-11 13:06:00 +00:00
parent 4eebc6c7f6
commit c317e3adc6
2 changed files with 8 additions and 2 deletions

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: bios.cpp,v 1.44 2005-09-08 13:08:52 qbix79 Exp $ */
/* $Id: bios.cpp,v 1.45 2005-09-11 13:06:00 qbix79 Exp $ */
#include "dosbox.h"
#include "mem.h"
@ -36,6 +36,7 @@
* counter using the BIOS_ZeroExtendedSize call */
static Bit16u size_extended;
static Bits other_memsystems=0;
void CMOS_SetRegister(Bitu regNr, Bit8u val); //For setting equipment word
static Bitu INT70_Handler(void) {
/* Acknowledge irq with cmos */
@ -737,6 +738,7 @@ public:
// PS2 mouse
config |= 0x04;
mem_writew(BIOS_CONFIGURATION,config);
CMOS_SetRegister(0x14,config); //Should be updated on changes
/* Setup extended memory size */
IO_Write(0x70,0x30);
size_extended=IO_Read(0x71);
@ -772,6 +774,7 @@ void BIOS_SetComPorts(Bit16u baseaddr[]) {
equipmentword &= (~0x0E00);
equipmentword |= (portcount << 9);
mem_writew(BIOS_CONFIGURATION,equipmentword);
CMOS_SetRegister(0x14,equipmentword); //Should be updated on changes
}

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: bios_disk.cpp,v 1.21 2005-09-01 17:34:39 qbix79 Exp $ */
/* $Id: bios_disk.cpp,v 1.22 2005-09-11 13:06:00 qbix79 Exp $ */
#include "dosbox.h"
#include "callback.h"
@ -52,6 +52,8 @@ RealPt imgDTAPtr;
DOS_DTA *imgDTA;
bool killRead;
void CMOS_SetRegister(Bitu regNr, Bit8u val); //For setting equipment word
/* 2 floppys and 2 harddrives, max */
imageDisk *imageDiskList[MAX_DISK_IMAGES];
imageDisk *diskSwap[MAX_SWAPPABLE_DISKS];
@ -207,6 +209,7 @@ imageDisk::imageDisk(FILE *imgFile, Bit8u *imgName, Bit32u imgSizeK, bool isHard
equipment|=(numofdisks<<5);
} else equipment|=1;
mem_writew(BIOS_CONFIGURATION,equipment);
CMOS_SetRegister(0x14, equipment);
}
}
}