1 files changed, 16 insertions, 21 deletions

diff --git a/src/uxn/uxn.h b/src/uxn/uxn.h
index 6c6d53e..a4ab428 100644
--- a/src/uxn/uxn.h
+++ b/src/uxn/uxn.h
@@ -14,27 +14,22 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-typedef unsigned char Uint8;
-typedef signed char Sint8;
-typedef unsigned short Uint16;
-typedef signed short Sint16;
-
 #define PAGE_PROGRAM 0x0100
 
 typedef struct {
-        Uint8 ptr, kptr, error;
-        Uint8 dat[256];
+        u8 ptr, kptr, error;
+        u8 dat[256];
 } Stack;
 
 typedef struct {
-        Uint16 ptr;
-        Uint8 *dat;
+        u16 ptr;
+        u8 *dat;
 } Memory;
 
 typedef struct Device {
         struct Uxn *u;
-        Uint8 addr, dat[16], *mem;
-        void (*talk)(struct Device *d, Uint8, Uint8);
+        u8 addr, dat[16], *mem;
+        void (*talk)(struct Device *d, u8, u8);
 } Device;
 
 typedef struct Uxn {
@@ -45,17 +40,17 @@ typedef struct Uxn {
 
 struct Uxn;
 
-static inline void   mempoke8(Uint8 *m, Uint16 a, Uint8 b) { m[a] = b; }
-static inline Uint8  mempeek8(Uint8 *m, Uint16 a) { return m[a]; }
-static inline void   mempoke16(Uint8 *m, Uint16 a, Uint16 b) { mempoke8(m, a, b >> 8); mempoke8(m, a + 1, b); }
-static inline Uint16 mempeek16(Uint8 *m, Uint16 a) { return (mempeek8(m, a) << 8) + mempeek8(m, a + 1); }
-static inline void   devpoke8(Device *d, Uint8 a, Uint8 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }
-static inline Uint8  devpeek8(Device *d, Uint8 a) { d->talk(d, a & 0x0f, 0); return d->dat[a & 0xf];  }
-static inline void   devpoke16(Device *d, Uint8 a, Uint16 b) { devpoke8(d, a, b >> 8); devpoke8(d, a + 1, b); }
-static inline Uint16 devpeek16(Device *d, Uint16 a) { return (devpeek8(d, a) << 8) + devpeek8(d, a + 1); }
+static inline void mempoke8(u8 *m, u16 a, u8 b) { m[a] = b; }
+static inline u8 mempeek8(u8 *m, u16 a) { return m[a]; }
+static inline void mempoke16(u8 *m, u16 a, u16 b) { mempoke8(m, a, b >> 8); mempoke8(m, a + 1, b); }
+static inline u16 mempeek16(u8 *m, u16 a) { return (mempeek8(m, a) << 8) + mempeek8(m, a + 1); }
+static inline void devpoke8(Device *d, u8 a, u8 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }
+static inline u8 devpeek8(Device *d, u8 a) { d->talk(d, a & 0x0f, 0); return d->dat[a & 0xf];  }
+static inline void devpoke16(Device *d, u8 a, u16 b) { devpoke8(d, a, b >> 8); devpoke8(d, a + 1, b); }
+static inline u16 devpeek16(Device *d, u16 a) { return (devpeek8(d, a) << 8) + devpeek8(d, a + 1); }
 
 int loaduxn(Uxn *c, char *filepath);
 int bootuxn(Uxn *c);
-int evaluxn(Uxn *u, Uint16 vec);
-Device *portuxn(Uxn *u, Uint8 id, char *name, void (*talkfn)(Device *, Uint8, Uint8));
+int evaluxn(Uxn *u, u16 vec);
+Device *portuxn(Uxn *u, u8 id, char *name, void (*talkfn)(Device *, u8, u8));
 #endif // UXNGBA_UXN_H