Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Update for LFSv2 support. Ports that have "bootxx_...
details: https://anonhg.NetBSD.org/src/rev/e71fcacdc014
branches: trunk
changeset: 543368:e71fcacdc014
user: simonb <simonb%NetBSD.org@localhost>
date: Sun Feb 23 23:23:07 2003 +0000
description:
Update for LFSv2 support. Ports that have "bootxx_lfs"-style
bootblocks currently only support LFSv2, but the second level
"boot" program supports both LFS versions.
diffstat:
sys/arch/alpha/stand/boot/filesystem.c | 8 +++++---
sys/arch/alpha/stand/bootxx_lfs/Makefile | 4 ++--
sys/arch/mipsco/stand/common/conf.c | 13 +++++++++----
sys/arch/pmax/stand/bootxx_lfs/Makefile | 4 ++--
sys/arch/pmax/stand/common/conf.c | 13 +++++++++----
sys/arch/sbmips/stand/boot/filesystem.c | 8 +++++---
sys/arch/sbmips/stand/bootxx_lfs/Makefile | 4 ++--
sys/arch/sgimips/stand/common/conf.c | 13 +++++++++----
sys/arch/x68k/stand/boot/conf.c | 8 +++++---
sys/arch/x68k/stand/libsa/Makefile | 4 ++--
10 files changed, 50 insertions(+), 29 deletions(-)
diffs (243 lines):
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/alpha/stand/boot/filesystem.c
--- a/sys/arch/alpha/stand/boot/filesystem.c Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/alpha/stand/boot/filesystem.c Sun Feb 23 23:23:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: filesystem.c,v 1.7 1999/08/18 21:34:11 cgd Exp $ */
+/* $NetBSD: filesystem.c,v 1.8 2003/02/23 23:23:07 simonb Exp $ */
/*
* Copyright (c) 1993 Philip A. Nelson.
@@ -46,8 +46,10 @@
ufs_stat },
{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
cd9660_stat },
- { lfs_open, lfs_close, lfs_read, lfs_write, lfs_seek,
- lfs_stat },
+ { lfsv1_open, lfsv1_close, lfsv1_read, lfsv1_write, lfsv1_seek,
+ lfsv1_stat },
+ { lfsv2_open, lfsv2_close, lfsv2_read, lfsv2_write, lfsv2_seek,
+ lfsv2_stat },
};
int nfsys = sizeof(file_system)/sizeof(struct fs_ops);
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/alpha/stand/bootxx_lfs/Makefile
--- a/sys/arch/alpha/stand/bootxx_lfs/Makefile Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/alpha/stand/bootxx_lfs/Makefile Sun Feb 23 23:23:07 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/02/01 23:58:48 simonb Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/23 23:23:08 simonb Exp $
PROG = bootxx_lfs
-CPPFLAGS += -DLIBSA_SINGLE_FILESYSTEM=lfs \
+CPPFLAGS += -DLIBSA_SINGLE_FILESYSTEM=lfsv2 \
-DBOOTXX_FS_NAME='"LFS"' \
-DBOOTXX_RAID1_SUPPORT \
-DNO_GETCHAR
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/mipsco/stand/common/conf.c
--- a/sys/arch/mipsco/stand/common/conf.c Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/mipsco/stand/common/conf.c Sun Feb 23 23:23:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.1 2000/09/18 11:40:48 wdk Exp $ */
+/* $NetBSD: conf.c,v 1.2 2003/02/23 23:23:08 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,14 +77,16 @@
#ifndef LIBSA_SINGLE_FILESYSTEM
#ifdef LIBSA_NO_FS_CLOSE
#define ufs_close 0
-#define lfs_close 0
+#define lfsv1_close 0
+#define lfsv2_close 0
#define cd9660_close 0
#define ustarfs_close 0
#define nfs_close 0
#endif
#ifdef LIBSA_NO_FS_WRITE
#define ufs_write 0
-#define lfs_write 0
+#define lfsv1_write 0
+#define lfsv2_write 0
#define cd9660_write 0
#define ustarfs_write 0
#define nfs_write 0
@@ -92,7 +94,10 @@
struct fs_ops file_system[] = {
{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
- { lfs_open, lfs_close, lfs_read, lfs_write, lfs_seek, lfs_stat },
+ { lfsv1_open, lfsv1_close, lfsv1_read, lfsv1_write, lfsv1_seek,
+ lfsv1_stat },
+ { lfsv2_open, lfsv2_close, lfsv2_read, lfsv2_write, lfsv2_seek,
+ lfsv2_stat },
{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
cd9660_stat },
{ ustarfs_open, ustarfs_close, ustarfs_read, ustarfs_write,
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/pmax/stand/bootxx_lfs/Makefile
--- a/sys/arch/pmax/stand/bootxx_lfs/Makefile Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/pmax/stand/bootxx_lfs/Makefile Sun Feb 23 23:23:07 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/02/01 23:58:49 simonb Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/23 23:23:09 simonb Exp $
PRIMARY_PROG= bootxx_lfs
-CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=lfs \
+CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=lfsv2 \
-DBOOTXX_FS_NAME='"LFS"'
# Use small daddr_t to avoid code bloat
CPPFLAGS+= -D__daddr_t=int32_t
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/pmax/stand/common/conf.c
--- a/sys/arch/pmax/stand/common/conf.c Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/pmax/stand/common/conf.c Sun Feb 23 23:23:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.18 2002/03/15 13:31:08 simonb Exp $ */
+/* $NetBSD: conf.c,v 1.19 2003/02/23 23:23:09 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -85,14 +85,16 @@
#ifndef LIBSA_SINGLE_FILESYSTEM
#ifdef LIBSA_NO_FS_CLOSE
#define ufs_close 0
-#define lfs_close 0
+#define lfsv1_close 0
+#define lfsv2_close 0
#define cd9660_close 0
#define ustarfs_close 0
#define nfs_close 0
#endif
#ifdef LIBSA_NO_FS_WRITE
#define ufs_write 0
-#define lfs_write 0
+#define lfsv1_write 0
+#define lfsv2_write 0
#define cd9660_write 0
#define ustarfs_write 0
#define nfs_write 0
@@ -100,7 +102,10 @@
struct fs_ops file_system[] = {
{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
- { lfs_open, lfs_close, lfs_read, lfs_write, lfs_seek, lfs_stat },
+ { lfsv1_open, lfsv1_close, lfsv1_read, lfsv1_write, lfsv1_seek,
+ lfsv1_stat },
+ { lfsv2_open, lfsv2_close, lfsv2_read, lfsv2_write, lfsv2_seek,
+ lfsv2_stat },
{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
cd9660_stat },
{ ustarfs_open, ustarfs_close, ustarfs_read, ustarfs_write,
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/sbmips/stand/boot/filesystem.c
--- a/sys/arch/sbmips/stand/boot/filesystem.c Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/sbmips/stand/boot/filesystem.c Sun Feb 23 23:23:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: filesystem.c,v 1.1 2002/11/09 06:20:37 cgd Exp $ */
+/* $NetBSD: filesystem.c,v 1.2 2003/02/23 23:23:09 simonb Exp $ */
/*
* Copyright (c) 1993 Philip A. Nelson.
@@ -46,8 +46,10 @@
ufs_stat },
{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
cd9660_stat },
- { lfs_open, lfs_close, lfs_read, lfs_write, lfs_seek,
- lfs_stat },
+ { lfsv1_open, lfsv1_close, lfsv1_read, lfsv1_write, lfsv1_seek,
+ lfsv1_stat },
+ { lfsv2_open, lfsv2_close, lfsv2_read, lfsv2_write, lfsv2_seek,
+ lfsv2_stat },
};
int nfsys = sizeof(file_system)/sizeof(struct fs_ops);
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/sbmips/stand/bootxx_lfs/Makefile
--- a/sys/arch/sbmips/stand/bootxx_lfs/Makefile Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/sbmips/stand/bootxx_lfs/Makefile Sun Feb 23 23:23:07 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/02/01 23:58:49 simonb Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/23 23:23:09 simonb Exp $
PROG = bootxx_lfs
-CPPFLAGS += -DLIBSA_SINGLE_FILESYSTEM=lfs \
+CPPFLAGS += -DLIBSA_SINGLE_FILESYSTEM=lfsv2 \
-DBOOTXX_FS_NAME='"LFS"' \
-DNO_GETCHAR
# Use small daddr_t to avoid code bloat
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/sgimips/stand/common/conf.c
--- a/sys/arch/sgimips/stand/common/conf.c Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/sgimips/stand/common/conf.c Sun Feb 23 23:23:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.1 2001/11/21 19:09:09 thorpej Exp $ */
+/* $NetBSD: conf.c,v 1.2 2003/02/23 23:23:10 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -78,14 +78,16 @@
#ifndef LIBSA_SINGLE_FILESYSTEM
#ifdef LIBSA_NO_FS_CLOSE
#define ufs_close 0
-#define lfs_close 0
+#define lfsv1_close 0
+#define lfsv2_close 0
#define cd9660_close 0
#define ustarfs_close 0
#define nfs_close 0
#endif
#ifdef LIBSA_NO_FS_WRITE
#define ufs_write 0
-#define lfs_write 0
+#define lfsv1_write 0
+#define lfsv2_write 0
#define cd9660_write 0
#define ustarfs_write 0
#define nfs_write 0
@@ -93,7 +95,10 @@
struct fs_ops file_system[] = {
{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
- { lfs_open, lfs_close, lfs_read, lfs_write, lfs_seek, lfs_stat },
+ { lfsv1_open, lfsv1_close, lfsv1_read, lfsv1_write, lfsv1_seek,
+ lfsv1_stat },
+ { lfsv2_open, lfsv2_close, lfsv2_read, lfsv2_write, lfsv2_seek,
+ lfsv2_stat },
{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
cd9660_stat },
#if 0
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/x68k/stand/boot/conf.c
--- a/sys/arch/x68k/stand/boot/conf.c Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/x68k/stand/boot/conf.c Sun Feb 23 23:23:07 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.3 2002/03/17 15:43:10 minoura Exp $ */
+/* $NetBSD: conf.c,v 1.4 2003/02/23 23:23:10 simonb Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -54,8 +54,10 @@
struct fs_ops file_system[] = {
{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek,
ufs_stat },
- { lfs_open, lfs_close, lfs_read, lfs_write, lfs_seek,
- lfs_stat },
+ { lfsv1_open, lfsv1_close, lfsv1_read, lfsv1_write, lfsv1_seek,
+ lfsv1_stat },
+ { lfsv2_open, lfsv2_close, lfsv2_read, lfsv2_write, lfsv2_seek,
+ lfsv2_stat },
{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
cd9660_stat },
{ ustarfs_open, ustarfs_close, ustarfs_read, ustarfs_write, ustarfs_seek,
diff -r 8bb4608a5b57 -r e71fcacdc014 sys/arch/x68k/stand/libsa/Makefile
--- a/sys/arch/x68k/stand/libsa/Makefile Sun Feb 23 23:17:42 2003 +0000
+++ b/sys/arch/x68k/stand/libsa/Makefile Sun Feb 23 23:23:07 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/02/02 05:14:38 isaki Exp $
+# $NetBSD: Makefile,v 1.14 2003/02/23 23:23:10 simonb Exp $
S= ${.CURDIR}/../../../..
LIBSADIR= $S/lib/libsa
@@ -14,7 +14,7 @@
SRCS+= close.c closeall.c cread.c dev.c fstat.c ioctl.c lseek.c
SRCS+= open.c read.c stat.c
SRCS+= loadfile.c loadfile_aout.c loadfile_elf32.c
-SRCS+= cd9660.c lfs.c nfs.c ufs.c ufs_ls.c ustarfs.c
+SRCS+= cd9660.c lfsv1.c lfsv2.c nfs.c ufs.c ufs_ls.c ustarfs.c
#SRCS+= arp.c ether.c in_cksum.c net.c netif.c rpc.c udp.c
#SRCS+= bootp.c
Home |
Main Index |
Thread Index |
Old Index