Remove all duplicate headers and create universal headers (FujiNetWIFI#141)

Author: FozzTexx

.gitignore

@@ -67,3 +67,4 @@ fujinet-lib/*
 
 # IDE files
 .vscode/*
+*.o

Makefile.apple2

@@ -10,7 +10,7 @@
 # Space or comma separated list of cc65 supported target platforms to build for.
 # Default: c64 (lowercase!)
 TARGETS := apple2
-FUJINET_LIB_VERSION = 4.7.5
+FUJINET_LIB_VERSION = 4.7.9
 FUJINET_LIB = fujinet-lib
 FUJINET_LIB_VERSION_DIR = $(FUJINET_LIB)/$(FUJINET_LIB_VERSION)-$(TARGETS)
 

Makefile.c64

@@ -11,7 +11,7 @@
 # Default: c64 (lowercase!)
 TARGETS := c64
 
-FUJINET_LIB_VERSION = 4.6.2
+FUJINET_LIB_VERSION = 4.7.9
 FUJINET_LIB = fujinet-lib
 FUJINET_LIB_VERSION_DIR = $(FUJINET_LIB)/$(FUJINET_LIB_VERSION)-$(TARGETS)
 
@@ -264,7 +264,7 @@ CFLAGS += --include-dir $(FUJINET_LIB_VERSION_DIR) -DUSING_FUJINET_LIB
 .SUFFIXES:
 .PHONY: all test clean get_fujinet_lib zap r2r
 
-all: get_fujinet_lib $(PROGRAM)
+all: get_fujinet_lib $(R2R_BIN)
 
 -include $(DEPENDS)
 -include $(STATEFILE)

src/adam/bar.c

@@ -3,9 +3,9 @@
  * Bar routines
  */
 
+#include "../screen.h"
 #include <video/tms99x8.h>
 #include <stdbool.h>
-#include "bar.h"
 
 #define DISPLAY_ROWS 17
 #define DISPLAY_LENGTH 60
@@ -95,7 +95,7 @@ void bar_down()
 /**
  * Jump to bar slot
  */
-void bar_jump(unsigned char i)
+void bar_jump(uint_fast8_t i)
 {
   bar_oldi=bar_i;
   bar_i=i;
@@ -106,7 +106,7 @@ void bar_jump(unsigned char i)
  * Get current bar position
  * @return bar index
  */
-unsigned char bar_get()
+uint_fast8_t bar_get()
 {
   return bar_i;
 }

src/adam/bar.h

@@ -3,22 +3,21 @@
  * Input routines
  */
 
-#include <video/tms99x8.h>
-#include <eos.h>
-#include <smartkeys.h>
-#include <conio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include "input.h"
+#include "../input.h"
 #include "cursor.h"
-#include "globals.h"
-#include "bar.h"
+#include "../globals.h"
+#include "../screen.h"
 #include "../set_wifi.h"
 #include "../die.h"
 #include "../hosts_and_devices.h"
 #include "../select_file.h"
 #include "../select_slot.h"
-#include "io.h"
+#include "../io.h"
+
+#include <video/tms99x8.h>
+#include <eos.h>
+#include <smartkeys.h>
+#include <conio.h>
 
 static GameControllerData cont;
 static unsigned char key=0;
@@ -327,7 +326,7 @@ HDSubState input_hosts_and_devices_devices(void)
     }
 }
 
-void input_line_hosts_and_devices_host_slot(unsigned char i, unsigned char o, char *c)
+void input_line_hosts_and_devices_host_slot(uint_fast8_t i, uint_fast8_t o, char *c)
 {
   input_line(1,i+1,o,c,32,false);
 }