dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

POSIX: hrt_work_lock.h to hrt_work.h 

The header file now contains all hrt workqueue related prototypes.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois 2015-06-02 01:06:18 -07:00
parent 6fd612a218
commit af45954690
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platforms/posix/px4_layer/drv_hrt.c
View File

@ -42,7 +42,7 @@
#include <semaphore.h> #include <semaphore.h>
#include <time.h> #include <time.h>
#include <string.h> #include <string.h>
#include "hrt_work_lock.h" #include "hrt_work.h"
static struct sq_queue_s callout_queue; static struct sq_queue_s callout_queue;

2
src/platforms/posix/px4_layer/hrt_queue.c
View File

@ -47,7 +47,7 @@
#include <semaphore.h> #include <semaphore.h>
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include <px4_workqueue.h> #include <px4_workqueue.h>
#include "hrt_work_lock.h" #include "hrt_work.h"
#ifdef CONFIG_SCHED_WORKQUEUE #ifdef CONFIG_SCHED_WORKQUEUE

2
src/platforms/posix/px4_layer/hrt_thread.c
View File

@ -46,7 +46,7 @@
#include <queue.h> #include <queue.h>
#include <px4_workqueue.h> #include <px4_workqueue.h>
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include "hrt_work_lock.h" #include "hrt_work.h"
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions

16
src/platforms/posix/px4_layer/hrt_work_cancel.c
View File

@ -41,7 +41,7 @@
#include <px4_defines.h> #include <px4_defines.h>
#include <queue.h> #include <queue.h>
#include <px4_workqueue.h> #include <px4_workqueue.h>
#include "hrt_work_lock.h" #include "hrt_work.h"
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -68,26 +68,21 @@
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: work_cancel * Name: hrt_work_cancel
* *
* Description: * Description:
* Cancel previously queued work. This removes work from the work queue. * Cancel previously queued work. This removes work from the work queue.
* After work has been canceled, it may be re-queue by calling work_queue() * After work has been canceled, it may be re-queue by calling
* again. * hrt_work_queue() again.
* *
* Input parameters: * Input parameters:
* qid - The work queue ID
* work - The previously queue work structure to cancel * work - The previously queue work structure to cancel
* *
* Returned Value:
* Zero on success, a negated errno on failure
*
****************************************************************************/ ****************************************************************************/
int hrt_work_cancel(struct work_s *work) void hrt_work_cancel(struct work_s *work)
{ {
struct wqueue_s *wqueue = &g_hrt_work; struct wqueue_s *wqueue = &g_hrt_work;
//irqstate_t flags;
//DEBUGASSERT(work != NULL && (unsigned)qid < NWORKERS); //DEBUGASSERT(work != NULL && (unsigned)qid < NWORKERS);
@ -113,5 +108,4 @@ int hrt_work_cancel(struct work_s *work)
} }
hrt_work_unlock(); hrt_work_unlock();
return PX4_OK;
} }

2
src/platforms/posix/px4_layer/px4_posix_impl.cpp
View File

@ -46,7 +46,7 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include "systemlib/param/param.h" #include "systemlib/param/param.h"
#include "hrt_work_lock.h" #include "hrt_work.h"
__BEGIN_DECLS __BEGIN_DECLS