From b662ee1aa2943606e1fb63376c2890c2e9e30be4 Mon Sep 17 00:00:00 2001
From: b1ackmai1er <difficultylevelhigh@gmail.com>
Date: Sun, 23 Feb 2020 09:55:46 +0800
Subject: [PATCH] Revert linux bin2asm font stuff

---
 Source/HBIOS/Build.sh        |  10 +---
 Tools/Linux/bin2asm          | Bin 10224 -> 0 bytes
 Tools/unix/bin2asm/LICENSE   |  21 --------
 Tools/unix/bin2asm/Makefile  |  20 -------
 Tools/unix/bin2asm/README.md |   5 --
 Tools/unix/bin2asm/bin2asm.c | 100 -----------------------------------
 6 files changed, 1 insertion(+), 155 deletions(-)
 delete mode 100755 Tools/Linux/bin2asm
 delete mode 100644 Tools/unix/bin2asm/LICENSE
 delete mode 100755 Tools/unix/bin2asm/Makefile
 delete mode 100644 Tools/unix/bin2asm/README.md
 delete mode 100644 Tools/unix/bin2asm/bin2asm.c

diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh
index 5ca3562e..48f21bc4 100755
--- a/Source/HBIOS/Build.sh
+++ b/Source/HBIOS/Build.sh
@@ -65,15 +65,7 @@ ROMSIZE		.EQU	$romsize
 EOF
 
 cp ../Forth/camel80.bin camel80.bin
-
-echo "Build font files ..."
-
-for file in $(ls -1 ../Fonts/*.bin | sort -V) ; do
- font=$(basename -- "$file")
- fontname="${font%.*}.asm"
- echo " " $fontname
- ../../Tools/Linux/bin2asm $file > ../HBIOS/$fontname
-done
+cp ../Fonts/font*.asm .
 
 make dbgmon.bin prefix.bin romldr.bin eastaegg.bin nascom.bin \
 	tastybasic.bin game.bin usrrom.bin imgpad.bin imgpad0.bin
diff --git a/Tools/Linux/bin2asm b/Tools/Linux/bin2asm
deleted file mode 100755
index 674c174a4599c021ba1f8bca1d2a755983bdedd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10224
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
CI6{vA

diff --git a/Tools/unix/bin2asm/LICENSE b/Tools/unix/bin2asm/LICENSE
deleted file mode 100644
index b6df5b30..00000000
--- a/Tools/unix/bin2asm/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016 ipatix
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/Tools/unix/bin2asm/Makefile b/Tools/unix/bin2asm/Makefile
deleted file mode 100755
index 9063175f..00000000
--- a/Tools/unix/bin2asm/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-CC = gcc
-STRIP = strip
-CFLAGS = -Werror -Wall -Wextra -Wconversion -O2 -D NDEBUG
-BINARY = bin2asm
-
-SRC_FILES = $(wildcard *.c)
-OBJ_FILES = $(SRC_FILES:.c=.o)
-
-all: $(BINARY)
-
-.PHONY: clean
-clean:
-	rm -f $(OBJ_FILES)
-
-$(BINARY): $(OBJ_FILES)
-	$(CC) -o $@ $^ $(LIBS)
-	$(STRIP) -s $@
-
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS) $(IMPORT)
diff --git a/Tools/unix/bin2asm/README.md b/Tools/unix/bin2asm/README.md
deleted file mode 100644
index cc666ba1..00000000
--- a/Tools/unix/bin2asm/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# bin2asm
-Converts binary files to ASM compatible assembly files
-
-Usage:
-$ bin2asm hello.bin > hello.asm
diff --git a/Tools/unix/bin2asm/bin2asm.c b/Tools/unix/bin2asm/bin2asm.c
deleted file mode 100644
index 75b4d61d..00000000
--- a/Tools/unix/bin2asm/bin2asm.c
+++ /dev/null
@@ -1,100 +0,0 @@
-//bin2asm from Michael Panzlaff https://github.com/ipatix/bin2asm Thanks Mike.
-//Modified by Phil Summers difficultylevelhigh@gmail.com for ROMWBW
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libgen.h>
-
-void die(const char msg[]) {
-    perror(msg);
-    exit(EXIT_FAILURE);
-}
-
-int main(int argc, char *argv[]) {
-    for (int i = 1; i < argc; i++) {
-        // determine file size
-        FILE *input_file = fopen(argv[i], "rb");
-        if (!input_file) {
-            fprintf(stderr, "fail %s\n", argv[i]);
-            die("Couldn't open input file");
-        }
-        if (fseek(input_file, 0, SEEK_END) == -1) {
-            die("Error determining file size");
-        }
-        long file_size = ftell(input_file);
-        if (file_size == -1) {
-            die("Error determining file size (2)");
-        }
-        if (fseek(input_file, 0, SEEK_SET) == -1) {
-            die("Error determining file size (3)");
-        }
-        // get file name
-        char *name = basename(argv[i]);
-        char *dot = strrchr(name, '.');
-        if (dot) {
-            *dot = '\0';
-        }
-
-        // write lines
-        while (file_size > 0) {
-            size_t bytes_read = (file_size > 8) ? 8 : (size_t)file_size;
-            unsigned char data_buf[8];
-            size_t actual_read = fread(data_buf, 1, bytes_read, input_file);
-            if (actual_read != bytes_read) {
-                fprintf(stderr, "Error while reading file, only %d read instead of %d\n", (int)actual_read, (int)bytes_read);
-                if (feof(input_file))
-                    fprintf(stderr, "Reached end of file\n");
-                if (ferror(input_file))
-                    fprintf(stderr, "An unknown error occured while reading the file\n");
-                perror("ERROR");
-                exit(EXIT_FAILURE);
-            }
-            switch (bytes_read) {
-                case 1:
-                    printf(" .db $%02X\r\n",
-                            data_buf[0]);
-                    break;
-                case 2:
-                    printf(" .db $%02X, $%02X\r\n",
-                            data_buf[0], data_buf[1]);
-                    break;
-                case 3:
-                    printf(" .db $%02X, $%02X, $%02X\r\n",
-                            data_buf[0], data_buf[1], data_buf[2]);
-                    break;
-                case 4:
-                    printf(" .db $%02X, $%02X, $%02X, $%02X\r\n",
-                            data_buf[0], data_buf[1], data_buf[2], data_buf[3]);
-                    break;
-                case 5:
-                    printf(" .db $%02X, $%02X, $%02X, $%02X, $%02X\r\n",
-                            data_buf[0], data_buf[1], data_buf[2], data_buf[3], data_buf[4]);
-                    break;
-                case 6:
-                    printf("        .db $%02X, $%02X, $%02X, $%02X, $%02X, $%02X\r\n",
-                            data_buf[0], data_buf[1], data_buf[2], data_buf[3], data_buf[4], data_buf[5]);
-                    break;
-                case 7:
-                    printf("        .db $%02X, $%02X, $%02X, $%02X, $%02X, $%02X, $%02X\r\n",
-                            data_buf[0], data_buf[1], data_buf[2], data_buf[3], data_buf[4], data_buf[5], data_buf[6]);
-                    break;
-                case 8:
-                    printf(" .db $%02X, $%02X, $%02X, $%02X, $%02X, $%02X, $%02X, $%02X\r\n",
-                            data_buf[0], data_buf[1], data_buf[2], data_buf[3], data_buf[4], data_buf[5], data_buf[6], data_buf[7]);
-                    break;
-                default:
-                    fprintf(stderr, "Invalid program state\n");
-                    exit(EXIT_FAILURE);
-            }
-            file_size -= (long)bytes_read;
-        }
-
-        printf("\r\n");
-
-        if (fclose(input_file)) {
-            die("Error while closing file");
-        }
-    }
-    return 0;
-}