:: commit 38ccb76c4023221270e2ed348625078803cc1ed4

mintsuki <mintsuki@protonmail.com> — 2023-06-14 23:47

parents: 7b1284808a

misc: limine-hdd.bin -> limine-bios-hdd.bin

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4f5f243b..26885b6c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -59,8 +59,8 @@ jobs:
       - name: Copy limine.h to bin
         run: cp limine.h build/bin/
 
-      - name: Remove limine-hdd.bin
-        run: rm build/bin/limine-hdd.bin
+      - name: Remove limine-bios-hdd.bin
+        run: rm build/bin/limine-bios-hdd.bin
 
       - name: Push binaries to binary branch
         run: |
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 424acc0b..fee3ebfe 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -109,12 +109,12 @@ all1: $(BUILD_UEFI_X86_64) $(BUILD_UEFI_IA32) $(BUILD_UEFI_AARCH64) $(BUILD_UEFI
 	$(MAKE) '$(call SHESCAPE,$(BINDIR))/limine'
 	$(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin'
 
-$(call MKESCAPE,$(BINDIR))/limine-hdd.h: $(call MKESCAPE,$(BINDIR))/limine-hdd.bin
+$(call MKESCAPE,$(BINDIR))/limine-bios-hdd.h: $(call MKESCAPE,$(BINDIR))/limine-bios-hdd.bin
 	$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
-	cd '$(call SHESCAPE,$(BINDIR))' && '$(call SHESCAPE,$(SRCDIR))/host/hgen.sh' >limine-hdd.h
+	cd '$(call SHESCAPE,$(BINDIR))' && '$(call SHESCAPE,$(SRCDIR))/host/hgen.sh' >limine-bios-hdd.h
 
 ifeq ($(BUILD_BIOS),limine-bios)
-$(call MKESCAPE,$(BINDIR))/limine: $(call MKESCAPE,$(BINDIR))/Makefile $(call MKESCAPE,$(SRCDIR))/host/limine.c $(call MKESCAPE,$(BINDIR))/limine-hdd.h
+$(call MKESCAPE,$(BINDIR))/limine: $(call MKESCAPE,$(BINDIR))/Makefile $(call MKESCAPE,$(SRCDIR))/host/limine.c $(call MKESCAPE,$(BINDIR))/limine-bios-hdd.h
 else
 override LIMINE_NO_BIOS := -DLIMINE_NO_BIOS
 
@@ -194,7 +194,7 @@ uninstall:
 
 $(call MKESCAPE,$(BUILDDIR))/stage1.stamp: $(STAGE1_FILES) $(call MKESCAPE,$(BUILDDIR))/decompressor-build/decompressor.bin $(call MKESCAPE,$(BUILDDIR))/common-bios/stage2.bin.gz
 	$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
-	cd '$(call SHESCAPE,$(SRCDIR))/stage1/hdd' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-hdd.bin'
+	cd '$(call SHESCAPE,$(SRCDIR))/stage1/hdd' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-bios-hdd.bin'
 ifneq ($(BUILD_BIOS_CD),no)
 	cd '$(call SHESCAPE,$(SRCDIR))/stage1/cd'  && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-bios-cd.bin'
 endif
diff --git a/host/hgen.sh b/host/hgen.sh
index 77b37fbb..934a5a5c 100755
--- a/host/hgen.sh
+++ b/host/hgen.sh
@@ -9,7 +9,7 @@ cat <<EOF
 const uint8_t binary_limine_hdd_bin_data[] = {
 EOF
 
-od -v -An -t x1 <limine-hdd.bin | "$SED" '/^$/d;s/  */ /g;s/ *$//g;s/ /, 0x/g;s/^, /    /g;s/$/,/g;s/^	, /    /g'
+od -v -An -t x1 <limine-bios-hdd.bin | "$SED" '/^$/d;s/  */ /g;s/ *$//g;s/ /, 0x/g;s/^, /    /g;s/$/,/g;s/^	, /    /g'
 
 cat <<EOF
 };
diff --git a/host/limine.c b/host/limine.c
index 039f83c4..3d02844c 100644
--- a/host/limine.c
+++ b/host/limine.c
@@ -13,7 +13,7 @@
 #include <limits.h>
 
 #ifndef LIMINE_NO_BIOS
-#include "limine-hdd.h"
+#include "limine-bios-hdd.h"
 #endif
 
 static void remove_arg(int *argc, char *argv[], int index) {
tab: 248 wrap: offon