Module Name: src
Committed By: kiyohara
Date: Mon Jul 20 04:59:04 UTC 2009
Modified Files:
src/sys/arch/ia64/stand/common: boot.c bootstrap.h commands.c console.c
devopen.c environment.c gets.c interp.c interp_backslash.c
interp_parse.c ls.c misc.c pager.c readdir.c strdup.c strtol.c
src/sys/arch/ia64/stand/efi/libefi: Makefile Makefile.inc devicename.c
efi_console.c efifpswa.c efifs.c
src/sys/arch/ia64/stand/ia64: Makefile.booters
src/sys/arch/ia64/stand/ia64/efi: Makefile conf.c main.c
src/sys/arch/ia64/stand/ia64/ski: Makefile bootinfo.c conf.c
devicename.c efi_stub.c exit.c main.c sal_stub.c skiconsole.c
skifs.c ssc.c time.c
Log Message:
Fix little bit, and add a few files.
current status is to see following thread.
http://mail-index.netbsd.org/port-ia64/2009/06/18/msg000102.html
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/common/boot.c \
src/sys/arch/ia64/stand/common/misc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/common/bootstrap.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/commands.c \
src/sys/arch/ia64/stand/common/console.c \
src/sys/arch/ia64/stand/common/devopen.c \
src/sys/arch/ia64/stand/common/interp_backslash.c \
src/sys/arch/ia64/stand/common/ls.c \
src/sys/arch/ia64/stand/common/readdir.c \
src/sys/arch/ia64/stand/common/strdup.c \
src/sys/arch/ia64/stand/common/strtol.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/common/environment.c \
src/sys/arch/ia64/stand/common/gets.c \
src/sys/arch/ia64/stand/common/pager.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/common/interp.c \
src/sys/arch/ia64/stand/common/interp_parse.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/efi/libefi/Makefile \
src/sys/arch/ia64/stand/efi/libefi/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/efi/libefi/devicename.c \
src/sys/arch/ia64/stand/efi/libefi/efi_console.c \
src/sys/arch/ia64/stand/efi/libefi/efifs.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/efi/libefi/efifpswa.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/Makefile.booters
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/ia64/efi/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/efi/conf.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/efi/main.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/ski/Makefile \
src/sys/arch/ia64/stand/ia64/ski/bootinfo.c \
src/sys/arch/ia64/stand/ia64/ski/devicename.c \
src/sys/arch/ia64/stand/ia64/ski/efi_stub.c \
src/sys/arch/ia64/stand/ia64/ski/exit.c \
src/sys/arch/ia64/stand/ia64/ski/sal_stub.c \
src/sys/arch/ia64/stand/ia64/ski/ssc.c \
src/sys/arch/ia64/stand/ia64/ski/time.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/ia64/ski/conf.c \
src/sys/arch/ia64/stand/ia64/ski/main.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/ski/skiconsole.c \
src/sys/arch/ia64/stand/ia64/ski/skifs.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/ia64/stand/common/boot.c
diff -u src/sys/arch/ia64/stand/common/boot.c:1.4 src/sys/arch/ia64/stand/common/boot.c:1.5
--- src/sys/arch/ia64/stand/common/boot.c:1.4 Wed Mar 18 10:22:31 2009
+++ src/sys/arch/ia64/stand/common/boot.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.4 2009/03/18 10:22:31 cegger Exp $ */
+/* $NetBSD: boot.c,v 1.5 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -35,6 +35,7 @@
*/
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include "bootstrap.h"
@@ -106,7 +107,6 @@
return(CMD_ERROR);
/* Call the exec handler from the loader matching the kernel */
- file_formats[fp->f_loader]->l_exec(fp);
command_errmsg = strerror(file_formats[fp->f_loader]->l_exec(fp));
return(CMD_ERROR);
}
Index: src/sys/arch/ia64/stand/common/misc.c
diff -u src/sys/arch/ia64/stand/common/misc.c:1.4 src/sys/arch/ia64/stand/common/misc.c:1.5
--- src/sys/arch/ia64/stand/common/misc.c:1.4 Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/common/misc.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.4 2009/03/18 16:00:12 cegger Exp $ */
+/* $NetBSD: misc.c,v 1.5 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -30,6 +30,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/common/misc.c,v 1.8.4.1 2004/09/03 19:25:40 iedowse Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <bootstrap.h>
/*
Index: src/sys/arch/ia64/stand/common/bootstrap.h
diff -u src/sys/arch/ia64/stand/common/bootstrap.h:1.5 src/sys/arch/ia64/stand/common/bootstrap.h:1.6
--- src/sys/arch/ia64/stand/common/bootstrap.h:1.5 Sun Mar 4 06:00:03 2007
+++ src/sys/arch/ia64/stand/common/bootstrap.h Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bootstrap.h,v 1.5 2007/03/04 06:00:03 christos Exp $ */
+/* $NetBSD: bootstrap.h,v 1.6 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -191,7 +191,7 @@
vaddr_t f_addr; /* load address */
size_t f_size; /* file size */
struct preloaded_file *f_next; /* next file */
- u_long *marks; /* filled by loadfile() */
+ u_long marks[MARK_MAX];/* filled by loadfile() */
};
struct file_format
Index: src/sys/arch/ia64/stand/common/commands.c
diff -u src/sys/arch/ia64/stand/common/commands.c:1.2 src/sys/arch/ia64/stand/common/commands.c:1.3
--- src/sys/arch/ia64/stand/common/commands.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/common/commands.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: commands.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: commands.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -30,6 +30,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.19 2003/08/25 23:30:41 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/common/console.c
diff -u src/sys/arch/ia64/stand/common/console.c:1.2 src/sys/arch/ia64/stand/common/console.c:1.3
--- src/sys/arch/ia64/stand/common/console.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/common/console.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: console.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -30,6 +30,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.6 2003/08/25 23:30:41 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/common/devopen.c
diff -u src/sys/arch/ia64/stand/common/devopen.c:1.2 src/sys/arch/ia64/stand/common/devopen.c:1.3
--- src/sys/arch/ia64/stand/common/devopen.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/common/devopen.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: devopen.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -30,6 +30,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.4 2003/08/25 23:30:41 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/common/interp_backslash.c
diff -u src/sys/arch/ia64/stand/common/interp_backslash.c:1.2 src/sys/arch/ia64/stand/common/interp_backslash.c:1.3
--- src/sys/arch/ia64/stand/common/interp_backslash.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/common/interp_backslash.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interp_backslash.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: interp_backslash.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Redistribution and use in source and binary forms, with or without
@@ -20,6 +20,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.6 2003/08/25 23:30:41 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/common/ls.c
diff -u src/sys/arch/ia64/stand/common/ls.c:1.2 src/sys/arch/ia64/stand/common/ls.c:1.3
--- src/sys/arch/ia64/stand/common/ls.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/common/ls.c Mon Jul 20 04:59:03 2009
@@ -1,5 +1,5 @@
/*
- * $NetBSD: ls.c,v 1.2 2006/04/22 07:58:53 cherry Exp $
+ * $NetBSD: ls.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $
*/
/*-
@@ -47,6 +47,7 @@
#include <sys/dirent.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/common/readdir.c
diff -u src/sys/arch/ia64/stand/common/readdir.c:1.2 src/sys/arch/ia64/stand/common/readdir.c:1.3
--- src/sys/arch/ia64/stand/common/readdir.c:1.2 Sun Jul 2 17:28:11 2006
+++ src/sys/arch/ia64/stand/common/readdir.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: readdir.c,v 1.2 2006/07/02 17:28:11 cherry Exp $ */
+/* $NetBSD: readdir.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1999,2000 Jonathan Lemon <[email protected]>
@@ -30,6 +30,7 @@
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <sys/param.h>
#include <sys/dirent.h>
@@ -42,7 +43,7 @@
static struct dirent dir; /* XXX not thread safe. eh ??? */
struct open_file *f = &files[fd];
- if ((unsigned)fd >= SOPEN_MAX || !(f->f_flags & O_RDONLY)) {
+ if ((unsigned)fd >= SOPEN_MAX) {
errno = EBADF;
return (NULL);
}
@@ -55,7 +56,6 @@
errno = FS_READDIR(f, &dir);
if (errno)
- printf("XXXdebugXXX: FS_READDIR returns NULL\n");
return (NULL);
return (&dir);
}
Index: src/sys/arch/ia64/stand/common/strdup.c
diff -u src/sys/arch/ia64/stand/common/strdup.c:1.2 src/sys/arch/ia64/stand/common/strdup.c:1.3
--- src/sys/arch/ia64/stand/common/strdup.c:1.2 Sat Mar 14 15:36:08 2009
+++ src/sys/arch/ia64/stand/common/strdup.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: strdup.c,v 1.2 2009/03/14 15:36:08 dsl Exp $ */
+/* $NetBSD: strdup.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -40,6 +40,7 @@
#endif /* LIBC_SCCS and not lint */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/common/strtol.c
diff -u src/sys/arch/ia64/stand/common/strtol.c:1.2 src/sys/arch/ia64/stand/common/strtol.c:1.3
--- src/sys/arch/ia64/stand/common/strtol.c:1.2 Sat Mar 14 15:36:08 2009
+++ src/sys/arch/ia64/stand/common/strtol.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: strtol.c,v 1.2 2009/03/14 15:36:08 dsl Exp $ */
+/* $NetBSD: strtol.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -40,6 +40,7 @@
#endif /* LIBC_SCCS and not lint */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include <machine/limits.h>
Index: src/sys/arch/ia64/stand/common/environment.c
diff -u src/sys/arch/ia64/stand/common/environment.c:1.1 src/sys/arch/ia64/stand/common/environment.c:1.2
--- src/sys/arch/ia64/stand/common/environment.c:1.1 Fri Apr 7 14:21:29 2006
+++ src/sys/arch/ia64/stand/common/environment.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: environment.c,v 1.1 2006/04/07 14:21:29 cherry Exp $ */
+/* $NetBSD: environment.c,v 1.2 2009/07/20 04:59:03 kiyohara Exp $ */
/*
@@ -36,6 +36,7 @@
*/
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include <bootstrap.h>
Index: src/sys/arch/ia64/stand/common/gets.c
diff -u src/sys/arch/ia64/stand/common/gets.c:1.1 src/sys/arch/ia64/stand/common/gets.c:1.2
--- src/sys/arch/ia64/stand/common/gets.c:1.1 Fri Apr 7 14:21:29 2006
+++ src/sys/arch/ia64/stand/common/gets.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gets.c,v 1.1 2006/04/07 14:21:29 cherry Exp $ */
+/* $NetBSD: gets.c,v 1.2 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1993
@@ -37,6 +37,9 @@
#include <sys/cdefs.h>
+#include "lib/libsa/stand.h"
+#include "lib/libsa/loadfile.h"
+
#include "bootstrap.h"
/* gets() with constrained input length */
Index: src/sys/arch/ia64/stand/common/pager.c
diff -u src/sys/arch/ia64/stand/common/pager.c:1.1 src/sys/arch/ia64/stand/common/pager.c:1.2
--- src/sys/arch/ia64/stand/common/pager.c:1.1 Fri Apr 7 14:21:29 2006
+++ src/sys/arch/ia64/stand/common/pager.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pager.c,v 1.1 2006/04/07 14:21:29 cherry Exp $ */
+/* $NetBSD: pager.c,v 1.2 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -32,6 +32,7 @@
#include <sys/cdefs.h>
#include "lib/libsa/stand.h"
+#include "lib/libsa/loadfile.h"
#include <bootstrap.h>
Index: src/sys/arch/ia64/stand/common/interp.c
diff -u src/sys/arch/ia64/stand/common/interp.c:1.3 src/sys/arch/ia64/stand/common/interp.c:1.4
--- src/sys/arch/ia64/stand/common/interp.c:1.3 Sun Jul 2 17:28:11 2006
+++ src/sys/arch/ia64/stand/common/interp.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interp.c,v 1.3 2006/07/02 17:28:11 cherry Exp $ */
+/* $NetBSD: interp.c,v 1.4 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -36,6 +36,7 @@
*/
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/common/interp_parse.c
diff -u src/sys/arch/ia64/stand/common/interp_parse.c:1.3 src/sys/arch/ia64/stand/common/interp_parse.c:1.4
--- src/sys/arch/ia64/stand/common/interp_parse.c:1.3 Wed Mar 18 17:06:45 2009
+++ src/sys/arch/ia64/stand/common/interp_parse.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interp_parse.c,v 1.3 2009/03/18 17:06:45 cegger Exp $ */
+/* $NetBSD: interp_parse.c,v 1.4 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Redistribution and use in source and binary forms, with or without
@@ -20,6 +20,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/common/interp_parse.c,v 1.10 2003/08/25 23:30:41 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/efi/libefi/Makefile
diff -u src/sys/arch/ia64/stand/efi/libefi/Makefile:1.1 src/sys/arch/ia64/stand/efi/libefi/Makefile:1.2
--- src/sys/arch/ia64/stand/efi/libefi/Makefile:1.1 Fri Apr 7 14:21:32 2006
+++ src/sys/arch/ia64/stand/efi/libefi/Makefile Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2006/04/07 14:21:32 cherry Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/20 04:59:03 kiyohara Exp $
S?= ${.CURDIR}/../../../../../
@@ -18,7 +18,7 @@
CPPFLAGS+= -I${.CURDIR}/../../common
SRCS= copy.c delay.c efi.c efi_console.c devicename.c bootinfo.c
-SRCS+= time.c efifs.c efi_console.c module.c exec.c #efinet.c
+SRCS+= time.c efifs.c efi_console.c module.c exec.c #efinet.c
.if ${MACHINE_ARCH} == "ia64"
SRCS+= efifpswa.c pal.S
Index: src/sys/arch/ia64/stand/efi/libefi/Makefile.inc
diff -u src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.1 src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.2
--- src/sys/arch/ia64/stand/efi/libefi/Makefile.inc:1.1 Fri Apr 7 14:21:32 2006
+++ src/sys/arch/ia64/stand/efi/libefi/Makefile.inc Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2006/04/07 14:21:32 cherry Exp $
+# $NetBSD: Makefile.inc,v 1.2 2009/07/20 04:59:03 kiyohara Exp $
#
# Configuration variables (default values are below):
#
@@ -43,6 +43,7 @@
cleandirefilib: .NOTMAIN
@echo cleandiring the efi library objects
@if [ -d "${EFIDST}" ]; then ${EFIMAKE} cleandir; fi
+ -rm -rf efi
dependall depend: .NOTMAIN dependefilib
dependefilib: .NOTMAIN __always_make_efilib
Index: src/sys/arch/ia64/stand/efi/libefi/devicename.c
diff -u src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.3 src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.4
--- src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.3 Fri Nov 24 19:38:55 2006
+++ src/sys/arch/ia64/stand/efi/libefi/devicename.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: devicename.c,v 1.3 2006/11/24 19:38:55 christos Exp $ */
+/* $NetBSD: devicename.c,v 1.4 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -31,6 +31,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/efi/libefi/devicename.c,v 1.3 2004/01/04 23:28:16 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <sys/disklabel.h>
#include <bootstrap.h>
Index: src/sys/arch/ia64/stand/efi/libefi/efi_console.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efi_console.c:1.3 src/sys/arch/ia64/stand/efi/libefi/efi_console.c:1.4
--- src/sys/arch/ia64/stand/efi/libefi/efi_console.c:1.3 Wed Mar 18 10:22:31 2009
+++ src/sys/arch/ia64/stand/efi/libefi/efi_console.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_console.c,v 1.3 2009/03/18 10:22:31 cegger Exp $ */
+/* $NetBSD: efi_console.c,v 1.4 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -32,6 +32,7 @@
#include <efi.h>
#include <efilib.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/efi/libefi/efifs.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efifs.c:1.3 src/sys/arch/ia64/stand/efi/libefi/efifs.c:1.4
--- src/sys/arch/ia64/stand/efi/libefi/efifs.c:1.3 Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/efi/libefi/efifs.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: efifs.c,v 1.3 2009/03/18 16:00:12 cegger Exp $ */
+/* $NetBSD: efifs.c,v 1.4 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -31,6 +31,7 @@
#include <sys/time.h>
#include <sys/dirent.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <lib/libkern/libkern.h>
#include <machine/stdarg.h>
Index: src/sys/arch/ia64/stand/efi/libefi/efifpswa.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efifpswa.c:1.2 src/sys/arch/ia64/stand/efi/libefi/efifpswa.c:1.3
--- src/sys/arch/ia64/stand/efi/libefi/efifpswa.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/efi/libefi/efifpswa.c Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: efifpswa.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: efifpswa.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
/*-
* Copyright (c) 2001 Peter Wemm <[email protected]>
@@ -32,6 +32,7 @@
#include <sys/param.h>
#include <sys/time.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <machine/stdarg.h>
#include <efi.h>
Index: src/sys/arch/ia64/stand/ia64/Makefile.booters
diff -u src/sys/arch/ia64/stand/ia64/Makefile.booters:1.2 src/sys/arch/ia64/stand/ia64/Makefile.booters:1.3
--- src/sys/arch/ia64/stand/ia64/Makefile.booters:1.2 Sun Apr 6 07:50:04 2008
+++ src/sys/arch/ia64/stand/ia64/Makefile.booters Mon Jul 20 04:59:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.2 2008/04/06 07:50:04 kochi Exp $
+# $NetBSD: Makefile.booters,v 1.3 2009/07/20 04:59:03 kiyohara Exp $
.include <bsd.own.mk>
@@ -16,7 +16,7 @@
.PATH: ${IA64_STAND_DIR}/efi
-CPPFLAGS += -nostdlib -nostdinc -I${.OBJDIR} -I${IA64_STAND_DIR} -I${IA64_STAND_DIR}/efi/include
+CPPFLAGS += -nostdlib -nostdinc -I${.OBJDIR} -I${IA64_STAND_DIR} -I${IA64_STAND_DIR}/efi/include
# Options used when building standalone components
CFLAGS+= -ffreestanding -fshort-wchar -Wformat -D_STANDALONE
@@ -24,12 +24,12 @@
CPPFLAGS+= -D_STANDALONE
.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine
+.BEGIN: machine
.NOPATH: machine
.endif
realdepend realall: machine lib
-CLEANFILES+= machine
+CLEANFILES= machine
machine:
-rm -f $@
Index: src/sys/arch/ia64/stand/ia64/efi/Makefile
diff -u src/sys/arch/ia64/stand/ia64/efi/Makefile:1.1 src/sys/arch/ia64/stand/ia64/efi/Makefile:1.2
--- src/sys/arch/ia64/stand/ia64/efi/Makefile:1.1 Fri Apr 7 14:21:32 2006
+++ src/sys/arch/ia64/stand/ia64/efi/Makefile Mon Jul 20 04:59:04 2009
@@ -23,13 +23,13 @@
CPPFLAGS+= -DLOADER
CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \
- -DHEAP_VARIABLE
+ -DHEAP_VARIABLE
# Pick up FreeBSD glue
#CPPFLAGS+= -I${.CURDIR}/../../
-# Always add MI sources
+# Always add MI sources
.PATH: ${.CURDIR}/../../common
.include "${.CURDIR}/../../common/Makefile.inc"
@@ -42,7 +42,7 @@
${PROG}: ${LDSCRIPT}
-CLEANFILES= vers.c loader.efi ${OBJS}
+CLEANFILES+= vers.c loader.efi ${OBJS}
NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH}
@@ -65,9 +65,9 @@
.include "${IA64_STAND_DIR}/efi/libefi/Makefile.inc"
LIBEFI= ${EFILIB}
-DPADD= ${LIBEFI} ${LIBLIST}
+DPADD= ${LIBEFI} ${LIBLIST}
# Cross dependencies between LIBEFI and LIB(SA|KERN). Need to elaborate below.
-LDADD= ${LIBEFI} ${LIBLIST} ${LIBEFI} ${LIBLIST}
+LDADD= ${LIBEFI} ${LIBLIST} ${LIBEFI} ${LIBLIST}
.include <bsd.prog.mk>
Index: src/sys/arch/ia64/stand/ia64/efi/conf.c
diff -u src/sys/arch/ia64/stand/ia64/efi/conf.c:1.2 src/sys/arch/ia64/stand/ia64/efi/conf.c:1.3
--- src/sys/arch/ia64/stand/ia64/efi/conf.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/efi/conf.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: conf.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
/*
* Copyright (c) 2004
@@ -31,6 +31,7 @@
#include <sys/types.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <bootstrap.h>
Index: src/sys/arch/ia64/stand/ia64/efi/main.c
diff -u src/sys/arch/ia64/stand/ia64/efi/main.c:1.5 src/sys/arch/ia64/stand/ia64/efi/main.c:1.6
--- src/sys/arch/ia64/stand/ia64/efi/main.c:1.5 Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/ia64/efi/main.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 2009/03/18 16:00:12 cegger Exp $ */
+/* $NetBSD: main.c,v 1.6 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -30,6 +30,7 @@
#include <sys/cdefs.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <machine/sal.h>
@@ -500,9 +501,8 @@
command_hcdp(int argc, char *argv[])
{
struct dig64_hcdp_table *tbl;
- struct dig64_hcdp_entry *ent;
- struct dig64_gas *gas;
- int i;
+ union dev_desc *desc;
+ int i, m, n;
tbl = efi_get_table(&hcdp);
if (tbl == NULL) {
@@ -513,11 +513,7 @@
printf("HCDP table has invalid signature\n");
return (CMD_OK);
}
- if (tbl->length < sizeof(*tbl) - sizeof(*tbl->entry)) {
- printf("HCDP table too short\n");
- return (CMD_OK);
- }
- printf("HCDP table at 0x%016lx\n", (u_long)tbl);
+ printf("HCDP table at 0x%lx\n", (u_long)tbl);
printf("Signature = %s\n", hcdp_string(tbl->signature, 4));
printf("Length = %u\n", tbl->length);
printf("Revision = %u\n", tbl->revision);
@@ -528,32 +524,95 @@
printf("Creator Id = %s\n", hcdp_string(tbl->creator_id, 4));
printf("Creator rev= %u\n", tbl->creator_rev);
printf("Entries = %u\n", tbl->entries);
- for (i = 0; i < tbl->entries; i++) {
- ent = tbl->entry + i;
- printf("Entry #%d:\n", i + 1);
- printf(" Type = %u\n", ent->type);
- printf(" Databits = %u\n", ent->databits);
- printf(" Parity = %u\n", ent->parity);
- printf(" Stopbits = %u\n", ent->stopbits);
- printf(" PCI seg = %u\n", ent->pci_segment);
- printf(" PCI bus = %u\n", ent->pci_bus);
- printf(" PCI dev = %u\n", ent->pci_device);
- printf(" PCI func = %u\n", ent->pci_function);
- printf(" Interrupt = %u\n", ent->interrupt);
- printf(" PCI flag = %u\n", ent->pci_flag);
- printf(" Baudrate = %lu\n",
- ((u_long)ent->baud_high << 32) + (u_long)ent->baud_low);
- gas = &ent->address;
- printf(" Addr space= %u\n", gas->addr_space);
- printf(" Bit width = %u\n", gas->bit_width);
- printf(" Bit offset= %u\n", gas->bit_offset);
- printf(" Address = 0x%016lx\n",
- ((u_long)gas->addr_high << 32) + (u_long)gas->addr_low);
- printf(" PCI type = %u\n", ent->pci_devid);
- printf(" PCI vndr = %u\n", ent->pci_vendor);
- printf(" IRQ = %u\n", ent->irq);
- printf(" PClock = %u\n", ent->pclock);
- printf(" PCI iface = %u\n", ent->pci_interface);
+ n = 0;
+ m = tbl->length - sizeof(struct dig64_hcdp_table);
+ i = 1;
+ while (n < m) {
+ printf("Entry #%d:\n", i);
+ desc = (union dev_desc *)((char *)tbl->entry + n);
+ printf(" Type = %u\n", desc->type);
+ if (desc->type == DIG64_ENTRYTYPE_TYPE0 ||
+ desc->type == DIG64_ENTRYTYPE_TYPE1) {
+ struct dig64_hcdp_entry *ent = &desc->uart;
+ struct dig64_gas *gas;
+ printf(" Databits = %u\n", ent->databits);
+ printf(" Parity = %u\n", ent->parity);
+ printf(" Stopbits = %u\n", ent->stopbits);
+ printf(" PCI seg = %u\n", ent->pci_segment);
+ printf(" PCI bus = %u\n", ent->pci_bus);
+ printf(" PCI dev = %u\n", ent->pci_device);
+ printf(" PCI func = %u\n", ent->pci_function);
+ printf(" Interrupt = %u\n", ent->interrupt);
+ printf(" PCI flag = %u\n", ent->pci_flag);
+ printf(" Baudrate = %lu\n",
+ ((u_long)ent->baud_high << 32) +
+ (u_long)ent->baud_low);
+ gas = &ent->address;
+ printf(" Addr space= %u\n", gas->addr_space);
+ printf(" Bit width = %u\n", gas->bit_width);
+ printf(" Bit offset= %u\n", gas->bit_offset);
+ printf(" Address = 0x%lx\n",
+ ((u_long)gas->addr_high << 32) +
+ (u_long)gas->addr_low);
+ printf(" PCI type = %u\n", ent->pci_devid);
+ printf(" PCI vndr = %u\n", ent->pci_vendor);
+ printf(" IRQ = %u\n", ent->irq);
+ printf(" PClock = %u\n", ent->pclock);
+ printf(" PCI iface = %u\n", ent->pci_interface);
+
+ n += sizeof(struct dig64_hcdp_entry);
+ } else {
+ struct dig64_pcdp_entry *pcdp = &desc->pcdp;
+
+ if (tbl->revision < 3) {
+ printf("PCDP not support\n");
+ return (CMD_OK);
+ }
+
+ printf(" Length = %u\n", pcdp->length);
+ printf(" Index EFI = %u\n", pcdp->index);
+ printf(" Interconn = %u", pcdp->specs.type);
+
+ switch (pcdp->specs.type) {
+ case DIG64_PCDP_SPEC_ACPI:
+ {
+ struct dig64_acpi_spec *acpi =
+ &pcdp->specs.acpi;
+
+ printf("(ACPI)\n");
+ printf(" Length = %u\n", acpi->length);
+ printf(" ACPI_UID = %x\n", acpi->uid);
+ printf(" ACPI_HID = %x\n", acpi->hid);
+ printf(" ACPI GSI = %x\n", acpi->acpi_gsi);
+ printf(" MMIO_TRA = %lx\n", acpi->mmio_tra);
+ printf(" IOPort_TRA= %lx\n",
+ acpi->ioport_tra);
+ printf(" Flags = %x\n", acpi->flags);
+ break;
+ }
+ case DIG64_PCDP_SPEC_PCI:
+ {
+ struct dig64_pci_spec *pci = &pcdp->specs.pci;
+
+ printf("(PCI)\n");
+ printf(" Length = %u\n", pci->length);
+ printf(" Seg GrpNum= %u\n", pci->sgn);
+ printf(" Bus = %u\n", pci->bus);
+ printf(" Device = %u\n", pci->device);
+ printf(" Function = %u\n", pci->function);
+ printf(" Device ID = %u\n", pci->device_id);
+ printf(" Vendor ID = %u\n", pci->vendor_id);
+ printf(" ACPI GSI = %x\n", pci->acpi_gsi);
+ printf(" MMIO_TRA = %lx\n", pci->mmio_tra);
+ printf(" IOPort_TRA= %lx\n",
+ pci->ioport_tra);
+ printf(" Flags = %x\n", pci->flags);
+ break;
+ }
+ }
+
+ n += pcdp->length;
+ }
}
printf("<EOT>\n");
return (CMD_OK);
Index: src/sys/arch/ia64/stand/ia64/ski/Makefile
diff -u src/sys/arch/ia64/stand/ia64/ski/Makefile:1.2 src/sys/arch/ia64/stand/ia64/ski/Makefile:1.3
--- src/sys/arch/ia64/stand/ia64/ski/Makefile:1.2 Mon Jul 3 16:50:40 2006
+++ src/sys/arch/ia64/stand/ia64/ski/Makefile Mon Jul 20 04:59:04 2009
@@ -20,14 +20,14 @@
CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH}
CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \
- -DHEAP_VARIABLE
+ -DHEAP_VARIABLE
-# Always add MI sources
+# Always add MI sources
.PATH: ${.CURDIR}/../../common
.include "${.CURDIR}/../../common/Makefile.inc"
LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
-LDFLAGS= -Wl,-T${LDSCRIPT} -symbolic -nostdlib #-shared
+LDFLAGS= -Wl,-T${LDSCRIPT} -symbolic -nostdlib #-shared
${PROG}: ${LDSCRIPT}
@@ -38,9 +38,9 @@
vers.c: ${VERSIONFILE} ${SOURCES}
${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
-DPADD= ${LIBLIST}
+DPADD= ${LIBLIST}
# Cross dependencies between LIB(SA|KERN). Need to elaborate below.
-LDADD= ${LIBLIST} ${LIBLIST}
+LDADD= ${LIBLIST} ${LIBLIST}
.include <bsd.prog.mk>
Index: src/sys/arch/ia64/stand/ia64/ski/bootinfo.c
diff -u src/sys/arch/ia64/stand/ia64/ski/bootinfo.c:1.2 src/sys/arch/ia64/stand/ia64/ski/bootinfo.c:1.3
--- src/sys/arch/ia64/stand/ia64/ski/bootinfo.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/ski/bootinfo.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: bootinfo.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -37,7 +37,6 @@
#include <sys/boot_flag.h>
#include <sys/exec_elf.h>
#include <sys/lock.h>
-#include <sys/lkm.h>
#include <machine/vmparam.h>
#include <machine/elf_machdep.h>
Index: src/sys/arch/ia64/stand/ia64/ski/devicename.c
diff -u src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.2 src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.3
--- src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/ski/devicename.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: devicename.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: devicename.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -30,6 +30,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/ia64/libski/devicename.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <sys/disklabel.h>
#include <bootstrap.h>
Index: src/sys/arch/ia64/stand/ia64/ski/efi_stub.c
diff -u src/sys/arch/ia64/stand/ia64/ski/efi_stub.c:1.2 src/sys/arch/ia64/stand/ia64/ski/efi_stub.c:1.3
--- src/sys/arch/ia64/stand/ia64/ski/efi_stub.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/ski/efi_stub.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_stub.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: efi_stub.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -36,6 +36,7 @@
#include <machine/bootinfo.h>
#include <machine/efi.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <bootstrap.h>
#include "libski.h"
Index: src/sys/arch/ia64/stand/ia64/ski/exit.c
diff -u src/sys/arch/ia64/stand/ia64/ski/exit.c:1.2 src/sys/arch/ia64/stand/ia64/ski/exit.c:1.3
--- src/sys/arch/ia64/stand/ia64/ski/exit.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/ski/exit.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: exit.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: exit.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -32,6 +32,7 @@
#include <sys/param.h>
#include <sys/time.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <bootstrap.h>
Index: src/sys/arch/ia64/stand/ia64/ski/sal_stub.c
diff -u src/sys/arch/ia64/stand/ia64/ski/sal_stub.c:1.2 src/sys/arch/ia64/stand/ia64/ski/sal_stub.c:1.3
--- src/sys/arch/ia64/stand/ia64/ski/sal_stub.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/ski/sal_stub.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sal_stub.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: sal_stub.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 2003 Marcel Moolenaar
@@ -33,6 +33,7 @@
#include <machine/md_var.h>
#include <machine/sal.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
#include "libski.h"
Index: src/sys/arch/ia64/stand/ia64/ski/ssc.c
diff -u src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.2 src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.3
--- src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/ski/ssc.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ssc.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: ssc.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -30,6 +30,7 @@
/* __FBSDID("$FreeBSD: src/sys/boot/ia64/libski/ssc.c,v 1.4 2003/09/08 09:11:32 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
#include "libski.h"
Index: src/sys/arch/ia64/stand/ia64/ski/time.c
diff -u src/sys/arch/ia64/stand/ia64/ski/time.c:1.2 src/sys/arch/ia64/stand/ia64/ski/time.c:1.3
--- src/sys/arch/ia64/stand/ia64/ski/time.c:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/ski/time.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.2 2006/04/22 07:58:53 cherry Exp $ */
+/* $NetBSD: time.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 1999, 2000
@@ -45,6 +45,7 @@
//#include <time.h>
#include <sys/time.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
#include "libski.h"
Index: src/sys/arch/ia64/stand/ia64/ski/conf.c
diff -u src/sys/arch/ia64/stand/ia64/ski/conf.c:1.1 src/sys/arch/ia64/stand/ia64/ski/conf.c:1.2
--- src/sys/arch/ia64/stand/ia64/ski/conf.c:1.1 Fri Apr 7 14:21:32 2006
+++ src/sys/arch/ia64/stand/ia64/ski/conf.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.1 2006/04/07 14:21:32 cherry Exp $ */
+/* $NetBSD: conf.c,v 1.2 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 1997
@@ -30,12 +30,13 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $NetBSD: conf.c,v 1.1 2006/04/07 14:21:32 cherry Exp $
+ * $NetBSD: conf.c,v 1.2 2009/07/20 04:59:04 kiyohara Exp $
*/
#include <sys/cdefs.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include <bootstrap.h>
Index: src/sys/arch/ia64/stand/ia64/ski/main.c
diff -u src/sys/arch/ia64/stand/ia64/ski/main.c:1.1 src/sys/arch/ia64/stand/ia64/ski/main.c:1.2
--- src/sys/arch/ia64/stand/ia64/ski/main.c:1.1 Fri Apr 7 14:21:32 2006
+++ src/sys/arch/ia64/stand/ia64/ski/main.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1 2006/04/07 14:21:32 cherry Exp $ */
+/* $NetBSD: main.c,v 1.2 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -30,6 +30,7 @@
#include <sys/cdefs.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
#include "libski.h"
Index: src/sys/arch/ia64/stand/ia64/ski/skiconsole.c
diff -u src/sys/arch/ia64/stand/ia64/ski/skiconsole.c:1.3 src/sys/arch/ia64/stand/ia64/ski/skiconsole.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/skiconsole.c:1.3 Wed Mar 18 10:22:31 2009
+++ src/sys/arch/ia64/stand/ia64/ski/skiconsole.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: skiconsole.c,v 1.3 2009/03/18 10:22:31 cegger Exp $ */
+/* $NetBSD: skiconsole.c,v 1.4 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,6 +29,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/sys/boot/ia64/libski/skiconsole.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); */
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
#include "libski.h"
Index: src/sys/arch/ia64/stand/ia64/ski/skifs.c
diff -u src/sys/arch/ia64/stand/ia64/ski/skifs.c:1.3 src/sys/arch/ia64/stand/ia64/ski/skifs.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/skifs.c:1.3 Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/ia64/ski/skifs.c Mon Jul 20 04:59:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: skifs.c,v 1.3 2009/03/18 16:00:12 cegger Exp $ */
+/* $NetBSD: skifs.c,v 1.4 2009/07/20 04:59:04 kiyohara Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -32,6 +32,7 @@
#include <sys/param.h>
#include <sys/time.h>
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
#include "bootstrap.h"
#include "libski.h"
