Import backup from 2004-03-10

kernel/char/keyboard.c

@@ -5,6 +5,10 @@
 
 #include "hos_defines.h"
 #include "keyboard.h"
+#include "sys/io.h"
+#include "sys/pic.h"
+#include "functions.h"
+#include "kio.h"
 
 #define KBD_BUFFER_LENGTH 64
 
@@ -49,13 +53,13 @@ void isr_keyboard()
 	if (kbdScan == 224)						//extended key
 	{
 		kbdExt = 1;
-		eoi();
+		pic_eoi();
 		return;
 	}
 	if (kbdScan == 225)						//2nd-set-extended key
 	{
 		kbdExt2 = 2;
-		eoi();
+		pic_eoi();
 		return;
 	}
 
@@ -117,7 +121,7 @@ void isr_keyboard()
 	{
 		if (kbdExt > 0)
 			kbdExt--;
-		eoi();
+		pic_eoi();
 		return;
 	}
 //====determine ASCII value of key::
@@ -182,14 +186,14 @@ void isr_keyboard()
 	}
 	if (kbdAscii == 2)							//unknown key / ignore key
 	{
-		eoi();
+		pic_eoi();
 		return;
 	}
 	if (kbdScan < KBD_SCAN_RELEASED)					//a key was pressed, save it
 	{
 		if (kbdBufferLen >= KBD_BUFFER_LENGTH)				//no key slots available
 		{
-			eoi();
+			pic_eoi();
 			return;
 		}
 		else
@@ -199,7 +203,7 @@ void isr_keyboard()
 		}
 	}
 
-	eoi();
+	pic_eoi();
 
 }
 

kernel/char/mouse.c

@@ -4,6 +4,8 @@
 
 #include "mouse.h"
 #include "hos_defines.h"
+#include "video/video.h"
+#include "sys/io.h"
 
 #define MOUSE_BUFFER_LENGTH 16