#define GETLEs32(X) ((int16_t)GETLE32((uint16_t *)X))
#define GETLE16(X) LE2HOST16(*(uint16_t *)X)
-#define GETLE32(X) LE2HOST32(*(uint32_t *)X)
+#define GETLE32_(X) LE2HOST32(*(uint32_t *)X)
#define GETLE16D(X) ({uint32_t val = GETLE32(X); (val<<16 | val >> 16);})
#define PUTLE16(X, Y) do{*((uint16_t *)X)=HOST2LE16((uint16_t)Y);}while(0)
-#define PUTLE32(X, Y) do{*((uint32_t *)X)=HOST2LE16((uint32_t)Y);}while(0)
+#define PUTLE32_(X, Y) do{*((uint32_t *)X)=HOST2LE16((uint32_t)Y);}while(0)
+#ifdef __arm__
+#define GETLE32(X) (*(uint16_t *)(X)|(((uint16_t *)(X))[1]<<16))
+#define PUTLE32(X, Y) do{uint16_t *p_=(uint16_t *)(X);uint32_t y_=Y;p_[0]=y_;p_[1]=y_>>16;}while(0)
+#else
+#define GETLE32 GETLE32_
+#define PUTLE32 PUTLE32_
+#endif
/////////////////////////////////////////////////////////////////////////////
typedef struct TWINTAG
{
PSXRect_t Position;
+ int xmask, ymask;
} TWin_t;
/////////////////////////////////////////////////////////////////////////////
// draw.c
extern int32_t GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP;
-extern int32_t GlobalTextREST,GlobalTextABR,GlobalTextPAGE;
+extern int32_t GlobalTextABR,GlobalTextPAGE;
extern short ly0,lx0,ly1,lx1,ly2,lx2,ly3,lx3;
extern long lLowerpart;
extern BOOL bCheckMask;
unsigned long ulInitDisplay(void);
void CloseDisplay(void);
+struct rearmed_cbs;
+extern const struct rearmed_cbs *rcbs;
+
#endif