1 files changed, 58 insertions, 19 deletions

diff --git a/firmware/target/arm/gigabeat/meg-fx/usb-meg-fx.c b/firmware/target/arm/gigabeat/meg-fx/usb-meg-fx.c
index 6e0f31e8c7..2415a099ba 100644
--- a/firmware/target/arm/gigabeat/meg-fx/usb-meg-fx.c
+++ b/firmware/target/arm/gigabeat/meg-fx/usb-meg-fx.c
@@ -20,33 +20,72 @@
 #include <stdbool.h>
 #include "cpu.h"
 #include "system.h"
+#include "kernel.h"
 
-void usb_init_device(void)
-{
-}
+#define USB_RST_ASSERT   GPBDAT &= ~(1 << 4)
+#define USB_RST_DEASSERT GPBDAT |=  (1 << 4)
+
+#define USB_ATA_ENABLE   GPBDAT |=  (1 << 5)
+#define USB_ATA_DISABLE  GPBDAT &= ~(1 << 5)
+
+#define USB_VPLUS_PWR_ASSERT    GPBDAT |=  (1 << 6)
+#define USB_VPLUS_PWR_DEASSERT  GPBDAT &= ~(1 << 6)
 
-bool usb_detect(void)
+#define USB_IS_PRESENT  (!(GPFDAT & 1))
+
+
+
+/* The usb detect is one pin to the cpu active low */
+inline bool usb_detect(void)
 {
-    return (GPFDAT & 1) ? false : true;
+    return USB_IS_PRESENT;
 }
 
-void usb_enable(bool on)
-{
-    if(on) {
-        int i;
 
-        GPBDAT &= 0x7EF;
-        GPBCON |= 1<<8;
 
-        GPGDAT &= 0xE7FF;
-        GPGDAT |= 1<<11;
+void usb_init_device(void)
+{
+    USB_VPLUS_PWR_ASSERT;    
+    sleep(HZ/20);
+    
+    /* Reset the usb port */
+    /* Make sure the cpu pin for reset line is set to output */
+    GPBCON = (GPBCON & ~0x300) | 0x100;
+    USB_RST_ASSERT;
+    sleep(HZ/25);
+    USB_RST_DEASSERT;
+    
+    /* needed to complete the reset */
+    USB_ATA_ENABLE;
+    
+    sleep(HZ/15);       /* 66ms */
+    
+    USB_ATA_DISABLE;
+    
+    sleep(HZ/25);
+    
+    /* leave chip in low power mode */
+    USB_VPLUS_PWR_DEASSERT;
+    
+    sleep(HZ/25);
+}
+
 
-        for (i = 0; i < 10000000; i++) {continue;}
 
-        GPBCON &= 0x2FFCFF;
-        GPBDAT |= 1<<5; 
-        GPBDAT |= 1<<6;
-    } else {
-        /* TODO how turn USB mode back off again? */
+void usb_enable(bool on)
+{
+    if (on)
+    {
+        /* make sure ata_en is high */    
+        USB_VPLUS_PWR_ASSERT;
+        USB_ATA_ENABLE;                
+    }
+    else
+    {
+        /* make sure ata_en is low */
+        USB_ATA_DISABLE;
+        USB_VPLUS_PWR_DEASSERT;
     }
+    
+    sleep(HZ/20); // > 50ms for detecting the enable state change
 }