sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct release notes, updat changelog, fix some conditional compilation

Browse Source
This commit is contained in:
Gregory Nutt 2014-08-15 06:56:42 -06:00
parent eab47a0566
commit 2bc07a03ae
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReleaseNotes
View File

@ -6601,7 +6601,7 @@ Bugfixes. Only the most critical bugfixes are listed here (see the ChangeLog fo
NuttX-7.4 NuttX-7.4
--------- ---------
The 103rd release of NuttX, Version 7.4, was made on August 15, 2014, The 104th release of NuttX, Version 7.4, was made on August 15, 2014,
and is available for download from the SourceForge website. Note and is available for download from the SourceForge website. Note
that release consists of two tarballs: nuttx-7.4.tar.gz and that release consists of two tarballs: nuttx-7.4.tar.gz and
apps-7.4.tar.gz. Both may be needed (see the top-level nuttx/README.txt apps-7.4.tar.gz. Both may be needed (see the top-level nuttx/README.txt

8
sched/wdog/wd_start.c
View File

@ -437,14 +437,16 @@ unsigned int wd_timer(int ticks)
wdog = (FAR wdog_t*)g_wdactivelist.head; wdog = (FAR wdog_t*)g_wdactivelist.head;
/* Decrement the lag for this watchdog. #ifndef CONFIG_SCHED_TICKLESS_ALARM
* /* There is logic to handle the case where ticks is greater than
* There is logic to handle the case where ticks is greater than
* the watchdog lag, but if the scheduling is working properly * the watchdog lag, but if the scheduling is working properly
* that should never happen. * that should never happen.
*/ */
DEBUGASSERT(ticks <= wdog->lag); DEBUGASSERT(ticks <= wdog->lag);
#endif
/* Decrement the lag for this watchdog. */
decr = MIN(wdog->lag, ticks); decr = MIN(wdog->lag, ticks);
/* There are. Decrement the lag counter */ /* There are. Decrement the lag counter */