Commit FS#8624 by Linus Nielsen, Ryan Press, Craig Elliott, and Kenderes Tamas. Adds preliminary support for numerous accessories that use the ipod serial port on the dock connector. See IpodAccessories for a list of tested devices.

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

11 files changed, 328 insertions, 26 deletions

diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c
index 47fbf564ff..a496824261 100644
--- a/firmware/drivers/serial.c
+++ b/firmware/drivers/serial.c
@@ -18,7 +18,9 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include "button.h"
 #include "config.h"
 #include "cpu.h"
@@ -28,6 +30,7 @@
 #include "adc.h"
 #include "lcd.h"
 #include "serial.h"
+#include "iap.h"
 
 #if CONFIG_CPU == IMX31L
 #include "serial-imx31.h"
@@ -68,6 +71,35 @@ void serial_setup (void)
     SCR1 = 0x10; /* Enable the receiver, no interrupt */
 }
 
+int tx_rdy(void)
+{
+    /* a dummy */
+    return 1;
+}
+
+int rx_rdy(void) 
+{
+    if(SSR1 & SCI_RDRF)
+        return 1;
+    else
+        return 0;
+}
+
+void tx_writec(unsigned char c)
+{
+    /* a dummy */
+}
+
+unsigned char rx_readc(void)
+{
+    char tmp;
+    /* Read byte and clear the Rx Full bit */
+    tmp = RDR1;
+    and_b(~SCI_RDRF, &SSR1);
+    return tmp;
+}
+
+
 /* This function returns the received remote control code only if it is
    received without errors before or after the reception.
    It therefore returns the received code on the second call after the
@@ -87,11 +119,9 @@ int remote_control_rx(void)
         return BUTTON_NONE;
     }
 
-    if(SSR1 & SCI_RDRF) {
-        /* Read byte and clear the Rx Full bit */
-        btn = RDR1;
-        and_b(~SCI_RDRF, &SSR1);
-
+    if(rx_rdy()) {
+        btn = rx_readc();
+        
         if(last_was_error)
         {
             last_valid_button = BUTTON_NONE;
@@ -149,16 +179,6 @@ int remote_control_rx(void)
 #endif /* !HAVE_FMADC && !STORAGE_MMC */
 #elif defined(CPU_COLDFIRE) && defined(HAVE_SERIAL)
 
-void serial_tx(const unsigned char *buf)
-{
-    while(*buf) {
-        while(!(USR0 & 0x04))
-        {
-        };
-        UTB0 = *buf++;
-    }
-}
-
 void serial_setup (void) 
 {
     UCR0 = 0x30; /* Reset transmitter */
@@ -171,6 +191,25 @@ void serial_setup (void)
     UCR0 = 0x04; /* Tx enable */
 }
 
+int tx_rdy(void)
+{
+    if(USR0 & 0x04)
+        return 1;
+    else
+        return 0;
+}
+
+int rx_rdy(void) 
+{
+    /* a dummy */
+    return 0;
+}
+
+void tx_writec(unsigned char c)
+{
+    UTB0 = c;
+}
+
 #elif (CONFIG_CPU == IMX31L)
 
 void serial_setup(void)
@@ -207,15 +246,216 @@ int rx_rdy(void)
         return 0;
 }
 
-void tx_writec(char c)
+void tx_writec(unsigned char c)
 {
     UTXD1=(int) c;
 }
 
+#elif defined(IPOD_ACCESSORY_PROTOCOL)
+static int autobaud = 0;
+void serial_setup (void)
+{
+    int tmp;
+    
+#if (MODEL_NUMBER == 3) || (MODEL_NUMBER == 8)
+
+    /* Route the Tx/Rx pins.  4G Ipod??? */
+    outl(0x70000018, inl(0x70000018) & ~0xc00);
+#elif (MODEL_NUMBER == 4) || (MODEL_NUMBER == 5)
+
+    /* Route the Tx/Rx pins.  5G Ipod */
+    (*(volatile unsigned long *)(0x7000008C)) &= ~0x0C;
+    GPO32_ENABLE &= ~0x0C;
+#endif
+    
+    DEV_EN = DEV_EN | DEV_SER0;
+    CPU_HI_INT_DIS = SER0_MASK;
+
+    DEV_RS |= DEV_SER0;
+    sleep(1);
+    DEV_RS &= ~DEV_SER0;
+
+    SER0_LCR = 0x80; /* Divisor latch enable */
+    SER0_DLM = 0x00;
+    SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+    SER0_IER = 0x01;
+
+    SER0_FCR = 0x07; /* Tx+Rx FIFO reset and FIFO enable */
+
+    CPU_INT_EN |= HI_MASK;
+    CPU_HI_INT_EN |= SER0_MASK;
+    tmp = SER0_RBR;
+
+    serial_bitrate(0);
+}
+
+void serial_bitrate(int rate)
+{
+    if(rate == 0)
+    {
+        autobaud = 2;
+        SER0_LCR = 0x80; /* Divisor latch enable */
+        SER0_DLL = 0x0D; /* 24000000/13/16 = 115384 baud */
+        SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+        return;
+    }
+
+    autobaud = 0;
+    SER0_LCR = 0x80; /* Divisor latch enable */
+    SER0_DLL = 24000000L / rate / 16;
+    SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+}
+
+int tx_rdy(void)
+{
+    if((SER0_LSR & 0x20))
+        return 1;
+    else
+        return 0;
+}
+
+int rx_rdy(void) 
+{
+    if((SER0_LSR & 0x1))
+        return 1;
+    else
+        return 0;
+}
+
+void tx_writec(unsigned char c)
+{
+    SER0_THR =(int) c;
+}
+
+unsigned char rx_readc(void)
+{
+    return (SER0_RBR & 0xFF);
+}
+
+void SERIAL0(void)
+{
+    static int badbaud = 0;
+    static bool newpkt = true;
+    char temp;
+    
+    while(rx_rdy())
+    {
+        temp = rx_readc();
+        if (newpkt && autobaud > 0)
+        {
+            if (autobaud == 1)
+            {
+                switch (temp)
+                {
+                    case 0xFF:
+                    case 0x55:
+                        break;
+                    case 0xFC:
+                        SER0_LCR = 0x80; /* Divisor latch enable */
+                        SER0_DLL = 0x4E; /* 24000000/78/16 = 19230 baud */
+                        SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                        temp = 0xFF;
+                        break;
+                    case 0xE0:
+                        SER0_LCR = 0x80; /* Divisor latch enable */
+                        SER0_DLL = 0x9C; /* 24000000/156/16 = 9615 baud */
+                        SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                        temp = 0xFF;
+                        break;
+                    default:
+                        badbaud++;
+                        if (badbaud >= 6) /* Switch baud detection mode */
+                        {
+                            autobaud = 2;
+                            SER0_LCR = 0x80; /* Divisor latch enable */
+                            SER0_DLL = 0x0D; /* 24000000/13/16 = 115384 baud */
+                            SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                            badbaud = 0;
+                        } else {
+                            SER0_LCR = 0x80; /* Divisor latch enable */
+                            SER0_DLL = 0x1A; /* 24000000/26/16 = 57692 baud */
+                            SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                        }
+                        continue;
+                }
+            } else {
+                switch (temp)
+                {
+                    case 0xFF:
+                    case 0x55:
+                        break;
+                    case 0xFE:
+                        SER0_LCR = 0x80; /* Divisor latch enable */
+                        SER0_DLL = 0x1A; /* 24000000/26/16 = 57692 baud */
+                        SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                        temp = 0xFF;
+                        break;
+                    case 0xFC:
+                        SER0_LCR = 0x80; /* Divisor latch enable */
+                        SER0_DLL = 0x27; /* 24000000/39/16 = 38461 baud */
+                        SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                        temp = 0xFF;
+                        break;
+                    case 0xE0:
+                        SER0_LCR = 0x80; /* Divisor latch enable */
+                        SER0_DLL = 0x4E; /* 24000000/78/16 = 19230 baud */
+                        SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                        temp = 0xFF;
+                        break;
+                    default:
+                        badbaud++;
+                        if (badbaud >= 6) /* Switch baud detection */
+                        {
+                            autobaud = 1;
+                            SER0_LCR = 0x80; /* Divisor latch enable */
+                            SER0_DLL = 0x1A; /* 24000000/26/16 = 57692 baud */
+                            SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                            badbaud = 0;
+                        } else {
+                            SER0_LCR = 0x80; /* Divisor latch enable */
+                            SER0_DLL = 0x0D; /* 24000000/13/16 = 115384 baud */
+                            SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */
+                        }
+                        continue;
+                }
+            }
+        }
+        bool pkt = iap_getc(temp);
+        if(newpkt == true && pkt == false)
+            autobaud = 0; /* Found good baud */
+        newpkt = pkt;
+    }
+}
+
+#else /* Other targets */
+void serial_setup (void) 
+{
+    /* a dummy */
+}
+
+int tx_rdy(void)
+{
+    /* a dummy */
+    return 1;
+}
+
+int rx_rdy(void) 
+{
+    /* a dummy */
+    return 0;
+}
+
+void tx_writec(unsigned char c)
+{
+    /* a dummy */
+}
+
+#endif
+
 void dprintf(const char * str, ... )
 {
     char dprintfbuff[256];
-    unsigned char * ptr;
+    char * ptr;
         
     va_list ap;
     va_start(ap, str);
@@ -224,7 +464,7 @@ void dprintf(const char * str, ... )
     vsnprintf(ptr,sizeof(dprintfbuff),str,ap);
     va_end(ap);
 
-    serial_tx(ptr);
+    serial_tx((unsigned char *)ptr);
 }
 
 void serial_tx(const unsigned char * buf)
@@ -241,10 +481,3 @@ void serial_tx(const unsigned char * buf)
         }
     }
 }
-
-#else /* Other targets */
-void serial_setup (void) 
-{
-    /* a dummy */
-}
-#endif
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 89b14f9907..f6c71f39d8 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -186,4 +186,6 @@
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
+#define IPOD_ACCESSORY_PROTOCOL
+
 #endif
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 47b7a4eacf..58a888a969 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -166,4 +166,6 @@
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
+#define IPOD_ACCESSORY_PROTOCOL
+
 #endif
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index 6017d0a2e8..8752181bb9 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -177,4 +177,6 @@
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
+#define IPOD_ACCESSORY_PROTOCOL
+
 #endif
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index d04e562086..ab974dc236 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -197,4 +197,6 @@
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
+#define IPOD_ACCESSORY_PROTOCOL
+
 #endif
diff --git a/firmware/export/iap.h b/firmware/export/iap.h
new file mode 100644
index 0000000000..6c0b968ab0
--- /dev/null
+++ b/firmware/export/iap.h
@@ -0,0 +1,31 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: iap.h 17400 2008-05-07 20:22:16Z xxxxxx $
+ *
+ * Copyright (C) 2002 by Alan Korr
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#ifndef __IAP_H__
+#define __IAP_H__
+
+extern int iap_getc(unsigned char x);
+extern void iap_write_pkt(unsigned char data, int len);
+extern void iap_setup(int ratenum);
+extern void iap_bitrate_set(int ratenum);
+extern void iap_periodic(void);
+extern void iap_handlepkt(void);
+extern void iap_track_changed(void);
+
+#endif
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index ef65463e5d..29cf8f2eb9 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -78,6 +78,8 @@
 #define SYS_REMOTE_UNPLUGGED      MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 5)
 #define SYS_SCREENDUMP            MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 0)
 #define SYS_CAR_ADAPTER_RESUME    MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 1)
+#define SYS_IAP_PERIODIC          MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 2)
+#define SYS_IAP_HANDLEPKT         MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 3)
 
 #define IS_SYSEVENT(ev)           ((ev & SYS_EVENT) == SYS_EVENT)
 
diff --git a/firmware/export/serial.h b/firmware/export/serial.h
index 425fc66fc6..8a4780c3f1 100644
--- a/firmware/export/serial.h
+++ b/firmware/export/serial.h
@@ -22,8 +22,11 @@
 #ifndef __SERIAL_H__
 #define __SERIAL_H__
 
-extern void serial_setup (void);
+extern void serial_setup(void);
+extern void serial_bitrate(int rate);
 extern int remote_control_rx(void);
 extern void serial_tx(const unsigned char *buf);
+extern void tx_writec(unsigned char c);
+extern int tx_rdy(void);
 
 #endif
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index e36c928fb0..21bbca62f0 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -316,7 +316,11 @@ int button_read_device(void)
     }
 
     /* The int_btn variable is set in the button interrupt handler */
+#ifdef IPOD_ACCESSORY_PROTOCOL
+    return int_btn | remote_control_rx();
+#else
     return int_btn;
+#endif
 }
 
 bool button_hold(void)
diff --git a/firmware/target/arm/ipod/button-target.h b/firmware/target/arm/ipod/button-target.h
index a0ac372839..67bdc72955 100644
--- a/firmware/target/arm/ipod/button-target.h
+++ b/firmware/target/arm/ipod/button-target.h
@@ -50,7 +50,22 @@ void ipod_4g_button_int(void);
                 |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SCROLL_FWD\
                 |BUTTON_SCROLL_BACK|BUTTON_PLAY)
 
+    /* Remote control's buttons */
+#ifdef IPOD_ACCESSORY_PROTOCOL
+#define BUTTON_RC_PLAY      0x00100000
+#define BUTTON_RC_STOP      0x00080000
+
+#define BUTTON_RC_LEFT      0x00040000
+#define BUTTON_RC_RIGHT     0x00020000
+#define BUTTON_RC_VOL_UP    0x00010000
+#define BUTTON_RC_VOL_DOWN  0x00008000
+
+#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\
+                |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\
+                |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN)
+#else
 #define BUTTON_REMOTE 0
+#endif
 
 /* This is for later
 #define  BUTTON_SCROLL_TOUCH 0x00000200
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index d683b3a561..b1f178c8d5 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -32,6 +32,7 @@
 #ifndef BOOTLOADER
 extern void TIMER1(void);
 extern void TIMER2(void);
+extern void SERIAL0(void);
 extern void ipod_mini_button_int(void); /* iPod Mini 1st gen only */
 extern void ipod_4g_button_int(void);   /* iPod 4th gen and higher only */
 
@@ -78,6 +79,11 @@ void irq(void)
                 button_int();
         }        
 #endif
+#ifdef IPOD_ACCESSORY_PROTOCOL
+        else if (CPU_HI_INT_STAT & SER0_MASK) {
+            SERIAL0();
+        }
+#endif
 #ifdef HAVE_USBSTACK
         else if (CPU_INT_STAT & USB_MASK) {
             usb_drv_int();