Added type gDelay to replace V2.x delaytime_t

Added type gTicks          to replace V2.x systemticks_t
Added type gThreadreturn   to replace V2.x threadreturn_t
Added type gThreadpriority to replace V2.x threadpriority_t

7 files changed, 15 insertions, 15 deletions

diff --git a/src/gdisp/gdisp_image.c b/src/gdisp/gdisp_image.c
index 03f3523e..dff13932 100644
--- a/src/gdisp/gdisp_image.c
+++ b/src/gdisp/gdisp_image.c
@@ -16,7 +16,7 @@
 	extern void gdispImageClose_NATIVE(gdispImage *img);
 	extern gdispImageError gdispImageCache_NATIVE(gdispImage *img);
 	extern gdispImageError gdispGImageDraw_NATIVE(GDisplay *g, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy);
-	extern delaytime_t gdispImageNext_NATIVE(gdispImage *img);
+	extern gDelay gdispImageNext_NATIVE(gdispImage *img);
 #endif
 
 #if GDISP_NEED_IMAGE_GIF
@@ -24,7 +24,7 @@
 	extern void gdispImageClose_GIF(gdispImage *img);
 	extern gdispImageError gdispImageCache_GIF(gdispImage *img);
 	extern gdispImageError gdispGImageDraw_GIF(GDisplay *g, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy);
-	extern delaytime_t gdispImageNext_GIF(gdispImage *img);
+	extern gDelay gdispImageNext_GIF(gdispImage *img);
 #endif
 
 #if GDISP_NEED_IMAGE_BMP
@@ -32,7 +32,7 @@
 	extern void gdispImageClose_BMP(gdispImage *img);
 	extern gdispImageError gdispImageCache_BMP(gdispImage *img);
 	extern gdispImageError gdispGImageDraw_BMP(GDisplay *g, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy);
-	extern delaytime_t gdispImageNext_BMP(gdispImage *img);
+	extern gDelay gdispImageNext_BMP(gdispImage *img);
 	extern uint16_t gdispImageGetPaletteSize_BMP(gdispImage *img);
 	extern gColor gdispImageGetPalette_BMP(gdispImage *img, uint16_t index);
 	extern gBool gdispImageAdjustPalette_BMP(gdispImage *img, uint16_t index, gColor newColor);
@@ -43,7 +43,7 @@
 	extern void gdispImageClose_JPG(gdispImage *img);
 	extern gdispImageError gdispImageCache_JPG(gdispImage *img);
 	extern gdispImageError gdispGImageDraw_JPG(GDisplay *g, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy);
-	extern delaytime_t gdispImageNext_JPG(gdispImage *img);
+	extern gDelay gdispImageNext_JPG(gdispImage *img);
 #endif
 
 #if GDISP_NEED_IMAGE_PNG
@@ -51,7 +51,7 @@
 	extern void gdispImageClose_PNG(gdispImage *img);
 	extern gdispImageError gdispImageCache_PNG(gdispImage *img);
 	extern gdispImageError gdispGImageDraw_PNG(GDisplay *g, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy);
-	extern delaytime_t gdispImageNext_PNG(gdispImage *img);
+	extern gDelay gdispImageNext_PNG(gdispImage *img);
 #endif
 
 /* The structure defining the routines for image drawing */
@@ -64,7 +64,7 @@ typedef struct gdispImageHandlers {
 							gCoord x, gCoord y,
 							gCoord cx, gCoord cy,
 							gCoord sx, gCoord sy);			/* The draw function */
-	delaytime_t		(*next)(gdispImage *img);					/* The next frame function */
+	gDelay		(*next)(gdispImage *img);					/* The next frame function */
 	uint16_t		(*getPaletteSize)(gdispImage *img);			/* Retrieve the size of the palette (number of entries) */
 	gColor			(*getPalette)(gdispImage *img, uint16_t index);							/* Retrieve a specific color value of the palette */
 	gBool			(*adjustPalette)(gdispImage *img, uint16_t index, gColor newColor);	/* Replace a color value in the palette */
@@ -186,7 +186,7 @@ gdispImageError gdispGImageDraw(GDisplay *g, gdispImage *img, gCoord x, gCoord y
 	return img->fns->draw(g, img, x, y, cx, cy, sx, sy);
 }
 
-delaytime_t gdispImageNext(gdispImage *img) {
+gDelay gdispImageNext(gdispImage *img) {
 	if (!img) return GDISP_IMAGE_ERR_NULLPOINTER;
 	if (!img->fns) return GDISP_IMAGE_ERR_BADFORMAT;
 	return img->fns->next(img);
diff --git a/src/gdisp/gdisp_image.h b/src/gdisp/gdisp_image.h
index cf0ada32..1f0acffb 100644
--- a/src/gdisp/gdisp_image.h
+++ b/src/gdisp/gdisp_image.h
@@ -243,7 +243,7 @@ gdispImageError gdispGImageDraw(GDisplay *g, gdispImage *img, gCoord x, gCoord y
  * @note	Calling gdispImageDraw() after getting a TIME_INFINITE will go back to drawing the first
  * 			frame/page.
  */
-delaytime_t gdispImageNext(gdispImage *img);
+gDelay gdispImageNext(gdispImage *img);
 
 /**
  * @brief	Get the number of entries in the color palette.
diff --git a/src/gdisp/gdisp_image_bmp.c b/src/gdisp/gdisp_image_bmp.c
index 61b801ad..0647e9ab 100644
--- a/src/gdisp/gdisp_image_bmp.c
+++ b/src/gdisp/gdisp_image_bmp.c
@@ -815,7 +815,7 @@ gdispImageError gdispGImageDraw_BMP(GDisplay *g, gdispImage *img, gCoord x, gCoo
 	return GDISP_IMAGE_ERR_OK;
 }
 
-delaytime_t gdispImageNext_BMP(gdispImage *img) {
+gDelay gdispImageNext_BMP(gdispImage *img) {
 	(void) img;
 
 	/* No more frames/pages */
diff --git a/src/gdisp/gdisp_image_gif.c b/src/gdisp/gdisp_image_gif.c
index edfa30c2..bad2a150 100644
--- a/src/gdisp/gdisp_image_gif.c
+++ b/src/gdisp/gdisp_image_gif.c
@@ -1106,15 +1106,15 @@ baddatacleanup:
 	return GDISP_IMAGE_ERR_BADDATA;
 }
 
-delaytime_t gdispImageNext_GIF(gdispImage *img) {
+gDelay gdispImageNext_GIF(gdispImage *img) {
 	gdispImagePrivate_GIF *	priv;
-	delaytime_t				delay;
+	gDelay				delay;
 	uint8_t					blocksz;
 
 	priv = (gdispImagePrivate_GIF *)img->priv;
 
 	// Save the delay and convert to millisecs
-	delay = (delaytime_t)priv->frame.delay * 10;
+	delay = (gDelay)priv->frame.delay * 10;
 
 	// We need to get to the end of this frame
 	if (!priv->frame.posend) {
diff --git a/src/gdisp/gdisp_image_jpg.c b/src/gdisp/gdisp_image_jpg.c
index 8056ac42..1deaaa0b 100644
--- a/src/gdisp/gdisp_image_jpg.c
+++ b/src/gdisp/gdisp_image_jpg.c
@@ -198,7 +198,7 @@ gdispImageError gdispGImageDraw_JPG(GDisplay *g, gdispImage *img, gCoord x, gCoo
     return GDISP_IMAGE_ERR_OK;
 }
 
-delaytime_t gdispImageNext_JPG(gdispImage *img) {
+gDelay gdispImageNext_JPG(gdispImage *img) {
 	(void) img;
 
 	/* No more frames/pages */
diff --git a/src/gdisp/gdisp_image_native.c b/src/gdisp/gdisp_image_native.c
index f97b7539..3ac5eb36 100644
--- a/src/gdisp/gdisp_image_native.c
+++ b/src/gdisp/gdisp_image_native.c
@@ -140,7 +140,7 @@ gdispImageError gdispGImageDraw_NATIVE(GDisplay *g, gdispImage *img, gCoord x, g
 	return GDISP_IMAGE_ERR_OK;
 }
 
-delaytime_t gdispImageNext_NATIVE(gdispImage *img) {
+gDelay gdispImageNext_NATIVE(gdispImage *img) {
 	(void) img;
 
 	/* No more frames/pages */
diff --git a/src/gdisp/gdisp_image_png.c b/src/gdisp/gdisp_image_png.c
index 782db31f..f714b779 100644
--- a/src/gdisp/gdisp_image_png.c
+++ b/src/gdisp/gdisp_image_png.c
@@ -1621,7 +1621,7 @@ baddata:
 	return GDISP_IMAGE_ERR_BADDATA;
 }
 
-delaytime_t gdispImageNext_PNG(gdispImage *img) {
+gDelay gdispImageNext_PNG(gdispImage *img) {
 	(void) img;
 
 	/* No more frames/pages */