2 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gaudio/pwm/gaudio_play_board_template.h b/drivers/gaudio/pwm/gaudio_play_board_template.h
index 4e3e3bb1..86c4ea8a 100644
--- a/drivers/gaudio/pwm/gaudio_play_board_template.h
+++ b/drivers/gaudio/pwm/gaudio_play_board_template.h
@@ -15,7 +15,7 @@
  *
  */
 
-static gBool gaudio_play_pwm_setup(uint32_t frequency, ArrayDataFormat format) {
+static gBool gaudio_play_pwm_setup(gU32 frequency, ArrayDataFormat format) {
 	/* Initialise the PWM - use a midpoint value for the initial PWM value */
 	/* Initialise the timer interrupt @ frequency */
 	/* Return gFalse if any parameter invalid */
@@ -31,7 +31,7 @@ static void gaudio_play_pwm_stop(void) {
 	/* Stop the PWM */
 }
 
-static void gaudio_play_pwm_setI(uint16_t value) {
+static void gaudio_play_pwm_setI(gU16 value) {
 	/* Set the PWM value */
 }
 
diff --git a/drivers/gaudio/pwm/gaudio_play_pwm.c b/drivers/gaudio/pwm/gaudio_play_pwm.c
index 57541470..899ea793 100644
--- a/drivers/gaudio/pwm/gaudio_play_pwm.c
+++ b/drivers/gaudio/pwm/gaudio_play_pwm.c
@@ -20,15 +20,15 @@ static void gaudio_play_pwm_timer_callbackI(void);
 
 static GDataBuffer		*pplay;
 static ArrayDataFormat	playfmt;
-static size_t			playlen;
-static uint8_t			*pdata;
+static gMemSize			playlen;
+static gU8			*pdata;
 
 static void gaudio_play_pwm_timer_callbackI(void) {
 	if (pplay) {
 
 		// Get the next value from the current data buffer
 		if (gfxSampleFormatBits(playfmt) > 8) {
-			gaudio_play_pwm_setI(*(uint16_t *)pdata);
+			gaudio_play_pwm_setI(*(gU16 *)pdata);
 			pdata += 2;
 		} else {
 			gaudio_play_pwm_setI(*pdata);
@@ -57,7 +57,7 @@ static void gaudio_play_pwm_timer_callbackI(void) {
 	playlen = pplay->len;
 	if (gfxSampleFormatBits(playfmt) > 8)
 		playlen >>= 1;
-	pdata = (uint8_t *)(pplay+1);
+	pdata = (gU8 *)(pplay+1);
 }
 
 
@@ -65,7 +65,7 @@ static void gaudio_play_pwm_timer_callbackI(void) {
 /* External declarations.                                                    */
 /*===========================================================================*/
 
-gBool gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat format) {
+gBool gaudio_play_lld_init(gU16 channel, gU32 frequency, ArrayDataFormat format) {
 	(void) channel;
 
 	if (format != ARRAY_DATA_8BITUNSIGNED && format != ARRAY_DATA_10BITUNSIGNED)
@@ -75,7 +75,7 @@ gBool gaudio_play_lld_init(uint16_t channel, uint32_t frequency, ArrayDataFormat
 	return gaudio_play_pwm_setup(frequency, format);
 }
 
-gBool gaudio_play_lld_set_volume(uint8_t vol) {
+gBool gaudio_play_lld_set_volume(gU8 vol) {
 	(void) vol;
 	return gFalse;
 }
@@ -93,7 +93,7 @@ void gaudio_play_lld_start(void) {
 	playlen = pplay->len;
 	if (gfxSampleFormatBits(playfmt) > 8)
 		playlen >>= 1;
-	pdata = (uint8_t *)(pplay+1);
+	pdata = (gU8 *)(pplay+1);
 	gfxSystemUnlock();
 
 	// Start the playing