Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/macppc/stand/ofwboot Add hfs support. Currently th...
details: https://anonhg.NetBSD.org/src/rev/5b087fb0e21c
branches: trunk
changeset: 499191:5b087fb0e21c
user: tsubai <tsubai%NetBSD.org@localhost>
date: Tue Nov 14 11:25:34 2000 +0000
description:
Add hfs support. Currently this layer simply throw the request to the OF
(and the OF recognizes HFS).
diffstat:
sys/arch/macppc/stand/ofwboot/Makefile | 4 +-
sys/arch/macppc/stand/ofwboot/hfs.c | 117 +++++++++++++++++++++++++++++++++
sys/arch/macppc/stand/ofwboot/hfs.h | 8 ++
sys/arch/macppc/stand/ofwboot/ofdev.c | 16 ++-
4 files changed, 137 insertions(+), 8 deletions(-)
diffs (199 lines):
diff -r 53e0878d5f41 -r 5b087fb0e21c sys/arch/macppc/stand/ofwboot/Makefile
--- a/sys/arch/macppc/stand/ofwboot/Makefile Tue Nov 14 11:14:55 2000 +0000
+++ b/sys/arch/macppc/stand/ofwboot/Makefile Tue Nov 14 11:25:34 2000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2000/10/28 15:41:25 garbled Exp $
+# $NetBSD: Makefile,v 1.19 2000/11/14 11:25:34 tsubai Exp $
S= ${.CURDIR}/../../../..
PROG= ofwboot
FILES= ${PROG}.elf ${PROG}.xcf
-SRCS= Locore.c boot.c ofdev.c net.c netif_of.c vers.c
+SRCS= Locore.c boot.c ofdev.c hfs net.c netif_of.c vers.c
XCOFFXTRA= Xcoffxtra.c
XCOFFXTRAOBJ= Xcoffxtra.o
CFLAGS+= -msoft-float
diff -r 53e0878d5f41 -r 5b087fb0e21c sys/arch/macppc/stand/ofwboot/hfs.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/macppc/stand/ofwboot/hfs.c Tue Nov 14 11:25:34 2000 +0000
@@ -0,0 +1,117 @@
+/* $NetBSD: hfs.c,v 1.1 2000/11/14 11:25:35 tsubai Exp $ */
+
+/*-
+ * Copyright (c) 2000 Tsubai Masanari. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+#include <lib/libkern/libkern.h>
+#include <lib/libsa/stand.h>
+
+#include <openfirm.h>
+#include <hfs.h>
+
+static int OF_fd; /* XXX */
+
+int
+hfs_open(path, f)
+ char *path;
+ struct open_file *f;
+{
+ int chosen;
+ char bootpath[128], *cp;
+
+ if ((chosen = OF_finddevice("/chosen")) == -1)
+ return ENXIO;
+ bzero(bootpath, sizeof bootpath);
+ OF_getprop(chosen, "bootpath", bootpath, sizeof bootpath);
+ cp = strrchr(bootpath, ',');
+ if (cp == NULL)
+ return ENXIO;
+
+ strcpy(cp + 1, path);
+ OF_fd = OF_open(bootpath);
+ if (OF_fd == -1)
+ return ENOENT;
+
+ return 0;
+}
+
+int
+hfs_close(f)
+ struct open_file *f;
+{
+ OF_close(OF_fd);
+ return 0;
+}
+
+int
+hfs_read(f, start, size, resid)
+ struct open_file *f;
+ void *start;
+ size_t size, *resid;
+{
+ int len;
+
+ len = OF_read(OF_fd, start, size);
+ size -= len;
+ if (resid)
+ *resid = size;
+ return 0;
+}
+
+int
+hfs_write(f, start, size, resid)
+ struct open_file *f;
+ void *start;
+ size_t size, *resid;
+{
+ printf("hfs_write\n");
+ return ENXIO;
+}
+
+off_t
+hfs_seek(f, offset, where)
+ struct open_file *f;
+ off_t offset;
+ int where;
+{
+ switch (where) {
+ case SEEK_SET:
+ return OF_seek(OF_fd, offset);
+ case SEEK_CUR:
+ case SEEK_END:
+ default:
+ return -1;
+ }
+}
+
+int
+hfs_stat(f, sb)
+ struct open_file *f;
+ struct stat *sb;
+{
+ return 0;
+}
diff -r 53e0878d5f41 -r 5b087fb0e21c sys/arch/macppc/stand/ofwboot/hfs.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/macppc/stand/ofwboot/hfs.h Tue Nov 14 11:25:34 2000 +0000
@@ -0,0 +1,8 @@
+/* $NetBSD: hfs.h,v 1.1 2000/11/14 11:25:35 tsubai Exp $ */
+
+int hfs_open(char *, struct open_file *);
+int hfs_close(struct open_file *);
+int hfs_read(struct open_file *, void *, size_t, size_t *);
+int hfs_write(struct open_file *, void *, size_t, size_t *);
+off_t hfs_seek(struct open_file *, off_t, int);
+int hfs_stat(struct open_file *, struct stat *);
diff -r 53e0878d5f41 -r 5b087fb0e21c sys/arch/macppc/stand/ofwboot/ofdev.c
--- a/sys/arch/macppc/stand/ofwboot/ofdev.c Tue Nov 14 11:14:55 2000 +0000
+++ b/sys/arch/macppc/stand/ofwboot/ofdev.c Tue Nov 14 11:25:34 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdev.c,v 1.4 1999/03/05 06:21:17 tsubai Exp $ */
+/* $NetBSD: ofdev.c,v 1.5 2000/11/14 11:25:35 tsubai Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -44,6 +44,7 @@
#include <lib/libsa/ufs.h>
#include <lib/libsa/cd9660.h>
#include <lib/libsa/nfs.h>
+#include <hfs.h>
#include "ofdev.h"
@@ -150,6 +151,9 @@
static struct fs_ops file_system_ufs = {
ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat
};
+static struct fs_ops file_system_hfs = {
+ hfs_open, hfs_close, hfs_read, hfs_write, hfs_seek, hfs_stat
+};
static struct fs_ops file_system_cd9660 = {
cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
cd9660_stat
@@ -328,17 +332,17 @@
of->f_dev = devsw;
of->f_devdata = &ofdev;
- bcopy(&file_system_ufs, file_system, sizeof file_system[0]);
- bcopy(&file_system_cd9660, file_system + 1,
- sizeof file_system[0]);
- nfsys = 2;
+ file_system[0] = file_system_ufs;
+ file_system[1] = file_system_cd9660;
+ file_system[2] = file_system_hfs;
+ nfsys = 3;
return 0;
}
if (!strcmp(buf, "network")) {
ofdev.type = OFDEV_NET;
of->f_dev = devsw;
of->f_devdata = &ofdev;
- bcopy(&file_system_nfs, file_system, sizeof file_system[0]);
+ file_system[0] = file_system_nfs;
nfsys = 1;
if (error = net_open(&ofdev))
goto bad;
Home |
Main Index |
Thread Index |
Old Index