valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

make variable types used in swapping consistent and use Bit8u for drives.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3917
This commit is contained in:
Peter Veenstra 2015-06-05 13:22:37 +00:00
parent 084342cf83
commit 7e22a0f0c0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/bios_disk.h
View file

@ -75,7 +75,7 @@ void incrementFDD(void);
extern imageDisk *imageDiskList[2 + MAX_HDD_IMAGES];
extern imageDisk *diskSwap[20];
extern Bits swapPosition;
extern Bit32s swapPosition;
extern Bit16u imgDTASeg; /* Real memory location of temporary DTA pointer for fat image disk access */
extern RealPt imgDTAPtr; /* Real memory location of temporary DTA pointer for fat image disk access */
extern DOS_DTA *imgDTA;

14
src/ints/bios_disk.cpp
View file

@ -58,7 +58,7 @@ 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];
Bits swapPosition;
Bit32s swapPosition;
void updateDPT(void) {
Bit32u tmpheads, tmpcyl, tmpsect, tmpsize;
@ -101,9 +101,9 @@ void incrementFDD(void) {
void swapInDisks(void) {
bool allNull = true;
Bits diskcount = 0;
Bits swapPos = swapPosition;
int i;
Bit32s diskcount = 0;
Bit32s swapPos = swapPosition;
Bit32s i;
/* Check to make sure that there is at least one setup image */
for(i=0;i<MAX_SWAPPABLE_DISKS;i++) {
@ -263,7 +263,7 @@ Bit32u imageDisk::getSectSize(void) {
return sector_size;
}
static Bitu GetDosDriveNumber(Bitu biosNum) {
static Bit8u GetDosDriveNumber(Bit8u biosNum) {
switch(biosNum) {
case 0x0:
return 0x0;
@ -282,7 +282,7 @@ static Bitu GetDosDriveNumber(Bitu biosNum) {
}
}
static bool driveInactive(Bitu driveNum) {
static bool driveInactive(Bit8u driveNum) {
if(driveNum>=(2 + MAX_HDD_IMAGES)) {
LOG(LOG_BIOS,LOG_ERROR)("Disk %d non-existant", driveNum);
last_status = 0x01;
@ -308,7 +308,7 @@ static bool driveInactive(Bitu driveNum) {
static Bitu INT13_DiskHandler(void) {
Bit16u segat, bufptr;
Bit8u sectbuf[512];
Bitu drivenum;
Bit8u drivenum;
Bitu i,t;
last_drive = reg_dl;
drivenum = GetDosDriveNumber(reg_dl);