From ca4419762eaab74d52e07e02defbaac42570fea3 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 28 Dec 2008 11:17:09 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@546 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- src/include/events.h | 17 ----------------- src/include/threads.h | 2 -- 2 files changed, 19 deletions(-) (limited to 'src/include') diff --git a/src/include/events.h b/src/include/events.h index 0ebe9952a..49b551f45 100644 --- a/src/include/events.h +++ b/src/include/events.h @@ -52,10 +52,6 @@ typedef struct EventSource { EventListener *es_next; } EventSource; -/** Returns the event mask from the event identifier. - * @deprecated use EVENT_MASK() instead.*/ -#define EventMask(eid) (1 << (eid)) - /** Returns the event mask from the event identifier.*/ #define EVENT_MASK(eid) (1 << (eid)) @@ -76,7 +72,6 @@ typedef struct EventSource { #define chEvtIsListening(esp) \ ((void *)(esp) != (void *)(esp)->es_next) - /** Event Handler callback function.*/ typedef void (*evhandler_t)(eventid_t); @@ -94,16 +89,11 @@ extern "C" { eventmask_t chEvtWaitOne(eventmask_t ewmask); eventmask_t chEvtWaitAny(eventmask_t ewmask); eventmask_t chEvtWaitAll(eventmask_t ewmask); - eventid_t chEvtWait(eventmask_t ewmask, - const evhandler_t handlers[]); #endif #ifdef CH_USE_EVENTS_TIMEOUT eventmask_t chEvtWaitOneTimeout(eventmask_t ewmask, systime_t time); eventmask_t chEvtWaitAnyTimeout(eventmask_t ewmask, systime_t time); eventmask_t chEvtWaitAllTimeout(eventmask_t ewmask, systime_t time); - eventid_t chEvtWaitTimeout(eventmask_t ewmask, - const evhandler_t handlers[], - systime_t time); #endif #ifdef __cplusplus } @@ -126,15 +116,8 @@ extern "C" { #define chEvtWaitOne(ewmask) chEvtWaitOneTimeout(ewmask, TIME_INFINITE) #define chEvtWaitAny(ewmask) chEvtWaitAnyTimeout(ewmask, TIME_INFINITE) #define chEvtWaitAll(ewmask) chEvtWaitAllTimeout(ewmask, TIME_INFINITE) -#define chEvtWait(ewmask, handlers) chEvtWaitTimeout(ewmask, handlers, TIME_INFINITE) #endif -/* - * Old function names, deprecated, will be removed in some next release. - */ -#define chEvtSend chEvtBroadcast -#define chEvtSendI chEvtBroadcastI - #endif /* CH_USE_EVENTS */ #endif /* _EVENTS_H_ */ diff --git a/src/include/threads.h b/src/include/threads.h index 5b26a6535..b63636e63 100644 --- a/src/include/threads.h +++ b/src/include/threads.h @@ -183,8 +183,6 @@ extern "C" { Thread *chThdCreateFromMemoryPool(MemoryPool *mp, tprio_t prio, tfunc_t pf, void *arg); #endif - Thread *chThdCreate(tprio_t prio, tmode_t mode, void *workspace, - size_t wsize, tfunc_t pf, void *arg); void chThdSetPriority(tprio_t newprio); Thread *chThdResume(Thread *tp); void chThdSuspend(Thread **tpp); -- cgit v1.2.3