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

More ZNeo compile fixes: include/stdio.h: Another place where misuse of FAR makes a difference. include/nuttx/sched.h: Be consistent in use of WDOG_ID type. ZDS-II doesn't like auto-conversions of struct wdog_s * to WDOG_I (which is type struct wdog_s *).

Browse Source
This commit is contained in:
Gregory Nutt 2019-06-03 13:28:39 -06:00
parent 96da37dc48
commit a9fd817eeb
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nuttx/sched.h
View File

@ -278,7 +278,7 @@ struct sporadic_s;
struct replenishment_s struct replenishment_s
{ {
FAR struct tcb_s *tcb; /* The parent TCB structure */ FAR struct tcb_s *tcb; /* The parent TCB structure */
struct wdog_s timer; /* Timer dedicated to this interval */ WDOG_ID timer; /* Timer dedicated to this interval */
uint32_t budget; /* Current budget time */ uint32_t budget; /* Current budget time */
uint8_t flags; /* See SPORADIC_FLAG_* definitions */ uint8_t flags; /* See SPORADIC_FLAG_* definitions */
}; };
@ -571,8 +571,6 @@ struct task_group_s
* that includes these common definitions. * that includes these common definitions.
*/ */
FAR struct wdog_s; /* Forward reference */
struct tcb_s struct tcb_s
{ {
/* Fields used to support list management *************************************/ /* Fields used to support list management *************************************/
@ -622,7 +620,7 @@ struct tcb_s
FAR struct sporadic_s *sporadic; /* Sporadic scheduling parameters */ FAR struct sporadic_s *sporadic; /* Sporadic scheduling parameters */
#endif #endif
FAR struct wdog_s *waitdog; /* All timed waits use this timer */ WDOG_ID waitdog; /* All timed waits use this timer */
/* Stack-Related Fields *******************************************************/ /* Stack-Related Fields *******************************************************/

2
include/stdio.h
View File

@ -187,7 +187,7 @@ int vasprintf(FAR char **ptr, FAR const IPTR char *fmt, va_list ap);
int vfprintf(FAR FILE *stream, FAR const IPTR char *fmt, int vfprintf(FAR FILE *stream, FAR const IPTR char *fmt,
va_list ap); va_list ap);
int vfscanf(FAR FILE *stream, FAR const IPTR char *fmt, va_list ap); int vfscanf(FAR FILE *stream, FAR const IPTR char *fmt, va_list ap);
int vprintf(FAR const IPTR FAR char *fmt, va_list ap); int vprintf(FAR const IPTR char *fmt, va_list ap);
int vsnprintf(FAR char *buf, size_t size, FAR const IPTR char *fmt, int vsnprintf(FAR char *buf, size_t size, FAR const IPTR char *fmt,
va_list ap); va_list ap);
int vsprintf(FAR char *buf, FAR const IPTR char *fmt, va_list ap); int vsprintf(FAR char *buf, FAR const IPTR char *fmt, va_list ap);