Some minor cleanup

1 files changed, 15 insertions, 13 deletions

diff --git a/src/aplos.h b/src/aplos.h
index 4e663f4..a64e7cc 100644
--- a/src/aplos.h
+++ b/src/aplos.h
@@ -28,30 +28,32 @@ struct boot_info
 
 /* boot.c */
 uint64_t cpu_count(void);
- 
+
+/* error.c */
+void assert(bool);
+
+/* font.c */
+void font_init(void);
+void font_draw(char8_t *, uint32_t, uint32_t, uint32_t, uint32_t);
+
 /* main.c */
 void main(struct boot_info *);
-#define ASSERT(chk) do{if(!(chk)) halt();}while(0)
+
+/* nasty.S */
+void halt(void);
 
 /* screen.c */
 void screen_init(struct framebuffer *);
 void screen_draw_pixel(uint32_t, uint32_t, uint32_t);
 void print(char8_t *, ...);
 
-/* font.c */
-void font_init(void);
-void font_draw(char8_t *, uint32_t, uint32_t, uint32_t, uint32_t);
+/* utf8.c */
+int utf8_char_length(const char8_t *);
+int utf8_cmp_n(const char8_t *, const char8_t *, uint64_t);
+uint32_t utf8_value(const char8_t *);
 
 /* util.c */
 uint16_t read_uint16_le(const uint8_t *);
 uint16_t read_uint16_be(const uint8_t *);
 uint32_t read_uint32_le(const uint8_t *);
 int memcmp(const void *, const void *, size_t);
-
-/* utf8.c */
-int utf8_char_length(const char8_t *);
-int utf8_cmp_n(const char8_t *, const char8_t *, uint64_t);
-uint32_t utf8_value(const char8_t *);
-
-/* nasty.S */
-extern void halt(void);