Tidy u gfxSem, gfxMutex and various Macros by converting to new types gSem, gMutex etc

2 files changed, 6 insertions, 6 deletions

diff --git a/src/gevent/gevent.c b/src/gevent/gevent.c
index 472fb25c..2ca2973e 100644
--- a/src/gevent/gevent.c
+++ b/src/gevent/gevent.c
@@ -20,7 +20,7 @@
 #define GLISTENER_WITHSOURCE		0x0002			// The source is currently using the buffer
 
 /* This mutex protects access to our tables */
-static gfxMutex	geventMutex;
+static gMutex	geventMutex;
 
 /* Our table of listener/source pairs */
 static GSourceListener		Assignments[GEVENT_MAX_SOURCE_LISTENERS];
@@ -62,9 +62,9 @@ void _geventDeinit(void)
 }
 
 void geventListenerInit(GListener *pl) {
-	gfxSemInit(&pl->waitqueue, 0, MAX_SEMAPHORE_COUNT);		// Next wait'er will block
-	pl->callback = 0;										// No callback active
-	pl->event.type = GEVENT_NULL;							// Always safety
+	gfxSemInit(&pl->waitqueue, 0, gSemMaxCount);		// Next wait'er will block
+	pl->callback = 0;									// No callback active
+	pl->event.type = GEVENT_NULL;						// Always safety
 	pl->flags = 0;
 }
 
diff --git a/src/gevent/gevent.h b/src/gevent/gevent.h
index 4e8dacec..d499ee32 100644
--- a/src/gevent/gevent.h
+++ b/src/gevent/gevent.h
@@ -55,8 +55,8 @@ typedef void (*GEventCallbackFn)(void *param, GEvent *pe);
 
 // The Listener Object
 typedef struct GListener {
-	gfxSem				waitqueue;			// Private: Semaphore for the listener to wait on.
-	gU16			flags;				// Private: Flags for operation
+	gSem				waitqueue;			// Private: Semaphore for the listener to wait on.
+	gU16				flags;				// Private: Flags for operation
 	GEventCallbackFn	callback;			// Private: Call back Function
 	void				*param;				// Private: Parameter for the callback function.
 	GEvent				event;				// Public:  The event object into which the event information is stored.