- ANSI function decls (func() -> func(void))
- u_intNN_t -> uintNN_t - some KNF
This commit is contained in:
tsutsui
parent
eff817e362
commit
63478f4368
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: autoconf.c,v 1.5 2003/07/15 01:31:40 lukem Exp $ */
|
||||
/* $NetBSD: autoconf.c,v 1.6 2005/02/19 15:42:33 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
@ -34,7 +34,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2003/07/15 01:31:40 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2005/02/19 15:42:33 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2003/07/15 01:31:40 lukem Exp $");
|
||||
#include <sys/conf.h>
|
||||
|
||||
void
|
||||
cpu_configure()
|
||||
cpu_configure(void)
|
||||
{
|
||||
/* Start configuration */
|
||||
splhigh();
|
||||
@ -56,7 +56,7 @@ cpu_configure()
|
||||
}
|
||||
|
||||
void
|
||||
cpu_rootconf()
|
||||
cpu_rootconf(void)
|
||||
{
|
||||
|
||||
/* No boot information */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: clock_machdep.c,v 1.3 2003/08/07 23:14:13 marcus Exp $ */
|
||||
/* $NetBSD: clock_machdep.c,v 1.4 2005/02/19 15:42:33 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
@ -34,7 +34,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: clock_machdep.c,v 1.3 2003/08/07 23:14:13 marcus Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: clock_machdep.c,v 1.4 2005/02/19 15:42:33 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -56,8 +56,8 @@ STATIC void dreamcast_rtc_init(void *);
|
||||
STATIC void dreamcast_rtc_get(void *, time_t, struct clock_ymdhms *);
|
||||
STATIC void dreamcast_rtc_set(void *, struct clock_ymdhms *);
|
||||
|
||||
STATIC u_int32_t dreamcast_read_rtc(void);
|
||||
STATIC void dreamcast_write_rtc(u_int32_t);
|
||||
STATIC uint32_t dreamcast_read_rtc(void);
|
||||
STATIC void dreamcast_write_rtc(uint32_t);
|
||||
|
||||
STATIC struct rtc_ops dreamcast_rtc_ops = {
|
||||
.init = dreamcast_rtc_init,
|
||||
@ -69,7 +69,7 @@ static bus_space_tag_t rtc_tag;
|
||||
static bus_space_handle_t rtc_handle;
|
||||
|
||||
void
|
||||
machine_clock_init()
|
||||
machine_clock_init(void)
|
||||
{
|
||||
|
||||
sh_clock_init(SH_CLOCK_NORTC, &dreamcast_rtc_ops);
|
||||
@ -108,10 +108,10 @@ dreamcast_rtc_set(void *cookie, struct clock_ymdhms *dt)
|
||||
dreamcast_write_rtc(clock_ymdhms_to_secs(dt));
|
||||
}
|
||||
|
||||
u_int32_t
|
||||
dreamcast_read_rtc()
|
||||
uint32_t
|
||||
dreamcast_read_rtc(void)
|
||||
{
|
||||
u_int32_t new, old;
|
||||
uint32_t new, old;
|
||||
int i;
|
||||
|
||||
for (old = 0;;) {
|
||||
@ -130,13 +130,13 @@ dreamcast_read_rtc()
|
||||
}
|
||||
|
||||
/* offset 20 years */
|
||||
return (new - 631152000);
|
||||
return new - 631152000;
|
||||
}
|
||||
|
||||
void
|
||||
dreamcast_write_rtc(u_int32_t secs)
|
||||
dreamcast_write_rtc(uint32_t secs)
|
||||
{
|
||||
u_int32_t new;
|
||||
uint32_t new;
|
||||
int i, retry;
|
||||
|
||||
/* offset 20 years */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kloader_machdep.c,v 1.1 2004/07/06 13:09:18 uch Exp $ */
|
||||
/* $NetBSD: kloader_machdep.c,v 1.2 2005/02/19 15:42:33 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
|
||||
@ -34,7 +34,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.1 2004/07/06 13:09:18 uch Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.2 2005/02/19 15:42:33 tsutsui Exp $");
|
||||
|
||||
#include "debug_kloader.h"
|
||||
|
||||
@ -97,9 +97,9 @@ kloader_dreamcast_boot(struct kloader_bootinfo *kbi, struct kloader_page_tag *p)
|
||||
SH4_TLB_DISABLE;
|
||||
|
||||
do {
|
||||
u_int32_t *dst =(u_int32_t *)p->dst;
|
||||
u_int32_t *src =(u_int32_t *)p->src;
|
||||
u_int32_t sz = p->sz / sizeof (int);
|
||||
uint32_t *dst =(uint32_t *)p->dst;
|
||||
uint32_t *src =(uint32_t *)p->src;
|
||||
uint32_t sz = p->sz / sizeof (int);
|
||||
while (sz--)
|
||||
*dst++ = *src++;
|
||||
} while ((p = (struct kloader_page_tag *)p->next) != 0);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: machdep.c,v 1.29 2004/07/06 13:09:18 uch Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.30 2005/02/19 15:42:33 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
|
||||
@ -72,7 +72,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2004/07/06 13:09:18 uch Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2005/02/19 15:42:33 tsutsui Exp $");
|
||||
|
||||
#include "opt_ddb.h"
|
||||
#include "opt_kgdb.h"
|
||||
@ -116,7 +116,7 @@ void main(void) __attribute__((__noreturn__));
|
||||
void dreamcast_startup(void) __attribute__((__noreturn__));
|
||||
|
||||
void
|
||||
dreamcast_startup()
|
||||
dreamcast_startup(void)
|
||||
{
|
||||
extern char edata[], end[];
|
||||
paddr_t kernend;
|
||||
@ -166,7 +166,7 @@ dreamcast_startup()
|
||||
}
|
||||
|
||||
void
|
||||
consinit()
|
||||
consinit(void)
|
||||
{
|
||||
static int initted;
|
||||
|
||||
@ -178,7 +178,7 @@ consinit()
|
||||
}
|
||||
|
||||
void
|
||||
cpu_startup()
|
||||
cpu_startup(void)
|
||||
{
|
||||
|
||||
strcpy(cpu_model, "SEGA Dreamcast\n");
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: mainbus.c,v 1.6 2003/07/15 01:31:41 lukem Exp $ */
|
||||
/* $NetBSD: mainbus.c,v 1.7 2005/02/19 15:42:33 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
@ -34,7 +34,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2003/07/15 01:31:41 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7 2005/02/19 15:42:33 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -58,7 +58,7 @@ int
|
||||
mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
|
||||
{
|
||||
|
||||
return (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
void
|
||||
@ -76,5 +76,5 @@ int
|
||||
mainbus_print(void *aux, const char *pnp)
|
||||
{
|
||||
|
||||
return (pnp ? QUIET : UNCONF);
|
||||
return pnp ? QUIET : UNCONF;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: sysasic.c,v 1.8 2004/06/14 12:47:36 itohy Exp $ */
|
||||
/* $NetBSD: sysasic.c,v 1.9 2005/02/19 15:42:33 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
|
||||
@ -34,7 +34,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: sysasic.c,v 1.8 2004/06/14 12:47:36 itohy Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: sysasic.c,v 1.9 2005/02/19 15:42:33 tsutsui Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -216,7 +216,7 @@ sysasic_intr_enable(void *arg, int on)
|
||||
struct syh_eventhand *hnd = arg;
|
||||
struct sysasic_intrhand *syh;
|
||||
int event;
|
||||
__volatile u_int32_t *masks, *stats;
|
||||
__volatile uint32_t *masks, *stats;
|
||||
int evmap;
|
||||
unsigned evbit;
|
||||
|
||||
@ -231,8 +231,8 @@ sysasic_intr_enable(void *arg, int on)
|
||||
event, SYSASIC_IRQ_INDEX_TO_IRQ(syh->syh_idx));
|
||||
#endif
|
||||
|
||||
masks = (__volatile u_int32_t *) SYSASIC_INTR_EN(syh->syh_idx);
|
||||
stats = (__volatile u_int32_t *) SYSASIC_INTR_ST;
|
||||
masks = (__volatile uint32_t *) SYSASIC_INTR_EN(syh->syh_idx);
|
||||
stats = (__volatile uint32_t *) SYSASIC_INTR_ST;
|
||||
evmap = SYSASIC_EVENT_INTR_MAP(event);
|
||||
evbit = SYSASIC_EVENT_INTR_BIT(event);
|
||||
|
||||
@ -263,8 +263,8 @@ sysasic_intr(void *arg)
|
||||
struct sysasic_intrhand *syh = arg;
|
||||
unsigned ev;
|
||||
int n, pos;
|
||||
u_int32_t *evwatched;
|
||||
__volatile u_int32_t *evmap;
|
||||
uint32_t *evwatched;
|
||||
__volatile uint32_t *evmap;
|
||||
struct syh_eventhand *evh;
|
||||
#ifdef DEBUG
|
||||
int handled = 0;
|
||||
@ -275,7 +275,7 @@ sysasic_intr(void *arg)
|
||||
evwatched = syh->syh_events;
|
||||
|
||||
/* status / clear */
|
||||
evmap = (__volatile u_int32_t *) SYSASIC_INTR_ST;
|
||||
evmap = (__volatile uint32_t *) SYSASIC_INTR_ST;
|
||||
|
||||
for (n = 0; n < (SYSASIC_EVENT_NMAP << 5); n |= 31, n++, evmap++) {
|
||||
if ((ev = *evwatched++) && (ev &= *evmap)) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user