Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sh3 ANSIfy KNF.
details: https://anonhg.NetBSD.org/src/rev/3599a0229fb8
branches: trunk
changeset: 522198:3599a0229fb8
user: uch <uch%NetBSD.org@localhost>
date: Tue Feb 12 15:26:45 2002 +0000
description:
ANSIfy KNF.
diffstat:
sys/arch/sh3/dev/pcic_shb.c | 21 +-
sys/arch/sh3/dev/pcic_shbsubr.c | 16 +-
sys/arch/sh3/dev/sci.c | 158 +++-----
sys/arch/sh3/dev/scif.c | 169 +++------
sys/arch/sh3/dev/shpcic.c | 149 ++-----
sys/arch/sh3/dev/shpcicvar.h | 73 +--
sys/arch/sh3/dev/wdog.c | 43 +-
sys/arch/sh3/include/bootinfo.h | 4 +-
sys/arch/sh3/include/bswap.h | 24 +-
sys/arch/sh3/include/bus.h | 623 ++++++++++++++--------------------
sys/arch/sh3/include/cpu.h | 44 +-
sys/arch/sh3/include/cpufunc.h | 5 +-
sys/arch/sh3/include/disklabel.h | 4 +-
sys/arch/sh3/include/intr.h | 19 +-
sys/arch/sh3/include/pmap.h | 49 +-
sys/arch/sh3/include/shbvar.h | 13 +-
sys/arch/sh3/include/wdogvar.h | 6 +-
sys/arch/sh3/sh3/clock.c | 25 +-
sys/arch/sh3/sh3/coff_exec.c | 198 ++++------
sys/arch/sh3/sh3/compat_13_machdep.c | 11 +-
sys/arch/sh3/sh3/db_disasm.c | 6 +-
sys/arch/sh3/sh3/db_interface.c | 29 +-
sys/arch/sh3/sh3/db_memrw.c | 16 +-
sys/arch/sh3/sh3/db_trace.c | 64 +-
sys/arch/sh3/sh3/disksubr.c | 147 +++----
sys/arch/sh3/sh3/dkbad.c | 14 +-
sys/arch/sh3/sh3/kgdb_machdep.c | 22 +-
sys/arch/sh3/sh3/mem.c | 22 +-
sys/arch/sh3/sh3/pmap.c | 524 ++++++++++++-----------------
sys/arch/sh3/sh3/process_machdep.c | 19 +-
sys/arch/sh3/sh3/sh3_machdep.c | 18 +-
sys/arch/sh3/sh3/sys_machdep.c | 7 +-
sys/arch/sh3/sh3/vm_machdep.c | 49 +-
33 files changed, 1043 insertions(+), 1548 deletions(-)
diffs (truncated from 5835 to 300 lines):
diff -r 989a6b2ae43a -r 3599a0229fb8 sys/arch/sh3/dev/pcic_shb.c
--- a/sys/arch/sh3/dev/pcic_shb.c Tue Feb 12 14:01:58 2002 +0000
+++ b/sys/arch/sh3/dev/pcic_shb.c Tue Feb 12 15:26:45 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcic_shb.c,v 1.4 2000/09/01 10:43:33 tsubai Exp $ */
+/* $NetBSD: pcic_shb.c,v 1.5 2002/02/12 15:26:45 uch Exp $ */
#define PCICSHBDEBUG
@@ -80,12 +80,12 @@
#define DPRINTF(arg)
#endif
-int pcic_shb_probe __P((struct device *, struct cfdata *, void *));
-void pcic_shb_attach __P((struct device *, struct device *, void *));
+int pcic_shb_probe(struct device *, struct cfdata *, void *);
+void pcic_shb_attach(struct device *, struct device *, void *);
-void *pcic_shb_chip_intr_establish __P((pcmcia_chipset_handle_t,
- struct pcmcia_function *, int, int (*) (void *), void *));
-void pcic_shb_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *));
+void *pcic_shb_chip_intr_establish(pcmcia_chipset_handle_t,
+ struct pcmcia_function *, int, int (*) (void *), void *);
+void pcic_shb_chip_intr_disestablish(pcmcia_chipset_handle_t, void *);
struct cfattach pcic_shb_ca = {
sizeof(struct shpcic_softc),
@@ -112,10 +112,7 @@
};
int
-pcic_shb_probe(parent, match, aux)
- struct device *parent;
- struct cfdata *match;
- void *aux;
+pcic_shb_probe(struct device *parent, struct cfdata *match, void *aux)
{
struct shb_attach_args *ia = aux;
#if 0
@@ -187,9 +184,7 @@
}
void
-pcic_shb_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+pcic_shb_attach(struct device *parent, struct device *self, void *aux)
{
struct shpcic_softc *sc = (void *) self;
struct shb_attach_args *ia = aux;
diff -r 989a6b2ae43a -r 3599a0229fb8 sys/arch/sh3/dev/pcic_shbsubr.c
--- a/sys/arch/sh3/dev/pcic_shbsubr.c Tue Feb 12 14:01:58 2002 +0000
+++ b/sys/arch/sh3/dev/pcic_shbsubr.c Tue Feb 12 15:26:45 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcic_shbsubr.c,v 1.3 2000/06/29 07:44:02 mrg Exp $ */
+/* $NetBSD: pcic_shbsubr.c,v 1.4 2002/02/12 15:26:45 uch Exp $ */
#define SHPCICSUBRDEBUG
@@ -115,12 +115,8 @@
#define DPRINTF(arg)
#endif
-void pcic_shb_bus_width_probe (sc, iot, ioh, base, length)
- struct shpcic_softc *sc;
- bus_space_tag_t iot;
- bus_space_handle_t ioh;
- bus_addr_t base;
- u_int32_t length;
+void pcic_shb_bus_width_probe (struct shpcic_softc *sc, bus_space_tag_t iot,
+ bus_space_handle_t ioh, bus_addr_t base, u_int32_t length)
{
#if 0
bus_space_handle_t ioh_high;
@@ -220,7 +216,7 @@
pcmcia_chipset_handle_t pch;
struct pcmcia_function *pf;
int ipl;
- int (*fct) __P((void *));
+ int (*fct)(void *);
void *arg;
{
struct shpcic_handle *h = (struct shpcic_handle *) pch;
@@ -265,9 +261,7 @@
}
void
-pcic_shb_chip_intr_disestablish(pch, ih)
- pcmcia_chipset_handle_t pch;
- void *ih;
+pcic_shb_chip_intr_disestablish(pcmcia_chipset_handle_t pch, void *ih)
{
struct shpcic_handle *h = (struct shpcic_handle *) pch;
diff -r 989a6b2ae43a -r 3599a0229fb8 sys/arch/sh3/dev/sci.c
--- a/sys/arch/sh3/dev/sci.c Tue Feb 12 14:01:58 2002 +0000
+++ b/sys/arch/sh3/dev/sci.c Tue Feb 12 15:26:45 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sci.c,v 1.17 2002/02/01 17:52:56 uch Exp $ */
+/* $NetBSD: sci.c,v 1.18 2002/02/12 15:26:46 uch Exp $ */
/*-
* Copyright (C) 1999 T.Horiuchi and SAITOH Masanobu. All rights reserved.
@@ -126,15 +126,15 @@
#include <machine/shbvar.h>
-static void scistart __P((struct tty *));
-static int sciparam __P((struct tty *, struct termios *));
+static void scistart(struct tty *);
+static int sciparam(struct tty *, struct termios *);
-void scicnprobe __P((struct consdev *));
-void scicninit __P((struct consdev *));
-void scicnputc __P((dev_t, int));
-int scicngetc __P((dev_t));
-void scicnpoolc __P((dev_t, int));
-int sciintr __P((void *));
+void scicnprobe(struct consdev *);
+void scicninit(struct consdev *);
+void scicnputc(dev_t, int);
+int scicngetc(dev_t);
+void scicnpoolc(dev_t, int);
+int sciintr(void *);
struct sci_softc {
struct device sc_dev; /* boilerplate */
@@ -189,27 +189,27 @@
};
/* controller driver configuration */
-static int sci_match __P((struct device *, struct cfdata *, void *));
-static void sci_attach __P((struct device *, struct device *, void *));
+static int sci_match(struct device *, struct cfdata *, void *);
+static void sci_attach(struct device *, struct device *, void *);
-void sci_break __P((struct sci_softc *, int));
-void sci_iflush __P((struct sci_softc *));
+void sci_break(struct sci_softc *, int);
+void sci_iflush(struct sci_softc *);
#define integrate static inline
#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
-void scisoft __P((void *));
+void scisoft(void *);
#else
#ifndef __NO_SOFT_SERIAL_INTERRUPT
-void scisoft __P((void));
+void scisoft(void);
#else
-void scisoft __P((void *));
+void scisoft(void *);
#endif
#endif
-integrate void sci_rxsoft __P((struct sci_softc *, struct tty *));
-integrate void sci_txsoft __P((struct sci_softc *, struct tty *));
-integrate void sci_stsoft __P((struct sci_softc *, struct tty *));
-integrate void sci_schedrx __P((struct sci_softc *));
-void scidiag __P((void *));
+integrate void sci_rxsoft(struct sci_softc *, struct tty *);
+integrate void sci_txsoft(struct sci_softc *, struct tty *);
+integrate void sci_stsoft(struct sci_softc *, struct tty *);
+integrate void sci_schedrx(struct sci_softc *);
+void scidiag(void *);
#define SCIUNIT_MASK 0x7ffff
#define SCIDIALOUT_MASK 0x80000
@@ -266,7 +266,7 @@
cdev_decl(sci);
-void InitializeSci __P((unsigned int));
+void InitializeSci (unsigned int);
/*
* following functions are debugging prupose only
@@ -275,18 +275,17 @@
#define I2C_ADRS (*(volatile unsigned int *)0xa8000000)
#define USART_ON (unsigned int)~0x08
-static void WaitFor __P((int));
-void sci_putc __P((unsigned char));
-unsigned char sci_getc __P((void));
-int SciErrCheck __P((void));
+static void WaitFor(int);
+void sci_putc(unsigned char);
+unsigned char sci_getc(void);
+int SciErrCheck(void);
/*
* WaitFor
* : int mSec;
*/
static void
-WaitFor(mSec)
- int mSec;
+WaitFor(int mSec)
{
/* Disable Under Flow interrupt, rising edge, 1/4 */
@@ -313,8 +312,7 @@
*/
void
-InitializeSci(bps)
- unsigned int bps;
+InitializeSci(unsigned int bps)
{
/* Initialize SCR */
@@ -349,8 +347,7 @@
* : unsigned char c;
*/
void
-sci_putc(c)
- unsigned char c;
+sci_putc(unsigned char c)
{
if (c == '\n')
@@ -411,10 +408,7 @@
static int
-sci_match(parent, cfp, aux)
- struct device *parent;
- struct cfdata *cfp;
- void *aux;
+sci_match(struct device *parent, struct cfdata *cfp, void *aux)
{
struct shb_attach_args *sa = aux;
@@ -427,9 +421,7 @@
}
static void
-sci_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+sci_attach(struct device *parent, struct device *self, void *aux)
{
struct sci_softc *sc = (struct sci_softc *)self;
struct tty *tp;
@@ -488,8 +480,7 @@
* Start or restart transmission.
*/
static void
-scistart(tp)
- struct tty *tp;
+scistart(struct tty *tp)
{
struct sci_softc *sc = sci_cd.cd_devs[SCIUNIT(tp->t_dev)];
int s;
@@ -549,9 +540,7 @@
* making sure all the changes could be done.
*/
static int
-sciparam(tp, t)
- struct tty *tp;
- struct termios *t;
+sciparam(struct tty *tp, struct termios *t)
{
struct sci_softc *sc = sci_cd.cd_devs[SCIUNIT(tp->t_dev)];
int ospeed = t->c_ospeed;
@@ -662,8 +651,7 @@
}
void
-sci_iflush(sc)
- struct sci_softc *sc;
+sci_iflush(struct sci_softc *sc)
{
unsigned char err_c;
volatile unsigned char c;
@@ -683,10 +671,7 @@
}
int
-sciopen(dev, flag, mode, p)
- dev_t dev;
- int flag, mode;
- struct proc *p;
+sciopen(dev_t dev, int flag, int mode, struct proc *p)
{
int unit = SCIUNIT(dev);
struct sci_softc *sc;
@@ -801,10 +786,7 @@
}
int
-sciclose(dev, flag, mode, p)
- dev_t dev;
- int flag, mode;
- struct proc *p;
+sciclose(dev_t dev, int flag, int mode, struct proc *p)
{
struct sci_softc *sc = sci_cd.cd_devs[SCIUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -823,10 +805,7 @@
}
Home |
Main Index |
Thread Index |
Old Index