1 files changed, 10 insertions, 62 deletions

diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index 92e3dee562..f687782447 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -22,71 +22,16 @@
  *
  ****************************************************************************/
 #include "config.h"
-#include "cpu.h"
-#include "kernel.h"
-#include "thread.h"
 #include "system.h"
-#include "debug.h"
-#include "ata.h"
-#include "fat.h"
-#include "disk.h"
-#include "panic.h"
-#include "lcd.h"
-#include "adc.h"
 #include "usb.h"
-#include "button.h"
-#include "sprintf.h"
-#include "string.h"
-#include "hwcompat.h"
-
-#include "usb-target.h"
 #include "arcotg_udc.h"
 
+#ifdef HAVE_USBSTACK
+#include "usbstack.h"
+#endif
+
 void usb_init_device(void)
 {
-    int r0;
-    outl(inl(0x70000084) | 0x200, 0x70000084);
-
-    outl(inl(0x7000002C) | 0x3000000, 0x7000002C);
-    DEV_EN |= DEV_USB;
-
-    DEV_RS |= DEV_USB; /* reset usb start */
-    DEV_RS &=~DEV_USB;/* reset usb end */
-
-    DEV_INIT |= INIT_USB;
-    while ((inl(0x70000028) & 0x80) == 0);
-
-    UDC_PORTSC1 |= PORTSCX_PORT_RESET;
-    while ((UDC_PORTSC1 & PORTSCX_PORT_RESET) != 0);
-
-    UDC_OTGSC |= 0x5F000000;
-    if( (UDC_OTGSC & 0x100) == 0) {
-        UDC_USBMODE &=~ USB_MODE_CTRL_MODE_HOST;
-        UDC_USBMODE |= USB_MODE_CTRL_MODE_DEVICE;
-        outl(inl(0x70000028) | 0x4000, 0x70000028);
-        outl(inl(0x70000028) | 0x2, 0x70000028);
-    } else {
-        UDC_USBMODE |= USB_MODE_CTRL_MODE_DEVICE;
-        outl(inl(0x70000028) &~0x4000, 0x70000028);
-        outl(inl(0x70000028) | 0x2, 0x70000028);
-    }
-    
-    
-    UDC_USBCMD |= USB_CMD_CTRL_RESET;
-    while((UDC_USBCMD & USB_CMD_CTRL_RESET) != 0);
-    
-    r0 = UDC_PORTSC1;
-
-    /* Note from IPL source (referring to next 5 lines of code: 
-       THIS NEEDS TO BE CHANGED ONCE THERE IS KERNEL USB */
-    DEV_INIT |= INIT_USB;
-    DEV_EN |= DEV_USB;
-    while ((inl(0x70000028) & 0x80) == 0);
-    outl(inl(0x70000028) | 0x2, 0x70000028);
-
-    udelay(0x186A0);
-
-    dr_controller_setup();
 
 #if defined(IPOD_COLOR) || defined(IPOD_4G) \
  || defined(IPOD_MINI)  || defined(IPOD_MINI2G)
@@ -98,6 +43,7 @@ void usb_init_device(void)
 
 void usb_enable(bool on)
 {
+#ifndef HAVE_USBSTACK
     /* This device specific code will eventually give way to proper USB
        handling, which should be the same for all PP502x targets. */
     if (on)
@@ -125,6 +71,7 @@ void usb_enable(bool on)
         }
 #endif
     }
+#endif
 }
 
 bool usb_detect(void)
@@ -151,12 +98,13 @@ bool usb_detect(void)
     }
 
     usbstatus1 = (UDC_OTGSC & 0x800) ? true : false;
+#ifdef HAVE_USBSTACK
     if ((usbstatus1 == true) && (prev_usbstatus1 == false)) {
-        dr_controller_run();
+        usb_stack_start();
     } else if ((usbstatus1 == false) && (prev_usbstatus1 == true)) {
-        dr_controller_stop();
+        usb_stack_stop();
     }
-
+#endif
     prev_usbstatus1 = usbstatus1;
     usbstatus2 = (UDC_PORTSC1 & PORTSCX_CURRENT_CONNECT_STATUS) ? true : false;