Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys add missing protos.
details: https://anonhg.NetBSD.org/src/rev/4c96f78990d1
branches: trunk
changeset: 537771:4c96f78990d1
user: chs <chs%NetBSD.org@localhost>
date: Sat Oct 05 17:01:51 2002 +0000
description:
add missing protos.
diffstat:
sys/arch/arm/ofw/openfirm.c | 10 ++--
sys/arch/shark/shark/hat.c | 73 ++++++++++++++++++++---------------
sys/arch/shark/shark/hat.h | 4 +-
sys/arch/shark/shark/ns87307reg.h | 13 ++---
sys/arch/shark/shark/pccons.c | 7 ++-
sys/arch/shark/shark/shark_machdep.c | 4 +-
sys/dev/ofw/openfirm.h | 5 +-
7 files changed, 65 insertions(+), 51 deletions(-)
diffs (265 lines):
diff -r 6482f5b67d94 -r 4c96f78990d1 sys/arch/arm/ofw/openfirm.c
--- a/sys/arch/arm/ofw/openfirm.c Sat Oct 05 17:01:50 2002 +0000
+++ b/sys/arch/arm/ofw/openfirm.c Sat Oct 05 17:01:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirm.c,v 1.1 2002/02/06 21:30:27 thorpej Exp $ */
+/* $NetBSD: openfirm.c,v 1.2 2002/10/05 17:01:51 chs Exp $ */
/*
* Copyright 1997
@@ -704,15 +704,15 @@
}
void
-(*OF_set_callback(newfunc))()
- void (*newfunc)();
+(*OF_set_callback(newfunc))(void *)
+ void (*newfunc)(void *);
{
static struct {
char *name;
int nargs;
int nreturns;
- void (*newfunc)();
- void (*oldfunc)();
+ void (*newfunc)(void *);
+ void (*oldfunc)(void *);
} args = {
"set-callback",
1,
diff -r 6482f5b67d94 -r 4c96f78990d1 sys/arch/shark/shark/hat.c
--- a/sys/arch/shark/shark/hat.c Sat Oct 05 17:01:50 2002 +0000
+++ b/sys/arch/shark/shark/hat.c Sat Oct 05 17:01:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hat.c,v 1.1 2002/02/10 01:58:03 thorpej Exp $ */
+/* $NetBSD: hat.c,v 1.2 2002/10/05 17:01:51 chs Exp $ */
/*
* Copyright 1997
@@ -60,19 +60,21 @@
#include <shark/shark/shark_fiq.h>
#include <shark/shark/sequoia.h>
+#include <shark/shark/hat.h>
static int hatOn = 0;
/* interface to high-availability timer */
-static void hatClkCount(int count);
-static void hatEnableSWTCH();
+static void hatClkCount(int);
+static void hatEnableSWTCH(void);
static void (*hatWedgeFn)(int);
extern struct fiqregs shark_fiqregs;
-int hatClkOff(void)
+int
+hatClkOff(void)
{
u_int16_t seqReg;
@@ -101,13 +103,14 @@
return 0;
}
-
-int hatClkOn(int count, void (*hatFn)(int), int arg,
- unsigned char *stack, void (*wedgeFn)(int))
+int
+hatClkOn(int count, void (*hatFn)(int), int arg,
+ unsigned char *stack, void (*wedgeFn)(int))
{
u_int16_t seqReg;
- if (hatOn) return -1;
+ if (hatOn)
+ return -1;
hatWedgeFn = wedgeFn;
@@ -144,9 +147,11 @@
}
-int hatClkAdjust(int count)
+int
+hatClkAdjust(int count)
{
- if (!hatOn) return -1;
+ if (!hatOn)
+ return -1;
hatClkCount(count);
hatEnableSWTCH();
@@ -155,37 +160,41 @@
}
static void
-hatEnableSWTCH()
+hatEnableSWTCH(void)
{
- u_int16_t seqReg;
+ u_int16_t seqReg;
- /* SWTCH input causes PMI, not automatic switch to standby mode! */
- /* clearing bit 9 is bad news. seems to enable PMI from secondary
- activity timeout! */
- /* first setting, then clearing this bit seems to unwedge the edge
- detect logic in the sequoia */
+ /* SWTCH input causes PMI, not automatic switch to standby mode! */
+ /* clearing bit 9 is bad news. seems to enable PMI from secondary
+ activity timeout! */
+ /* first setting, then clearing this bit seems to unwedge the edge
+ detect logic in the sequoia */
- sequoiaRead(PMC_PMIMCR_REG, &seqReg);
- sequoiaWrite(PMC_PMIMCR_REG, seqReg | (PMIMCR_M_IMSKSWSTBY));
- sequoiaWrite(PMC_PMIMCR_REG, seqReg & ~(PMIMCR_M_IMSKSWSTBY));
+ sequoiaRead(PMC_PMIMCR_REG, &seqReg);
+ sequoiaWrite(PMC_PMIMCR_REG, seqReg | (PMIMCR_M_IMSKSWSTBY));
+ sequoiaWrite(PMC_PMIMCR_REG, seqReg & ~(PMIMCR_M_IMSKSWSTBY));
}
-void hatUnwedge()
+void
+hatUnwedge(void)
{
- static int lastFiqsHappened = -1;
- extern int fiqs_happened;
-
- if (!hatOn) return;
+ static int lastFiqsHappened = -1;
+ extern int fiqs_happened;
- if (lastFiqsHappened == fiqs_happened) {
- hatEnableSWTCH();
- if (hatWedgeFn) (*hatWedgeFn)(fiqs_happened);
- } else {
- lastFiqsHappened = fiqs_happened;
- }
+ if (!hatOn)
+ return;
+
+ if (lastFiqsHappened == fiqs_happened) {
+ hatEnableSWTCH();
+ if (hatWedgeFn)
+ (*hatWedgeFn)(fiqs_happened);
+ } else {
+ lastFiqsHappened = fiqs_happened;
+ }
}
-static void hatClkCount(int count)
+static void
+hatClkCount(int count)
{
u_int savedints;
diff -r 6482f5b67d94 -r 4c96f78990d1 sys/arch/shark/shark/hat.h
--- a/sys/arch/shark/shark/hat.h Sat Oct 05 17:01:50 2002 +0000
+++ b/sys/arch/shark/shark/hat.h Sat Oct 05 17:01:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hat.h,v 1.1 2002/02/10 01:58:03 thorpej Exp $ */
+/* $NetBSD: hat.h,v 1.2 2002/10/05 17:01:51 chs Exp $ */
/*
* Copyright 1997
@@ -83,7 +83,7 @@
/* hatUnwedge: call this function periodically (slower than the frequency
of the HAT) to unwedge the HAT, if necessary.
*/
-void hatUnwedge();
+void hatUnwedge(void);
/* HAT_MIN_FREQ: should be a power of 2. Call hatUnwedge() no more
often than HAT_MIN_FREQ. HMF should be a power of 2.
diff -r 6482f5b67d94 -r 4c96f78990d1 sys/arch/shark/shark/ns87307reg.h
--- a/sys/arch/shark/shark/ns87307reg.h Sat Oct 05 17:01:50 2002 +0000
+++ b/sys/arch/shark/shark/ns87307reg.h Sat Oct 05 17:01:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ns87307reg.h,v 1.1 2002/02/10 01:58:06 thorpej Exp $ */
+/* $NetBSD: ns87307reg.h,v 1.2 2002/10/05 17:01:51 chs Exp $ */
/*
* Copyright 1997
@@ -383,13 +383,10 @@
/* Functions to help configure the ns87307 logical devices.
*/
-int i87307KbdConfig __P((bus_space_tag_t iot,
- u_int comBase,
- u_int irqNum ));
-int i87307MouseConfig __P((bus_space_tag_t iot,
- u_int irqNum ));
+int i87307KbdConfig(bus_space_tag_t, u_int, u_int);
+int i87307MouseConfig(bus_space_tag_t, u_int);
+int i87307PrinterConfig(bus_space_tag_t, u_int);
-
-void nsioConfigPrint(bus_space_tag_t nsioIot, bus_space_handle_t nsioIoh );
+void nsioConfigPrint(bus_space_tag_t, bus_space_handle_t);
#endif /* _NS87307REG_H */
diff -r 6482f5b67d94 -r 4c96f78990d1 sys/arch/shark/shark/pccons.c
--- a/sys/arch/shark/shark/pccons.c Sat Oct 05 17:01:50 2002 +0000
+++ b/sys/arch/shark/shark/pccons.c Sat Oct 05 17:01:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.11 2002/10/02 15:52:40 thorpej Exp $ */
+/* $NetBSD: pccons.c,v 1.12 2002/10/05 17:01:51 chs Exp $ */
/*
* Copyright 1997
@@ -297,8 +297,13 @@
int pccngetc __P((dev_t));
void pccnpollc __P((dev_t, int));
+char *xinterpret(struct pc_softc *, u_char);
+
#ifdef SHARK
static void force_vga_mode __P((void));
+int get_shark_screen_ihandle(void);
+void shark_screen_cleanup(int);
+
/*
** Definitions needed by getDisplayInfo
*/
diff -r 6482f5b67d94 -r 4c96f78990d1 sys/arch/shark/shark/shark_machdep.c
--- a/sys/arch/shark/shark/shark_machdep.c Sat Oct 05 17:01:50 2002 +0000
+++ b/sys/arch/shark/shark/shark_machdep.c Sat Oct 05 17:01:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: shark_machdep.c,v 1.9 2002/10/02 15:52:41 thorpej Exp $ */
+/* $NetBSD: shark_machdep.c,v 1.10 2002/10/05 17:01:51 chs Exp $ */
/*
* Copyright 1997
@@ -148,7 +148,7 @@
/* Local routines */
static void process_kernel_args __P((void));
-
+void ofw_device_register(struct device *, void *);
/**************************************************************/
diff -r 6482f5b67d94 -r 4c96f78990d1 sys/dev/ofw/openfirm.h
--- a/sys/dev/ofw/openfirm.h Sat Oct 05 17:01:50 2002 +0000
+++ b/sys/dev/ofw/openfirm.h Sat Oct 05 17:01:51 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirm.h,v 1.18 2002/09/18 01:44:13 chs Exp $ */
+/* $NetBSD: openfirm.h,v 1.19 2002/10/05 17:01:52 chs Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -96,6 +96,9 @@
int OF_read(int, void *, int);
int OF_write(int, void *, int);
int OF_seek(int, u_quad_t);
+void *OF_claim(void *, u_int, u_int);
+void OF_release(void *, u_int);
+int OF_milliseconds(void);
void OF_boot(char *) __attribute__((__noreturn__));
void OF_enter(void);
void OF_exit(void) __attribute__((__noreturn__));
Home |
Main Index |
Thread Index |
Old Index