uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Fix endian macro's

Browse source
This commit is contained in:
inmarket 2015-11-18 09:59:31 +10:00
parent 461b0bf091
commit d7e5c9f606
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gdisp/gdisp_image.c
View file

@ -209,7 +209,7 @@ void gdispImageFree(gdispImage *img, void *ptr, size_t sz) {
we.w = w; we.w = w;
return (((uint16_t)we.b[0]))|(((uint16_t)we.b[1]) << 8); return (((uint16_t)we.b[0]))|(((uint16_t)we.b[1]) << 8);
} }
uint16_t gdispImageH16toBE16(uint16_t dw) { uint16_t gdispImageH16toBE16(uint16_t w) {
union wbyteorder_u we; union wbyteorder_u we;
we.w = w; we.w = w;

24
src/gdisp/gdisp_image_support.h
View file

@ -32,16 +32,16 @@
* There is no alignment requirement. * There is no alignment requirement.
*/ */
#if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_LITTLE && GFX_CPU_NO_ALIGNMENT_FAULTS #if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_LITTLE && GFX_CPU_NO_ALIGNMENT_FAULTS
#define gidspImageGetLE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx)) #define gdispImageGetLE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx))
#define gidspImageGetLE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx)) #define gdispImageGetLE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx))
#else #else
#define gdispImageGetLE16(p, idx) ( gdispImageGetByte(uint16_t, (p), (idx) , 0) | gdispImageGetByte(uint16_t, (p), (idx)+1, 8)) #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)\ #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)) |gdispImageGetByte(uint32_t, (p), (idx)+2, 16) | gdispImageGetByte(uint32_t, (p), (idx)+3, 24))
#endif #endif
#if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_BIG && GFX_CPU_NO_ALIGNMENT_FAULTS #if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_BIG && GFX_CPU_NO_ALIGNMENT_FAULTS
#define gidspImageGetBE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx)) #define gdispImageGetBE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx))
#define gidspImageGetBE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx)) #define gdispImageGetBE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx))
#else #else
#define gdispImageGetBE16(p, idx) ( gdispImageGetByte(uint16_t, (p), (idx) , 8) | gdispImageGetByte(uint16_t, (p), (idx)+1, 0)) #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)\ #define gdispImageGetBE32(p, idx) ( gdispImageGetByte(uint32_t, (p), (idx) , 24) | gdispImageGetByte(uint32_t, (p), (idx)+1, 16)\
@ -54,19 +54,19 @@
*/ */
#if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_LITTLE #if GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_LITTLE
#define gdispImageGetAlignedLE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx)) #define gdispImageGetAlignedLE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx))
#define gdispImageGetAlignedBE16(p, idx) gidspImageGetBE16(p, (idx)) #define gdispImageGetAlignedBE16(p, idx) gdispImageGetBE16(p, (idx))
#define gdispImageGetAlignedLE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx)) #define gdispImageGetAlignedLE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx))
#define gdispImageGetAlignedBE32(p, idx) gidspImageGetBE32(p, (idx)) #define gdispImageGetAlignedBE32(p, idx) gdispImageGetBE32(p, (idx))
#elif GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_BIG #elif GFX_CPU_ENDIAN == GFX_CPU_ENDIAN_BIG
#define gdispImageGetAlignedLE16(p, idx) gidspImageGetLE16(p, (idx)) #define gdispImageGetAlignedLE16(p, idx) gdispImageGetLE16(p, (idx))
#define gdispImageGetAlignedBE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx)) #define gdispImageGetAlignedBE16(p, idx) gdispImageGetVar(uint16_t, (p), (idx))
#define gdispImageGetAlignedLE32(p, idx) gidspImageGetLE32(p, (idx)) #define gdispImageGetAlignedLE32(p, idx) gdispImageGetLE32(p, (idx))
#define gdispImageGetAlignedBE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx)) #define gdispImageGetAlignedBE32(p, idx) gdispImageGetVar(uint32_t, (p), (idx))
#else #else
#define gdispImageGetAlignedLE16(p, idx) gidspImageGetLE16(p, (idx)) #define gdispImageGetAlignedLE16(p, idx) gdispImageGetLE16(p, (idx))
#define gdispImageGetAlignedBE16(p, idx) gidspImageGetBE16(p, (idx)) #define gdispImageGetAlignedBE16(p, idx) gdispImageGetBE16(p, (idx))
#define gdispImageGetAlignedLE32(p, idx) gidspImageGetLE32(p, (idx)) #define gdispImageGetAlignedLE32(p, idx) gdispImageGetLE32(p, (idx))
#define gdispImageGetAlignedBE32(p, idx) gidspImageGetBE32(p, (idx)) #define gdispImageGetAlignedBE32(p, idx) gdispImageGetBE32(p, (idx))
#endif #endif
/* /*