Module Name: src
Committed By: mlelstv
Date: Mon Apr 25 15:12:07 UTC 2022
Modified Files:
src/sys/arch/x68k/stand/boot: conf.c
src/sys/arch/x68k/stand/xxboot: Makefile.xxboot xx.c
Log Message:
libsa now needs ioctl to support media with large sectors. Provide
missing functions.
libsa defines files[] array itself, just reference it.
This also adds another global variable that tracks the root
filesystem module.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/stand/boot/conf.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/xxboot/xx.c
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/x68k/stand/boot/conf.c
diff -u src/sys/arch/x68k/stand/boot/conf.c:1.11 src/sys/arch/x68k/stand/boot/conf.c:1.12
--- src/sys/arch/x68k/stand/boot/conf.c:1.11 Sat Jun 25 14:35:58 2016
+++ src/sys/arch/x68k/stand/boot/conf.c Mon Apr 25 15:12:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.11 2016/06/25 14:35:58 isaki Exp $ */
+/* $NetBSD: conf.c,v 1.12 2022/04/25 15:12:07 mlelstv Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -84,5 +84,3 @@ struct netif_driver *netif_drivers[] = {
};
int n_netif_drivers = sizeof(netif_drivers) / sizeof(netif_drivers[0]);
-
-struct open_file files[SOPEN_MAX];
Index: src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
diff -u src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.19 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.20
--- src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.19 Fri Feb 4 06:16:03 2022
+++ src/sys/arch/x68k/stand/xxboot/Makefile.xxboot Mon Apr 25 15:12:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xxboot,v 1.19 2022/02/04 06:16:03 isaki Exp $
+# $NetBSD: Makefile.xxboot,v 1.20 2022/04/25 15:12:07 mlelstv Exp $
NOMAN= # defined
@@ -25,7 +25,7 @@ BINMODE= 444
S= ${.CURDIR}/../../../../..
M= $S/arch/x68k
.PATH: ${.CURDIR}/..
-SRCS= boot.S bootmain.c conf.c xx.c
+SRCS= boot.S bootmain.c xx.c
SRCS+= ashrdi3.S
SRCS+= ashldi3.S
SRCS+= memcpy.S
@@ -65,7 +65,7 @@ CPPFLAGS+= -DLIBSA_NO_RAW_ACCESS
CPPFLAGS+= -DLIBSA_NO_TWIDDLE
CPPFLAGS+= -DUSTAR_SECT_PER_CYL=30
SRCS+= open.c close.c read.c lseek.c loadfile.c loadfile_aout.c alloc.c
-SRCS+= errno.c globals.c
+SRCS+= errno.c globals.c files.c
SRCS+= $(FS).c
SRCS+= ${BOOTSRCS}
Index: src/sys/arch/x68k/stand/xxboot/xx.c
diff -u src/sys/arch/x68k/stand/xxboot/xx.c:1.4 src/sys/arch/x68k/stand/xxboot/xx.c:1.5
--- src/sys/arch/x68k/stand/xxboot/xx.c:1.4 Sun Aug 16 06:43:43 2020
+++ src/sys/arch/x68k/stand/xxboot/xx.c Mon Apr 25 15:12:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xx.c,v 1.4 2020/08/16 06:43:43 isaki Exp $ */
+/* $NetBSD: xx.c,v 1.5 2022/04/25 15:12:07 mlelstv Exp $ */
/*
* Copyright (c) 2010 MINOURA Makoto.
@@ -72,3 +72,11 @@ xxstrategy(void *arg, int rw, daddr_t db
*rsize = size;
return 0;
}
+
+int
+xxioctl(struct open_file *f, u_long cmd, void *data)
+{
+
+ return ENOTTY;
+}
+
