Module Name: src
Committed By: eeh
Date: Wed Feb 17 15:50:06 UTC 2010
Modified Files:
src/sys/arch/sparc/stand/ofwboot: ofdev.c
Log Message:
Add support for ffsv2 and lfs.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc/stand/ofwboot/ofdev.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/sparc/stand/ofwboot/ofdev.c
diff -u src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.25 src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.26
--- src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.25 Wed Jan 27 22:18:37 2010
+++ src/sys/arch/sparc/stand/ofwboot/ofdev.c Wed Feb 17 15:50:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdev.c,v 1.25 2010/01/27 22:18:37 martin Exp $ */
+/* $NetBSD: ofdev.c,v 1.26 2010/02/17 15:50:06 eeh Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -41,6 +41,7 @@
#include <lib/libsa/stand.h>
#include <lib/libsa/ufs.h>
+#include <lib/libsa/lfs.h>
#include <lib/libsa/cd9660.h>
#ifdef NETBOOT
#include <lib/libsa/nfs.h>
@@ -188,8 +189,10 @@
};
int ndevs = sizeof ofdevsw / sizeof ofdevsw[0];
+
#ifdef SPARC_BOOT_UFS
-static struct fs_ops file_system_ufs = FS_OPS(ufs);
+static struct fs_ops file_system_ufs[] =
+{ FS_OPS(ufs), FS_OPS(ffsv2), FS_OPS(lfsv1), FS_OPS(lfsv2) };
#endif
#ifdef SPARC_BOOT_CD9660
static struct fs_ops file_system_cd9660 = FS_OPS(cd9660);
@@ -199,7 +202,7 @@
static struct fs_ops file_system_tftp = FS_OPS(tftp);
#endif
-struct fs_ops file_system[3];
+struct fs_ops file_system[7];
int nfsys;
static struct of_dev ofdev = {
@@ -515,11 +518,13 @@
of->f_dev = ofdevsw;
of->f_devdata = &ofdev;
#ifdef SPARC_BOOT_UFS
- memcpy(&file_system[nfsys++], &file_system_ufs, sizeof file_system[0]);
+ memcpy(&file_system[nfsys++], &file_system_ufs[0], sizeof file_system[0]);
+ memcpy(&file_system[nfsys++], &file_system_ufs[1], sizeof file_system[0]);
+ memcpy(&file_system[nfsys++], &file_system_ufs[2], sizeof file_system[0]);
+ memcpy(&file_system[nfsys++], &file_system_ufs[3], sizeof file_system[0]);
#endif
#ifdef SPARC_BOOT_CD9660
- memcpy(&file_system[nfsys++], &file_system_cd9660,
- sizeof file_system[0]);
+ memcpy(&file_system[nfsys++], &file_system_cd9660, sizeof file_system[0]);
#endif
DPRINTF(("devopen: return 0\n"));
return 0;
