Gmini SMSC chip improvements

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6030 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 40 insertions, 25 deletions

diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index cfdae2c090..12ad11532a 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -30,6 +30,8 @@
 #include "string.h"
 #include "hwcompat.h"
 
+#define SECTOR_SIZE     (512)
+
 #if CONFIG_CPU == MCF5249
 
 /* don't use sh7034 assembler routines */
@@ -162,8 +164,8 @@
 #define READ_PATTERN3 0xaa
 #define READ_PATTERN4 0x55
 
-extern int idatastart __attribute__ ((section(".idata")));
 
+static unsigned char ide_sector_data[SECTOR_SIZE] __attribute__ ((section(".idata")));
 static unsigned ide_reg_temp __attribute__ ((section(".idata")));
 
 void ide_write_register(int reg, int value) {
@@ -175,7 +177,7 @@ void ide_write_register(int reg, int value) {
     ide_reg_temp = value;
 
     long extAddr = (long)reg << 16;
-    ddma_transfer(1, 1, (char*)&ide_reg_temp - (char*)&idatastart, extAddr, 2);  
+    ddma_transfer(1, 1, &ide_reg_temp, extAddr, 2);  
 
     /* set the RAM speed to 6 cycles.
     unsigned char miuscfg = MIUSCFG;
@@ -190,7 +192,7 @@ int ide_read_register(int reg) {
        MIUSCFG = miuscfg; */
   
     long extAddr = (long)reg << 16;
-    ddma_transfer(0, 1, (char*)&ide_reg_temp - (char*)&idatastart, extAddr, 2);
+    ddma_transfer(0, 1, &ide_reg_temp, extAddr, 2);
   
     /* This is done like this in the archos firmware... 
        miuscfg = MIUSCFG;
@@ -229,7 +231,6 @@ int ide_read_register(int reg) {
 
 #define READ_TIMEOUT 5*HZ
 
-#define SECTOR_SIZE     512
 
 static struct mutex ata_mtx;
 char ata_device; /* device 0 (master) or 1 (slave) */
@@ -364,6 +365,16 @@ static void copy_read_sectors(unsigned char* buf, int wordcount)
         } while (++wbuf < wbufend); /* tail loop is faster */
     }
 #else
+#if CONFIG_CPU == TCC730
+    int sectorcount = wordcount / 0x100;
+    do {
+        /* Slurp an entire sector with a single dma transfer */
+        ddma_transfer(0, 1, ide_sector_data, ATA_DATA_IDX << 16, SECTOR_SIZE);
+        memcpy(buf, ide_sector_data, SECTOR_SIZE);
+        buf += SECTOR_SIZE;
+        sectorcount--;
+    } while (sectorcount > 0);
+#else
     /* turbo-charged assembler version */
     /* this assumes wordcount to be a multiple of 4 */
     asm (
@@ -459,6 +470,7 @@ static void copy_read_sectors(unsigned char* buf, int wordcount)
         "r0","r1","r2","r3"
     );
 #endif
+#endif
 }
 
 int ata_read_sectors(IF_MV2(int drive,)
@@ -1071,14 +1083,22 @@ int ata_hard_reset(void)
     GPIO_OUT |= 0x00080000;
     sleep(1); /* > 25us */
 #elif CONFIG_CPU == TCC730
+
+    P6 &= ~0x40;
+    ddma_transfer(0, 1, ide_sector_data, 0xF00000, SECTOR_SIZE);
+    P6 |= 0x40;
+    
+    /*
+      What can the following do?
     P1 |= 0x04;
     P10CON &= ~0x56;
-    sleep(1); /* > ???ms */
+    sleep(1);
 
     P10CON |= 0x56;
     P10 &= ~0x56;
     P1 &= ~0x04;
-    sleep(1); /* > ???ms */
+    sleep(1);
+    */
 #endif
 
     /* state HRR2 */
@@ -1206,10 +1226,7 @@ void ata_enable(bool on)
     GPIO_ENABLE |= 0x00040000;
     GPIO_FUNCTION |= 0x00040000;
 #elif CONFIG_CPU == TCC730
-    if(on)
-        P1 |= 0x08;
-    else
-        P1 &= ~0x08;
+
 #endif
 }
 
@@ -1358,8 +1375,7 @@ int ata_init(void)
 {
     int rc;
 #if CONFIG_CPU == TCC730
-    /* TODO: check for cold start (never happenning now) */
-    bool coldstart = false;
+    bool coldstart = (P1 & 0x80) == 0;
 #elif CONFIG_CPU == MCF5249
     bool coldstart = (GPIO_FUNCTION & 0x00080000) == 0;
 #else
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index 1c1ce4629f..3a4ae466bc 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -139,10 +139,10 @@ void ide_power_enable(bool on)
     else
         GPIO_OUT |= 0x80000000;
 #elif defined(GMINI_ARCH)
-    if (on)
-        P1 |= 0x04;
+    if(on)
+        P1 |= 0x08;
     else
-        P2 &= ~0x04;
+        P1 &= ~0x08;
 #else
     bool touched = false;
 #ifdef NEEDS_ATA_POWER_ON
@@ -190,7 +190,7 @@ bool ide_powered(void)
 #ifdef IRIVER_H100
     return (GPIO_OUT & 0x80000000)?false:true;
 #elif defined(GMINI_ARCH)
-    return (P1 & 0x04?true:false);
+    return (P1 & 0x08?true:false);
 #else
 #if defined(NEEDS_ATA_POWER_ON) || defined(HAVE_ATA_POWER_OFF)
 #ifdef ATA_POWER_PLAYERSTYLE
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 626cdfa257..b0f6eb65a0 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -199,7 +199,7 @@ extern void set_pll_freq(int pll_index, long freq_out);
 
 extern void* volatile interrupt_vector[16]  __attribute__ ((section(".idata")));
 
-extern void ddma_transfer(int dir, int mem, long intAddr, long extAddr,
+extern void ddma_transfer(int dir, int mem, void* intAddr, long extAddr,
                           int num);
 
 
diff --git a/firmware/system.c b/firmware/system.c
index 9d3e2a0dbd..05f5f49034 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -34,13 +34,13 @@ void ddma_wait_idle(void)
     } while ((DDMACOM & 3) != 0);
 }
 
-void ddma_transfer(int dir, int mem, long intAddr, long extAddr, int num)
+void ddma_transfer(int dir, int mem, void* intAddr, long extAddr, int num)
     __attribute__ ((section (".icode")));
-void ddma_transfer(int dir, int mem, long intAddr, long extAddr, int num) {
+void ddma_transfer(int dir, int mem, void* intAddr, long extAddr, int num) {
     int irq = set_irq_level(1);
     ddma_wait_idle();
     long externalAddress = (long) extAddr;
-    long internalAddress = (long) intAddr;
+    long internalAddress = ((long) intAddr) & 0xFFFF;
     /* HW wants those two in word units. */
     num /= 2;
     externalAddress /= 2;
@@ -130,10 +130,9 @@ void smsc_delay() {
 }
 
 static void extra_init(void) {
-    /* Power on 
-       P1 |= 0x01;
-       P1CON |= 0x01;
-    */
+    /* Power on stuff */
+    P1 |= 0x07;
+    P1CON |= 0x1f;
     
     /* SMSC chip config (?) */
     P6CON |= 0x08;
@@ -147,7 +146,7 @@ static void extra_init(void) {
     }
     
     /* P5 conf
-     * line 2 & 4 are digital, other analog. : P5CON = 0xec;
+     * lines 0, 1 & 4 are digital, other analog. : P5CON = 0xec;
      */
     
     /* P7 conf