X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common.h;h=9d4f605c49f3728a754d00bf740ffd8ebd205650;hb=a88b04319e4e8a00fb955ee085929039f0c34a49;hp=f111348db3286fca692f5f3683c0f131d3a4bd50;hpb=2823a4c8196a02da86ee180cf55586d4e8c91a2f;p=gpsp.git

diff --git a/common.h b/common.h
index f111348..9d4f605 100644
--- a/common.h
+++ b/common.h
@@ -29,6 +29,7 @@
 #ifdef _WIN32_WCE
   #include <windows.h>
 #else
+  #define _BSD_SOURCE // sync
   #include <stdlib.h>
   #include <stdio.h>
   #include <string.h>
@@ -114,8 +115,8 @@
   typedef signed char s8;
   typedef unsigned short int u16;
   typedef signed short int s16;
-  typedef unsigned long u32;
-  typedef signed long s32;
+  typedef unsigned int u32;
+  typedef signed int s32;
   typedef unsigned long long int u64;
   typedef signed long long int s64;
 
@@ -135,8 +136,8 @@
 
   #define file_close(filename_tag)                                            \
   {                                                                           \
-    sync();                                                                   \
     fclose(filename_tag);                                                     \
+    sync();                                                                   \
   }                                                                           \
 
 #else
@@ -147,40 +148,16 @@
 #endif
 
   #define file_read(filename_tag, buffer, size)                               \
-    fread(buffer, size, 1, filename_tag)                                      \
+    fread(buffer, 1, size, filename_tag)                                      \
 
   #define file_write(filename_tag, buffer, size)                              \
-    fwrite(buffer, size, 1, filename_tag)                                     \
+    fwrite(buffer, 1, size, filename_tag)                                     \
 
   #define file_seek(filename_tag, offset, type)                               \
     fseek(filename_tag, offset, type)                                         \
 
   #define file_tag_type FILE *
 
-  // The ARM arch uses SDL, and SDL requires you to know what resolution
-  // you want. Define the resolution for ARM arch builds here.
-  // Placed in common.h for use with video.c and gui.c.
-
-  #ifndef PC_BUILD
-
-  #define GP2X_SCREEN_WIDTH 320
-  #define GP2X_SCREEN_HEIGHT 240
-
-  #define GIZ_SCREEN_WIDTH 320
-  #define GIZ_SCREEN_HEIGHT 240
-
-  #ifdef GP2X_BUILD
-    #define SDL_SCREEN_WIDTH GP2X_SCREEN_WIDTH
-    #define SDL_SCREEN_HEIGHT GP2X_SCREEN_HEIGHT
-
-  #elif defined(GIZ_BUILD)
-
-    #define SDL_SCREEN_WIDTH GIZ_SCREEN_WIDTH
-    #define SDL_SCREEN_HEIGHT GIZ_SCREEN_HEIGHT
-  #endif
-
-  #endif
-
 #endif
 
 // These must be variables, not constants.
@@ -203,6 +180,7 @@
 
 
 typedef u32 fixed16_16;
+typedef u32 fixed8_24;
 
 #define float_to_fp16_16(value)                                               \
   (fixed16_16)((value) * 65536.0)                                             \
@@ -219,6 +197,12 @@ typedef u32 fixed16_16;
 #define fp16_16_fractional_part(value)                                        \
   ((value) & 0xFFFF)                                                          \
 
+#define float_to_fp8_24(value)                                                \
+  (fixed8_24)((value) * 16777216.0)                                           \
+
+#define fp8_24_fractional_part(value)                                         \
+  ((value) & 0xFFFFFF)                                                        \
+
 #define fixed_div(numerator, denominator, bits)                               \
   (((numerator * (1 << bits)) + (denominator / 2)) / denominator)             \
 
@@ -248,6 +232,9 @@ typedef u32 fixed16_16;
 #include "zip.h"
 #include "cheats.h"
 
+#ifdef ARM_ARCH
+  #include "arm/warm.h"
+#endif
 
 #ifdef PSP_BUILD
   #define printf pspDebugScreenPrintf
@@ -268,9 +255,11 @@ typedef u32 fixed16_16;
   #define vprintf(format, ap)                                                 \
     vfprintf(stderr, format, ap)                                              \
 
-  void gp2x_overclock(void);
-
 //  #define STDIO_DEBUG
 #endif
 
+#ifdef PND_BUILD
+  #include "pandora/pnd.h"
+#endif
+
 #endif