OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix mismatched prototype error in work_queue()

This commit is contained in:
=?UTF-8?Q?Manuel_St=c3=bchn?= 2016-01-24 12:48:24 -06:00 committed by Gregory Nutt
parent abe8215a44
commit 2bacc40350
3 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch

@ -1 +1 @@
Subproject commit f28b525870aa79ba2925468a0f6bd27b8af421b6
Subproject commit 7843ff7609a657430a4ba0b86eb3267682d73a30

22
libc/wqueue/work_queue.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* libc/wqueue/work_queue.c
*
* Copyright (C) 2009-2011, 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2009-2011, 2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -52,22 +52,6 @@
#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__)
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Type Declarations
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Variables
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
@ -103,7 +87,7 @@
static int work_qqueue(FAR struct usr_wqueue_s *wqueue,
FAR struct work_s *work, worker_t worker,
FAR void *arg, uint32_t delay)
FAR void *arg, systime_t delay)
{
DEBUGASSERT(work != NULL);
@ -162,7 +146,7 @@ static int work_qqueue(FAR struct usr_wqueue_s *wqueue,
****************************************************************************/
int work_queue(int qid, FAR struct work_s *work, worker_t worker,
FAR void *arg, uint32_t delay)
FAR void *arg, systime_t delay)
{
if (qid == USRWORK)
{

22
sched/wqueue/kwork_queue.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* sched/wqueue/kwork_queue.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -52,22 +52,6 @@
#ifdef CONFIG_SCHED_WORKQUEUE
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Type Declarations
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Variables
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
@ -103,7 +87,7 @@
static void work_qqueue(FAR struct kwork_wqueue_s *wqueue,
FAR struct work_s *work, worker_t worker,
FAR void *arg, uint32_t delay)
FAR void *arg, systime_t delay)
{
irqstate_t flags;
@ -162,7 +146,7 @@ static void work_qqueue(FAR struct kwork_wqueue_s *wqueue,
****************************************************************************/
int work_queue(int qid, FAR struct work_s *work, worker_t worker,
FAR void *arg, uint32_t delay)
FAR void *arg, systime_t delay)
{
#ifdef CONFIG_SCHED_HPWORK
if (qid == HPWORK)