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

updated loggingsystem

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@989
This commit is contained in:
Peter Veenstra 2003-05-04 19:19:09 +00:00
parent 72d44cbc16
commit bbb7cf45b0
44 changed files with 208 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/hardware/keyboard.cpp
View file

@ -47,7 +47,7 @@ struct KeyCode {
};
struct KeyEvent {
Bitu type;
Bits type;
Bitu state;
KEYBOARD_EventHandler * handler;
KeyEvent * next;
@ -180,7 +180,7 @@ static void write_p60(Bit32u port,Bit8u val) {
KEYBOARD_AddCode(0xfa,0,0,STATE_NORMAL); /* Acknowledge */
break;
default:
LOG(LOG_ERROR|LOG_KEYBOARD,"60:Unhandled command %X",val);
LOG(LOG_KEYBOARD,LOG_ERROR)("60:Unhandled command %X",val);
}
return;
case CMD_SETOUTPORT:
@ -218,13 +218,13 @@ static void write_p64(Bit32u port,Bit8u val) {
keyb.scheduled=true;
PIC_AddEvent(KEYBOARD_GetCode,KEYDELAY);
}
LOG(LOG_KEYBOARD,"Activated");
LOG(LOG_KEYBOARD,LOG_NORMAL)("Activated");
break;
case 0xae: /* Deactivate keyboard */
keyb.active=false;
PIC_DeActivateIRQ(1);
PIC_RemoveEvents(KEYBOARD_GetCode);
LOG(LOG_KEYBOARD,"De-Activated");
LOG(LOG_KEYBOARD,LOG_NORMAL)("De-Activated");
break;
case 0xd0: /* Outport on buffer */
KEYBOARD_AddCode(MEM_A20_Enabled() ? 0x02 : 0,0,0,STATE_NORMAL);
@ -233,7 +233,7 @@ static void write_p64(Bit32u port,Bit8u val) {
keyb.command=CMD_SETOUTPORT;
break;
default:
LOG(LOG_ERROR|LOG_KEYBOARD,"Port 64 write with val %d",val);
LOG(LOG_KEYBOARD,LOG_ERROR)("Port 64 write with val %d",val);
break;
}
}
@ -246,7 +246,7 @@ void KEYBOARD_AddEvent(Bitu keytype,Bitu state,KEYBOARD_EventHandler * handler)
KeyEvent * newevent=new KeyEvent;
/* Add the event in the correct key structure */
if (keytype>=KBD_LAST) {
LOG(LOG_ERROR|LOG_KEYBOARD,"Illegal key %d for handler",keytype);
LOG(LOG_KEYBOARD,LOG_ERROR)("Illegal key %d for handler",keytype);
}
newevent->next=event_handlers[keytype];
event_handlers[keytype]=newevent;
@ -372,7 +372,7 @@ void KEYBOARD_AddKey(KBD_KEYS keytype,Bitu unicode,Bitu mod,bool pressed) {
case KBD_insert:extend=true;ret=82;break;
case KBD_delete:extend=true;ret=83;break;
default:
E_Exit("Unsopperted key press");
E_Exit("Unsupported key press");
break;
}
/* check for active key events */