X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=main.c;h=d69bb40a1d53dda7f353ae9fb491c4d1fc9f95d2;hb=31c91f98447bb3e72a8d45fa594dee6bda266071;hp=51f43269c5302ff585aa05ca887a75c1b8668b91;hpb=cbb2f30692a3d5cb7817aaa95dc14f8db24f5adb;p=ppcskel.git diff --git a/main.c b/main.c index 51f4326..d69bb40 100644 --- a/main.c +++ b/main.c @@ -24,8 +24,8 @@ Copyright (C) 2009 John Kelley #include "video_low.h" #include "input.h" #include "console.h" -#include "ohci.h" #include "irq.h" +#include "usb/core/core.h" #define MINIMUM_MINI_VERSION 0x00010001 @@ -88,19 +88,20 @@ int main(void) irq_bw_enable(BW_PI_IRQ_RESET); irq_bw_enable(BW_PI_IRQ_HW); //hollywood pic irq_hw_enable(IRQ_OHCI0); - + ipc_initialize(); ipc_slowping(); gecko_init(); input_init(); init_fb(vmode); - ohci_init(); VIDEO_Init(vmode); VIDEO_SetFrameBuffer(get_xfb()); VISetupEncoder(); + usb_init(); + u32 version = ipc_getvers(); u16 mini_version_major = version >> 16 & 0xFFFF; u16 mini_version_minor = version & 0xFFFF; @@ -120,6 +121,8 @@ int main(void) printf("bye, world!\n"); */ + (void) usb_add_device(); + while(1) { // just to get sure we are still in this loop //_CPU_ISR_Enable() // don't know why this is needed...