Added new type definitions - moving towards V3.0

7 files changed, 39 insertions, 39 deletions

diff --git a/drivers/gaudio/Win32/gaudio_play_Win32.c b/drivers/gaudio/Win32/gaudio_play_Win32.c
index 7bca6e04..33342151 100644
--- a/drivers/gaudio/Win32/gaudio_play_Win32.c
+++ b/drivers/gaudio/Win32/gaudio_play_Win32.c
@@ -31,7 +31,7 @@
 
 static HWAVEOUT		ah = 0;
 static volatile int	nQueuedBuffers;
-static bool_t		isRunning;
+static gBool		isRunning;
 static WAVEHDR		WaveHdrs[MAX_WAVE_HEADERS];
 static HANDLE		waveThread;
 static DWORD		threadID;
@@ -46,7 +46,7 @@ static DWORD		threadID;
  * anyway, so instead just use CALLBACK_THREAD here instead.
  *************************************************************************/
 
-static bool_t senddata(WAVEHDR *pwh) {
+static gBool senddata(WAVEHDR *pwh) {
 	GDataBuffer *paud;
 
 	// Get the next data block to send
@@ -56,7 +56,7 @@ static bool_t senddata(WAVEHDR *pwh) {
 		gaudioPlayDoneI();
 	gfxSystemUnlock();
 	if (!paud)
-		return FALSE;
+		return gFalse;
 
 	// Prepare the wave header for Windows
 	pwh->dwUser = (DWORD_PTR)paud;
@@ -76,7 +76,7 @@ static bool_t senddata(WAVEHDR *pwh) {
 	}
 
 	nQueuedBuffers++;
-	return TRUE;
+	return gTrue;
 }
 
 static DWORD WINAPI waveProc(LPVOID arg) {
@@ -122,11 +122,11 @@ static DWORD WINAPI waveProc(LPVOID arg) {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
+gBool gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
 	WAVEFORMATEX	wfx;
 
 	if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_16BITSIGNED)
-		return FALSE;
+		return gFalse;
 
 	if (!waveThread) {
 		if (!(waveThread = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)waveProc, 0, 0, &threadID))) {
@@ -153,19 +153,19 @@ bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataForma
 		exit(-1);
 	}
 
-	return TRUE;
+	return gTrue;
 }
 
-bool_t gaudio_play_lld_set_volume(uint8_t vol) {
+gBool gaudio_play_lld_set_volume(uint8_t vol) {
 	if (!ah)
-		return FALSE;
+		return gFalse;
 	return waveOutSetVolume(ah, (((uint16_t)vol)<<8)|vol) != 0;
 }
 
 void gaudio_play_lld_start(void) {
 	WAVEHDR		*pwh;
 
-	isRunning = TRUE;
+	isRunning = gTrue;
 	while (nQueuedBuffers < MAX_WAVE_HEADERS) {
 		// Find the empty one - there will always be at least one.
 		for(pwh = WaveHdrs; pwh->lpData; pwh++);
@@ -177,7 +177,7 @@ void gaudio_play_lld_start(void) {
 }
 
 void gaudio_play_lld_stop(void) {
-	isRunning = FALSE;
+	isRunning = gFalse;
 	waveOutReset(ah);
 	while(nQueuedBuffers) Sleep(1);
 }
diff --git a/drivers/gaudio/Win32/gaudio_record_Win32.c b/drivers/gaudio/Win32/gaudio_record_Win32.c
index 1c86c37f..065c2e5f 100644
--- a/drivers/gaudio/Win32/gaudio_record_Win32.c
+++ b/drivers/gaudio/Win32/gaudio_record_Win32.c
@@ -31,7 +31,7 @@
 
 static HWAVEIN		ah = 0;
 static volatile int	nQueuedBuffers;
-static bool_t		isRunning;
+static gBool		isRunning;
 static WAVEHDR		WaveHdrs[MAX_WAVE_HEADERS];
 static HANDLE		waveThread;
 static DWORD		threadID;
@@ -46,7 +46,7 @@ static DWORD		threadID;
  * anyway, so instead just use CALLBACK_THREAD here instead.
  *************************************************************************/
 
-static bool_t getbuffer(WAVEHDR *pwh) {
+static gBool getbuffer(WAVEHDR *pwh) {
 	GDataBuffer *paud;
 
 	// Get the next data block to send
@@ -56,7 +56,7 @@ static bool_t getbuffer(WAVEHDR *pwh) {
 		gaudioRecordDoneI();
 	gfxSystemUnlock();
 	if (!paud)
-		return FALSE;
+		return gFalse;
 
 	// Prepare the wave header for Windows
 	pwh->dwUser = (DWORD_PTR)paud;
@@ -75,7 +75,7 @@ static bool_t getbuffer(WAVEHDR *pwh) {
 	}
 
 	nQueuedBuffers++;
-	return TRUE;
+	return gTrue;
 }
 
 static DWORD WINAPI waveProc(LPVOID arg) {
@@ -124,11 +124,11 @@ static DWORD WINAPI waveProc(LPVOID arg) {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-bool_t gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
+gBool gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
 	WAVEFORMATEX	wfx;
 
 	if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_16BITSIGNED)
-		return FALSE;
+		return gFalse;
 
 	if (!waveThread) {
 		if (!(waveThread = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)waveProc, 0, 0, &threadID))) {
@@ -155,7 +155,7 @@ bool_t gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFor
 		exit(-1);
 	}
 
-	return TRUE;
+	return gTrue;
 }
 
 void gaudio_record_lld_start(void) {
@@ -173,13 +173,13 @@ void gaudio_record_lld_start(void) {
 			break;
 	}
 	if (!isRunning) {
-		isRunning = TRUE;
+		isRunning = gTrue;
 		waveInStart(ah);
 	}
 }
 
 void gaudio_record_lld_stop(void) {
-	isRunning = FALSE;
+	isRunning = gFalse;
 	waveInReset(ah);
 	while(nQueuedBuffers) Sleep(1);
 }
diff --git a/drivers/gaudio/gadc/gaudio_record_gadc.c b/drivers/gaudio/gadc/gaudio_record_gadc.c
index c894c84b..01eebd7e 100644
--- a/drivers/gaudio/gadc/gaudio_record_gadc.c
+++ b/drivers/gaudio/gadc/gaudio_record_gadc.c
@@ -30,10 +30,10 @@ static void gadcCallbackI(void) {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-bool_t gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
+gBool gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
 	/* Check the parameters */
 	if (channel >= GAUDIO_RECORD_NUM_CHANNELS || frequency > GAUDIO_RECORD_MAX_SAMPLE_FREQUENCY || format != GAUDIO_RECORD_FORMAT1)
-		return FALSE;
+		return gFalse;
 
 	/* Setup the high speed GADC */
 	gadcHighSpeedInit(gaudio_gadc_physdevs[channel], frequency);
@@ -41,7 +41,7 @@ bool_t gaudio_record_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFor
 	/* Register ourselves for ISR callbacks */
 	gadcHighSpeedSetISRCallback(gadcCallbackI);
 
-	return TRUE;
+	return gTrue;
 }
 
 void gaudio_record_lld_start(void) {
diff --git a/drivers/gaudio/pwm/gaudio_play_board_template.h b/drivers/gaudio/pwm/gaudio_play_board_template.h
index 24039d17..c2a91fe1 100644
--- a/drivers/gaudio/pwm/gaudio_play_board_template.h
+++ b/drivers/gaudio/pwm/gaudio_play_board_template.h
@@ -15,10 +15,10 @@
  *
  */
 
-static bool gaudio_play_pwm_setup(uint32_t frequency, ArrayDataFormat format) {
+static gBool gaudio_play_pwm_setup(uint32_t frequency, ArrayDataFormat format) {
 	/* Initialise the PWM - use a midpoint value for the initial PWM value */
 	/* Initialise the timer interrupt @ frequency */
-	/* Return FALSE if any parameter invalid */
+	/* Return gFalse if any parameter invalid */
 }
 
 static void gaudio_play_pwm_start(void) {
diff --git a/drivers/gaudio/pwm/gaudio_play_pwm.c b/drivers/gaudio/pwm/gaudio_play_pwm.c
index 91d7a835..ab83852d 100644
--- a/drivers/gaudio/pwm/gaudio_play_pwm.c
+++ b/drivers/gaudio/pwm/gaudio_play_pwm.c
@@ -65,19 +65,19 @@ static void gaudio_play_pwm_timer_callbackI(void) {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
+gBool gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
 	(void) channel;
 
 	if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_10BITUNSIGNED)
-		return FALSE;
+		return gFalse;
 
 	playfmt = format;
 	return gaudio_play_pwm_setup(frequency, format);
 }
 
-bool_t gaudio_play_lld_set_volume(uint8_t vol) {
+gBool gaudio_play_lld_set_volume(uint8_t vol) {
 	(void) vol;
-	return FALSE;
+	return gFalse;
 }
 
 void gaudio_play_lld_start(void) {
diff --git a/drivers/gaudio/vs1053/gaudio_play_board_template.h b/drivers/gaudio/vs1053/gaudio_play_board_template.h
index d6125bbc..273bd7ed 100644
--- a/drivers/gaudio/vs1053/gaudio_play_board_template.h
+++ b/drivers/gaudio/vs1053/gaudio_play_board_template.h
@@ -24,7 +24,7 @@ static void board_reset(void) {
 }
 
 // Returns the state of the dreq pin
-static bool board_dreq(void) {
+static gBool board_dreq(void) {
 
 }
 
diff --git a/drivers/gaudio/vs1053/gaudio_play_vs1053.c b/drivers/gaudio/vs1053/gaudio_play_vs1053.c
index c96ec036..8b333741 100644
--- a/drivers/gaudio/vs1053/gaudio_play_vs1053.c
+++ b/drivers/gaudio/vs1053/gaudio_play_vs1053.c
@@ -61,7 +61,7 @@
 #endif
 
 // Our static variables
-static bool_t	vs1053_isinit;
+static gBool	vs1053_isinit;
 static GTimer	playTimer;
 
 // Some common macro's
@@ -228,7 +228,7 @@ static void FeedData(void *param) {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
+gBool gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
 	uint32_t	brate;
 	uint32_t	bps;
 	uint8_t		buf[4];
@@ -246,14 +246,14 @@ bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataForma
 	};
 
 	if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_16BITSIGNED && format != ARRAY_DATA_UNKNOWN)
-		return FALSE;
+		return gFalse;
 	if (frequency > VS1053_MAX_SAMPLE_RATE)
-		return FALSE;
+		return gFalse;
 
 	// Reset the chip if needed
 	if (!vs1053_isinit) {
 		vs1053_hard_reset();
-		vs1053_isinit = TRUE;
+		vs1053_isinit = gTrue;
 	}
 
 	// Setup
@@ -274,10 +274,10 @@ bool_t gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataForma
 		buf[0] = gfxSampleFormatBits(format);				buf[1] = 0;								data_write(buf, 2);
 		data_write(hdr2, sizeof(hdr2));
 	}
-	return TRUE;
+	return gTrue;
 }
 
-bool_t gaudio_play_lld_set_volume(uint8_t vol) {
+gBool gaudio_play_lld_set_volume(uint8_t vol) {
 	uint16_t tmp;
 
 	// Volume is 0xFE -> 0x00. Adjust vol to match
@@ -291,7 +291,7 @@ bool_t gaudio_play_lld_set_volume(uint8_t vol) {
 
 	cmd_write(SCI_VOL, tmp);
 
-	return TRUE;
+	return gTrue;
 }
 
 void gaudio_play_lld_start(void) {
@@ -310,7 +310,7 @@ void gaudio_play_lld_start(void) {
 
 	// Start the playing by starting the timer and executing FeedData immediately just to get things started
 	// We really should set the timer to be equivalent to half the available data but that is just too hard to calculate.
-	gtimerStart(&playTimer, FeedData, 0, TRUE, VS1053_POLL_RATE);
+	gtimerStart(&playTimer, FeedData, 0, gTrue, VS1053_POLL_RATE);
 	FeedData(0);
 }