X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=main.c;h=133d998531a4271cbb0e707f33c115b66385adfe;hb=dd7d06aa840f23f3447befc37ce1ddcbe3a10c29;hp=62116920a79401ed597fd10b3727ec5797da5b1d;hpb=e256c484ff2f56a6a58547c88b3763e8f2ae2c13;p=ppcskel.git

diff --git a/main.c b/main.c
index 6211692..133d998 100644
--- a/main.c
+++ b/main.c
@@ -24,8 +24,11 @@ Copyright (C) 2009              John Kelley <wiidev@kelley.ca>
 #include "video_low.h"
 #include "input.h"
 #include "console.h"
-#include "ohci.h"
 #include "irq.h"
+#include "usb/core/core.h"
+#include "usb/drivers/class/hid.h"
+#include "sha1.h"
+#include "hollywood.h"
 
 #define MINIMUM_MINI_VERSION 0x00010001
 
@@ -85,15 +88,19 @@ int main(void)
 	dsp_reset();
 
 	irq_initialize();
-	irq_enable(IRQ_OHCI0);
-	
+	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();
 
 	gecko_init();
     input_init();
 	init_fb(vmode);
-	ohci_init();
 
 	VIDEO_Init(vmode);
 	VIDEO_SetFrameBuffer(get_xfb());
@@ -112,19 +119,94 @@ int main(void)
 			; // better ideas welcome!
 	}
 
-    print_str_noscroll(112, 112, "ohai, world!\n");
+	/* external ohci */
+	usb_init(OHCI0_REG_BASE);
 
-	testOTP();
+	/* internal ohci */
+	//usb_init(OHCI1_REG_BASE);
 
-	printf("bye, world!\n");
+	/* load HID keyboard driver */
+	usb_hidkb_init();
+
+	/* wait for usb keyboard plugged in */
+	if(!usb_hidkb_inuse()) {
+		print_str("plug in an usb keyboard", 23);
+	}
+	while(!usb_hidkb_inuse());
+
+	print_str("hello keyboard :)", 17);
+
+#define FONT_WIDTH  13
+#define FONT_HEIGHT 15
+#define STDOUT_BORDER_LEFT 20
+#define STDOUT_BORDER_RIGHT 650
+#define STDOUT_BORDER_TOP 20
+#define STDOUT_BORDER_BOTTOM 550
+#define TABSIZE 4
+	/* you are welcome to make this nice :) */
+	char str[7];
+	u16 i, j, y=STDOUT_BORDER_TOP, x=STDOUT_BORDER_LEFT;
+	u16 old_x, old_y;
+	struct kbrep *k;
 
 	while(1) {
-		// just to get sure we are still in this loop
-		//wtf? _CPU_ISR_Enable() // don't know why this is needed...
-		udelay(100000);
-		printf("x");
+		memset(str, '\0', 7);
+		j=0;
+		k = usb_hidkb_getChars();
+		old_x = x; /* save actual x and y position for printing after the loop */
+		old_y = y;
+		for(i=0; k->keys[i]>0; i++) {
+			unsigned char key = usb_hidkb_get_char_from_keycode(k->keys[i],
+					(k->mod & MOD_lshift) || (k->mod & MOD_rshift));
+			/* no key or key not relevant? next, please. */
+			if (key == 0)
+				continue;
+
+			/* RETURN pressed? */
+			if (key == '\n') {
+				x = STDOUT_BORDER_LEFT;
+				y += FONT_HEIGHT;
+			/* TAB pressed? */
+			} else if (key == '\t') {
+				x += (TABSIZE*FONT_WIDTH);
+
+			/* BACKSPACE pressed? */
+			} else if (key == '\r') {
+				/* TODO */
+
+			/* now we have only printable characters left */
+			} else {
+				x += FONT_WIDTH;
+				str[j] = key;
+				j++;
+			}
+
+			/* line full? break! */
+			if(x > (STDOUT_BORDER_RIGHT-FONT_WIDTH)) {
+				x = STDOUT_BORDER_LEFT;
+				y += FONT_HEIGHT;
+			}
+			/* screen full? start again at top */
+			if(y > (STDOUT_BORDER_BOTTOM-FONT_HEIGHT)) {
+				y = STDOUT_BORDER_TOP;
+			}
+		}
+		free(k);
+		if(j > 0) { /* when there was any printable stuff, show it */
+			print_str_noscroll(old_x, old_y, str);
+			printf("y: %d\n", y);
+		}
+
 	}
 
+#if 0
+	printf("===============================\n");
+
+	SHA1TestCases();
+
+	printf("bye, world!\n");
+#endif
+
 	return 0;
 }