[src/trunk]: src/sys/arch/ia64/stand Make it all compile

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

details:   https://anonhg.NetBSD.org/src/rev/f5aeb4cd3ad1
branches:  trunk
changeset: 783534:f5aeb4cd3ad1
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Dec 27 20:21:50 2012 +0000

description:
Make it all compile

diffstat:

 sys/arch/ia64/stand/common/bootstrap.h      |  11 ++++++++++-
 sys/arch/ia64/stand/common/fileload.c       |   8 +++++---
 sys/arch/ia64/stand/common/interp.c         |   3 ++-
 sys/arch/ia64/stand/common/misc.c           |   5 ++++-
 sys/arch/ia64/stand/common/readdir.c        |   5 ++++-
 sys/arch/ia64/stand/efi/libefi/bootinfo.c   |   4 +++-
 sys/arch/ia64/stand/efi/libefi/devicename.c |   3 ++-
 sys/arch/ia64/stand/efi/libefi/efi.c        |   3 ++-
 sys/arch/ia64/stand/efi/libefi/efifsdev.h   |   3 ++-
 sys/arch/ia64/stand/efi/libefi/exec.c       |   4 +++-
 sys/arch/ia64/stand/ia64/efi/main.c         |   4 ++--
 sys/arch/ia64/stand/ia64/ski/acpi_stub.c    |   7 +++++--
 sys/arch/ia64/stand/ia64/ski/bootinfo.c     |   3 ++-
 sys/arch/ia64/stand/ia64/ski/devicename.c   |   3 ++-
 sys/arch/ia64/stand/ia64/ski/efi_stub.c     |   6 +++---
 sys/arch/ia64/stand/ia64/ski/exec.c         |   5 +++--
 sys/arch/ia64/stand/ia64/ski/libski.h       |   2 +-
 sys/arch/ia64/stand/ia64/ski/main.c         |   3 ++-
 sys/arch/ia64/stand/ia64/ski/sal_stub.c     |   4 +++-
 19 files changed, 60 insertions(+), 26 deletions(-)

diffs (truncated from 414 to 300 lines):

diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/common/bootstrap.h
--- a/sys/arch/ia64/stand/common/bootstrap.h    Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/common/bootstrap.h    Thu Dec 27 20:21:50 2012 +0000
@@ -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 <msmith%freebsd.org@localhost>
@@ -57,6 +57,7 @@
 #define CMD_OK         0
 #define CMD_ERROR      1
 
+
 /* interp.c */
 void   interact(void);
 int    include(const char *filename);
@@ -124,6 +125,7 @@
 };
 extern struct console  *consoles[];
 void           cons_probe(void);
+int            ischar(void);
 
 /*
  * Plug-and-play enumerator/configurator interface.
@@ -211,6 +213,7 @@
 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 @@
 /* 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);
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/common/fileload.c
--- a/sys/arch/ia64/stand/common/fileload.c     Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/common/fileload.c     Thu Dec 27 20:21:50 2012 +0000
@@ -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 <msmith%freebsd.org@localhost>
@@ -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 @@
     
     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);
 }
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/common/interp.c
--- a/sys/arch/ia64/stand/common/interp.c       Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/common/interp.c       Thu Dec 27 20:21:50 2012 +0000
@@ -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 <msmith%freebsd.org@localhost>
@@ -37,6 +37,7 @@
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.h>
 
 #include "bootstrap.h"
 
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/common/misc.c
--- a/sys/arch/ia64/stand/common/misc.c Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/common/misc.c Thu Dec 27 20:21:50 2012 +0000
@@ -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 <msmith%freebsd.org@localhost>
@@ -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.
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/common/readdir.c
--- a/sys/arch/ia64/stand/common/readdir.c      Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/common/readdir.c      Thu Dec 27 20:21:50 2012 +0000
@@ -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 <jlemon%freebsd.org@localhost>
@@ -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)
 {
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/efi/libefi/bootinfo.c
--- a/sys/arch/ia64/stand/efi/libefi/bootinfo.c Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/efi/libefi/bootinfo.c Thu Dec 27 20:21:50 2012 +0000
@@ -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 <msmith%freebsd.org@localhost>
@@ -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" 
 
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/efi/libefi/devicename.c
--- a/sys/arch/ia64/stand/efi/libefi/devicename.c       Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/efi/libefi/devicename.c       Thu Dec 27 20:21:50 2012 +0000
@@ -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 <msmith%freebsd.org@localhost>
@@ -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>
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/efi/libefi/efi.c
--- a/sys/arch/ia64/stand/efi/libefi/efi.c      Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/efi/libefi/efi.c      Thu Dec 27 20:21:50 2012 +0000
@@ -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;
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/efi/libefi/efifsdev.h
--- a/sys/arch/ia64/stand/efi/libefi/efifsdev.h Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/efi/libefi/efifsdev.h Thu Dec 27 20:21:50 2012 +0000
@@ -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_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);
 
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/efi/libefi/exec.c
--- a/sys/arch/ia64/stand/efi/libefi/exec.c     Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/efi/libefi/exec.c     Thu Dec 27 20:21:50 2012 +0000
@@ -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"
 
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/ia64/efi/main.c
--- a/sys/arch/ia64/stand/ia64/efi/main.c       Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/ia64/efi/main.c       Thu Dec 27 20:21:50 2012 +0000
@@ -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 <msmith%freebsd.org@localhost>
@@ -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"
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/ia64/ski/acpi_stub.c
--- a/sys/arch/ia64/stand/ia64/ski/acpi_stub.c  Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/ia64/ski/acpi_stub.c  Thu Dec 27 20:21:50 2012 +0000
@@ -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 @@
        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);
 }
diff -r 49345db306b7 -r f5aeb4cd3ad1 sys/arch/ia64/stand/ia64/ski/bootinfo.c
--- a/sys/arch/ia64/stand/ia64/ski/bootinfo.c   Thu Dec 27 16:42:32 2012 +0000
+++ b/sys/arch/ia64/stand/ia64/ski/bootinfo.c   Thu Dec 27 20:21:50 2012 +0000
@@ -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 <msmith%freebsd.org@localhost>
@@ -44,6 +44,7 @@
 
 
 #include "bootstrap.h"