X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=bootcensus;a=blobdiff_plain;f=src%2Fkeyb.c;h=0b6187129b305b010e21efe9fc7b77222a908391;hp=a63312e62ece6361af7323b157425cbab84623e6;hb=5e8cc93aaf1173688852acaa0825698c2dc0cb3f;hpb=91253d061647c194cdc8c16c9ae85eccdf942139

diff --git a/src/keyb.c b/src/keyb.c
index a63312e..0b61871 100644
--- a/src/keyb.c
+++ b/src/keyb.c
@@ -15,13 +15,13 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
+#include <stdio.h>
 #include <string.h>
 #include "keyb.h"
 #include "intr.h"
 #include "asmops.h"
+#include "kbregs.h"
 
-#define KB_IRQ	1
-#define KB_PORT		0x60
 
 /* table with rough translations from set 1 scancodes to ASCII-ish */
 static int scantbl[] = {
@@ -115,12 +115,56 @@ void kb_putback(int key)
 	buffer[buf_ridx] = key;
 }
 
+int kb_wait_write(void)
+{
+	int i;
+	for(i=0; i<32768; i++) {
+		if(!(inb(KB_STATUS_PORT) & KB_STAT_INBUF_FULL)) {
+			return 1;
+		}
+		iodelay();
+	}
+	/*printf("kb_wait_write timeout\n");*/
+	return 0;
+}
+
+int kb_wait_read(void)
+{
+	int i;
+	for(i=0; i<32768; i++) {
+		if((inb(KB_STATUS_PORT) & KB_STAT_OUTBUF_FULL)) {
+			return 1;
+		}
+		iodelay();
+	}
+	/*printf("kb_wait_read timeout\n");*/
+	return 0;
+}
+
+void kb_send_cmd(unsigned char cmd)
+{
+	kb_wait_write();
+	outb(cmd, KB_CMD_PORT);
+}
+
+void kb_send_data(unsigned char data)
+{
+	kb_wait_write();
+	outb(data, KB_DATA_PORT);
+}
+
+unsigned char kb_read_data(void)
+{
+	kb_wait_read();
+	return inb(KB_DATA_PORT);
+}
+
 static void kbintr()
 {
 	unsigned char code;
 	int key, press;
 
-	code = inb(KB_PORT);
+	code = inb(KB_DATA_PORT);
 
 	if(code >= 128) {
 		press = 0;