license stuff

[ppcskel.git] / main.c

diff --git a/main.c b/main.c
index ca0b2eaedb6a58ac26a7d75a89063cd940f591bf..dcc2f19b3bdbae5deb1669ecdc9a8e8eb75b6796 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,8 +24,10 @@ 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 "hollywood.h"
 
 #define MINIMUM_MINI_VERSION 0x00010001
 
@@ -84,8 +86,13 @@ int main(void)
        exception_init();
        dsp_reset();
 
-       // clear interrupt mask
-       write32(BW_PI_IRQMASK, 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();
@@ -93,7 +100,6 @@ int main(void)
        gecko_init();
     input_init();
        init_fb(vmode);
-       ohci_init();
 
        VIDEO_Init(vmode);
        VIDEO_SetFrameBuffer(get_xfb());
@@ -112,25 +118,48 @@ 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();
 
-       // enable OHCI0 interrupt on hollywood-pic
-       write32(HW_PPCIRQFLAG, ~0);
-       write32(HW_PPCIRQMASK, 1<<5);
-       // enable RESET and PIC (#14) interrupts on processor interface
-       write32(BW_PI_IRQFLAG, ~0);
-       write32(BW_PI_IRQMASK, (1<<1) | (1<<14));
-       _CPU_ISR_Enable()
+       /* you are welcome to make this nice :) */
+       char str[7];
+       u16 i, j, y=20, x=20;
+       struct kbrep *k;
 
        while(1) {
-               // just to get sure we are still in this loop
-               _CPU_ISR_Enable() // don't know why this is needed...
-               udelay(100000);
-               printf("x");
+               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;
+               }
        }
 
        return 0;