Module Name: src
Committed By: tsutsui
Date: Sun Jun 12 13:40:14 UTC 2011
Modified Files:
src/sys/arch/emips/emips: promcall.c
Log Message:
Some KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/emips/promcall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/emips/emips/promcall.c
diff -u src/sys/arch/emips/emips/promcall.c:1.2 src/sys/arch/emips/emips/promcall.c:1.3
--- src/sys/arch/emips/emips/promcall.c:1.2 Tue Feb 8 20:20:11 2011
+++ src/sys/arch/emips/emips/promcall.c Sun Jun 12 13:40:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: promcall.c,v 1.2 2011/02/08 20:20:11 rmind Exp $ */
+/* $NetBSD: promcall.c,v 1.3 2011/06/12 13:40:14 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.2 2011/02/08 20:20:11 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.3 2011/06/12 13:40:14 tsutsui Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -60,16 +60,19 @@
static int nogetsysid(void);
static void nohalt(int *, int);
-/* Callback vector. We keep this fall-back copy jic the bootloader is broken.
+/*
+ * Callback vector. We keep this fall-back copy jic the bootloader is broken.
*/
static void *nope(void)
{
- return NULL;
+
+ return NULL;
}
static int nogetchar(void)
{
- return -1;
+
+ return -1;
}
static void noprintf(const char *fmt, ...)
@@ -78,56 +81,58 @@
static int nogetsysid(void)
{
- /* say its an eMIPS, ML board */
- return MAKESYSID(1,1,XS_ML40x,MIPS_eMIPS);
+
+ /* say its an eMIPS, ML board */
+ return MAKESYSID(1, 1, XS_ML40x, MIPS_eMIPS);
}
static void nohalt(int *unused, int howto)
{
- while(1) ; /* fool gcc */
+
+ while (1); /* fool gcc */
/*NOTREACHED*/
}
const struct callback callvec = {
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
nogetchar,
- nope,
- nope,
+ nope,
+ nope,
noprintf,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
- nogetsysid,
- nope,
- nope,
- nope,
- nope,
- nope,
- nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nogetsysid,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
+ nope,
nohalt
};
@@ -166,8 +171,7 @@
* Print a character on PROM console.
*/
static void
-romputc(dev_t dev,
- int c)
+romputc(dev_t dev, int c)
{
int s;
@@ -186,7 +190,8 @@
int
prom_systype(void)
{
- return (*callv->_getsysid)();
+
+ return (*callv->_getsysid)();
}
/*
@@ -195,8 +200,8 @@
void __attribute__((__noreturn__))
prom_halt(int howto)
{
+
(*callv->_halt)((int *)0, howto);
while(1) ; /* fool gcc */
/*NOTREACHED*/
}
-
