Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/atari Misc KNF.
details: https://anonhg.NetBSD.org/src/rev/739529ec7959
branches: trunk
changeset: 753899:739529ec7959
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Tue Apr 13 11:22:22 2010 +0000
description:
Misc KNF.
diffstat:
sys/arch/atari/atari/atari_init.c | 8 +-
sys/arch/atari/atari/bus.c | 8 +-
sys/arch/atari/atari/disksubr.c | 6 +-
sys/arch/atari/atari/intr.c | 6 +-
sys/arch/atari/atari/machdep.c | 8 +-
sys/arch/atari/atari/stalloc.c | 12 ++--
sys/arch/atari/dev/fd.c | 6 +-
sys/arch/atari/dev/grf.c | 92 +++++++++++++++++----------------
sys/arch/atari/dev/grfabs_et.c | 34 ++++++------
sys/arch/atari/dev/grfabs_fal.c | 19 ++++---
sys/arch/atari/dev/grfabs_tt.c | 18 +++---
sys/arch/atari/dev/hdfd.c | 35 ++++++------
sys/arch/atari/dev/ite.c | 101 +++++++++++++++++++------------------
sys/arch/atari/dev/ite_et.c | 63 ++++++++++++-----------
sys/arch/atari/dev/kbd.c | 6 +-
sys/arch/atari/dev/view.c | 84 ++++++++++++++++---------------
sys/arch/atari/isa/isa_machdep.c | 23 ++++----
sys/arch/atari/pci/pci_machdep.c | 28 +++++----
sys/arch/atari/vme/et4000.c | 77 +++++++++++++++-------------
sys/arch/atari/vme/if_le_vme.c | 81 +++++++++++++++--------------
sys/arch/atari/vme/vme_machdep.c | 20 ++++---
21 files changed, 381 insertions(+), 354 deletions(-)
diffs (truncated from 2240 to 300 lines):
diff -r 43f8478955b4 -r 739529ec7959 sys/arch/atari/atari/atari_init.c
--- a/sys/arch/atari/atari/atari_init.c Tue Apr 13 11:01:22 2010 +0000
+++ b/sys/arch/atari/atari/atari_init.c Tue Apr 13 11:22:22 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_init.c,v 1.92 2009/12/11 22:23:08 tsutsui Exp $ */
+/* $NetBSD: atari_init.c,v 1.93 2010/04/13 11:22:22 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.92 2009/12/11 22:23:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.93 2010/04/13 11:22:22 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -525,7 +525,7 @@
lp = (paddr_t *)0;
le = (paddr_t *)pstart;
fp = (paddr_t *)kbase;
- while(lp < le)
+ while (lp < le)
*fp++ = *lp++;
}
#if defined(M68040) || defined(M68060)
@@ -747,7 +747,7 @@
#else
pg_proto = STIO_PHYS | PG_RW | PG_CI | PG_V;
#endif
- while(pg < epg) {
+ while (pg < epg) {
*pg++ = pg_proto;
pg_proto += PAGE_SIZE;
}
diff -r 43f8478955b4 -r 739529ec7959 sys/arch/atari/atari/bus.c
--- a/sys/arch/atari/atari/bus.c Tue Apr 13 11:01:22 2010 +0000
+++ b/sys/arch/atari/atari/bus.c Tue Apr 13 11:22:22 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.52 2010/03/31 13:15:52 tsutsui Exp $ */
+/* $NetBSD: bus.c,v 1.53 2010/04/13 11:22:22 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.52 2010/03/31 13:15:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.53 2010/04/13 11:22:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@
pg_proto = pa | PG_RW | PG_V;
if (!(flags & BUS_SPACE_MAP_CACHEABLE))
pg_proto |= PG_CI;
- while(pg < epg) {
+ while (pg < epg) {
*pg++ = pg_proto;
pg_proto += PAGE_SIZE;
#if defined(M68040) || defined(M68060)
@@ -245,7 +245,7 @@
*bshp = va + (bpa & PGOFSET);
- for(; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
+ for (; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
u_int *ptep, npte;
pmap_enter(pmap_kernel(), (vaddr_t)va, pa,
diff -r 43f8478955b4 -r 739529ec7959 sys/arch/atari/atari/disksubr.c
--- a/sys/arch/atari/atari/disksubr.c Tue Apr 13 11:01:22 2010 +0000
+++ b/sys/arch/atari/atari/disksubr.c Tue Apr 13 11:22:22 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.42 2010/03/31 14:12:55 tsutsui Exp $ */
+/* $NetBSD: disksubr.c,v 1.43 2010/04/13 11:22:22 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.42 2010/03/31 14:12:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.43 2010/04/13 11:22:22 tsutsui Exp $");
#ifndef DISKLABEL_NBDA
#define DISKLABEL_NBDA /* required */
@@ -509,7 +509,7 @@
break;
}
if (pno < 0) {
- if((pno = user_part + 1) >= MAXPARTITIONS)
+ if ((pno = user_part + 1) >= MAXPARTITIONS)
continue;
user_part = pno;
}
diff -r 43f8478955b4 -r 739529ec7959 sys/arch/atari/atari/intr.c
--- a/sys/arch/atari/atari/intr.c Tue Apr 13 11:01:22 2010 +0000
+++ b/sys/arch/atari/atari/intr.c Tue Apr 13 11:22:22 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.21 2010/03/31 14:12:55 tsutsui Exp $ */
+/* $NetBSD: intr.c,v 1.22 2010/04/13 11:22:22 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.21 2010/03/31 14:12:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.22 2010/04/13 11:22:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,7 +226,7 @@
struct intrhand *cur_vec;
vector = ih->ih_vector;
- switch(ih->ih_type & (AUTO_VEC|USER_VEC)) {
+ switch (ih->ih_type & (AUTO_VEC|USER_VEC)) {
case AUTO_VEC:
if (vector < AVEC_MIN || vector > AVEC_MAX)
return 0;
diff -r 43f8478955b4 -r 739529ec7959 sys/arch/atari/atari/machdep.c
--- a/sys/arch/atari/atari/machdep.c Tue Apr 13 11:01:22 2010 +0000
+++ b/sys/arch/atari/atari/machdep.c Tue Apr 13 11:22:22 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.166 2010/03/31 14:12:55 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.167 2010/04/13 11:22:22 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.166 2010/03/31 14:12:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.167 2010/04/13 11:22:22 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -795,7 +795,7 @@
void (*function)(void *, void *);
do {
- s = splhigh ();
+ s = splhigh();
if ((si = si_callbacks) != NULL)
si_callbacks = si->next;
splx(s);
@@ -804,7 +804,7 @@
function = si->function;
rock1 = si->rock1;
rock2 = si->rock2;
- s = splhigh ();
+ s = splhigh();
if (si_callbacks)
softint_schedule(si_callback_cookie);
si->next = si_free;
diff -r 43f8478955b4 -r 739529ec7959 sys/arch/atari/atari/stalloc.c
--- a/sys/arch/atari/atari/stalloc.c Tue Apr 13 11:01:22 2010 +0000
+++ b/sys/arch/atari/atari/stalloc.c Tue Apr 13 11:22:22 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: stalloc.c,v 1.12 2009/03/18 10:22:24 cegger Exp $ */
+/* $NetBSD: stalloc.c,v 1.13 2010/04/13 11:22:22 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman (Atari modifications)
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stalloc.c,v 1.12 2009/03/18 10:22:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stalloc.c,v 1.13 2010/04/13 11:22:22 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -95,14 +95,14 @@
*/
bfit = NULL;
mn = free_list.cqh_first;
- for(; mn != (void *)&free_list; mn = mn->free_link.cqe_next) {
- if(size <= mn->size) {
- if((bfit != NULL) && (bfit->size < mn->size))
+ for (; mn != (void *)&free_list; mn = mn->free_link.cqe_next) {
+ if (size <= mn->size) {
+ if ((bfit != NULL) && (bfit->size < mn->size))
continue;
bfit = mn;
}
}
- if(bfit != NULL)
+ if (bfit != NULL)
mn = bfit;
if (mn == (void *)&free_list) {
printf("St-mem pool exhausted, binpatch 'st_pool_size'"
diff -r 43f8478955b4 -r 739529ec7959 sys/arch/atari/dev/fd.c
--- a/sys/arch/atari/dev/fd.c Tue Apr 13 11:01:22 2010 +0000
+++ b/sys/arch/atari/dev/fd.c Tue Apr 13 11:22:22 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.75 2010/04/07 13:53:05 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.76 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.75 2010/04/07 13:53:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.76 2010/04/13 11:31:11 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -487,7 +487,7 @@
tsleep((void *)sc, PRIBIO, "fdopen", 0);
splx(s);
- if((sc->flags & FLPF_ISOPEN) == 0) {
+ if ((sc->flags & FLPF_ISOPEN) == 0) {
/*
* Initialise some driver values.
*/
diff -r 43f8478955b4 -r 739529ec7959 sys/arch/atari/dev/grf.c
--- a/sys/arch/atari/dev/grf.c Tue Apr 13 11:01:22 2010 +0000
+++ b/sys/arch/atari/dev/grf.c Tue Apr 13 11:22:22 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.42 2010/04/13 09:51:07 tsutsui Exp $ */
+/* $NetBSD: grf.c,v 1.43 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.42 2010/04/13 09:51:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.43 2010/04/13 11:31:11 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -159,36 +159,38 @@
int
grfbusmatch(struct device *pdp, struct cfdata *cfp, void *auxp)
{
- if(strcmp(auxp, grfbus_cd.cd_name))
- return(0);
+
+ if (strcmp(auxp, grfbus_cd.cd_name))
+ return 0;
- if(atari_realconfig == 0)
+ if (atari_realconfig == 0)
cfdata_gbus = cfp;
- return(1); /* Always there */
+ return 1; /* Always there */
}
void
grfbusattach(struct device *pdp, struct device *dp, void *auxp)
{
- grf_auxp_t grf_auxp;
+ grf_auxp_t grf_auxp;
- grf_auxp.busprint = grfbusprint;
- grf_auxp.from_bus_match = 1;
+ grf_auxp.busprint = grfbusprint;
+ grf_auxp.from_bus_match = 1;
- if(dp == NULL) /* Console init */
- atari_config_found(cfdata_gbus, NULL, (void*)&grf_auxp, grfbusprint);
- else {
- printf("\n");
- config_found(dp, (void*)&grf_auxp, grfbusprint);
- }
+ if (dp == NULL) /* Console init */
+ atari_config_found(cfdata_gbus, NULL, &grf_auxp, grfbusprint);
+ else {
+ printf("\n");
+ config_found(dp, &grf_auxp, grfbusprint);
+ }
}
int
grfbusprint(void *auxp, const char *name)
{
- if(name == NULL)
- return(UNCONF);
- return(QUIET);
+
+ if (name == NULL)
+ return UNCONF;
+ return QUIET;
}
/*ARGSUSED*/
@@ -198,20 +200,20 @@
Home |
Main Index |
Thread Index |
Old Index