summaryrefslogtreecommitdiffstats
path: root/firmware/export
diff options
context:
space:
mode:
authorCástor Muñoz <cmvidal@gmail.com>2014-12-06 23:13:44 +0100
committerCástor Muñoz <cmvidal@gmail.com>2015-10-07 06:15:03 +0200
commitefd047a08bf990b9d10be5e5df1bce83968bd4e4 (patch)
tree8f2ac064275f315741d78e5908a7c10c43937b02 /firmware/export
parent38ae0d53e834e6538e3820c3fd1977c971a81c15 (diff)
downloadrockbox-efd047a08bf990b9d10be5e5df1bce83968bd4e4.tar.gz
rockbox-efd047a08bf990b9d10be5e5df1bce83968bd4e4.zip
iPod Classic: implement IPOD_ACCESSORY_PROTOCOL
Change-Id: I0f0950c42ae5bf5c5b4c2c2f097f8c68a92ba4dd
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/config/ipod6g.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h
index a885a11144..7e7025e157 100644
--- a/firmware/export/config/ipod6g.h
+++ b/firmware/export/config/ipod6g.h
@@ -247,10 +247,14 @@
#define USB_NUM_ENDPOINTS 6
#define USB_DEVBSS_ATTR __attribute__((aligned(16)))
+#define HAVE_SERIAL
+/* Disable iAP when LOGF_SERIAL is enabled to avoid conflicts */
+#ifndef LOGF_SERIAL
+#define IPOD_ACCESSORY_PROTOCOL
+#endif
+
/* Define this if you can switch on/off the accessory power supply */
#define HAVE_ACCESSORY_SUPPLY
-//#define IPOD_ACCESSORY_PROTOCOL
-#define HAVE_SERIAL
/* Define this, if you can switch on/off the lineout */
#define HAVE_LINEOUT_POWEROFF