5 files changed, 14 insertions, 15 deletions
diff --git a/include/fifo.h b/include/fifo.h
index c6eee2d..5fec62f 100644
--- a/include/fifo.h
+++ b/include/fifo.h
@@ -6,22 +6,22 @@
 #define FIFO_LEN 32
 
 struct fifo {
-    uint8_t head;
-    uint8_t tail;
-    uint8_t data[FIFO_LEN];
+    u8 head;
+    u8 tail;
+    u8 data[FIFO_LEN];
 };
 
-static inline uint8_t
+static inline u8
 fifo_pop(struct fifo *fifo)
 {
-    uint8_t ret = fifo->data[fifo->head];
+    u8 ret = fifo->data[fifo->head];
     if (++fifo->head >= LENGTH(fifo->data))
         fifo->head = 0;
     return ret;
 }
 
 static inline void
-fifo_push(struct fifo *fifo, uint8_t v)
+fifo_push(struct fifo *fifo, u8 v)
 {
     fifo->data[fifo->tail] = v;
 
diff --git a/include/i2c.h b/include/i2c.h
index 18fa5e9..a43744a 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -1,7 +1,7 @@
 #ifndef I2C_H
 #define I2C_H
 
-#include <stdint.h>
+#include <zeta.h>
 
 #define NACK 0
 #define ACK 1
@@ -16,9 +16,9 @@ void
 i2c_stop_condition(void);
 
 void
-i2c_send(uint8_t b);
+i2c_send(u8 b);
 
 uint8_t
-i2c_recv(uint8_t ack);
+i2c_recv(u8 ack);
 
 #endif // I2C_H
diff --git a/include/input.h b/include/input.h
index a2f03e2..2f4f05a 100644
--- a/include/input.h
+++ b/include/input.h
@@ -3,7 +3,7 @@
 
 #include <fifo.h>
 
-static inline uint8_t
+static inline u8
 poll_keys(void)
 {
 	return (port_b_data & 0x7C) >> 2;
diff --git a/include/tft.h b/include/tft.h
index 1e2fce2..c7dd680 100644
--- a/include/tft.h
+++ b/include/tft.h
@@ -1,8 +1,7 @@
 #ifndef TFT_H
 #define TFT_H
 
-#include <hardware.h>
-#include <stdint.h>
+#include <zeta.h>
 
 #define TFT_WIDTH 480
 #define TFT_HEIGHT 320
@@ -112,14 +111,14 @@ tft_ram_wr(void)
 }
 
 static inline void
-tft_pixel(uint8_t r, uint8_t g, uint8_t b)
+tft_pixel(u8 r, u8 g, u8 b)
 {
 	tft_data = (r << 3) | ((g & 0x38) >> 3);
 	tft_data = ((g & 0x07) << 5) | b & 0x1F;
 }
 
 void
-tft_set_area(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
+tft_set_area(u16 x, u16 y, u16 w, u16 h);
 
 void
 tft_init(void);
diff --git a/include/tty.h b/include/tty.h
index ea73e5f..b48993d 100644
--- a/include/tty.h
+++ b/include/tty.h
@@ -12,7 +12,7 @@ void
 addstr(const char *str);
 
 void
-setcur(unsigned int ncol, unsigned int nrow);
+setcur(u16 ncol, u16 nrow);
 
 void
 swap_colors(void);