[src/trunk]: src/sys/arch/alpha/stand Make the bootblocks build with warnings.

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

details:   https://anonhg.NetBSD.org/src/rev/f0b8f1f9af52
branches:  trunk
changeset: 539137:f0b8f1f9af52
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Nov 09 06:34:37 2002 +0000

description:
Make the bootblocks build with warnings.

diffstat:

 sys/arch/alpha/stand/Makefile.bootprogs |   5 +-
 sys/arch/alpha/stand/netboot/dev_net.c  |  15 +++++-
 sys/arch/alpha/stand/netboot/dev_net.h  |   6 +-
 sys/arch/alpha/stand/netboot/getsecs.c  |  11 ++++-
 sys/arch/alpha/stand/netboot/if_prom.c  |  74 +++++++++++---------------------
 5 files changed, 50 insertions(+), 61 deletions(-)

diffs (221 lines):

diff -r 03107804f814 -r f0b8f1f9af52 sys/arch/alpha/stand/Makefile.bootprogs
--- a/sys/arch/alpha/stand/Makefile.bootprogs   Sat Nov 09 06:22:22 2002 +0000
+++ b/sys/arch/alpha/stand/Makefile.bootprogs   Sat Nov 09 06:34:37 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.21 2002/01/05 01:22:21 thorpej Exp $
+# $NetBSD: Makefile.bootprogs,v 1.22 2002/11/09 06:34:37 thorpej Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -9,9 +9,6 @@
 
 STRIP?=        strip
 
-# XXX Can't do warnings yet.
-WARNS= 0
-
 CHECKSIZE_CMD= SIZE=${SIZE} sh ${.CURDIR}/../common/checksize.sh
 
 .PHONY: machine-links
diff -r 03107804f814 -r f0b8f1f9af52 sys/arch/alpha/stand/netboot/dev_net.c
--- a/sys/arch/alpha/stand/netboot/dev_net.c    Sat Nov 09 06:22:22 2002 +0000
+++ b/sys/arch/alpha/stand/netboot/dev_net.c    Sat Nov 09 06:34:37 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.10 1999/11/13 21:38:20 thorpej Exp $ */
+/* $NetBSD: dev_net.c,v 1.11 2002/11/09 06:34:38 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -192,13 +192,22 @@
 }
 
 int
-net_ioctl()
+net_ioctl(f, cmd, data)
+       struct open_file *f;
+       u_long cmd;
+       void *data;
 {
        return EIO;
 }
 
 int
-net_strategy()
+net_strategy(devdata, rw, blk, size, buf, rsize)
+       void *devdata;
+       int rw;
+       daddr_t blk;
+       size_t size;
+       void *buf;
+       size_t *rsize;
 {
        return EIO;
 }
diff -r 03107804f814 -r f0b8f1f9af52 sys/arch/alpha/stand/netboot/dev_net.h
--- a/sys/arch/alpha/stand/netboot/dev_net.h    Sat Nov 09 06:22:22 2002 +0000
+++ b/sys/arch/alpha/stand/netboot/dev_net.h    Sat Nov 09 06:34:37 2002 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: dev_net.h,v 1.2 1998/01/05 07:02:48 perry Exp $        */
+/*     $NetBSD: dev_net.h,v 1.3 2002/11/09 06:34:38 thorpej Exp $      */
 
 
 int    net_open __P((struct open_file *, ...));
 int    net_close __P((struct open_file *));
-int    net_ioctl();
-int    net_strategy();
+int    net_ioctl __P((struct open_file *, u_long, void *));
+int    net_strategy __P((void *, int , daddr_t , size_t, void *, size_t *));
 
diff -r 03107804f814 -r f0b8f1f9af52 sys/arch/alpha/stand/netboot/getsecs.c
--- a/sys/arch/alpha/stand/netboot/getsecs.c    Sat Nov 09 06:22:22 2002 +0000
+++ b/sys/arch/alpha/stand/netboot/getsecs.c    Sat Nov 09 06:34:37 2002 +0000
@@ -1,11 +1,18 @@
-/*     $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $        */
+/*     $NetBSD: getsecs.c,v 1.6 2002/11/09 06:34:38 thorpej Exp $      */
 
 #include <sys/param.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+  
+#include <lib/libsa/stand.h> 
+#include <lib/libsa/net.h>
+
 #include "include/prom.h"
 #include "include/rpb.h"
 
 int
-getsecs()
+getsecs(void)
 {
        static long tnsec;
        static long lastpcc, wrapsecs;
diff -r 03107804f814 -r f0b8f1f9af52 sys/arch/alpha/stand/netboot/if_prom.c
--- a/sys/arch/alpha/stand/netboot/if_prom.c    Sat Nov 09 06:22:22 2002 +0000
+++ b/sys/arch/alpha/stand/netboot/if_prom.c    Sat Nov 09 06:34:37 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_prom.c,v 1.16 2001/07/22 15:17:31 wiz Exp $ */
+/* $NetBSD: if_prom.c,v 1.17 2002/11/09 06:34:38 thorpej Exp $ */
 
 /*
  * Copyright (c) 1997 Christopher G. Demetriou.  All rights reserved.
@@ -47,13 +47,6 @@
 #include "stand/common/common.h"
 #include "stand/common/bbinfo.h"
 
-int prom_probe();
-int prom_match();
-void prom_init();
-int prom_get();
-int prom_put();
-void prom_end();
-
 extern struct netif_stats      prom_stats[];
 
 struct netif_dif prom_ifs[] = {
@@ -73,43 +66,24 @@
        0xfeedbeefdeadbabe,                     /* magic number */
 };
 
-struct netif_driver prom_netif_driver = {
-       "prom",                 /* netif_bname */
-       prom_match,             /* netif_match */
-       prom_probe,             /* netif_probe */
-       prom_init,              /* netif_init */
-       prom_get,               /* netif_get */
-       prom_put,               /* netif_put */
-       prom_end,               /* netif_end */
-       prom_ifs,               /* netif_ifs */
-       NENTS(prom_ifs)         /* netif_nifs */
-};
-
 int broken_firmware;
 
-int
-prom_match(nif, machdep_hint)
-       struct netif *nif;
-       void *machdep_hint;
+static int
+prom_match(struct netif *nif, void *machdep_hint)
 {
 
        return (1);
 }
 
-int
-prom_probe(nif, machdep_hint)
-       struct netif *nif;
-       void *machdep_hint;
+static int
+prom_probe(struct netif *nif, void *machdep_hint)
 {
 
        return 0;
 }
 
-int
-prom_put(desc, pkt, len)
-       struct iodesc *desc;
-       void *pkt;
-       int len;
+static int
+prom_put(struct iodesc *desc, void *pkt, size_t len)
 {
 
        prom_write(booted_dev_fd, len, pkt, 0);
@@ -117,13 +91,8 @@
        return len;
 }
 
-
-int
-prom_get(desc, pkt, len, timeout)
-       struct iodesc *desc;
-       void *pkt;
-       int len;
-       time_t timeout;
+static int
+prom_get(struct iodesc *desc, void *pkt, size_t len, time_t timeout)
 {
        prom_return_t ret;
        time_t t;
@@ -149,12 +118,8 @@
        return cc;
 }
 
-extern char *strchr();
-
-void
-prom_init(desc, machdep_hint)
-       struct iodesc *desc;
-       void *machdep_hint;
+static void
+prom_init(struct iodesc *desc, void *machdep_hint)
 {
        int i, netbbinfovalid;
        const char *enet_addr;
@@ -239,10 +204,21 @@
        halt();
 }
 
-void
-prom_end(nif)
-       struct netif *nif;
+static void
+prom_end(struct netif *nif)
 {
 
        /* nothing to do */
 }
+
+struct netif_driver prom_netif_driver = {
+       "prom",                 /* netif_bname */
+       prom_match,             /* netif_match */
+       prom_probe,             /* netif_probe */
+       prom_init,              /* netif_init */
+       prom_get,               /* netif_get */
+       prom_put,               /* netif_put */
+       prom_end,               /* netif_end */
+       prom_ifs,               /* netif_ifs */
+       NENTS(prom_ifs)         /* netif_nifs */
+};