Module Name: src
Committed By: rin
Date: Sat Jun 29 13:46:40 UTC 2024
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/dosboot: Makefile devopen.c dosfile.c dosfile.h
src/sys/arch/i386/stand/lib: Makefile libi386.h
Log Message:
i386: stand: Adjust for DOS-routine migration
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/dosboot/devopen.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/dosboot/dosfile.c \
src/sys/arch/i386/stand/dosboot/dosfile.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/stand/lib/libi386.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.99 src/sys/arch/i386/stand/Makefile.booters:1.100
--- src/sys/arch/i386/stand/Makefile.booters:1.99 Sat Jun 29 13:18:18 2024
+++ src/sys/arch/i386/stand/Makefile.booters Sat Jun 29 13:46:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.99 2024/06/29 13:18:18 rin Exp $
+# $NetBSD: Makefile.booters,v 1.100 2024/06/29 13:46:40 rin Exp $
NOLIBCSANITIZER=
NOSANITIZER=
@@ -26,9 +26,6 @@ I386_STAND_DIR?= $S/arch/i386/stand
.PATH: ${I386_STAND_DIR}/lib
-.PATH: ${I386_STAND_DIR}/lib/crt/dos
-DOSSTART= start_dos.o doscommain.o
-
.PATH: ${I386_STAND_DIR}/lib/crt/pxe
PXESTART= start_pxe.o
Index: src/sys/arch/i386/stand/dosboot/Makefile
diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.37 src/sys/arch/i386/stand/dosboot/Makefile:1.38
--- src/sys/arch/i386/stand/dosboot/Makefile:1.37 Sat Jun 29 08:05:13 2024
+++ src/sys/arch/i386/stand/dosboot/Makefile Sat Jun 29 13:46:40 2024
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.37 2024/06/29 08:05:13 rin Exp $
+# $NetBSD: Makefile,v 1.38 2024/06/29 13:46:40 rin Exp $
S= ${.CURDIR}/../../../..
BASE= dosboot
PROG= ${BASE}.com
NEWVERSWHAT= "DOS Boot"
-STARTFILE= ${DOSSTART}
+STARTFILE= start_dos.o doscommain.o
RELOC= 0x100
-SRCS= main.c devopen.c exec.c exec_multiboot1.c exec_multiboot2.c
+SRCS= main.c devopen.c exec.c
+SRCS+= dosfile.c dos_file.S
+SRCS+= exec_multiboot1.c exec_multiboot2.c
#CPPFLAGS+= -DSLOW # for libz; no longer available
CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
@@ -27,7 +29,6 @@ CFLAGS+= -Wall -Wmissing-prototypes -Wst
CPPFLAGS+= -DSTACK_START=0x10000
SAMISCCPPFLAGS+= -DHEAP_START=0x20000 -DHEAP_LIMIT=0x50000
SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_INCLUDE_NET=no SA_ENABLE_LS_OP=yes
-I386MISCMAKEFLAGS= I386_INCLUDE_DOS=yes
# DOS command line arguments are located at 0x0000.
COPTS.doscommain.c+= -fno-delete-null-pointer-checks
Index: src/sys/arch/i386/stand/dosboot/devopen.c
diff -u src/sys/arch/i386/stand/dosboot/devopen.c:1.11 src/sys/arch/i386/stand/dosboot/devopen.c:1.12
--- src/sys/arch/i386/stand/dosboot/devopen.c:1.11 Sat Mar 14 15:36:07 2009
+++ src/sys/arch/i386/stand/dosboot/devopen.c Sat Jun 29 13:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.11 2009/03/14 15:36:07 dsl Exp $ */
+/* $NetBSD: devopen.c,v 1.12 2024/06/29 13:46:40 rin Exp $ */
/*
* Copyright (c) 1996
@@ -32,9 +32,10 @@
#include <libi386.h>
#include <biosdisk.h>
-#include <dosfile.h>
#include <bootinfo.h>
+#include "dosfile.h"
+
struct devsw devsw[] = {
{"disk", biosdisk_strategy, biosdisk_open, biosdisk_close, biosdisk_ioctl},
};
Index: src/sys/arch/i386/stand/dosboot/dosfile.c
diff -u src/sys/arch/i386/stand/dosboot/dosfile.c:1.1 src/sys/arch/i386/stand/dosboot/dosfile.c:1.2
--- src/sys/arch/i386/stand/dosboot/dosfile.c:1.1 Sat Jun 29 13:45:14 2024
+++ src/sys/arch/i386/stand/dosboot/dosfile.c Sat Jun 29 13:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dosfile.c,v 1.1 2024/06/29 13:45:14 rin Exp $ */
+/* $NetBSD: dosfile.c,v 1.2 2024/06/29 13:46:40 rin Exp $ */
/*
* Copyright (c) 1996
@@ -37,11 +37,6 @@
#include "diskbuf.h"
#include "dosfile.h"
-extern int dosopen(const char *);
-extern void dosclose(int);
-extern int dosread(int, char *, int);
-extern int dosseek(int, int, int);
-
struct dosfile {
int doshandle, off;
};
Index: src/sys/arch/i386/stand/dosboot/dosfile.h
diff -u src/sys/arch/i386/stand/dosboot/dosfile.h:1.1 src/sys/arch/i386/stand/dosboot/dosfile.h:1.2
--- src/sys/arch/i386/stand/dosboot/dosfile.h:1.1 Sat Jun 29 13:45:14 2024
+++ src/sys/arch/i386/stand/dosboot/dosfile.h Sat Jun 29 13:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dosfile.h,v 1.1 2024/06/29 13:45:14 rin Exp $ */
+/* $NetBSD: dosfile.h,v 1.2 2024/06/29 13:46:40 rin Exp $ */
/*
* Copyright (c) 1996
@@ -26,4 +26,10 @@
*
*/
+void dosclose(int);
+int dosopen(const char *);
+int dosread(int, char *, int);
+int dosseek(int, int, int);
+extern int doserrno; /* in dos_file.S */
+
FS_DEF(dos);
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.51 src/sys/arch/i386/stand/lib/Makefile:1.52
--- src/sys/arch/i386/stand/lib/Makefile:1.51 Sat Jun 29 07:43:25 2024
+++ src/sys/arch/i386/stand/lib/Makefile Sat Jun 29 13:46:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2024/06/29 07:43:25 rin Exp $
+# $NetBSD: Makefile,v 1.52 2024/06/29 13:46:40 rin Exp $
S?= ${.CURDIR}/../../../..
@@ -7,7 +7,6 @@ NOPIC=# defined
NOPROFILE=# defined
I386_INCLUDE_DISK?= yes
-I386_INCLUDE_DOS?= no
I386_INCLUDE_PS2?= yes
AFLAGS.realprot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
@@ -33,9 +32,6 @@ SRCS+= rasops.c vbe.c biosvbe.S
SRCS+= biosdisk.c biosdisk_ll.c bios_disk.S
CWARNFLAGS.gcc+= ${CC_WNO_ADDRESS_OF_PACKED_MEMBER}
.endif
-.if (${I386_INCLUDE_DOS} == "yes")
-SRCS+= dosfile.c dos_file.S
-.endif
.if (${I386_INCLUDE_DISK} == "yes") || (${I386_INCLUDE_DOS} == "yes")
SRCS+= diskbuf.c
.endif
Index: src/sys/arch/i386/stand/lib/libi386.h
diff -u src/sys/arch/i386/stand/lib/libi386.h:1.52 src/sys/arch/i386/stand/lib/libi386.h:1.53
--- src/sys/arch/i386/stand/lib/libi386.h:1.52 Sat Jun 29 08:30:49 2024
+++ src/sys/arch/i386/stand/lib/libi386.h Sat Jun 29 13:46:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: libi386.h,v 1.52 2024/06/29 08:30:49 rin Exp $ */
+/* $NetBSD: libi386.h,v 1.53 2024/06/29 13:46:40 rin Exp $ */
/*
* Copyright (c) 1996
@@ -149,12 +149,6 @@ __compactcall int biosdisk_getextinfo(in
int get_harddrives(void);
void biosdisk_probe(void);
-void dosclose(int);
-int dosopen(char *);
-int dosread(int, char *, int);
-int dosseek(int, int, int);
-extern int doserrno; /* in dos_file.S */
-
void module_add(char *);
void splash_add(char *);
void rnd_add(char *);
