diff options
Diffstat (limited to 'src/gdisp/gdisp_image_support.h')
-rw-r--r-- | src/gdisp/gdisp_image_support.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/gdisp/gdisp_image_support.h b/src/gdisp/gdisp_image_support.h index d64eef5b..5a114fc6 100644 --- a/src/gdisp/gdisp_image_support.h +++ b/src/gdisp/gdisp_image_support.h @@ -18,50 +18,50 @@ #define _GDISP_IMAGE_SUPPORT_H /* Base endian handling routines */ -#define gdispImageGetVar(type, p, idx) (*(type *)(((uint8_t *)(p))+(idx))) -#define gdispImageGetByte(type, p, idx, shift) (((type)gdispImageGetVar(uint8_t, p, idx))<<(shift)) -#define gdispImageSwap16(w) ((((uint16_t)(w))>>8)|(((uint16_t)(w))<<8)) -#define gdispImageSwap32(dw) ((((uint32_t)(dw))>>24)|((((uint32_t)(dw))&0x00FF0000)>>8)\ - |((((uint32_t)(dw))&0x0000FF00)<<8)|(((uint32_t)(dw))<<24)) -#define gdispImageSwapWords32(dw) ((((uint32_t)(dw))>>16)|(((uint32_t)(dw))<<16)) -#define gdispImageSwapBytes32(dw) (((((uint32_t)(dw))&0xFF000000)>>8)|((((uint32_t)(dw))&0x00FF0000)<<8)\ - |((((uint32_t)(dw))&0x0000FF00)>>8)|(((uint32_t)(dw))<<8)) +#define gdispImageGetVar(type, p, idx) (*(type *)(((gU8 *)(p))+(idx))) +#define gdispImageGetByte(type, p, idx, shift) (((type)gdispImageGetVar(gU8, p, idx))<<(shift)) +#define gdispImageSwap16(w) ((((gU16)(w))>>8)|(((gU16)(w))<<8)) +#define gdispImageSwap32(dw) ((((gU32)(dw))>>24)|((((gU32)(dw))&0x00FF0000)>>8)\ + |((((gU32)(dw))&0x0000FF00)<<8)|(((gU32)(dw))<<24)) +#define gdispImageSwapWords32(dw) ((((gU32)(dw))>>16)|(((gU32)(dw))<<16)) +#define gdispImageSwapBytes32(dw) (((((gU32)(dw))&0xFF000000)>>8)|((((gU32)(dw))&0x00FF0000)<<8)\ + |((((gU32)(dw))&0x0000FF00)>>8)|(((gU32)(dw))<<8)) /* - * Get a uint16_t/uint32_t from memory in the required endianness. + * Get a gU16/gU32 from memory in the required endianness. * There is no alignment requirement. */ #if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_LITTLE && GFX_CPU_NO_ALIGNMENT_FAULTS - #define gdispImageGetLE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx)) - #define gdispImageGetLE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx)) + #define gdispImageGetLE16(p, idx) gdispImageGetVar(gU16, (p), (idx)) + #define gdispImageGetLE32(p, idx) gdispImageGetVar(gU32, (p), (idx)) #else - #define gdispImageGetLE16(p, idx) ( gdispImageGetByte(uint16_t, (p), (idx) , 0) | gdispImageGetByte(uint16_t, (p), (idx)+1, 8)) - #define gdispImageGetLE32(p, idx) ( gdispImageGetByte(uint32_t, (p), (idx) , 0) | gdispImageGetByte(uint32_t, (p), (idx)+1, 8)\ - |gdispImageGetByte(uint32_t, (p), (idx)+2, 16) | gdispImageGetByte(uint32_t, (p), (idx)+3, 24)) + #define gdispImageGetLE16(p, idx) ( gdispImageGetByte(gU16, (p), (idx) , 0) | gdispImageGetByte(gU16, (p), (idx)+1, 8)) + #define gdispImageGetLE32(p, idx) ( gdispImageGetByte(gU32, (p), (idx) , 0) | gdispImageGetByte(gU32, (p), (idx)+1, 8)\ + |gdispImageGetByte(gU32, (p), (idx)+2, 16) | gdispImageGetByte(gU32, (p), (idx)+3, 24)) #endif #if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_BIG && GFX_CPU_NO_ALIGNMENT_FAULTS - #define gdispImageGetBE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx)) - #define gdispImageGetBE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx)) + #define gdispImageGetBE16(p, idx) gdispImageGetVar(gU16, (p), (idx)) + #define gdispImageGetBE32(p, idx) gdispImageGetVar(gU32, (p), (idx)) #else - #define gdispImageGetBE16(p, idx) ( gdispImageGetByte(uint16_t, (p), (idx) , 8) | gdispImageGetByte(uint16_t, (p), (idx)+1, 0)) - #define gdispImageGetBE32(p, idx) ( gdispImageGetByte(uint32_t, (p), (idx) , 24) | gdispImageGetByte(uint32_t, (p), (idx)+1, 16)\ - |gdispImageGetByte(uint32_t, (p), (idx)+2, 8) | gdispImageGetByte(uint32_t, (p), (idx)+3, 0)) + #define gdispImageGetBE16(p, idx) ( gdispImageGetByte(gU16, (p), (idx) , 8) | gdispImageGetByte(gU16, (p), (idx)+1, 0)) + #define gdispImageGetBE32(p, idx) ( gdispImageGetByte(gU32, (p), (idx) , 24) | gdispImageGetByte(gU32, (p), (idx)+1, 16)\ + |gdispImageGetByte(gU32, (p), (idx)+2, 8) | gdispImageGetByte(gU32, (p), (idx)+3, 0)) #endif /* - * Get a uint16_t/uint32_t from memory in the required endianness. + * Get a gU16/gU32 from memory in the required endianness. * These are optimised routines but the memory must be word/dword aligned. */ #if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_LITTLE - #define gdispImageGetAlignedLE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx)) + #define gdispImageGetAlignedLE16(p, idx) gdispImageGetVar(gU16, (p), (idx)) #define gdispImageGetAlignedBE16(p, idx) gdispImageGetBE16(p, (idx)) - #define gdispImageGetAlignedLE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx)) + #define gdispImageGetAlignedLE32(p, idx) gdispImageGetVar(gU32, (p), (idx)) #define gdispImageGetAlignedBE32(p, idx) gdispImageGetBE32(p, (idx)) #elif GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_BIG #define gdispImageGetAlignedLE16(p, idx) gdispImageGetLE16(p, (idx)) - #define gdispImageGetAlignedBE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx)) + #define gdispImageGetAlignedBE16(p, idx) gdispImageGetVar(gU16, (p), (idx)) #define gdispImageGetAlignedLE32(p, idx) gdispImageGetLE32(p, (idx)) - #define gdispImageGetAlignedBE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx)) + #define gdispImageGetAlignedBE32(p, idx) gdispImageGetVar(gU32, (p), (idx)) #else #define gdispImageGetAlignedLE16(p, idx) gdispImageGetLE16(p, (idx)) #define gdispImageGetAlignedBE16(p, idx) gdispImageGetBE16(p, (idx)) @@ -109,10 +109,10 @@ #define gdispImageMakeLE32(dw) { dw = gdispImageH32toLE32(dw); } #define gdispImageMakeBE32(dw) { dw = gdispImageH32toBE32(dw); } #else - uint16_t gdispImageH16toLE16(uint16_t w); - uint16_t gdispImageH16toBE16(uint16_t w); - uint32_t gdispImageH32toLE32(uint32_t dw); - uint32_t gdispImageH32toBE32(uint32_t dw); + gU16 gdispImageH16toLE16(gU16 w); + gU16 gdispImageH16toBE16(gU16 w); + gU32 gdispImageH32toLE32(gU32 dw); + gU32 gdispImageH32toBE32(gU32 dw); #define gdispImageMakeLE16(w) { w = gdispImageH16toLE16(w); } #define gdispImageMakeBE16(w) { w = gdispImageH16toBE16(w); } #define gdispImageMakeLE32(dw) { dw = gdispImageH32toLE32(dw); } @@ -120,11 +120,11 @@ #endif -void *gdispImageAlloc(gdispImage *img, size_t sz); -void gdispImageFree(gdispImage *img, void *ptr, size_t sz); +void *gdispImageAlloc(gdispImage *img, gMemSize sz); +void gdispImageFree(gdispImage *img, void *ptr, gMemSize sz); #if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_UNKNOWN - extern const uint8_t gdispImageEndianArray[4]; + extern const gU8 gdispImageEndianArray[4]; #endif #endif /* _GDISP_IMAGE_SUPPORT_H */ |