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

replaced Debug_Msg with LOG

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@725
This commit is contained in:
Ulf Wohlers 2003-03-07 11:20:47 +00:00
parent 14dbc00591
commit 542d0739c9
3 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dos/cdrom.cpp
View file

@ -84,11 +84,11 @@ BYTE CDROM_Interface_Aspi::GetHostAdapter(void)
ResetEvent(hEvent);
dwStatus = pSendASPI32Command((LPSRB)&s);
if ((dwStatus==0) && (s.SRB_Status!=SS_INVALID_CMD)) {
DEBUG_ShowMsg(0,"SCSI: Host Adapter found: %d",i);
LOG(LOG_MISC,"SCSI: Host Adapter found: %d",i);
return i;
};
};
DEBUG_ShowMsg(0,"SCSI: Host Adapter not found.");
LOG(LOG_MISC|LOG_ERROR,"SCSI: Host Adapter not found.");
return 0;
};
@ -111,15 +111,15 @@ bool CDROM_Interface_Aspi::ScanRegistryFindKey(HKEY& hKeyBase)
newKeyResult = RegOpenKeyEx (hKeyBase,subKey,0,KEY_READ,&hNewKey);
if (newKeyResult==ERROR_SUCCESS) {
if (GetRegistryValue(hNewKey,"CurrentDriveLetterAssignment",buffer,256)) {
DEBUG_ShowMsg(0,"SCSI: Drive Letter found: %s",buffer);
LOG(LOG_MISC,"SCSI: Drive Letter found: %s",buffer);
// aha, something suspicious...
if (buffer[0]==letter) {
// found it... lets see if we can get the scsi values
bool v1 = GetRegistryValue(hNewKey,"SCSILUN",buffer,256);
DEBUG_ShowMsg(0,"SCSI: SCSILUN found: %s",buffer);
LOG(LOG_MISC,"SCSI: SCSILUN found: %s",buffer);
lun = buffer[0]-'0';
bool v2 = GetRegistryValue(hNewKey,"SCSITargetID",buffer,256);
DEBUG_ShowMsg(0,"SCSI: SCSITargetID found: %s",buffer);
LOG(LOG_MISC,"SCSI: SCSITargetID found: %s",buffer);
target = buffer[0]-'0';
RegCloseKey(hNewKey);
if (v1 && v2) {

3
src/dos/cdrom_ioctl.cpp
View file

@ -246,7 +246,8 @@ int CDROM_GetMountType(char* path)
return 2;
};
#else
#else #if defined (WIN32)
// *****************************************************************
// Windows IOCTL functions (not suitable for 95/98/Me)

29
src/dos/dos_mscdex.cpp
View file

@ -17,6 +17,7 @@
*/
#include <string.h>
#include <ctype.h>
#include "cpu.h"
#include "callback.h"
#include "dos_system.h"
@ -228,31 +229,31 @@ int CMscdex::AddDrive(Bit16u _drive, char* physicalPath, Bit8u& subUnit)
// WIN NT/200/XP
if (gUseASPI) {
cdrom[numDrives] = new CDROM_Interface_Aspi();
DEBUG_ShowMsg(0,"MSCDEX: ASPI Interface.");
LOG(LOG_MISC,"MSCDEX: ASPI Interface.");
} else {
cdrom[numDrives] = new CDROM_Interface_Ioctl();
DEBUG_ShowMsg(0,"MSCDEX: IOCTL Interface.");
LOG(LOG_MISC,"MSCDEX: IOCTL Interface.");
}
} else {
// Win 95/98/ME - always use ASPI
cdrom[numDrives] = new CDROM_Interface_Aspi();
DEBUG_ShowMsg(0,"MSCDEX: ASPI Interface.");
LOG(LOG_MISC,"MSCDEX: ASPI Interface.");
}
#else
cdrom[numDrives] = new CDROM_Interface_Linux();
#endif
DEBUG_ShowMsg(0,"MSCDEX: Mounting physical cdrom: %s" ,physicalPath);
LOG(LOG_MISC,"MSCDEX: Mounting physical cdrom: %s" ,physicalPath);
} break;
case 0x01 : // iso cdrom interface
// FIXME: Not yet supported
DEBUG_ShowMsg(0,"MSCDEX: Mounting iso file as cdrom: %s" ,physicalPath);
LOG(LOG_MISC|LOG_ERROR,"MSCDEX: Mounting iso file as cdrom: %s" ,physicalPath);
cdrom[numDrives] = new CDROM_Interface_Fake;
return 2;
break;
case 0x02 : // fake cdrom interface (directories)
cdrom[numDrives] = new CDROM_Interface_Fake;
DEBUG_ShowMsg(0,"MSCDEX: Mounting directory as cdrom: %s",physicalPath);
DEBUG_ShowMsg(0,"MSCDEX: You wont have full MSCDEX support !");
LOG(LOG_MISC,"MSCDEX: Mounting directory as cdrom: %s",physicalPath);
LOG(LOG_MISC,"MSCDEX: You wont have full MSCDEX support !");
result = 5;
break;
default : // weird result
@ -513,27 +514,27 @@ static CMscdex* mscdex = 0;
static Bitu MSCDEX_Strategy_Handler(void)
{
// DEBUG_ShowMsg("MSCDEX: Device Strategy Routine called.");
// LOG("MSCDEX: Device Strategy Routine called.");
return CBRET_NONE;
}
static Bitu MSCDEX_Interrupt_Handler(void)
{
// DEBUG_ShowMsg("MSCDEX: Device Interrupt Routine called.");
// LOG("MSCDEX: Device Interrupt Routine called.");
Bit8u subFuncNr = 0xFF;
PhysPt data = PhysMake(SegValue(es),reg_bx);
Bit8u subUnit = mem_readb(data+1);
Bit8u funcNr = mem_readb(data+2);
// if (funcNr!=0x03) DEBUG_ShowMsg("MSCDEX: Driver Function %02X",funcNr);
// if (funcNr!=0x03) LOG("MSCDEX: Driver Function %02X",funcNr);
switch (funcNr) {
case 0x03 : { /* IOCTL INPUT */
PhysPt buffer = PhysMake(mem_readw(data+0x10),mem_readw(data+0x0E));
subFuncNr = mem_readb(buffer);
//if (subFuncNr!=0x0B) DEBUG_ShowMsg("MSCDEX: IOCTL INPUT Subfunction %02X",subFuncNr);
//if (subFuncNr!=0x0B) LOG("MSCDEX: IOCTL INPUT Subfunction %02X",subFuncNr);
switch (subFuncNr) {
case 0x00 : /* Get Device Header address */
mem_writed(buffer+1,RealMake(mscdex->rootDriverHeaderSeg,0));
@ -629,7 +630,7 @@ static Bitu MSCDEX_Interrupt_Handler(void)
case 0x0C : { /* IOCTL OUTPUT */
PhysPt buffer = PhysMake(mem_readw(data+0x10),mem_readw(data+0x0E));
subFuncNr = mem_readb(buffer);
// if (subFuncNr!=0x0B) DEBUG_ShowMsg("MSCDEX: IOCTL OUTPUT Subfunction %02X",subFuncNr);
// if (subFuncNr!=0x0B) LOG("MSCDEX: IOCTL OUTPUT Subfunction %02X",subFuncNr);
switch (subFuncNr) {
case 0x00 : // Unload /eject) media
mscdex->LoadUnloadMedia(subUnit,true);
@ -692,7 +693,7 @@ static bool MSCDEX_Handler(void)
if (reg_ah!=0x15) return false;
PhysPt data = PhysMake(SegValue(es),reg_bx);
// if (reg_ax!=0x1510) DEBUG_ShowMsg("MSCEEX: INT 2F %04X",reg_ax);
// if (reg_ax!=0x1510) LOG("MSCEEX: INT 2F %04X",reg_ax);
switch (reg_ax) {
case 0x1500: /* Install check */
@ -775,7 +776,7 @@ public:
device_MSCDEX() { name="MSCD001"; }
bool Read (Bit8u * data,Bit16u * size) { return false;}
bool Write(Bit8u * data,Bit16u * size) {
DEBUG_ShowMsg(0,"Write to mscdex device");
LOG(0,"Write to mscdex device");
return false;
}
bool Seek(Bit32u * pos,Bit32u type){return false;}