[src/trunk]: src/sys/arch/shark add missing protos.

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

details:   https://anonhg.NetBSD.org/src/rev/21962085d600
branches:  trunk
changeset: 537769:21962085d600
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Oct 05 17:01:49 2002 +0000

description:
add missing protos.

diffstat:

 sys/arch/shark/isa/clock.c                 |  33 +++++++++++++----------------
 sys/arch/shark/isa/isa_irqhandler.c        |   8 +++---
 sys/arch/shark/isa/isa_shark_machdep.c     |   6 +++-
 sys/arch/shark/ofw/com_ofisa_consolehack.c |   5 +++-
 sys/arch/shark/ofw/oftodclock.c            |   5 +++-
 sys/arch/shark/ofw/ofw.c                   |  11 +++++----
 6 files changed, 37 insertions(+), 31 deletions(-)

diffs (204 lines):

diff -r be31481b16b0 -r 21962085d600 sys/arch/shark/isa/clock.c
--- a/sys/arch/shark/isa/clock.c        Sat Oct 05 17:01:10 2002 +0000
+++ b/sys/arch/shark/isa/clock.c        Sat Oct 05 17:01:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.2 2002/09/27 15:36:42 provos Exp $ */
+/*     $NetBSD: clock.c,v 1.3 2002/10/05 17:01:49 chs Exp $    */
 
 /*
  * Copyright 1997
@@ -138,24 +138,23 @@
 #include <dev/ic/i8253reg.h>
 #include <shark/isa/nvram.h>
 #include <shark/isa/spkrreg.h>
+#include <shark/shark/hat.h>
 
-#ifdef SHARK
-#include <shark/shark/hat.h>
-#endif
-
-void   sysbeepstop __P((void *));
-void   sysbeep __P((int, int));
-void   rtcinit __P((void));
+void   sysbeepstop(void *);
+void   sysbeep(int, int);
+void   rtcinit(void);
 int     timer_hz_to_count(int);
 
-static void findcpuspeed __P((void));
-static void init_isa_timer_tables();
+static void findcpuspeed(void);
+static void init_isa_timer_tables(void);
 static void delayloop(int);
-static int  clockintr __P((void *));
-static int  gettick __P((void));
+static int  clockintr(void *);
+static int  gettick(void);
 
-__inline u_int mc146818_read __P((void *, u_int));
-__inline void mc146818_write __P((void *, u_int, u_int));
+void startrtclock(void);
+
+__inline u_int mc146818_read(void *, u_int);
+__inline void mc146818_write(void *, u_int, u_int);
 
 #define        SECMIN  ((unsigned)60)                  /* seconds per minute */
 #define        SECHOUR ((unsigned)(60*SECMIN))         /* seconds per hour */
@@ -311,6 +310,8 @@
 
 }
 
+void gettimer0count(struct count64 *);
+
 /* must be called at SPL_CLOCK or higher */
 void gettimer0count(pcount)
        struct count64 *pcount;
@@ -348,21 +349,17 @@
 #ifdef TESTHAT
        static int ticks = 0;
 #endif
-#ifdef SHARK
        static int hatUnwedgeCtr = 0;
-#endif
 
        gettimer0count(&timer0_at_last_clockintr);
 
        mc146818_read(NULL, MC_REGC); /* clear the clock interrupt */
 
-#ifdef SHARK
        /* check to see if the high-availability timer needs to be unwedged */
        if (++hatUnwedgeCtr >= (hz / HAT_MIN_FREQ)) {
          hatUnwedgeCtr = 0;
          hatUnwedge(); 
        }
-#endif
 
 #ifdef TESTHAT
        ++ticks;
diff -r be31481b16b0 -r 21962085d600 sys/arch/shark/isa/isa_irqhandler.c
--- a/sys/arch/shark/isa/isa_irqhandler.c       Sat Oct 05 17:01:10 2002 +0000
+++ b/sys/arch/shark/isa/isa_irqhandler.c       Sat Oct 05 17:01:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_irqhandler.c,v 1.3 2002/09/27 15:36:43 provos Exp $        */
+/*     $NetBSD: isa_irqhandler.c,v 1.4 2002/10/05 17:01:49 chs Exp $   */
 
 /*
  * Copyright 1997
@@ -102,9 +102,9 @@
 
 /* Prototypes */
 
-extern void set_spl_masks      __P((void));
-
-void irq_calculatemasks __P((void));
+extern void set_spl_masks(void);
+void irq_calculatemasks(void);
+void stray_irqhandler(u_int);
 
 #define WriteWord(a, b) *((volatile unsigned int *)(a)) = (b)
 
diff -r be31481b16b0 -r 21962085d600 sys/arch/shark/isa/isa_shark_machdep.c
--- a/sys/arch/shark/isa/isa_shark_machdep.c    Sat Oct 05 17:01:10 2002 +0000
+++ b/sys/arch/shark/isa/isa_shark_machdep.c    Sat Oct 05 17:01:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_shark_machdep.c,v 1.2 2002/09/25 17:05:26 cgd Exp $        */
+/*     $NetBSD: isa_shark_machdep.c,v 1.3 2002/10/05 17:01:49 chs Exp $        */
 
 /*
  * Copyright 1997
@@ -54,6 +54,8 @@
 
 unsigned i8259_mask;
 
+void isa_init8259s(void);
+
 /* Notes on the interaction of StrongARM and ISA.  A lot of the nastiness
    is caused by consciously prostituting shark to a low bill of materials.
    
@@ -112,7 +114,7 @@
  * Initialize the interrupt controllers.
  */
 void
-isa_init8259s()
+isa_init8259s(void)
 {
   /* initialize 8259's */
   outb(IO_ICU1, 0x19);            /* reset; four bytes, level triggered */
diff -r be31481b16b0 -r 21962085d600 sys/arch/shark/ofw/com_ofisa_consolehack.c
--- a/sys/arch/shark/ofw/com_ofisa_consolehack.c        Sat Oct 05 17:01:10 2002 +0000
+++ b/sys/arch/shark/ofw/com_ofisa_consolehack.c        Sat Oct 05 17:01:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_ofisa_consolehack.c,v 1.1 2002/02/10 01:57:56 thorpej Exp $        */
+/*     $NetBSD: com_ofisa_consolehack.c,v 1.2 2002/10/05 17:01:50 chs Exp $    */
 
 /*
  * Copyright 1997
@@ -54,6 +54,9 @@
 
 #include <dev/cons.h>
 
+void comcnprobe(struct consdev *);
+void comcninit(struct consdev *);
+
 void
 comcnprobe(cp)
         struct consdev *cp;
diff -r be31481b16b0 -r 21962085d600 sys/arch/shark/ofw/oftodclock.c
--- a/sys/arch/shark/ofw/oftodclock.c   Sat Oct 05 17:01:10 2002 +0000
+++ b/sys/arch/shark/ofw/oftodclock.c   Sat Oct 05 17:01:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: oftodclock.c,v 1.1 2002/02/10 01:57:59 thorpej Exp $   */
+/*     $NetBSD: oftodclock.c,v 1.2 2002/10/05 17:01:50 chs Exp $       */
 
 /*
  * Copyright 1997
@@ -84,6 +84,9 @@
 #define        SECDAY  ((unsigned)(24*SECHOUR))        /* seconds per day */
 #define        SECYR   ((unsigned)(365*SECDAY))        /* seconds per common year */
 
+static int yeartoday(int);
+static void setthetime(time_t, int);
+
 static int
 yeartoday(year)
        int year;
diff -r be31481b16b0 -r 21962085d600 sys/arch/shark/ofw/ofw.c
--- a/sys/arch/shark/ofw/ofw.c  Sat Oct 05 17:01:10 2002 +0000
+++ b/sys/arch/shark/ofw/ofw.c  Sat Oct 05 17:01:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofw.c,v 1.20 2002/08/24 02:16:35 thorpej Exp $ */
+/*     $NetBSD: ofw.c,v 1.21 2002/10/05 17:01:50 chs Exp $     */
 
 /*
  * Copyright 1997
@@ -208,7 +208,7 @@
 static ofw_handle_t ofw_client_services_handle;
 
 
-static void ofw_callbackhandler __P((struct ofw_cbargs *));
+static void ofw_callbackhandler __P((void *));
 static void ofw_construct_proc0_addrspace __P((pv_addr_t *, pv_addr_t *));
 static void ofw_getphysmeminfo __P((void));
 static void ofw_getvirttranslations __P((void));
@@ -777,7 +777,7 @@
        /* First initialize our callback memory allocator. */
        ofw_initallocator();
 
-       OF_set_callback((void(*)())ofw_callbackhandler);
+       OF_set_callback(ofw_callbackhandler);
 
        /* Switch to the proc0 pagetables. */
        setttb(proc0_ttbbase.pv_pa);
@@ -958,9 +958,10 @@
 
 /* N.B.  Not supposed to call printf in callback-handler!  Could deadlock! */
 static void
-ofw_callbackhandler(args)
-       struct ofw_cbargs *args;
+ofw_callbackhandler(v)
+       void *v;
 {
+       struct ofw_cbargs *args = v;
        char *name = args->name;
        int nargs = args->nargs;
        int nreturns = args->nreturns;