Bluetooth demo can now create and maintain logical channels - need to determine why...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / XPROG / XMEGANVM.c

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
index fc98cfc..f63f13a 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
@@ -81,6 +81,13 @@ bool XMEGANVM_WaitWhileNVMBusBusy(void)
                        TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
                        return true;\r
                }\r
+\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
+               {\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
+               }\r
        }\r
        \r
        return false;\r
@@ -106,6 +113,13 @@ bool XMEGANVM_WaitWhileNVMControllerBusy(void)
                        TimeoutMSRemaining = COMMAND_TIMEOUT_MS;\r
                        return true;\r
                }\r
+\r
+               /* Manage software timeout */\r
+               if (TIFR0 & (1 << OCF0A))\r
+               {\r
+                       TIFR0 |= (1 << OCF0A);\r
+                       TimeoutMSRemaining--;\r
+               }\r
        }\r
        \r
        return false;\r