gpu-gles: remove short types

[pcsx_rearmed.git] / plugins / gpu-gles / gpuPlugin.h

diff --git a/plugins/gpu-gles/gpuPlugin.h b/plugins/gpu-gles/gpuPlugin.h
index c452032..e9a66af 100644 (file)
--- a/plugins/gpu-gles/gpuPlugin.h
+++ b/plugins/gpu-gles/gpuPlugin.h
@@ -51,11 +51,11 @@ extern "C" {
 #include "plugin.h"\r
 #include <gl/gl.h>\r
 #else\r
-#ifndef MAEMO_CHANGES\r
-       #include "psxCommon.h"\r
-#else\r
-       #include "../psxCommon.h"\r
-#endif \r
+//#ifndef MAEMO_CHANGES\r
+//     #include "psxCommon.h"\r
+//#else\r
+//     #include "../psxCommon.h"\r
+//#endif\r
 #include "gpuExternals.h"\r
 #ifdef __NANOGL__\r
 #include <gl/gl.h>\r
@@ -81,38 +81,38 @@ extern "C" {
 #define bool unsigned short\r
 \r
 typedef struct {\r
-       u32 ulFreezeVersion;\r
-       u32 ulStatus;\r
-       u32 ulControl[256];\r
-       u8 psxVRam[1024*1024*2];\r
+       unsigned int ulFreezeVersion;\r
+       unsigned int ulStatus;\r
+       unsigned int ulControl[256];\r
+       unsigned char psxVRam[1024*1024*2];\r
 } GPUFreeze_t;\r
 \r
-long CALLBACK GPU_init();\r
-long CALLBACK GPU_shutdown();\r
-long CALLBACK GPU_open(int hwndGPU);                    \r
-long CALLBACK GPU_close();\r
-unsigned long CALLBACK GPU_readData(void);\r
-void CALLBACK GPU_readDataMem(unsigned long * pMem, int iSize);\r
-unsigned long CALLBACK GPU_readStatus(void);\r
-void CALLBACK GPU_writeData(unsigned long gdata);\r
-void CALLBACK GPU_writeDataMem(unsigned long * pMem, int iSize);\r
-void CALLBACK GPU_writeStatus(unsigned long gdata);\r
-long CALLBACK GPU_dmaChain(unsigned long * baseAddrL, unsigned long addr);\r
-void CALLBACK GPU_updateLace(void);\r
-void CALLBACK GPU_makeSnapshot(void);\r
-long CALLBACK GPU_freeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF);\r
-long CALLBACK GPU_getScreenPic(u8 * pMem);\r
-long CALLBACK GPU_showScreenPic(u8 * pMem);\r
-//void CALLBACK GPU_keypressed(int keycode);\r
-//void CALLBACK GPU_displayText(s8 * pText);\r
-//void CALLBACK GPU_clearDynarec(void (CALLBACK *callback)(void));\r
-long CALLBACK GPU_configure(void);\r
-long CALLBACK GPU_test(void);\r
-void CALLBACK GPU_about(void);\r
+long CALLBACK GPUinit();\r
+long CALLBACK GPUshutdown();\r
+long CALLBACK GPUopen(int hwndGPU);\r
+long CALLBACK GPUclose();\r
+unsigned long CALLBACK GPUreadData(void);\r
+void CALLBACK GPUreadDataMem(unsigned long * pMem, int iSize);\r
+unsigned long CALLBACK GPUreadStatus(void);\r
+void CALLBACK GPUwriteData(unsigned long gdata);\r
+void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize);\r
+void CALLBACK GPUwriteStatus(unsigned long gdata);\r
+long CALLBACK GPUdmaChain(unsigned long * baseAddrL, unsigned long addr);\r
+void CALLBACK GPUupdateLace(void);\r
+void CALLBACK GPUmakeSnapshot(void);\r
+long CALLBACK GPUfreeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF);\r
+long CALLBACK GPUgetScreenPic(unsigned char * pMem);\r
+long CALLBACK GPUshowScreenPic(unsigned char * pMem);\r
+//void CALLBACK GPUkeypressed(int keycode);\r
+//void CALLBACK GPUdisplayText(s8 * pText);\r
+//void CALLBACK GPUclearDynarec(void (CALLBACK *callback)(void));\r
+long CALLBACK GPUconfigure(void);\r
+long CALLBACK GPUtest(void);\r
+void CALLBACK GPUabout(void);\r
 \r
 \r
 void           DoSnapShot(void);\r
-void              GPU_vSinc(void);\r
+void              GPUvSinc(void);\r
 void           updateDisplay(void);\r
 void           updateFrontDisplay(void);\r
 void           SetAutoFrameCap(void);\r
@@ -121,8 +121,8 @@ void           CheckVRamRead(int x, int y, int dx, int dy, bool bFront);
 void           CheckVRamReadEx(int x, int y, int dx, int dy);\r
 void           SetFixes(void);\r
 \r
-void PaintPicDot(u8 * p,u8 c);\r
-//void DrawNumBorPic(u8 *pMem, int lSelectedSlot);\r
+void PaintPicDot(unsigned char * p,unsigned char c);\r
+//void DrawNumBorPic(unsigned char *pMem, int lSelectedSlot);\r
 void ResizeWindow();\r
 \r
 ////////////////////////////////////////////////////////////////////////////\r