diff options
-rw-r--r-- | sys/sys/_task.h | 24 | ||||
-rw-r--r-- | sys/sys/interrupt.h | 1 | ||||
-rw-r--r-- | sys/sys/taskqueue.h | 8 |
3 files changed, 3 insertions, 30 deletions
diff --git a/sys/sys/_task.h b/sys/sys/_task.h index 5e1205e..2a51e1b 100644 --- a/sys/sys/_task.h +++ b/sys/sys/_task.h @@ -38,31 +38,13 @@ * times the task was enqueued before the call to taskqueue_run(). */ typedef void task_fn_t(void *context, int pending); -typedef int task_drv_fn_t(void *context, int pending); struct task { STAILQ_ENTRY(task) ta_link; /* link for queue */ - u_short ta_pending; /* count times queued */ - u_short ta_priority; /* Priority */ - uint16_t ta_ppending; /* previous pending value */ - uint8_t ta_rc; /* last return code */ - uint8_t ta_flags; /* flag state */ - union { - task_fn_t *_ta_func; /* task handler */ - task_drv_fn_t *_ta_drv_func; /* task handler */ - } u; - + u_short ta_pending; /* count times queued */ + u_short ta_priority; /* Priority */ + task_fn_t *ta_func; /* task handler */ void *ta_context; /* argument for handler */ }; -#define ta_func u._ta_func -#define ta_drv_func u._ta_drv_func - - -#define TA_COMPLETE 0x0 -#define TA_NO_DEQUEUE 0x1 - -#define TA_REFERENCED (1 << 0) - - #endif /* !_SYS__TASK_H_ */ diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h index d55dfa4..be5d0f4 100644 --- a/sys/sys/interrupt.h +++ b/sys/sys/interrupt.h @@ -167,6 +167,5 @@ int swi_add(struct intr_event **eventp, const char *name, void **cookiep); void swi_sched(void *cookie, int flags); int swi_remove(void *cookie); -struct thread *intr_handler_thread(struct intr_handler *ih); #endif diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h index 87458b3..4065a58 100644 --- a/sys/sys/taskqueue.h +++ b/sys/sys/taskqueue.h @@ -75,8 +75,6 @@ void taskqueue_thread_enqueue(void *context); (task)->ta_priority = (priority); \ (task)->ta_func = (func); \ (task)->ta_context = (context); \ - (task)->ta_ppending = 0; \ - (task)->ta_rc = 0; \ } while (0) /* @@ -160,10 +158,4 @@ struct taskqueue *taskqueue_create_fast(const char *name, int mflags, taskqueue_enqueue_fn enqueue, void *context); -struct taskqueue *taskqueue_define_drv(void *arg, const char *name); -struct thread *taskqueue_drv_thread(void *context); -struct intr_handler *taskqueue_drv_handler(struct taskqueue *); -void taskqueue_free_drv(struct taskqueue *queue); - - #endif /* !_SYS_TASKQUEUE_H_ */ |