1st name change

Author: markjfisher

Makefile

@@ -207,20 +207,21 @@ OBJECTS := $(OBJECTS:common/$(SRCDIR)/%=$(OBJDIR)/common/%)
 # Set DEPENDS to something like 'obj/c64/foo.d obj/c64/bar.d'.
 DEPENDS := $(OBJECTS:.o=.d)
 
-# Add to LIBS something like 'src/foo.lib src/c64/bar.lib'.
+# Add to LIBS something like atari/src/bar.lib'.
 LIBS += $(wildcard $(TARGETLIST)/$(SRCDIR)/*.lib)
 
-# add common/inc, <target>/src/inc, and the root directory (for fujinet-network.[h|inc])
 ASFLAGS += \
 	--asm-include-dir common/inc \
 	--asm-include-dir $(TARGETLIST)/$(SRCDIR)/fn_network/inc \
 	--asm-include-dir $(TARGETLIST)/$(SRCDIR)/fn_io/inc \
+	--asm-include-dir $(TARGETLIST)/$(SRCDIR)/fn_fuji/inc \
 	--asm-include-dir .
 
 CFLAGS += \
 	--include-dir common/inc \
 	--include-dir $(TARGETLIST)/$(SRCDIR)/fn_network/inc \
 	--include-dir $(TARGETLIST)/$(SRCDIR)/fn_io/inc \
+	--include-dir $(TARGETLIST)/$(SRCDIR)/fn_fuji/inc \
 	--include-dir .
 
 CHANGELOG = Changelog.md
@@ -232,6 +233,8 @@ VERSION_STRING := $(file < $(VERSION_FILE))
 # include files that are included in the ZIP dist/release target
 FN_NW_HEADER = fujinet-network.h
 FN_NW_INC = fujinet-network.inc
+FN_IO_HEADER = fujinet-io.h
+FN_IO_INC = fujinet-io.inc
 
 .SUFFIXES:
 .PHONY: all clean dist fujinet-network.lib.$(TARGETLIST)
@@ -325,6 +328,8 @@ dist: $(PROGRAM)
 	cp build/$(PROGRAM) dist/fujinet-network-$(TARGETLIST)_$(VERSION_STRING).lib
 	cp $(FN_NW_HEADER) dist/
 	cp $(FN_NW_INC) dist/
+	cp $(FN_IO_HEADER) dist/
+	cp $(FN_IO_INC) dist/
 	cp $(CHANGELOG) dist/
 	cd dist && zip fujinet-network-$(TARGETLIST)_$(VERSION_STRING).zip $(CHANGELOG) fujinet-network-$(TARGETLIST)_$(VERSION_STRING).lib *.h *.inc
 	$(call RMFILES,dist/fujinet-network-$(TARGETLIST)_*.lib)

README.md

@@ -8,7 +8,7 @@
 
         .include        "zp.inc"
         .include        "macros.inc"
-        .include        "fn_data.inc"
+        .include        "device.inc"
         .include        "fujinet-io.inc"
 
 ; uint8_t fn_io_appkey_open(AppKeyOpen *buffer);

atari/src/fn_network/bus.s renamed to atari/src/fn_fuji/bus.s

@@ -7,7 +7,7 @@
 
         .include        "zp.inc"
         .include        "macros.inc"
-        .include        "fn_data.inc"
+        .include        "device.inc"
         .include        "fujinet-io.inc"
 
 ; uint8_t fn_io_appkey_write(uint16_t count, AppKeyWrite *buffer);

atari/src/fn_network/copy_cmd_data.s renamed to atari/src/fn_fuji/copy_cmd_data.s

@@ -8,7 +8,7 @@
 
         .include        "zp.inc"
         .include        "macros.inc"
-        .include        "fn_data.inc"
+        .include        "device.inc"
 
 ; uint8_t fn_io_base64_decode_compute();
 ;

atari/src/fn_network/inc/device.inc renamed to atari/src/fn_fuji/inc/device.inc

@@ -10,7 +10,7 @@
 
         .include        "zp.inc"
         .include        "macros.inc"
-        .include        "fn_data.inc"
+        .include        "device.inc"
 
 ; uint8_t fn_io_base64_decode_input(char *s, uint16_t len);
 ;

atari/src/fn_io/fn_io_appkey_open_read.s

@@ -8,7 +8,7 @@
 
         .include        "zp.inc"
         .include        "macros.inc"
-        .include        "fn_data.inc"
+        .include        "device.inc"
 
 ; uint8_t fn_io_base64_decode_length(unsigned long *len);
 ;