Module Name: src
Committed By: martin
Date: Thu Dec 27 20:21:51 UTC 2012
Modified Files:
src/sys/arch/ia64/stand/common: bootstrap.h fileload.c interp.c misc.c
readdir.c
src/sys/arch/ia64/stand/efi/libefi: bootinfo.c devicename.c efi.c
efifsdev.h exec.c
src/sys/arch/ia64/stand/ia64/efi: main.c
src/sys/arch/ia64/stand/ia64/ski: acpi_stub.c bootinfo.c devicename.c
efi_stub.c exec.c libski.h main.c sal_stub.c
Log Message:
Make it all compile
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/common/bootstrap.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/fileload.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/common/interp.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/common/misc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/common/readdir.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/efi/libefi/bootinfo.c \
src/sys/arch/ia64/stand/efi/libefi/efi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/efi/libefi/devicename.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/stand/efi/libefi/efifsdev.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/efi/libefi/exec.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/ia64/efi/main.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c
cvs rdiff -u -r1.3 -r1.4 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/main.c \
src/sys/arch/ia64/stand/ia64/ski/sal_stub.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/ski/exec.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/ia64/ski/libski.h
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/bootstrap.h
diff -u src/sys/arch/ia64/stand/common/bootstrap.h:1.7 src/sys/arch/ia64/stand/common/bootstrap.h:1.8
--- src/sys/arch/ia64/stand/common/bootstrap.h:1.7 Thu Jun 30 20:09:31 2011
+++ src/sys/arch/ia64/stand/common/bootstrap.h Thu Dec 27 20:21:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bootstrap.h,v 1.7 2011/06/30 20:09:31 wiz Exp $ */
+/* $NetBSD: bootstrap.h,v 1.8 2012/12/27 20:21:50 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -57,6 +57,7 @@ extern char command_errbuf[]; /* XXX bla
#define CMD_OK 0
#define CMD_ERROR 1
+
/* interp.c */
void interact(void);
int include(const char *filename);
@@ -124,6 +125,7 @@ struct console
};
extern struct console *consoles[];
void cons_probe(void);
+int ischar(void);
/*
* Plug-and-play enumerator/configurator interface.
@@ -211,6 +213,7 @@ int mod_loadkld(const char *name, int
struct preloaded_file *file_alloc(void);
struct preloaded_file *file_findfile(char *name, char *type);
+int file_loadkernel(char *filename, int argc, char *argv[]);
void file_discard(struct preloaded_file *fp);
int elf64_loadfile(char *filename, u_int64_t dest, struct preloaded_file **result);
@@ -330,6 +333,12 @@ time_t time(time_t *tloc);
/* calloc.c */
void *calloc(unsigned int, unsigned int);
+/* various string functions */
+size_t strspn(const char *s1, const char *s2);
+size_t strlen(const char *s);
+char *strcpy(char * restrict dst, const char * restrict src);
+char *strcat(char * restrict s, const char * restrict append);
+
/* pager.c */
extern void pager_open(void);
extern void pager_close(void);
Index: src/sys/arch/ia64/stand/common/fileload.c
diff -u src/sys/arch/ia64/stand/common/fileload.c:1.2 src/sys/arch/ia64/stand/common/fileload.c:1.3
--- src/sys/arch/ia64/stand/common/fileload.c:1.2 Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/common/fileload.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fileload.c,v 1.2 2009/03/18 16:00:12 cegger Exp $ */
+/* $NetBSD: fileload.c,v 1.3 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -33,8 +33,9 @@
*/
#include <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.h>
#include <sys/param.h>
-#include <sys/lkm.h>
#include <sys/queue.h>
#include "bootstrap.h"
@@ -266,10 +267,11 @@ file_alloc(void)
if ((fp = alloc(sizeof(struct preloaded_file))) != NULL) {
memset(fp, 0, sizeof(struct preloaded_file));
-
+/*
if (fp->marks = alloc(sizeof(u_long))) {
memset(fp->marks, 0, sizeof(u_long));
}
+*/
}
return (fp);
}
Index: src/sys/arch/ia64/stand/common/interp.c
diff -u src/sys/arch/ia64/stand/common/interp.c:1.4 src/sys/arch/ia64/stand/common/interp.c:1.5
--- src/sys/arch/ia64/stand/common/interp.c:1.4 Mon Jul 20 04:59:03 2009
+++ src/sys/arch/ia64/stand/common/interp.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: interp.c,v 1.4 2009/07/20 04:59:03 kiyohara Exp $ */
+/* $NetBSD: interp.c,v 1.5 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -37,6 +37,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/misc.c
diff -u src/sys/arch/ia64/stand/common/misc.c:1.5 src/sys/arch/ia64/stand/common/misc.c:1.6
--- src/sys/arch/ia64/stand/common/misc.c:1.5 Mon Jul 20 04:59:03 2009
+++ src/sys/arch/ia64/stand/common/misc.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.5 2009/07/20 04:59:03 kiyohara Exp $ */
+/* $NetBSD: misc.c,v 1.6 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -33,6 +33,9 @@
#include <lib/libsa/loadfile.h>
#include <bootstrap.h>
+
+#define min(A, B) (((A) < (B)) ? (A) : (B))
+
/*
* Concatenate the (argc) elements of (argv) into a single string, and return
* a copy of same.
Index: src/sys/arch/ia64/stand/common/readdir.c
diff -u src/sys/arch/ia64/stand/common/readdir.c:1.3 src/sys/arch/ia64/stand/common/readdir.c:1.4
--- src/sys/arch/ia64/stand/common/readdir.c:1.3 Mon Jul 20 04:59:03 2009
+++ src/sys/arch/ia64/stand/common/readdir.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: readdir.c,v 1.3 2009/07/20 04:59:03 kiyohara Exp $ */
+/* $NetBSD: readdir.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1999,2000 Jonathan Lemon <[email protected]>
@@ -35,8 +35,11 @@
#include <sys/param.h>
#include <sys/dirent.h>
+#include <efi/libefi/efifsdev.h>
#include <bootstrap.h>
+int skifs_readdir(struct open_file *f, struct dirent *d);
+
struct dirent *
readdirfd(int fd)
{
Index: src/sys/arch/ia64/stand/efi/libefi/bootinfo.c
diff -u src/sys/arch/ia64/stand/efi/libefi/bootinfo.c:1.3 src/sys/arch/ia64/stand/efi/libefi/bootinfo.c:1.4
--- src/sys/arch/ia64/stand/efi/libefi/bootinfo.c:1.3 Sun Jul 2 17:28:11 2006
+++ src/sys/arch/ia64/stand/efi/libefi/bootinfo.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.c,v 1.3 2006/07/02 17:28:11 cherry Exp $ */
+/* $NetBSD: bootinfo.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -31,6 +31,7 @@
#include <lib/libsa/stand.h>
#include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.h>
#include <sys/param.h>
#include <sys/reboot.h>
@@ -45,6 +46,7 @@
#include <efi.h>
#include <efilib.h>
+#include <efiboot.h>
#include "bootstrap.h"
Index: src/sys/arch/ia64/stand/efi/libefi/efi.c
diff -u src/sys/arch/ia64/stand/efi/libefi/efi.c:1.3 src/sys/arch/ia64/stand/efi/libefi/efi.c:1.4
--- src/sys/arch/ia64/stand/efi/libefi/efi.c:1.3 Thu Sep 21 09:58:27 2006
+++ src/sys/arch/ia64/stand/efi/libefi/efi.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: efi.c,v 1.3 2006/09/21 09:58:27 kochi Exp $ */
+/* $NetBSD: efi.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -32,6 +32,7 @@
#include <efi.h>
#include <efilib.h>
#include <lib/libsa/stand.h>
+#include <lib/libkern/libkern.h>
EFI_HANDLE IH;
EFI_SYSTEM_TABLE *ST;
Index: src/sys/arch/ia64/stand/efi/libefi/devicename.c
diff -u src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.4 src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.5
--- src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.4 Mon Jul 20 04:59:03 2009
+++ src/sys/arch/ia64/stand/efi/libefi/devicename.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: devicename.c,v 1.4 2009/07/20 04:59:03 kiyohara Exp $ */
+/* $NetBSD: devicename.c,v 1.5 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -32,6 +32,7 @@
#include <lib/libsa/stand.h>
#include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.h>
#include <sys/disklabel.h>
#include <bootstrap.h>
Index: src/sys/arch/ia64/stand/efi/libefi/efifsdev.h
diff -u src/sys/arch/ia64/stand/efi/libefi/efifsdev.h:1.1 src/sys/arch/ia64/stand/efi/libefi/efifsdev.h:1.2
--- src/sys/arch/ia64/stand/efi/libefi/efifsdev.h:1.1 Fri Apr 7 14:21:32 2006
+++ src/sys/arch/ia64/stand/efi/libefi/efifsdev.h Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: efifsdev.h,v 1.1 2006/04/07 14:21:32 cherry Exp $ */
+/* $NetBSD: efifsdev.h,v 1.2 2012/12/27 20:21:51 martin Exp $ */
/*
* Copyright (c) 2005
@@ -36,4 +36,5 @@ int efifs_read(struct open_file *, void
int efifs_write(struct open_file *, void *, size_t, size_t *);
off_t efifs_seek(struct open_file *, off_t, int );
int efifs_stat(struct open_file *, struct stat *);
+int efifs_readdir(struct open_file *f, struct dirent *d);
Index: src/sys/arch/ia64/stand/efi/libefi/exec.c
diff -u src/sys/arch/ia64/stand/efi/libefi/exec.c:1.5 src/sys/arch/ia64/stand/efi/libefi/exec.c:1.6
--- src/sys/arch/ia64/stand/efi/libefi/exec.c:1.5 Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/efi/libefi/exec.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.5 2009/03/18 16:00:12 cegger Exp $ */
+/* $NetBSD: exec.c,v 1.6 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,6 +68,7 @@
#include <lib/libsa/stand.h>
#include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.h>
#include <sys/param.h>
#include <sys/lock.h>
@@ -80,6 +81,7 @@
#include <efi.h>
#include <efilib.h>
+#include <efiboot.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.7 src/sys/arch/ia64/stand/ia64/efi/main.c:1.8
--- src/sys/arch/ia64/stand/ia64/efi/main.c:1.7 Sat Jan 22 19:19:19 2011
+++ src/sys/arch/ia64/stand/ia64/efi/main.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.7 2011/01/22 19:19:19 joerg Exp $ */
+/* $NetBSD: main.c,v 1.8 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -32,7 +32,6 @@
#include <lib/libsa/stand.h>
#include <lib/libsa/loadfile.h>
-
#include <machine/sal.h>
#include <machine/pal.h>
#include <machine/pte.h>
@@ -40,6 +39,7 @@
#include <efi.h>
#include <efilib.h>
+#include <efifsdev.h>
#include "bootstrap.h"
#include "efiboot.h"
Index: src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c
diff -u src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.6 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.7
--- src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.6 Wed Nov 11 05:19:34 2009
+++ src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_stub.c,v 1.6 2009/11/11 05:19:34 kiyohara Exp $ */
+/* $NetBSD: acpi_stub.c,v 1.7 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 2003 Marcel Moolenaar
@@ -34,6 +34,9 @@
#include <sys/types.h>
#include <sys/lock.h>
+#include <lib/libkern/libkern.h>
+#include <lib/libsa/loadfile.h>
+#include <bootstrap.h>
#include <dev/acpi/acpica.h>
#define APIC_IO_SAPIC 6
@@ -186,6 +189,6 @@ acpi_stub_init(void)
cksum(&acpi_root, 20, &acpi_root.Checksum);
cksum(&acpi_root, sizeof(acpi_root), &acpi_root.ExtendedChecksum);
- xsdt.apic_tbl = (UINT32)&apic;
+ xsdt.apic_tbl = (UINT32)(uintptr_t)&apic;
cksum(&xsdt, sizeof(xsdt), &xsdt.Header.Checksum);
}
Index: src/sys/arch/ia64/stand/ia64/ski/bootinfo.c
diff -u src/sys/arch/ia64/stand/ia64/ski/bootinfo.c:1.3 src/sys/arch/ia64/stand/ia64/ski/bootinfo.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/bootinfo.c:1.3 Mon Jul 20 04:59:04 2009
+++ src/sys/arch/ia64/stand/ia64/ski/bootinfo.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
+/* $NetBSD: bootinfo.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -44,6 +44,7 @@
#include "bootstrap.h"
+#include "libski.h"
/*
* Return a 'boothowto' value corresponding to the kernel arguments in
Index: src/sys/arch/ia64/stand/ia64/ski/devicename.c
diff -u src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.3 src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.3 Mon Jul 20 04:59:04 2009
+++ src/sys/arch/ia64/stand/ia64/ski/devicename.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: devicename.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
+/* $NetBSD: devicename.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -31,6 +31,7 @@
#include <lib/libsa/stand.h>
#include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.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.3 src/sys/arch/ia64/stand/ia64/ski/efi_stub.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/efi_stub.c:1.3 Mon Jul 20 04:59:04 2009
+++ src/sys/arch/ia64/stand/ia64/ski/efi_stub.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_stub.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
+/* $NetBSD: efi_stub.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -41,8 +41,8 @@
#include "libski.h"
-extern void acpi_root;
-extern void sal_systab;
+extern char acpi_root[];
+extern char sal_systab[];
extern void acpi_stub_init(void);
extern void sal_stub_init(void);
Index: src/sys/arch/ia64/stand/ia64/ski/main.c
diff -u src/sys/arch/ia64/stand/ia64/ski/main.c:1.3 src/sys/arch/ia64/stand/ia64/ski/main.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/main.c:1.3 Sat Jan 22 19:19:19 2011
+++ src/sys/arch/ia64/stand/ia64/ski/main.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2011/01/22 19:19:19 joerg Exp $ */
+/* $NetBSD: main.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1998 Michael Smith <[email protected]>
@@ -39,6 +39,7 @@ static int command_quit(int argc, char *
extern char bootprog_name[];
extern char bootprog_rev[];
+int skifs_dev_init(void);
struct bootblk_command commands[] = {
COMMON_COMMANDS,
Index: src/sys/arch/ia64/stand/ia64/ski/sal_stub.c
diff -u src/sys/arch/ia64/stand/ia64/ski/sal_stub.c:1.3 src/sys/arch/ia64/stand/ia64/ski/sal_stub.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/sal_stub.c:1.3 Mon Jul 20 04:59:04 2009
+++ src/sys/arch/ia64/stand/ia64/ski/sal_stub.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sal_stub.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
+/* $NetBSD: sal_stub.c,v 1.4 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 2003 Marcel Moolenaar
@@ -38,6 +38,8 @@
#include "bootstrap.h"
#include "libski.h"
+void ski_cons_putchar(int c);
+
extern void PalProc(void);
static sal_entry_t SalProc;
Index: src/sys/arch/ia64/stand/ia64/ski/exec.c
diff -u src/sys/arch/ia64/stand/ia64/ski/exec.c:1.5 src/sys/arch/ia64/stand/ia64/ski/exec.c:1.6
--- src/sys/arch/ia64/stand/ia64/ski/exec.c:1.5 Wed Mar 18 16:00:12 2009
+++ src/sys/arch/ia64/stand/ia64/ski/exec.c Thu Dec 27 20:21:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.5 2009/03/18 16:00:12 cegger Exp $ */
+/* $NetBSD: exec.c,v 1.6 2012/12/27 20:21:51 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,6 +68,7 @@
#include <lib/libsa/stand.h>
#include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.h>
#include <sys/param.h>
#include <sys/lock.h>
@@ -159,7 +160,7 @@ elf64_exec(struct preloaded_file *fp)
*/
bi = &bootinfo;
memset(bi, 0, sizeof(struct bootinfo));
- bi_load(bi, fp);
+ bi_load(bi, fp, "");
/*
* Region 6 is direct mapped UC and region 7 is direct mapped
Index: src/sys/arch/ia64/stand/ia64/ski/libski.h
diff -u src/sys/arch/ia64/stand/ia64/ski/libski.h:1.2 src/sys/arch/ia64/stand/ia64/ski/libski.h:1.3
--- src/sys/arch/ia64/stand/ia64/ski/libski.h:1.2 Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/ia64/ski/libski.h Thu Dec 27 20:21:51 2012
@@ -74,7 +74,7 @@ extern int ski_boot(void);
struct bootinfo;
struct preloaded_file;
-extern int bi_load(struct bootinfo *, struct preloaded_file *);
+extern int bi_load(struct bootinfo *, struct preloaded_file *, char *args);
#define SSC_CONSOLE_INIT 20
#define SSC_GETCHAR 21
