#define USE_KERNEL_MAGIC 1
// === IMPORTS ===
-void Threads_Dump();
+void Threads_Dump(void);
+void Heap_Stats(void);
// === PROTOTYPES ===
int KB_Install(char **Arguments);
-void KB_IRQHandler();
+void KB_IRQHandler(int IRQNum);
void KB_AddBuffer(char ch);
Uint64 KB_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Dest);
-void KB_UpdateLEDs();
+void KB_UpdateLEDs(void);
int KB_IOCtl(tVFS_Node *Node, int Id, void *Data);
// === GLOBALS ===
// === CODE ===
/**
- * \fn int KB_Install(char **Arguments)
+ * \brief Install the keyboard driver
*/
int KB_Install(char **Arguments)
{
}
/**
- * \fn void KB_IRQHandler()
* \brief Called on a keyboard IRQ
+ * \param IRQNum IRQ number (unused)
*/
-void KB_IRQHandler()
+void KB_IRQHandler(int IRQNum)
{
Uint8 scancode;
Uint32 ch;
// int keyNum;
// Check port 0x64 to tell if this is from the aux port
- if( inb(0x64) & 0x20 ) return;
+ //if( inb(0x64) & 0x20 ) return;
scancode = inb(0x60); // Read from the keyboard's data buffer
//Log_Debug("Keyboard", "scancode = %02x", scancode);
{
switch(ch)
{
- case 'd': __asm__ __volatile__ ("xchg %bx, %bx"); break;
- case 'p': Threads_Dump(); break;
+ // Kernel Panic (Page Fault)
+ case 'q': *((int*)1) = 0; return;
+ // Bochs Magic Breakpoint
+ case 'd': __asm__ __volatile__ ("xchg %bx, %bx"); return;
+ // Thread List Dump
+ case 'p': Threads_Dump(); return;
+ // Heap Statistics
+ case 'h': Heap_Stats(); return;
}
}
#endif
// Is shift pressed
- // - Darn ugly hacks !(!x) means (bool)x
- if( !(!gbKB_ShiftState) ^ gbKB_CapsState)
+ // - Darn ugly hacks !!x means (bool)x
+ if( !!gbKB_ShiftState ^ gbKB_CapsState)
{
switch(ch)
{
}
/**
- * \fn void KB_UpdateLEDs()
+ * \fn void KB_UpdateLEDs(void)
* \brief Updates the status of the keyboard LEDs
*/
-void KB_UpdateLEDs()
+void KB_UpdateLEDs(void)
{
Uint8 leds;