3 files changed, 9 insertions, 6 deletions

diff --git a/firmware/export/iap.h b/firmware/export/iap.h
index 8ee26cbe9f..22f36083d1 100644
--- a/firmware/export/iap.h
+++ b/firmware/export/iap.h
@@ -22,7 +22,9 @@
 
 #include <stdbool.h>
 
-#define RX_BUFLEN 512
+/* This is just the payload size, without sync, length and checksum */
+#define RX_BUFLEN (64*1024)
+/* This is the entire frame length, sync, length, payload and checksum */
 #define TX_BUFLEN 128
 
 extern bool iap_getc(unsigned char x);
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index 76ed96bd14..3cadefdf68 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -79,8 +79,6 @@
 #define SYS_REMOTE_PLUGGED        MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 4)
 #define SYS_REMOTE_UNPLUGGED      MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 5)
 #define SYS_CAR_ADAPTER_RESUME    MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 0)
-#define SYS_IAP_PERIODIC          MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 1)
-#define SYS_IAP_HANDLEPKT         MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 2)
 #define SYS_CALL_INCOMING         MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 3)
 #define SYS_CALL_HUNG_UP          MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 4)
 #define SYS_VOLUME_CHANGED        MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 5)
diff --git a/firmware/target/arm/pp/debug-pp.c b/firmware/target/arm/pp/debug-pp.c
index f4ba61cd39..2f57e1ef14 100644
--- a/firmware/target/arm/pp/debug-pp.c
+++ b/firmware/target/arm/pp/debug-pp.c
@@ -155,9 +155,12 @@ bool dbg_ports(void)
 
 #if defined(IPOD_ACCESSORY_PROTOCOL)
         const unsigned char *serbuf = iap_get_serbuf();
-        lcd_putsf(0, line++, "IAP: %02x %02x %02x %02x %02x %02x %02x %02x", 
-         serbuf[0], serbuf[1], serbuf[2], serbuf[3], serbuf[4], serbuf[5],
-         serbuf[6], serbuf[7]);
+        if (serbuf)
+        {
+            lcd_putsf(0, line++, "IAP: %02x %02x %02x %02x %02x %02x %02x %02x",
+             serbuf[0], serbuf[1], serbuf[2], serbuf[3], serbuf[4], serbuf[5],
+             serbuf[6], serbuf[7]);
+        }
 #endif
 
 #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB)