[src/trunk]: src/sys/arch/vax/boot ufs -> ffsv1 (ffsv2 is commentout due to s...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/20099faa523b
branches:  trunk
changeset: 787668:20099faa523b
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 28 01:13:40 2013 +0000

description:
ufs -> ffsv1 (ffsv2 is commentout due to size limitations)

diffstat:

 sys/arch/vax/boot/boot/conf.c     |  7 ++++---
 sys/arch/vax/boot/xxboot/bootxx.c |  7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r f5fe1706934a -r 20099faa523b sys/arch/vax/boot/boot/conf.c
--- a/sys/arch/vax/boot/boot/conf.c     Fri Jun 28 00:53:04 2013 +0000
+++ b/sys/arch/vax/boot/boot/conf.c     Fri Jun 28 01:13:40 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.15 2009/03/18 16:00:15 cegger Exp $ */
+/*     $NetBSD: conf.c,v 1.16 2013/06/28 01:13:40 matt Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -88,13 +88,14 @@
 int     ndevs = (sizeof(devsw)/sizeof(devsw[0]));
 
 struct fs_ops file_system[] = {
-       FS_OPS(ufs),
+       FS_OPS(ffsv1),
+       //FS_OPS(ffsv2),
        FS_OPS(nfs),
        FS_OPS(cd9660),
        FS_OPS(ustarfs),
 };
 
-int nfsys = (sizeof(file_system) / sizeof(struct fs_ops));
+int nfsys = __arraycount(file_system);
 
 int
 nostrategy(void *f, int func, daddr_t dblk,
diff -r f5fe1706934a -r 20099faa523b sys/arch/vax/boot/xxboot/bootxx.c
--- a/sys/arch/vax/boot/xxboot/bootxx.c Fri Jun 28 00:53:04 2013 +0000
+++ b/sys/arch/vax/boot/xxboot/bootxx.c Fri Jun 28 01:13:40 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.36 2009/09/18 21:40:09 mhitch Exp $ */
+/* $NetBSD: bootxx.c,v 1.37 2013/06/28 01:13:40 matt Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -186,7 +186,8 @@
  */
 struct fs_ops file_system[] = {
 #ifdef NEED_UFS
-       { ufs_open, 0, ufs_read, 0, 0, ufs_stat },
+       { ffsv1_open, 0, ffsv1_read, 0, 0, ffsv1_stat },
+       //{ ffsv2_open, 0, ffsv2_read, 0, 0, ffsv2_stat },
 #endif
 #ifdef NEED_CD9660
        { cd9660_open, 0, cd9660_read, 0, 0, cd9660_stat },
@@ -196,7 +197,7 @@
 #endif
 };
 
-int nfsys = (sizeof(file_system) / sizeof(struct fs_ops));
+int nfsys = __arraycount(file_system);
 
 #if 0
 int tar_open(char *path, struct open_file *f);