From 2bacc40350e38de606b3c1083ca5783403786e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=3D=3FUTF-8=3FQ=3FManuel=5FSt=3Dc3=3Dbchn=3F=3D?= Date: Sun, 24 Jan 2016 12:48:24 -0600 Subject: [PATCH] Fix mismatched prototype error in work_queue() --- arch | 2 +- libc/wqueue/work_queue.c | 22 +++------------------- sched/wqueue/kwork_queue.c | 22 +++------------------- 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/arch b/arch index f28b525870..7843ff7609 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit f28b525870aa79ba2925468a0f6bd27b8af421b6 +Subproject commit 7843ff7609a657430a4ba0b86eb3267682d73a30 diff --git a/libc/wqueue/work_queue.c b/libc/wqueue/work_queue.c index ae3a412c57..ba9e13c97e 100644 --- a/libc/wqueue/work_queue.c +++ b/libc/wqueue/work_queue.c @@ -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 * * 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) { diff --git a/sched/wqueue/kwork_queue.c b/sched/wqueue/kwork_queue.c index 45bd740600..e2f7d88003 100644 --- a/sched/wqueue/kwork_queue.c +++ b/sched/wqueue/kwork_queue.c @@ -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 * * 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)