X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=ppcskel.git;a=blobdiff_plain;f=main.c;fp=main.c;h=451b87dba0a95145ca920c0b972d0ba88ca8d9ef;hp=3e186f3f13505102362c6a0baa1af280907f7792;hb=59cd61cee0ebb13ed425654f9de96652c167c5cd;hpb=22afc41a706dc6a3244fa748e593b8f8a238a83f

diff --git a/main.c b/main.c
index 3e186f3..451b87d 100644
--- a/main.c
+++ b/main.c
@@ -24,6 +24,9 @@ Copyright (C) 2009              John Kelley <wiidev@kelley.ca>
 #include "video_low.h"
 #include "input.h"
 #include "console.h"
+#include "irq.h"
+#include "usb/core/core.h"
+#include "usb/drivers/class/hid.h"
 #include "sha1.h"
 #include "hollywood.h"
 
@@ -84,8 +87,13 @@ int main(void)
 	exception_init();
 	dsp_reset();
 
-	// clear interrupt mask
-	write32(0x0c003004, 0);
+	irq_initialize();
+	irq_bw_enable(BW_PI_IRQ_RESET);
+	irq_bw_enable(BW_PI_IRQ_HW); //hollywood pic
+	/* external ohci */
+	irq_hw_enable(IRQ_OHCI0);
+	/* internal ohci */
+	//irq_hw_enable(IRQ_OHCI1);
 
 	ipc_initialize();
 	ipc_slowping();
@@ -111,11 +119,57 @@ int main(void)
 			; // better ideas welcome!
 	}
 
+	/* external ohci */
+	usb_init(OHCI0_REG_BASE);
+
+	/* internal ohci */
+	//usb_init(OHCI1_REG_BASE);
+
+	/* load HID keyboard driver */
+	usb_hidkb_init();
+
+	/* you are welcome to make this nice :) */
+	char str[7];
+	u16 i, j, y=20, x=20;
+	struct kbrep *k;
+
+	while(1) {
+		memset(str, '\0', 8);
+		j=0;
+		k = usb_hidkb_getChars();
+		for(i=0; k->keys[i]>0; i++) {
+			if(x>650) {
+				x = 20;
+				y += 15;
+			}
+			if(y>440) {
+				y=20;
+			}
+			if((k->keys[i] >= 4) && k->keys[i] <= 4+'z'-'a') {
+				str[j] = k->keys[i] - 4 + 'a';
+			} 
+			else if (k->keys[i] == 0x28) {
+				y += 15;
+				x = 20;
+			}
+			j++;
+		}
+		if(j > 0) {
+			print_str_noscroll(x, y, str);
+			printf("y: %d\n", y);
+		}
+		while(j--) {
+			x += 13;
+		}
+	}
+
+#if 0
 	printf("===============================\n");
 
 	SHA1TestCases();
 
 	printf("bye, world!\n");
+#endif
 
 	return 0;
 }