Fix incorrect definition of Endpoint_BytesInEndpoint() for the U4 parts.

[pub/USBasp.git] / Projects / AVRISP / Lib / PDIProtocol.c

diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDIProtocol.c
index 2ed3ff2..d98c51c 100644 (file)
--- a/Projects/AVRISP/Lib/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/PDIProtocol.c
@@ -28,7 +28,7 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

-#if defined(ENABLE_XPROG_PROTOCOL)\r
+#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r

 \r
 #warning PDI Programming Protocol support is incomplete and not currently suitable for use.\r
 \r
 \r
 #warning PDI Programming Protocol support is incomplete and not currently suitable for use.\r
 \r


@@ -109,7 +109,10 @@ static void PDIProtocol_EnterXPROGMode(void)
        \r
        /* Must hold DATA line high for at least 90nS to enable PDI interface */\r
        PDIDATA_LINE_PORT |= PDIDATA_LINE_MASK;\r
        \r
        /* Must hold DATA line high for at least 90nS to enable PDI interface */\r
        PDIDATA_LINE_PORT |= PDIDATA_LINE_MASK;\r

-       _delay_us(1);\r
+       asm volatile ("NOP"::);\r
+       #if (F_CPU > 8000000)\r
+       asm volatile ("NOP"::);\r
+       #endif\r

        \r
        /* Toggle CLOCK line 16 times within 100uS of the original 90nS timeout to keep PDI interface enabled */\r
        for (uint8_t i = 0; i < 16; i++)\r
        \r
        /* Toggle CLOCK line 16 times within 100uS of the original 90nS timeout to keep PDI interface enabled */\r
        for (uint8_t i = 0; i < 16; i++)\r