5 files changed, 46 insertions, 12 deletions

diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h
index ff260dc956..d68d21455f 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config-c200.h
@@ -180,9 +180,6 @@
 
 /* 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 7b27391c64..2be64d95cc 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config-e200.h
@@ -177,9 +177,6 @@
 
 /* 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.h b/firmware/export/config.h
index 15b137588e..7fb41d8d83 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -439,6 +439,8 @@
 #if CONFIG_CPU == IMX31L
 /* Priority in bootloader is wanted */
 #define HAVE_PRIORITY_SCHEDULING
+#define USB_STATUS_BY_EVENT
+#define USB_DETECT_BY_DRV
 #endif
 
 #else /* !BOOTLOADER */
@@ -452,13 +454,18 @@
 
 #define HAVE_SEMAPHORE_OBJECTS
 
-#ifdef TOSHIBA_GIGABEAT_F
-#define HAVE_WAKEUP_OBJECTS
+#if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC
+#define USB_STATUS_BY_EVENT
+#define USB_DETECT_BY_DRV
+#if CONFIG_CPU != IMX31L
+#define INCLUDE_TIMEOUT_API
 #endif
+#endif /* HAVE_USBSTACK */
 
 #endif /* BOOTLOADER */
 
-#if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) || (CONFIG_CPU == AS3525)
+#if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \
+    || (CONFIG_CPU == AS3525) || (CONFIG_CPU == S3C2440) 
 #define HAVE_WAKEUP_OBJECTS
 #endif
 
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index 0f622a907d..36c88e00df 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -218,6 +218,7 @@
 #define CACHE_OP_INVALIDATE  0x0004
 
 /* GPIO Ports */
+#define GPIO_BASE_ADDR   0x6000d000
 #define GPIOA_ENABLE     (*(volatile unsigned long *)(0x6000d000))
 #define GPIOB_ENABLE     (*(volatile unsigned long *)(0x6000d004))
 #define GPIOC_ENABLE     (*(volatile unsigned long *)(0x6000d008))
@@ -322,10 +323,41 @@
  * define the value of those bits. */
 
 #define GPIO_SET_BITWISE(port, mask) \
-        do { *(&port + (0x800/sizeof(long))) = (mask << 8) | mask; } while(0)
+        do { *(&(port) + (0x800/sizeof(long))) = ((mask) << 8) | (mask); } while(0)
 
 #define GPIO_CLEAR_BITWISE(port, mask) \
-        do { *(&port + (0x800/sizeof(long))) = mask << 8; } while(0)
+        do { *(&(port) + (0x800/sizeof(long))) = (mask) << 8; } while(0)
+
+#define GPIO_WRITE_BITWISE(port, val, mask) \
+        do { *(&(port) + (0x800/sizeof(long))) = ((mask) << 8) | (val); } while(0)
+
+/* GPIO Module 0 */
+#define GPIOA  0
+#define GPIOB  1
+#define GPIOC  2
+#define GPIOD  3
+/* GPIO Module 1 */
+#define GPIOE  4
+#define GPIOF  5
+#define GPIOG  6
+#define GPIOH  7
+/* GPIO Module 2 */
+#define GPIOI  8
+#define GPIOJ  9
+#define GPIOK 10
+#define GPIOL 11
+
+#define GPIO_MODULE_NUM(gpio)   ((gpio)>>2)
+#define GPIO_MAP_ADDR(gpio)     (GPIO_BASE_ADDR+(GPIO_MODULE_NUM(gpio)<<7)+(((gpio)&3)<<2))
+#define GPIO_ENABLE(gpio)       (*(volatile unsigned long *)(GPIO_MAP_ADDR(gpio)+0x00))
+#define GPIO_OUTPUT_EN(gpio)    (*(volatile unsigned long *)(GPIO_MAP_ADDR(gpio)+0x10))
+#define GPIO_OUTPUT_VAL(gpio)   (*(volatile unsigned long *)(GPIO_MAP_ADDR(gpio)+0x20))
+#define GPIO_INPUT_VAL(gpio)    (*(volatile unsigned long *)(GPIO_MAP_ADDR(gpio)+0x30))
+#define GPIO_INT_STAT(gpio)     (*(volatile unsigned long *)(GPIO_MAP_ADDR(gpio)+0x40))
+#define GPIO_INT_EN(gpio)       (*(volatile unsigned long *)(GPIO_MAP_ADDR(gpio)+0x50))
+#define GPIO_INT_LEV(gpio)      (*(volatile unsigned long *)(GPIO_MAP_ADDR(gpio)+0x60))
+#define GPIO_INT_CLR(gpio)      (*(volatile unsigned long *)(GPIO_MAP_ADDR(gpio)+0x70))
+#define GPIO_HI_INT_MASK(gpio)  (1ul << GPIO_MODULE_NUM(gpio))
 
 /* Device initialization */
 #define PP_VER1          (*(volatile unsigned long *)(0x70000000))
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index 0a0539a622..90713594a5 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -31,8 +31,8 @@
 
 /* Messages from usb_tick and thread states */
 enum {
+    USB_EXTRACTED = 0,       /* Event+State */
     USB_INSERTED,            /* Event+State */
-    USB_EXTRACTED,           /* Event+State */
 #if defined(HAVE_USB_POWER) || defined(USB_DETECT_BY_DRV)
     USB_POWERED,             /* Event+State */
 #endif
@@ -135,6 +135,7 @@ bool usb_exclusive_storage(void); /* storage is available for usb */
 
 #ifdef USB_FIREWIRE_HANDLING
 bool firewire_detect(void);
+void usb_firewire_connect_event(void);
 #endif
 
 #endif