8 files changed, 33 insertions, 18 deletions

diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h
index d68d21455f..ff260dc956 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config-c200.h
@@ -180,6 +180,9 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
+#ifndef BOOTLOADER
+#define USB_DETECT_BY_DRV
+#endif
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7450
 
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h
index 2be64d95cc..7b27391c64 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config-e200.h
@@ -177,6 +177,9 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
+#ifndef BOOTLOADER
+#define USB_DETECT_BY_DRV
+#endif
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7421
 
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h
index 64f351c1ce..9e6029f00b 100644
--- a/firmware/export/config-gigabeat-s.h
+++ b/firmware/export/config-gigabeat-s.h
@@ -176,10 +176,12 @@
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
-/* enable these for the experimental usb stack */
+/* enable these for the usb stack */
 #define USE_ROCKBOX_USB
 #define HAVE_USBSTACK
 #define USB_STORAGE
+/* usb stack and driver settings */
+#define USB_PORTSCX_PHY_TYPE PORTSCX_PTS_ULPI
 #define USB_VENDOR_ID 0x0930
 #define USB_PRODUCT_ID 0x0010
 
@@ -201,7 +203,7 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 8
 
-#define HAVE_SERIAL
+//#define HAVE_SERIAL
 #define HAVE_VOLUME_IN_LIST
 
 /*Remove Comments from UART_INT to enable the UART interrupts,*/
diff --git a/firmware/export/imx31l.h b/firmware/export/imx31l.h
index b572c788a9..b55a56b105 100755
--- a/firmware/export/imx31l.h
+++ b/firmware/export/imx31l.h
@@ -36,7 +36,11 @@
 #define FRAME_SIZE    (240*320*2)
 
 #define DEVBSS_ATTR   __attribute__((section(".devbss"),nocommon))
-#define QHARRAY_ATTR  __attribute__((section(".qharray"),nocommon))
+/* USBOTG */
+#define USB_QHARRAY_ATTR    __attribute__((section(".qharray"),nocommon,aligned(2048)))
+#define USB_NUM_ENDPOINTS   8
+#define USB_DEVBSS_ATTR     DEVBSS_ATTR
+#define USB_BASE            OTG_BASE_ADDR
 
 /*
  * AIPS 1
@@ -1580,6 +1584,4 @@
 #define UART_FIFO_CTRL          0x881
 #define TIMEOUT                 1000
 
-#define USB_BASE                OTG_BASE_ADDR
-
 #endif /* __IMX31L_H__ */
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index b4919a219e..0f622a907d 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -23,7 +23,12 @@
 
 /* All info gleaned and/or copied from the iPodLinux project. */
 
-#define QHARRAY_ATTR   __attribute__((section(".qharray"),nocommon))
+/* USBOTG */
+#define USB_NUM_ENDPOINTS  3
+/* This needs to be 2048 byte aligned, but USB_QHARRAY_ATTR should take care
+ * of that */
+#define USB_QHARRAY_ATTR   __attribute__((section(".qharray"),nocommon,aligned(4)))
+#define USB_DEVBSS_ATTR    IBSS_ATTR
 
 /* DRAM starts at 0x10000000, but in Rockbox we remap it to 0x00000000 */
 #define DRAM_START       0x10000000
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index a6cfad5889..0a0539a622 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -33,8 +33,11 @@
 enum {
     USB_INSERTED,            /* Event+State */
     USB_EXTRACTED,           /* Event+State */
-#ifdef HAVE_USB_POWER
-    USB_POWERED,             /* State */
+#if defined(HAVE_USB_POWER) || defined(USB_DETECT_BY_DRV)
+    USB_POWERED,             /* Event+State */
+#endif
+#ifdef USB_DETECT_BY_DRV
+    USB_UNPOWERED,           /* Event */
 #endif
 #ifdef HAVE_LCD_BITMAP
     USB_SCREENDUMP,          /* State */
@@ -107,6 +110,7 @@ struct usb_transfer_completion_event_data
 
 void usb_init(void);
 void usb_enable(bool on);
+void usb_attach(void);
 void usb_start_monitoring(void);
 void usb_close(void);
 void usb_acknowledge(long id);
diff --git a/firmware/export/usb_core.h b/firmware/export/usb_core.h
index 7af8e43c8d..d0c8270d93 100644
--- a/firmware/export/usb_core.h
+++ b/firmware/export/usb_core.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2007 by Bjรถrn Stenberg
+ * Copyright (C) 2007 by Bj๖rn Stenberg
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -35,14 +35,6 @@
 
 /* endpoints */
 #define EP_CONTROL 0
-#if CONFIG_CPU == IMX31L
-#define NUM_ENDPOINTS 8
-#define USBDEVBSS_ATTR  DEVBSS_ATTR
-#else
-#define USBDEVBSS_ATTR  IBSS_ATTR
-#define NUM_ENDPOINTS 3
-#endif
-
 extern int usb_max_pkt_size;
 
 struct usb_class_driver;
diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h
index 3d2e689050..23f6f4ce2a 100644
--- a/firmware/export/usb_drv.h
+++ b/firmware/export/usb_drv.h
@@ -24,9 +24,13 @@
 #include "kernel.h"
 
 void usb_drv_startup(void);
+void usb_drv_usb_detect_event(void); /* Target implemented */
+void usb_drv_int_enable(bool enable); /* Target implemented */
+void usb_drv_reset(void);
 void usb_drv_init(void);
 void usb_drv_exit(void);
-void usb_drv_int(void);
+void usb_drv_attach(void);
+void usb_drv_int(void); /* Call from target INT handler */
 void usb_drv_stall(int endpoint, bool stall,bool in);
 bool usb_drv_stalled(int endpoint,bool in);
 int usb_drv_send(int endpoint, void* ptr, int length);