projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable...
[pub/USBasp.git]
/
Projects
/
AVRISP-MKII
/
Lib
/
XPROG
/
TINYNVM.c
diff --git
a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
index
0ab2975
..
a894793
100644
(file)
--- a/
Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/
Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@
-86,6
+86,13
@@
bool TINYNVM_WaitWhileNVMBusBusy(void)
TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
\r
return true;
\r
}
\r
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
}
\r
\r
return false;
\r
@@
-110,6
+117,13
@@
bool TINYNVM_WaitWhileNVMControllerBusy(void)
TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
\r
return true;
\r
}
\r
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
}
\r
\r
return false;
\r