git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed logging to support 8-charater identifiers
[tpg/acess2.git]
/
Kernel
/
drv
/
kb.c
diff --git
a/Kernel/drv/kb.c
b/Kernel/drv/kb.c
index
950f722
..
6577882
100644
(file)
--- a/
Kernel/drv/kb.c
+++ b/
Kernel/drv/kb.c
@@
-64,6
+64,7
@@
int KB_Install(char **Arguments)
temp = inb(0x61);
outb(0x61, temp | 0x80);
outb(0x61, temp & 0x7F);
temp = inb(0x61);
outb(0x61, temp | 0x80);
outb(0x61, temp & 0x7F);
+ inb(0x60); // Clear keyboard buffer
IRQ_AddHandler(1, KB_IRQHandler);
DevFS_AddDevice( &gKB_DevInfo );
IRQ_AddHandler(1, KB_IRQHandler);
DevFS_AddDevice( &gKB_DevInfo );
@@
-81,17
+82,16
@@
void KB_IRQHandler()
Uint32 ch;
// int keyNum;
Uint32 ch;
// int keyNum;
- //if( inportb(0x64) & 0x20 ) return;
+ // Check port 0x64 to tell if this is from the aux port
+ //if( inb(0x64) & 0x20 ) return;
scancode = inb(0x60); // Read from the keyboard's data buffer
scancode = inb(0x60); // Read from the keyboard's data buffer
- Log_Debug("KB", "scancode = %02x");
-
- //Log("KB_IRQHandler: scancode = 0x%02x", scancode);
+ //Log_Debug("Keyboard", "scancode = %02x", scancode);
// Ignore ACKs
if(scancode == 0xFA) {
// Ignore ACKs
if(scancode == 0xFA) {
- // Oh man! This is ana
chic (I'm leaving it here to represent the
- // mess that Acess once was)
+ // Oh man! This is ana
rchic (I'm leaving it here to represent
+ //
the
mess that Acess once was)
//kb_lastChar = KB_ACK;
return;
}
//kb_lastChar = KB_ACK;
return;
}
@@
-126,7
+126,7
@@
void KB_IRQHandler()
//keyNum = giKB_KeyLayer * 256 + scancode;
// Check for unknown key
if(!ch && !gbKB_KeyUp)
//keyNum = giKB_KeyLayer * 256 + scancode;
// Check for unknown key
if(!ch && !gbKB_KeyUp)
-
Warning(
"UNK %i %x", giKB_KeyLayer, scancode);
+
Log_Warning("Keyboard",
"UNK %i %x", giKB_KeyLayer, scancode);
// Key Up?
if (gbKB_KeyUp)
// Key Up?
if (gbKB_KeyUp)
@@
-173,11
+173,11
@@
void KB_IRQHandler()
#if USE_KERNEL_MAGIC
if(ch == KEY_LCTRL) {
gbKB_MagicState |= 1;
#if USE_KERNEL_MAGIC
if(ch == KEY_LCTRL) {
gbKB_MagicState |= 1;
-
Log_Log("KB
", "Kernel Magic LCTRL Down\n");
+
//Log_Log("Keyboard
", "Kernel Magic LCTRL Down\n");
}
if(ch == KEY_LALT) {
gbKB_MagicState |= 2;
}
if(ch == KEY_LALT) {
gbKB_MagicState |= 2;
-
Log_Log("KB
", "Kernel Magic LALT Down\n");
+
//Log_Log("Keyboard
", "Kernel Magic LALT Down\n");
}
if(gbKB_MagicState == 3)
{
}
if(gbKB_MagicState == 3)
{
UCC
git Repository :: git.ucc.asn.au