From 89a616127284df0735d65caa6a20dd3425bdda2e Mon Sep 17 00:00:00 2001
From: Peter Evans <pevans@activecampaign.com>
Date: Tue, 26 Dec 2017 16:47:34 -0600
Subject: [PATCH] Reorganize header files

---
 include/mos6502.h    | 16 ++++++++--------
 include/option.h     | 10 +++++-----
 include/vm_bitfont.h |  2 +-
 include/vm_screen.h  | 14 +++++++-------
 include/vm_segment.h |  8 ++++----
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/include/mos6502.h b/include/mos6502.h
index 8443959..addf2c3 100644
--- a/include/mos6502.h
+++ b/include/mos6502.h
@@ -111,18 +111,18 @@ typedef vm_8bit (*mos6502_address_resolver)(mos6502 *);
  */
 typedef void (*mos6502_instruction_handler)(mos6502 *, vm_8bit);
 
-extern mos6502 *mos6502_create();
-extern void mos6502_free(mos6502 *);
-extern vm_8bit mos6502_next_byte(mos6502 *);
-extern void mos6502_push_stack(mos6502 *, vm_16bit);
-extern vm_16bit mos6502_pop_stack(mos6502 *);
-extern void mos6502_set_status(mos6502 *, vm_8bit);
-extern void mos6502_modify_status(mos6502 *, vm_8bit, vm_8bit);
 extern int mos6502_cycles(mos6502 *, vm_8bit);
 extern int mos6502_instruction(vm_8bit);
+extern mos6502 *mos6502_create();
 extern mos6502_instruction_handler mos6502_get_instruction_handler(vm_8bit);
-extern void mos6502_execute(mos6502 *, vm_8bit);
+extern vm_16bit mos6502_pop_stack(mos6502 *);
+extern vm_8bit mos6502_next_byte(mos6502 *);
 extern vm_8bit mos6502_read_byte(mos6502 *);
+extern void mos6502_execute(mos6502 *, vm_8bit);
+extern void mos6502_free(mos6502 *);
+extern void mos6502_modify_status(mos6502 *, vm_8bit, vm_8bit);
+extern void mos6502_push_stack(mos6502 *, vm_16bit);
+extern void mos6502_set_status(mos6502 *, vm_8bit);
 
 /*
  * Below are some functions that are defined in mos6502.addr.c
diff --git a/include/option.h b/include/option.h
index e63fbce..bf315e3 100644
--- a/include/option.h
+++ b/include/option.h
@@ -8,15 +8,15 @@
  */
 #define OPTION_MAX_DISKS 2
 
-extern const char *option_get_error();
 extern FILE *option_get_input(int);
+extern const char *option_get_error();
+extern int option_get_height();
+extern int option_get_width();
 extern int option_parse(int, char **);
-extern void option_print_help();
 extern int option_read_file(int, const char *);
+extern int option_set_size(const char *);
+extern void option_print_help();
 extern void option_set_error(const char *);
 extern void option_set_input(int, FILE *);
-extern int option_set_size(const char *);
-extern int option_get_width();
-extern int option_get_height();
 
 #endif
diff --git a/include/vm_bitfont.h b/include/vm_bitfont.h
index 4cc0215..c63a9ea 100644
--- a/include/vm_bitfont.h
+++ b/include/vm_bitfont.h
@@ -15,9 +15,9 @@ typedef struct {
     char cmask;
 } vm_bitfont;
 
+extern int vm_bitfont_render(vm_bitfont *, vm_screen *, SDL_Rect *, char);
 extern vm_bitfont *vm_bitfont_create(vm_screen *, const char *, int, int, char);
 extern void vm_bitfont_free(vm_bitfont *);
 extern void vm_bitfont_offset(vm_bitfont *, char, int *, int *);
-extern int vm_bitfont_render(vm_bitfont *, vm_screen *, SDL_Rect *, char);
 
 #endif
diff --git a/include/vm_screen.h b/include/vm_screen.h
index 42cceb4..0a83ce6 100644
--- a/include/vm_screen.h
+++ b/include/vm_screen.h
@@ -24,17 +24,17 @@ typedef struct {
     int ycoords;
 } vm_screen;
 
+extern bool vm_screen_active(vm_screen *);
 extern int vm_screen_add_window(vm_screen *, int, int);
-extern void vm_screen_set_logical_coords(vm_screen *, int, int);
+extern int vm_screen_init();
 extern int vm_screen_xcoords(vm_screen *);
 extern int vm_screen_ycoords(vm_screen *);
-extern int vm_screen_init();
-extern void vm_screen_finish();
-extern void vm_screen_refresh(vm_screen *);
-extern bool vm_screen_active(vm_screen *);
-extern void vm_screen_draw_rect(vm_screen *, int, int, int, int);
-extern void vm_screen_free(vm_screen *);
 extern vm_screen *vm_screen_create();
+extern void vm_screen_draw_rect(vm_screen *, int, int, int, int);
+extern void vm_screen_finish();
+extern void vm_screen_free(vm_screen *);
+extern void vm_screen_refresh(vm_screen *);
 extern void vm_screen_set_color(vm_screen *, uint8_t, uint8_t, uint8_t, uint8_t);
+extern void vm_screen_set_logical_coords(vm_screen *, int, int);
 
 #endif
diff --git a/include/vm_segment.h b/include/vm_segment.h
index 5a03b85..39ee838 100644
--- a/include/vm_segment.h
+++ b/include/vm_segment.h
@@ -54,11 +54,11 @@ struct vm_segment {
 };
 
 extern int vm_segment_copy(vm_segment *, vm_segment *, size_t, size_t, size_t);
+extern int vm_segment_read_map(vm_segment *, size_t, vm_segment_read_fn);
+extern int vm_segment_set(vm_segment *, size_t, vm_8bit);
+extern int vm_segment_write_map(vm_segment *, size_t, vm_segment_write_fn);
+extern vm_8bit vm_segment_get(vm_segment *, size_t);
 extern vm_segment *vm_segment_create(size_t);
 extern void vm_segment_free(vm_segment *);
-extern vm_8bit vm_segment_get(vm_segment *, size_t);
-extern int vm_segment_set(vm_segment *, size_t, vm_8bit);
-extern int vm_segment_read_map(vm_segment *, size_t, vm_segment_read_fn);
-extern int vm_segment_write_map(vm_segment *, size_t, vm_segment_write_fn);
 
 #endif