Module Name: src
Committed By: tsutsui
Date: Tue Apr 13 11:31:11 UTC 2010
Modified Files:
src/sys/arch/atari/dev: fd.c grf.c grfabs_et.c grfabs_fal.c grfabs_tt.c
hdfd.c ite.c ite_et.c kbd.c view.c
src/sys/arch/atari/isa: isa_machdep.c
src/sys/arch/atari/pci: pci_machdep.c
src/sys/arch/atari/vme: et4000.c if_le_vme.c vme_machdep.c
Log Message:
Misc KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/atari/dev/grf.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/atari/dev/grfabs_et.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/atari/dev/grfabs_fal.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/atari/dev/grfabs_tt.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/atari/dev/ite.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/atari/dev/ite_et.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/atari/dev/kbd.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/atari/dev/view.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/atari/isa/isa_machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/atari/pci/pci_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/atari/vme/et4000.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/atari/vme/if_le_vme.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/atari/vme/vme_machdep.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/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.75 src/sys/arch/atari/dev/fd.c:1.76
--- src/sys/arch/atari/dev/fd.c:1.75 Wed Apr 7 13:53:05 2010
+++ src/sys/arch/atari/dev/fd.c Tue Apr 13 11:31:11 2010
@@ -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.
*/
Index: src/sys/arch/atari/dev/grf.c
diff -u src/sys/arch/atari/dev/grf.c:1.42 src/sys/arch/atari/dev/grf.c:1.43
--- src/sys/arch/atari/dev/grf.c:1.42 Tue Apr 13 09:51:07 2010
+++ src/sys/arch/atari/dev/grf.c Tue Apr 13 11:31:11 2010
@@ -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(atari_realconfig == 0)
+ if (strcmp(auxp, grfbus_cd.cd_name))
+ return 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 @@
struct grf_softc *gp;
if (GRFUNIT(dev) >= NGRF)
- return(ENXIO);
+ return ENXIO;
gp = grfsp[GRFUNIT(dev)];
if (gp == NULL)
- return(ENXIO);
+ return ENXIO;
if ((gp->g_flags & GF_ALIVE) == 0)
- return(ENXIO);
+ return ENXIO;
if ((gp->g_flags & (GF_OPEN|GF_EXCLUDE)) == (GF_OPEN|GF_EXCLUDE))
- return(EBUSY);
+ return EBUSY;
grf_viewsync(gp);
- return(0);
+ return 0;
}
/*ARGSUSED*/
@@ -223,7 +225,7 @@
gp = grfsp[GRFUNIT(dev)];
(void)grfoff(dev);
gp->g_flags &= GF_ALIVE;
- return(0);
+ return 0;
}
/*ARGSUSED*/
@@ -255,14 +257,14 @@
error = grfsinfo(dev, (struct grfdyninfo *) data);
break;
case GRFGETVMODE:
- return(gp->g_mode(gp, GM_GRFGETVMODE, data, 0, 0));
+ return gp->g_mode(gp, GM_GRFGETVMODE, data, 0, 0);
case GRFSETVMODE:
error = gp->g_mode(gp, GM_GRFSETVMODE, data, 0, 0);
if (error == 0 && gp->g_itedev)
ite_reinit(gp->g_itedev);
break;
case GRFGETNUMVM:
- return(gp->g_mode(gp, GM_GRFGETNUMVM, data, 0, 0));
+ return gp->g_mode(gp, GM_GRFGETNUMVM, data, 0, 0);
/*
* these are all hardware dependant, and have to be resolved
* in the respective driver.
@@ -279,13 +281,13 @@
* check to see whether it's a command recognized by the
* view code.
*/
- return((*view_cdevsw.d_ioctl)(gp->g_viewdev, cmd, data, flag,
- l));
+ return (*view_cdevsw.d_ioctl)(gp->g_viewdev,
+ cmd, data, flag, l);
error = EINVAL;
break;
}
- return(error);
+ return error;
}
/*
@@ -309,20 +311,20 @@
* control registers
*/
if (off >= 0 && off < gi->gd_regsize)
- return(((paddr_t)gi->gd_regaddr + off) >> PGSHIFT);
+ return ((paddr_t)gi->gd_regaddr + off) >> PGSHIFT;
/*
* VGA memory
*/
if (off >= vgabase && off < (vgabase + gi->gd_vgasize))
- return(((paddr_t)gi->gd_vgaaddr - vgabase + off) >> PGSHIFT);
+ return ((paddr_t)gi->gd_vgaaddr - vgabase + off) >> PGSHIFT;
/*
* frame buffer
*/
if (off >= linbase && off < (linbase + gi->gd_fbsize))
- return(((paddr_t)gi->gd_fbaddr - linbase + off) >> PGSHIFT);
- return(-1);
+ return ((paddr_t)gi->gd_fbaddr - linbase + off) >> PGSHIFT;
+ return -1;
}
int
@@ -333,14 +335,14 @@
gp = grfsp[GRFUNIT(dev)];
if (gp->g_flags & GF_GRFON)
- return(0);
+ return 0;
gp->g_flags |= GF_GRFON;
if (gp->g_itedev != NODEV)
ite_off(gp->g_itedev, 3);
- return(gp->g_mode(gp, (dev & GRFOVDEV) ? GM_GRFOVON : GM_GRFON,
- NULL, 0, 0));
+ return gp->g_mode(gp, (dev & GRFOVDEV) ? GM_GRFOVON : GM_GRFON,
+ NULL, 0, 0);
}
int
@@ -352,11 +354,11 @@
gp = grfsp[GRFUNIT(dev)];
if ((gp->g_flags & GF_GRFON) == 0)
- return(0);
+ return 0;
gp->g_flags &= ~GF_GRFON;
error = gp->g_mode(gp, (dev & GRFOVDEV) ? GM_GRFOVOFF : GM_GRFOFF,
- NULL, 0, 0);
+ NULL, 0, 0);
/*
* Closely tied together no X's
@@ -364,7 +366,7 @@
if (gp->g_itedev != NODEV)
ite_on(gp->g_itedev, 2);
- return(error);
+ return error;
}
int
@@ -381,7 +383,7 @@
*/
if (gp->g_itedev != NODEV)
ite_reinit(gp->g_itedev);
- return(error);
+ return error;
}
/*
@@ -411,8 +413,8 @@
gi->gd_vgasize = bm.vga_mappable;
gi->gd_vgabase = bm.vga_base;
- if((*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCGSIZE, (void *)&vs, 0,
- NOLWP)) {
+ if ((*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCGSIZE, (void *)&vs, 0,
+ NOLWP)) {
/*
* fill in some default values...
* XXX: Should _never_ happen
@@ -453,15 +455,15 @@
grf_viewsync(gp);
(*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCDISPLAY,
NULL, 0, NOLWP);
- return(0);
+ return 0;
case GM_GRFOFF:
(*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCREMOVE,
NULL, 0, NOLWP);
- return(0);
+ return 0;
case GM_GRFCONFIG:
default:
break;
}
- return(EPASSTHROUGH);
+ return EPASSTHROUGH;
}
#endif /* NGRF > 0 */
Index: src/sys/arch/atari/dev/grfabs_et.c
diff -u src/sys/arch/atari/dev/grfabs_et.c:1.33 src/sys/arch/atari/dev/grfabs_et.c:1.34
--- src/sys/arch/atari/dev/grfabs_et.c:1.33 Tue Oct 20 19:10:10 2009
+++ src/sys/arch/atari/dev/grfabs_et.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_et.c,v 1.33 2009/10/20 19:10:10 snj Exp $ */
+/* $NetBSD: grfabs_et.c,v 1.34 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.33 2009/10/20 19:10:10 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.34 2010/04/13 11:31:11 tsutsui Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -281,7 +281,8 @@
void
et_free_view(view_t *v)
{
- if(v) {
+
+ if (v) {
et_remove_view(v);
if (v->colormap != &gra_con_cmap)
free(v->colormap, M_DEVBUF);
@@ -311,8 +312,7 @@
if (!atari_realconfig) {
v = &gra_con_view;
bm = &con_bm;
- }
- else {
+ } else {
v = malloc(sizeof(*v), M_DEVBUF, M_WAITOK);
bm = malloc(sizeof(*bm), M_DEVBUF, M_WAITOK);
}
@@ -348,8 +348,8 @@
sa->fb_size = 0;
bm->plane = (u_char *)sa->sv_fb;
et_loadmode(mode->data, &sa->sv_regs);
- }
- else v->save_area = NULL;
+ } else
+ v->save_area = NULL;
v->colormap = alloc_colormap(mode);
if (v->colormap) {
@@ -513,7 +513,7 @@
/*
* Set the clock...
*/
- for(clock = ET_NUMCLOCKS-1; clock > 0; clock--) {
+ for (clock = ET_NUMCLOCKS-1; clock > 0; clock--) {
if (et_clockfreqs[clock] <= mode->pixel_clock)
break;
}
@@ -631,7 +631,7 @@
/* I'm unable to try the rest.... */
regs->misc_output = tmp;
- if(regs == &loc_regs)
+ if (regs == &loc_regs)
et_hwrest(regs);
}
@@ -649,13 +649,13 @@
* General VGA registers
*/
et_regs->misc_output = vgar(ba, GREG_MISC_OUTPUT_R);
- for(i = 0; i < 25; i++)
+ for (i = 0; i < 25; i++)
et_regs->crt[i] = RCrt(ba, i);
- for(i = 0; i < 21; i++)
+ for (i = 0; i < 21; i++)
et_regs->attr[i] = RAttr(ba, i | 0x20);
- for(i = 0; i < 9; i++)
+ for (i = 0; i < 9; i++)
et_regs->grf[i] = RGfx(ba, i);
- for(i = 0; i < 5; i++)
+ for (i = 0; i < 5; i++)
et_regs->seq[i] = RSeq(ba, i);
/*
@@ -689,7 +689,7 @@
* General VGA registers
*/
WSeq(ba, SEQ_ID_RESET, 0x01);
- for(i = 1; i < 5; i++)
+ for (i = 1; i < 5; i++)
WSeq(ba, i, et_regs->seq[i]);
WSeq(ba, SEQ_ID_RESET, 0x03);
@@ -698,11 +698,11 @@
*/
WCrt(ba, CRT_ID_END_VER_RETR,
et_regs->crt[CRT_ID_END_VER_RETR] & 0x7f);
- for(i = 0; i < 25; i++)
+ for (i = 0; i < 25; i++)
WCrt(ba, i, et_regs->crt[i]);
- for(i = 0; i < 9; i++)
+ for (i = 0; i < 9; i++)
WGfx(ba, i, et_regs->grf[i]);
- for(i = 0; i < 21; i++)
+ for (i = 0; i < 21; i++)
WAttr(ba, i | 0x20, et_regs->attr[i]);
/*
Index: src/sys/arch/atari/dev/grfabs_fal.c
diff -u src/sys/arch/atari/dev/grfabs_fal.c:1.26 src/sys/arch/atari/dev/grfabs_fal.c:1.27
--- src/sys/arch/atari/dev/grfabs_fal.c:1.26 Wed Oct 21 21:50:14 2009
+++ src/sys/arch/atari/dev/grfabs_fal.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_fal.c,v 1.26 2009/10/21 21:50:14 snj Exp $ */
+/* $NetBSD: grfabs_fal.c,v 1.27 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1995 Thomas Gerner.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.26 2009/10/21 21:50:14 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.27 2010/04/13 11:31:11 tsutsui Exp $");
#ifdef FALCON_VIDEO
/*
@@ -278,7 +278,8 @@
dm->depth = 4;
else if (stshift == 1) /* 4 color */
dm->depth = 2;
- else dm->depth = 1; /* 2 color */
+ else
+ dm->depth = 1; /* 2 color */
/*
* Now calculate the screen hight
@@ -353,7 +354,8 @@
struct videl *vregs;
static int vbl_count = 1;
- if(vbl_count--) return;
+ if (vbl_count--)
+ return;
v = (view_t*)falcon_needs_vbl;
@@ -364,7 +366,8 @@
* Write to videl registers only on VGA displays
* This is only a hack. Must be fixed soon. XXX -- Thomas
*/
- if(mon_type != FAL_VGA) return;
+ if (mon_type != FAL_VGA)
+ return;
vregs = vm_regs(v->mode);
@@ -511,7 +514,8 @@
if (!atari_realconfig)
v = &gra_con_view;
- else v = malloc(sizeof(*v), M_DEVBUF, M_NOWAIT);
+ else
+ v = malloc(sizeof(*v), M_DEVBUF, M_NOWAIT);
if (v == NULL)
return(NULL);
@@ -611,8 +615,7 @@
if (!atari_realconfig) {
cm = &gra_con_cmap;
cm->entry = gra_con_colors;
- }
- else {
+ } else {
int size;
size = sizeof(*cm) + (nentries * sizeof(cm->entry[0]));
Index: src/sys/arch/atari/dev/grfabs_tt.c
diff -u src/sys/arch/atari/dev/grfabs_tt.c:1.22 src/sys/arch/atari/dev/grfabs_tt.c:1.23
--- src/sys/arch/atari/dev/grfabs_tt.c:1.22 Tue Oct 20 19:10:10 2009
+++ src/sys/arch/atari/dev/grfabs_tt.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_tt.c,v 1.22 2009/10/20 19:10:10 snj Exp $ */
+/* $NetBSD: grfabs_tt.c,v 1.23 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.22 2009/10/20 19:10:10 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.23 2010/04/13 11:31:11 tsutsui Exp $");
#ifdef TT_VIDEO
/*
@@ -182,7 +182,8 @@
void
tt_free_view(view_t *v)
{
- if(v) {
+
+ if (v) {
tt_remove_view(v);
if (v->colormap != &gra_con_cmap)
free(v->colormap, M_DEVBUF);
@@ -254,7 +255,8 @@
*/
if (v->flags & VF_DISPLAY)
creg = &creg[cm->first];
- else creg = NULL;
+ else
+ creg = NULL;
vcreg = &vcm->entry[cm->first];
ncreg -= cm->first;
@@ -282,8 +284,9 @@
if (!atari_realconfig)
v = &gra_con_view;
- else v = malloc(sizeof(*v), M_DEVBUF, M_NOWAIT);
- if(v == NULL)
+ else
+ v = malloc(sizeof(*v), M_DEVBUF, M_NOWAIT);
+ if (v == NULL)
return (NULL);
bm = alloc_bitmap(mode->size.width, mode->size.height, mode->depth);
@@ -397,8 +400,7 @@
if (!atari_realconfig) {
cm = &gra_con_cmap;
cm->entry = gra_con_colors;
- }
- else {
+ } else {
int size;
size = sizeof(*cm) + (nentries * sizeof(cm->entry[0]));
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.72 src/sys/arch/atari/dev/hdfd.c:1.73
--- src/sys/arch/atari/dev/hdfd.c:1.72 Tue Apr 13 09:51:07 2010
+++ src/sys/arch/atari/dev/hdfd.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.72 2010/04/13 09:51:07 tsutsui Exp $ */
+/* $NetBSD: hdfd.c,v 1.73 2010/04/13 11:31:11 tsutsui Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.72 2010/04/13 09:51:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.73 2010/04/13 11:31:11 tsutsui Exp $");
#include "opt_ddb.h"
@@ -327,8 +327,8 @@
bus_space_handle_t handle;
/* Match only once */
- if(strcmp("fdc", aux) || fdc_matched)
- return(0);
+ if (strcmp("fdc", aux) || fdc_matched)
+ return 0;
if (!atari_realconfig)
return 0;
@@ -339,7 +339,7 @@
if (bus_space_map(mb_tag, FD_IOBASE, FD_IOSIZE, 0, &handle)) {
printf("fdcprobe: cannot map io-area\n");
mb_free_bus_space_tag(mb_tag);
- return (0);
+ return 0;
}
fdio_addr = bus_space_vaddr(mb_tag, handle); /* XXX */
@@ -415,8 +415,7 @@
out_fdc(NE7CMD_LOCK);
(void)fdcresult(fdc);
has_fifo = 1;
- }
- else {
+ } else {
(void)rd_fdc_reg(fddata);
printf(": no fifo");
}
@@ -566,8 +565,7 @@
* We don't want to stay on ipl6.....
*/
add_sicallback((si_farg)fdcpseudointr, intr_arg, 0);
- }
- else {
+ } else {
s = splbio();
(void) fdcintr(intr_arg);
splx(s);
@@ -700,13 +698,15 @@
int
fdread(dev_t dev, struct uio *uio, int flags)
{
- return (physio(fdstrategy, NULL, dev, B_READ, minphys, uio));
+
+ return physio(fdstrategy, NULL, dev, B_READ, minphys, uio);
}
int
fdwrite(dev_t dev, struct uio *uio, int flags)
{
- return (physio(fdstrategy, NULL, dev, B_WRITE, minphys, uio));
+
+ return physio(fdstrategy, NULL, dev, B_WRITE, minphys, uio);
}
void
@@ -772,7 +772,8 @@
}
fdc->sc_status[n++] = rd_fdc_reg(fddata);
}
- else delay(10);
+ else
+ delay(10);
}
log(LOG_ERR, "fdcresult: timeout\n");
return -1;
@@ -1291,7 +1292,7 @@
((struct partinfo *)addr)->disklab = fd->sc_dk.dk_label;
((struct partinfo *)addr)->part =
&fd->sc_dk.dk_label->d_partitions[RAW_PART];
- return(0);
+ return 0;
case DIOCWLABEL:
if ((flag & FWRITE) == 0)
@@ -1343,7 +1344,7 @@
return 0;
case FDIOCSETFORMAT:
- if((flag & FWRITE) == 0)
+ if ((flag & FWRITE) == 0)
return EBADF; /* must be opened for writing */
form_parms = (struct fdformat_parms *)addr;
if (form_parms->fdformat_version != FDFORMAT_VERSION)
@@ -1392,7 +1393,7 @@
return 0;
case FDIOCFORMAT_TRACK:
- if((flag & FWRITE) == 0)
+ if ((flag & FWRITE) == 0)
return EBADF; /* must be opened for writing */
form_cmd = (struct fdformat_cmd *)addr;
if (form_cmd->formatcmd_version != FDFORMAT_VERSION)
@@ -1462,7 +1463,7 @@
/* set up a buffer header for fdstrategy() */
bp = getiobuf(NULL, false);
- if(bp == 0)
+ if (bp == NULL)
return ENOBUFS;
memset((void *)bp, 0, sizeof(struct buf));
bp->b_flags = B_PHYS | B_FORMAT;
@@ -1489,7 +1490,7 @@
/* ...and wait for it to complete */
mutex_enter(bp->b_objlock);
- while(!(bp->b_oflags & BO_DONE)) {
+ while ((bp->b_oflags & BO_DONE) == 0) {
rv = cv_timedwait(&bp->b_done, bp->b_objlock, 20 * hz);
if (rv == EWOULDBLOCK)
break;
Index: src/sys/arch/atari/dev/ite.c
diff -u src/sys/arch/atari/dev/ite.c:1.67 src/sys/arch/atari/dev/ite.c:1.68
--- src/sys/arch/atari/dev/ite.c:1.67 Tue Apr 13 09:51:07 2010
+++ src/sys/arch/atari/dev/ite.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.67 2010/04/13 09:51:07 tsutsui Exp $ */
+/* $NetBSD: ite.c,v 1.68 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.67 2010/04/13 09:51:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.68 2010/04/13 11:31:11 tsutsui Exp $");
#include "opt_ddb.h"
@@ -241,8 +241,8 @@
if (dp) {
s = spltty();
- if(con_itesoftc.grf != NULL
- && con_itesoftc.grf->g_unit == gp->g_unit) {
+ if (con_itesoftc.grf != NULL &&
+ con_itesoftc.grf->g_unit == gp->g_unit) {
/*
* console reinit copy params over.
* and console always gets keyboard
@@ -278,10 +278,11 @@
static struct ite_softc *
getitesp(dev_t dev)
{
- if(atari_realconfig && (con_itesoftc.grf == NULL))
+
+ if (atari_realconfig && (con_itesoftc.grf == NULL))
return(device_lookup_private(&ite_cd, ITEUNIT(dev)));
- if(con_itesoftc.grf == NULL)
+ if (con_itesoftc.grf == NULL)
panic("no ite_softc for console");
return(&con_itesoftc);
}
@@ -390,7 +391,8 @@
ip->kbdmap = malloc(sizeof(struct kbdmap), M_DEVBUF, M_WAITOK);
memcpy(ip->kbdmap, &ascii_kbdmap, sizeof(struct kbdmap));
}
- else ip->kbdmap = &ascii_kbdmap;
+ else
+ ip->kbdmap = &ascii_kbdmap;
ip->cursorx = 0;
ip->cursory = 0;
@@ -424,7 +426,8 @@
tp = ip->tp = ttymalloc();
tty_attach(tp);
}
- else tp = ip->tp;
+ else
+ tp = ip->tp;
if (kauth_authorize_device_tty(l->l_cred, KAUTH_DEVICE_TTY_OPEN, tp))
return (EBUSY);
@@ -543,7 +546,7 @@
KDASSERT(tp);
error = (*tp->t_linesw->l_ioctl) (tp, cmd, addr, flag, l);
- if(error != EPASSTHROUGH)
+ if (error != EPASSTHROUGH)
return (error);
error = ttioctl(tp, cmd, addr, flag, l);
@@ -797,25 +800,26 @@
/*
* No special action if key released
*/
- if(up) {
+ if (up) {
splx(s);
return -1;
}
/* translate modifiers */
- if(kbd_modifier & KBD_MOD_SHIFT) {
- if(kbd_modifier & KBD_MOD_ALT)
+ if (kbd_modifier & KBD_MOD_SHIFT) {
+ if (kbd_modifier & KBD_MOD_ALT)
key = kbdmap->alt_shift_keys[c];
- else key = kbdmap->shift_keys[c];
+ else
+ key = kbdmap->shift_keys[c];
}
- else if(kbd_modifier & KBD_MOD_ALT)
+ else if (kbd_modifier & KBD_MOD_ALT)
key = kbdmap->alt_keys[c];
else {
key = kbdmap->keys[c];
/*
* If CAPS and key is CAPable (no pun intended)
*/
- if((kbd_modifier & KBD_MOD_CAPS) && (key.mode & KBD_MODE_CAPS))
+ if ((kbd_modifier & KBD_MOD_CAPS) && (key.mode & KBD_MODE_CAPS))
key = kbdmap->shift_keys[c];
}
code = key.code;
@@ -824,12 +828,12 @@
/*
* If string return simple console filter
*/
- if(key->mode & (KBD_MODE_STRING | KBD_MODE_KPAD)) {
+ if (key->mode & (KBD_MODE_STRING | KBD_MODE_KPAD)) {
splx(s);
return -1;
}
/* handle dead keys */
- if(key->mode & KBD_MODE_DEAD) {
+ if (key->mode & KBD_MODE_DEAD) {
/* if entered twice, send accent itself */
if (last_dead == key->mode & KBD_MODE_ACCMASK)
last_dead = 0;
@@ -839,7 +843,7 @@
return -1;
}
}
- if(last_dead) {
+ if (last_dead) {
/* can't apply dead flag to string-keys */
if (code >= '@' && code < 0x7f)
code =
@@ -847,7 +851,7 @@
last_dead = 0;
}
#endif
- if(kbd_modifier & KBD_MOD_CTRL)
+ if (kbd_modifier & KBD_MOD_CTRL)
code &= 0x1f;
/*
@@ -872,7 +876,7 @@
repeat_handler(void *arg)
{
tout_pending = 0;
- if(last_char)
+ if (last_char)
add_sicallback((si_farg)ite_filter, (void *)last_char,
(void *)ITEFILT_REPEATER);
}
@@ -893,7 +897,7 @@
again = true;
}
- if(kbd_ite == NULL)
+ if (kbd_ite == NULL)
return;
kbd_tty = kbd_ite->tp;
@@ -919,7 +923,7 @@
* Stop repeating on up event
*/
if (up) {
- if(tout_pending) {
+ if (tout_pending) {
callout_stop(&repeat_ch);
tout_pending = 0;
last_char = 0;
@@ -927,7 +931,7 @@
splx(s);
return;
}
- else if(tout_pending && last_char != c) {
+ else if (tout_pending && last_char != c) {
/*
* Different character, stop also
*/
@@ -939,7 +943,7 @@
/*
* Handle ite-switching ALT + Fx
*/
- if((kbd_modifier == KBD_MOD_ALT) && (c >= 0x3b) && (c <= 0x44)) {
+ if ((kbd_modifier == KBD_MOD_ALT) && (c >= 0x3b) && (c <= 0x44)) {
ite_switch(c - 0x3b);
splx(s);
return;
@@ -947,14 +951,14 @@
/*
* Safety button, switch back to ascii keymap.
*/
- if(kbd_modifier == (KBD_MOD_ALT | KBD_MOD_LSHIFT) && c == 0x3b) {
+ if (kbd_modifier == (KBD_MOD_ALT | KBD_MOD_LSHIFT) && c == 0x3b) {
/* ALT + LSHIFT + F1 */
memcpy(kbdmap, &ascii_kbdmap, sizeof(struct kbdmap));
splx(s);
return;
#ifdef DDB
- }
- else if(kbd_modifier == (KBD_MOD_ALT | KBD_MOD_LSHIFT) && c == 0x43) {
+ } else if (kbd_modifier == (KBD_MOD_ALT | KBD_MOD_LSHIFT) &&
+ c == 0x43) {
/*
* ALT + LSHIFT + F9 -> Debugger!
*/
@@ -967,7 +971,7 @@
/*
* The rest of the code is senseless when the device is not open.
*/
- if(kbd_tty == NULL) {
+ if (kbd_tty == NULL) {
splx(s);
return;
}
@@ -975,19 +979,20 @@
/*
* Translate modifiers
*/
- if(kbd_modifier & KBD_MOD_SHIFT) {
- if(kbd_modifier & KBD_MOD_ALT)
+ if (kbd_modifier & KBD_MOD_SHIFT) {
+ if (kbd_modifier & KBD_MOD_ALT)
key = kbdmap->alt_shift_keys[c];
- else key = kbdmap->shift_keys[c];
+ else
+ key = kbdmap->shift_keys[c];
}
- else if(kbd_modifier & KBD_MOD_ALT)
- key = kbdmap->alt_keys[c];
+ else if (kbd_modifier & KBD_MOD_ALT)
+ key = kbdmap->alt_keys[c];
else {
key = kbdmap->keys[c];
/*
* If CAPS and key is CAPable (no pun intended)
*/
- if((kbd_modifier & KBD_MOD_CAPS) && (key.mode & KBD_MODE_CAPS))
+ if ((kbd_modifier & KBD_MOD_CAPS) && (key.mode & KBD_MODE_CAPS))
key = kbdmap->shift_keys[c];
}
code = key.code;
@@ -999,14 +1004,13 @@
* overhead, since we have to do the conversion each time, but
* I guess that's ok.
*/
- if(!tout_pending && caller == ITEFILT_TTY && kbd_ite->key_repeat) {
+ if (!tout_pending && caller == ITEFILT_TTY && kbd_ite->key_repeat) {
tout_pending = 1;
last_char = c;
callout_reset(&repeat_ch, start_repeat_timeo * hz / 100,
repeat_handler, NULL);
- }
- else if(!tout_pending && caller==ITEFILT_REPEATER
- && kbd_ite->key_repeat) {
+ } else if (!tout_pending && caller==ITEFILT_REPEATER &&
+ kbd_ite->key_repeat) {
tout_pending = 1;
last_char = c;
callout_reset(&repeat_ch, next_repeat_timeo * hz / 100,
@@ -1034,14 +1038,13 @@
/*
* If not string, apply CTRL modifiers
*/
- if(!(key.mode & KBD_MODE_STRING)
- && (!(key.mode & KBD_MODE_KPAD)
- || (kbd_ite && !kbd_ite->keypad_appmode))) {
- if(kbd_modifier & KBD_MOD_CTRL)
+ if (!(key.mode & KBD_MODE_STRING) &&
+ (!(key.mode & KBD_MODE_KPAD) ||
+ (kbd_ite && !kbd_ite->keypad_appmode))) {
+ if (kbd_modifier & KBD_MOD_CTRL)
code &= 0x1f;
- }
- else if((key.mode & KBD_MODE_KPAD)
- && (kbd_ite && kbd_ite->keypad_appmode)) {
+ } else if ((key.mode & KBD_MODE_KPAD) &&
+ (kbd_ite && kbd_ite->keypad_appmode)) {
static const char * const in = "0123456789-+.\r()/*";
static const char * const out = "pqrstuvwxymlnMPQRS";
char *cp = strchr(in, code);
@@ -1070,9 +1073,9 @@
* keymap setting, AND we're in app-cursor mode, switch
* to the above table. This is *nasty* !
*/
- if(((c == 0x48) || (c == 0x4b) || (c == 0x4d) || (c == 0x50))
- && kbd_ite->cursor_appmode
- && !memcmp(str, "\x03\x1b[", 3) &&
+ if (((c == 0x48) || (c == 0x4b) ||(c == 0x4d) || (c == 0x50)) &&
+ kbd_ite->cursor_appmode &&
+ !memcmp(str, "\x03\x1b[", 3) &&
strchr("ABCD", str[3]))
str = app_cursor + 4 * (str[3] - 'A');
@@ -2191,7 +2194,7 @@
break;
case BEL:
- if(kbd_tty && kbd_ite && kbd_ite->tp == kbd_tty)
+ if (kbd_tty && kbd_ite && kbd_ite->tp == kbd_tty)
kbdbell();
break;
Index: src/sys/arch/atari/dev/ite_et.c
diff -u src/sys/arch/atari/dev/ite_et.c:1.28 src/sys/arch/atari/dev/ite_et.c:1.29
--- src/sys/arch/atari/dev/ite_et.c:1.28 Tue Feb 9 23:05:16 2010
+++ src/sys/arch/atari/dev/ite_et.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_et.c,v 1.28 2010/02/09 23:05:16 wiz Exp $ */
+/* $NetBSD: ite_et.c,v 1.29 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.28 2010/02/09 23:05:16 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.29 2010/04/13 11:31:11 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@
/*
* Check if the layers we depend on exist
*/
- if(!(machineid & ATARI_HADES))
+ if (!(machineid & ATARI_HADES))
return 0;
if (!et_probe_card())
return 0;
@@ -156,9 +156,9 @@
/*
* Final constraint: each grf needs a view....
*/
- if((cfdata_grf == NULL) || (did_consinit > 1)) {
- if((*view_cdevsw.d_open)(cfp->cf_unit, 0, 0, NULL))
- return 0;
+ if ((cfdata_grf == NULL) || (did_consinit > 1)) {
+ if ((*view_cdevsw.d_open)(cfp->cf_unit, 0, 0, NULL))
+ return 0;
}
did_consinit = 2;
return 1;
@@ -187,7 +187,7 @@
/*
* Handle exception case: early console init
*/
- if(dp == NULL) {
+ if (dp == NULL) {
congrf.g_unit = cfdata_grf->cf_unit;
congrf.g_grfdev = makedev(maj, congrf.g_unit);
congrf.g_itedev = (dev_t)-1;
@@ -207,15 +207,14 @@
gp->g_unit = device_unit(&gp->g_device);
grfsp[gp->g_unit] = gp;
- if((cfdata_grf != NULL) && (gp->g_unit == congrf.g_unit)) {
+ if ((cfdata_grf != NULL) && (gp->g_unit == congrf.g_unit)) {
/*
* We inited earlier just copy the info, take care
* not to copy the device struct though.
*/
memcpy(&gp->g_display, &congrf.g_display,
(char *)&gp[1] - (char *)&gp->g_display);
- }
- else {
+ } else {
gp->g_grfdev = makedev(maj, gp->g_unit);
gp->g_itedev = (dev_t)-1;
gp->g_flags = GF_ALIVE;
@@ -227,9 +226,10 @@
}
printf(": %dx%d", gp->g_display.gd_dwidth, gp->g_display.gd_dheight);
- if(gp->g_display.gd_colors == 2)
+ if (gp->g_display.gd_colors == 2)
printf(" monochrome\n");
- else printf(" colors %d\n", gp->g_display.gd_colors);
+ else
+ printf(" colors %d\n", gp->g_display.gd_colors);
/*
* try and attach an ite
@@ -251,9 +251,10 @@
int
grfetprint(void *auxp, const char *pnp)
{
- if(pnp) /* XXX */
+
+ if (pnp) /* XXX */
aprint_normal("ite at %s", pnp);
- return(UNCONF);
+ return UNCONF;
}
/*
@@ -285,7 +286,7 @@
view_t *view;
save_area_t *et_save;
- if((cci = ip->priv) != NULL)
+ if ((cci = ip->priv) != NULL)
return;
ip->itexx_ioctl = iteet_ioctl;
@@ -297,13 +298,14 @@
#endif
/* Find the correct set of rendering routines for this font. */
- if(ip->font.width != 8)
+ if (ip->font.width != 8)
panic("kernel font size not supported");
- if(!atari_realconfig)
+ if (!atari_realconfig)
ip->priv = cci = &con_ipriv;
- else ip->priv = cci = (ipriv_t*)malloc(sizeof(*cci), M_DEVBUF,M_WAITOK);
- if(cci == NULL)
+ else
+ ip->priv = cci = malloc(sizeof(*cci), M_DEVBUF, M_WAITOK);
+ if (cci == NULL)
panic("No memory for ite-view");
memset(cci, 0, sizeof(*cci));
@@ -321,7 +323,7 @@
/*
* Only console will be turned on by default..
*/
- if(ip->flags & ITE_ISCONS)
+ if (ip->flags & ITE_ISCONS)
ip->grf->g_mode(ip->grf, GM_GRFON, NULL, 0, 0);
/*
@@ -373,18 +375,20 @@
et_save = (save_area_t *)view->save_area;
if (et_save == NULL)
- et_inittextmode(ip, NULL, view->flags & VF_DISPLAY);
+ et_inittextmode(ip, NULL, view->flags & VF_DISPLAY);
else {
- et_inittextmode(ip, &et_save->sv_regs, view->flags & VF_DISPLAY);
- et_save->fb_size = ip->cols * ip->rows;
+ et_inittextmode(ip, &et_save->sv_regs,
+ view->flags & VF_DISPLAY);
+ et_save->fb_size = ip->cols * ip->rows;
}
et_clear(ip, 0, 0, ip->rows, ip->cols);
- return(error);
+ return error;
}
int
-iteet_ioctl(struct ite_softc *ip, u_long cmd, void * addr, int flag, struct lwp *l)
+iteet_ioctl(struct ite_softc *ip, u_long cmd, void * addr, int flag,
+ struct lwp *l)
{
struct winsize ws;
struct itewinsize *is;
@@ -397,7 +401,7 @@
case ITEIOCSWINSZ:
is = (struct itewinsize *)addr;
- if(ite_newsize(ip, is))
+ if (ite_newsize(ip, is))
error = ENOMEM;
else {
view = viewview(ip->grf->g_viewdev);
@@ -428,7 +432,7 @@
error = EPASSTHROUGH;
break;
}
- return (error);
+ return error;
}
void
@@ -498,7 +502,7 @@
int len;
dest = (u_short *)v->bitmap->plane + (sy * ip->cols) + sx;
- for(len = w * h; len-- ;)
+ for (len = w * h; len-- ;)
*dest++ = 0x2007;
}
@@ -538,8 +542,7 @@
if (src > dst) {
while (len--)
*dst++ = *src++;
- }
- else {
+ } else {
src = &src[len];
dst = &dst[len];
while (len--)
Index: src/sys/arch/atari/dev/kbd.c
diff -u src/sys/arch/atari/dev/kbd.c:1.40 src/sys/arch/atari/dev/kbd.c:1.41
--- src/sys/arch/atari/dev/kbd.c:1.40 Wed Nov 25 20:40:41 2009
+++ src/sys/arch/atari/dev/kbd.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.40 2009/11/25 20:40:41 abs Exp $ */
+/* $NetBSD: kbd.c,v 1.41 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.40 2009/11/25 20:40:41 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.41 2010/04/13 11:31:11 tsutsui Exp $");
#include "mouse.h"
#include "ite.h"
@@ -777,7 +777,7 @@
return 1;
}
if (mask) {
- if(up)
+ if (up)
kbd_modifier &= ~mask;
else
kbd_modifier |= mask;
Index: src/sys/arch/atari/dev/view.c
diff -u src/sys/arch/atari/dev/view.c:1.31 src/sys/arch/atari/dev/view.c:1.32
--- src/sys/arch/atari/dev/view.c:1.31 Sun Jul 19 05:43:23 2009
+++ src/sys/arch/atari/dev/view.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.31 2009/07/19 05:43:23 tsutsui Exp $ */
+/* $NetBSD: view.c,v 1.32 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
* a interface to graphics. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.31 2009/07/19 05:43:23 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.32 2010/04/13 11:31:11 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,16 +98,16 @@
{
int i;
- if(view_inited)
- return(1);
+ if (view_inited)
+ return 1;
view_inited = 1;
- for(i=0; i<NVIEW; i++) {
+ for (i = 0; i < NVIEW; i++) {
views[i].view = NULL;
views[i].flags = 0;
}
- return(1);
+ return 1;
}
@@ -129,7 +129,7 @@
* mark views that share this monitor as not displaying
*/
for (i = 0; i < NVIEW; i++) {
- if(views[i].flags & VUF_DISPLAY) {
+ if (views[i].flags & VUF_DISPLAY) {
if (vu->view && (vu->view == views[i].view)) {
splx(s);
return;
@@ -172,7 +172,7 @@
vu->flags &= ~VUF_ADDED;
if (vu->flags & VUF_DISPLAY) {
for (i = 0; i < NVIEW; i++) {
- if((views[i].flags & VUF_ADDED) && &views[i] != vu) {
+ if ((views[i].flags & VUF_ADDED) && &views[i] != vu) {
view_display(&views[i]);
break;
}
@@ -200,21 +200,21 @@
cs = 1;
if (cs == 0 && co == 0)
- return(0);
+ return 0;
ns.width = vs->width;
ns.height = vs->height;
- if((dmode = grf_get_best_mode(&ns, vs->depth)) != NULL) {
+ if ((dmode = grf_get_best_mode(&ns, vs->depth)) != NULL) {
/*
* If we can't do better, leave it
*/
- if(dmode == vu->view->mode)
- return(0);
+ if (dmode == vu->view->mode)
+ return 0;
}
new = grf_alloc_view(dmode, &ns, vs->depth);
if (new == NULL)
- return(ENOMEM);
+ return ENOMEM;
old = vu->view;
vu->view = new;
@@ -233,7 +233,7 @@
view_display(vu);
}
grf_free_view(old);
- return(0);
+ return 0;
}
static int
@@ -243,23 +243,24 @@
long *cme;
long *uep;
- if(ucm->size > MAX_CENTRIES)
- return(EINVAL);
+ if (ucm->size > MAX_CENTRIES)
+ return EINVAL;
/* add one incase of zero, ick. */
cme = malloc(sizeof(ucm->entry[0])*(ucm->size+1), M_TEMP,M_WAITOK);
if (cme == NULL)
- return(ENOMEM);
+ return ENOMEM;
error = 0;
uep = ucm->entry;
ucm->entry = cme; /* set entry to out alloc. */
- if(vu->view == NULL || grf_get_colormap(vu->view, ucm))
+ if (vu->view == NULL || grf_get_colormap(vu->view, ucm))
error = EINVAL;
- else error = copyout(cme, uep, sizeof(ucm->entry[0]) * ucm->size);
+ else
+ error = copyout(cme, uep, sizeof(ucm->entry[0]) * ucm->size);
ucm->entry = uep; /* set entry back to users. */
free(cme, M_TEMP);
- return(error);
+ return error;
}
static int
@@ -268,13 +269,13 @@
colormap_t *cm;
int error = 0;
- if(ucm->size > MAX_CENTRIES)
- return(EINVAL);
+ if (ucm->size > MAX_CENTRIES)
+ return EINVAL;
- cm = malloc(sizeof(ucm->entry[0])*ucm->size + sizeof(*cm), M_TEMP,
- M_WAITOK);
- if(cm == NULL)
- return(ENOMEM);
+ cm = malloc(sizeof(ucm->entry[0])*ucm->size + sizeof(*cm),
+ M_TEMP, M_WAITOK);
+ if (cm == NULL)
+ return ENOMEM;
memcpy(cm, ucm, sizeof(colormap_t));
cm->entry = (long *)&cm[1]; /* table directly after. */
@@ -283,7 +284,7 @@
&& (vu->view == NULL || grf_use_colormap(vu->view, cm)))
error = EINVAL;
free(cm, M_TEMP);
- return(error);
+ return error;
}
/*
@@ -299,10 +300,10 @@
vu = &views[minor(dev)];
- if(minor(dev) >= NVIEW)
- return(EXDEV);
- if(vu->flags & VUF_OPEN)
- return(EBUSY);
+ if (minor(dev) >= NVIEW)
+ return EXDEV;
+ if (vu->flags & VUF_OPEN)
+ return EBUSY;
vu->size.x = view_default_x;
vu->size.y = view_default_y;
@@ -311,7 +312,7 @@
vu->size.depth = view_default_depth;
vu->view = grf_alloc_view(NULL, &size, vu->size.depth);
if (vu->view == NULL)
- return(ENOMEM);
+ return ENOMEM;
vu->size.x = vu->view->display.x;
vu->size.y = vu->view->display.y;
@@ -319,7 +320,7 @@
vu->size.height = vu->view->display.height;
vu->size.depth = vu->view->bitmap->depth;
vu->flags |= VUF_OPEN;
- return(0);
+ return 0;
}
/*ARGSUSED*/
@@ -331,12 +332,12 @@
vu = &views[minor(dev)];
if ((vu->flags & VUF_OPEN) == 0)
- return (0); /* XXX not open? */
+ return 0; /* XXX not open? */
view_remove (vu);
grf_free_view (vu->view);
vu->flags = 0;
vu->view = NULL;
- return (0);
+ return 0;
}
@@ -384,7 +385,7 @@
error = EPASSTHROUGH;
break;
}
- return(error);
+ return error;
}
/*ARGSUSED*/
@@ -406,25 +407,26 @@
* control registers
*/
if (off >= 0 && off < bm->reg_size)
- return(((paddr_t)bm->hw_regs + off) >> PGSHIFT);
+ return ((paddr_t)bm->hw_regs + off) >> PGSHIFT;
/*
* VGA memory
*/
if (off >= bmd_vga && off < (bmd_vga + bm->vga_mappable))
- return(((paddr_t)bm->vga_address - bmd_vga + off) >> PGSHIFT);
+ return ((paddr_t)bm->vga_address - bmd_vga + off) >> PGSHIFT;
/*
* frame buffer
*/
if (off >= bmd_lin && off < (bmd_lin + bm->phys_mappable))
- return(((paddr_t)bmd_start - bmd_lin + off) >> PGSHIFT);
+ return ((paddr_t)bmd_start - bmd_lin + off) >> PGSHIFT;
- return(-1);
+ return -1;
}
view_t *
viewview(dev_t dev)
{
- return(views[minor(dev)].view);
+
+ return views[minor(dev)].view;
}
Index: src/sys/arch/atari/isa/isa_machdep.c
diff -u src/sys/arch/atari/isa/isa_machdep.c:1.36 src/sys/arch/atari/isa/isa_machdep.c:1.37
--- src/sys/arch/atari/isa/isa_machdep.c:1.36 Sun Aug 23 01:27:13 2009
+++ src/sys/arch/atari/isa/isa_machdep.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.36 2009/08/23 01:27:13 mrg Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.37 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1997 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.36 2009/08/23 01:27:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.37 2010/04/13 11:31:11 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -91,21 +91,21 @@
static int nmatched = 0;
if (strcmp((char *)auxp, "isab"))
- return (0); /* Wrong number... */
+ return 0; /* Wrong number... */
- if(atari_realconfig == 0)
- return (1);
+ if (atari_realconfig == 0)
+ return 1;
if (machineid & (ATARI_HADES|ATARI_MILAN)) {
/*
* The Hades and Milan have only one pci bus
*/
if (nmatched)
- return (0);
+ return 0;
nmatched++;
- return (1);
+ return 1;
}
- return(0);
+ return 0;
}
void
@@ -144,9 +144,10 @@
int
atariisabusprint(void *auxp, const char *name)
{
- if(name == NULL)
- return(UNCONF);
- return(QUIET);
+
+ if (name == NULL)
+ return UNCONF;
+ return QUIET;
}
void
Index: src/sys/arch/atari/pci/pci_machdep.c
diff -u src/sys/arch/atari/pci/pci_machdep.c:1.47 src/sys/arch/atari/pci/pci_machdep.c:1.48
--- src/sys/arch/atari/pci/pci_machdep.c:1.47 Wed Mar 18 10:22:25 2009
+++ src/sys/arch/atari/pci/pci_machdep.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.47 2009/03/18 10:22:25 cegger Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.48 2010/04/13 11:31:11 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.47 2009/03/18 10:22:25 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.48 2010/04/13 11:31:11 tsutsui Exp $");
#include "opt_mbtype.h"
@@ -144,21 +144,21 @@
static int nmatched = 0;
if (strcmp((char *)auxp, "pcib"))
- return (0); /* Wrong number... */
+ return 0; /* Wrong number... */
- if(atari_realconfig == 0)
- return (1);
+ if (atari_realconfig == 0)
+ return 1;
if (machineid & (ATARI_HADES|ATARI_MILAN)) {
/*
* Both Hades and Milan have only one pci bus
*/
if (nmatched)
- return (0);
+ return 0;
nmatched++;
- return (1);
+ return 1;
}
- return (0);
+ return 0;
}
void
@@ -204,9 +204,10 @@
int
ataripcibusprint(void *auxp, const char *name)
{
- if(name == NULL)
- return(UNCONF);
- return(QUIET);
+
+ if (name == NULL)
+ return UNCONF;
+ return QUIET;
}
void
@@ -598,7 +599,8 @@
pcitag_t
pci_make_tag(pci_chipset_tag_t pc, int bus, int device, int function)
{
- return ((bus << 16) | (device << 11) | (function << 8));
+
+ return (bus << 16) | (device << 11) | (function << 8);
}
void
@@ -679,7 +681,7 @@
panic("pci_intr_string: bogus handle 0x%x", ih);
sprintf(irqstr, "irq %d", ih);
- return (irqstr);
+ return irqstr;
}
Index: src/sys/arch/atari/vme/et4000.c
diff -u src/sys/arch/atari/vme/et4000.c:1.21 src/sys/arch/atari/vme/et4000.c:1.22
--- src/sys/arch/atari/vme/et4000.c:1.21 Tue Apr 13 09:51:07 2010
+++ src/sys/arch/atari/vme/et4000.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: et4000.c,v 1.21 2010/04/13 09:51:07 tsutsui Exp $ */
+/* $NetBSD: et4000.c,v 1.22 2010/04/13 11:31:11 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.21 2010/04/13 09:51:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.22 2010/04/13 11:31:11 tsutsui Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -151,7 +151,7 @@
{
struct vme_attach_args *va = auxp;
- return(et_probe_addresses(va));
+ return et_probe_addresses(va);
}
static int
@@ -173,7 +173,7 @@
if (vat.va_irq != VMECF_IRQ_DEFAULT) {
printf("et probe: config error: no irq support\n");
- return(0);
+ return 0;
}
if (vat.va_iobase == VMECF_IOPORT_DEFAULT)
vat.va_iobase = et_ap->io_addr;
@@ -186,24 +186,24 @@
if (bus_space_map(iot, vat.va_iobase, vat.va_iosize, 0,
&ioh)) {
printf("et probe: cannot map io area\n");
- return(0);
+ return 0;
}
if (bus_space_map(memt, vat.va_maddr, vat.va_msize,
BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_CACHEABLE,
&memh)) {
bus_space_unmap(iot, ioh, vat.va_iosize);
printf("et probe: cannot map memory area\n");
- return(0);
+ return 0;
}
found = et_detect(&iot, &memt, &ioh, &memh, vat.va_msize);
bus_space_unmap(iot, ioh, vat.va_iosize);
bus_space_unmap(memt, memh, vat.va_msize);
if (found) {
*va = vat;
- return(1);
+ return 1;
}
}
- return(0);
+ return 0;
}
static void
@@ -249,10 +249,10 @@
int vgabase;
/* Test accessibility of registers and memory */
- if(!bus_space_peek_1(*iot, *ioh, GREG_STATUS1_R))
- return(0);
- if(!bus_space_peek_1(*memt, *memh, 0))
- return(0);
+ if (!bus_space_peek_1(*iot, *ioh, GREG_STATUS1_R))
+ return 0;
+ if (!bus_space_peek_1(*memt, *memh, 0))
+ return 0;
et_start(iot, ioh, &vgabase, &saved);
@@ -270,7 +270,7 @@
new, (orig ^ 0x10));
#else
et_stop(iot, ioh, &vgabase, &saved);
- return(0);
+ return 0;
#endif
}
/* Is the card and ET4000? Check read/write of CRTC[33] */
@@ -285,7 +285,7 @@
new, (orig ^ 0x0f));
#else
et_stop(iot, ioh, &vgabase, &saved);
- return(0);
+ return 0;
#endif
}
@@ -310,7 +310,7 @@
printf("et4000: Video base write/read failed\n");
#else
et_stop(iot, ioh, &vgabase, &saved);
- return(0);
+ return 0;
#endif
}
bus_space_write_4(*memt, *memh, memsize - 4, TEST_PATTERN);
@@ -320,12 +320,12 @@
printf("et4000: Video top write/read failed\n");
#else
et_stop(iot, ioh, &vgabase, &saved);
- return(0);
+ return 0;
#endif
}
et_stop(iot, ioh, &vgabase, &saved);
- return(1);
+ return 1;
}
static void
@@ -366,11 +366,11 @@
sc = device_lookup_private(&et_cd, minor(dev));
if (sc == NULL)
- return(ENXIO);
+ return ENXIO;
if (sc->sc_flags & ET_SC_FLAGS_INUSE)
- return(EBUSY);
+ return EBUSY;
sc->sc_flags |= ET_SC_FLAGS_INUSE;
- return(0);
+ return 0;
}
int
@@ -383,19 +383,21 @@
*/
sc = device_lookup_private(&et_cd, minor(dev));
sc->sc_flags &= ~ET_SC_FLAGS_INUSE;
- return(0);
+ return 0;
}
int
etread(dev_t dev, struct uio *uio, int flags)
{
- return(EINVAL);
+
+ return EINVAL;
}
int
etwrite(dev_t dev, struct uio *uio, int flags)
{
- return(EINVAL);
+
+ return EINVAL;
}
int
@@ -407,10 +409,10 @@
sc = device_lookup_private(&et_cd, minor(dev));
switch (cmd) {
case GRFIOCON:
- return(0);
+ return 0;
break;
case GRFIOCOFF:
- return(0);
+ return 0;
break;
case GRFIOCGINFO:
g_display.gd_fbaddr = (void *) (sc->sc_maddr);
@@ -435,16 +437,16 @@
memcpy(data, (void *)&g_display, sizeof(struct grfinfo));
break;
case GRFIOCMAP:
- return(EINVAL);
+ return EINVAL;
break;
case GRFIOCUNMAP:
- return(EINVAL);
+ return EINVAL;
break;
default:
- return(EINVAL);
+ return EINVAL;
break;
}
- return(0);
+ return 0;
}
paddr_t
@@ -459,23 +461,23 @@
* mapped from offset 0x0 to REG_MAPPABLE
*/
if (offset >= 0 && offset <= sc->sc_iosize)
- return(m68k_btop(sc->sc_iobase + offset));
+ return m68k_btop(sc->sc_iobase + offset);
/*
* VGA memory
* mapped from offset 0xa0000 to 0xc0000
*/
if (offset >= VGA_BASE && offset < (VGA_MAPPABLE + VGA_BASE))
- return(m68k_btop(sc->sc_maddr + offset - VGA_BASE));
+ return m68k_btop(sc->sc_maddr + offset - VGA_BASE);
/*
* frame buffer
* mapped from offset 0x400000 to 0x4fffff
*/
if (offset >= FRAME_BASE && offset < sc->sc_msize + FRAME_BASE)
- return(m68k_btop(sc->sc_maddr + offset - FRAME_BASE));
+ return m68k_btop(sc->sc_maddr + offset - FRAME_BASE);
- return(-1);
+ return -1;
}
int
@@ -484,16 +486,17 @@
struct et_softc *sc;
if (minor(dev) >= et_cd.cd_ndevs)
- return(ENXIO);
+ return ENXIO;
sc = device_lookup_private(&et_cd, minor(dev));
if (sc == NULL)
- return(ENXIO);
- return(0);
+ return ENXIO;
+ return 0;
}
int
etoff(dev_t dev)
{
- return(0);
+
+ return 0;
}
Index: src/sys/arch/atari/vme/if_le_vme.c
diff -u src/sys/arch/atari/vme/if_le_vme.c:1.29 src/sys/arch/atari/vme/if_le_vme.c:1.30
--- src/sys/arch/atari/vme/if_le_vme.c:1.29 Tue Mar 16 17:56:41 2010
+++ src/sys/arch/atari/vme/if_le_vme.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_vme.c,v 1.29 2010/03/16 17:56:41 tsutsui Exp $ */
+/* $NetBSD: if_le_vme.c,v 1.30 2010/04/13 11:31:11 tsutsui Exp $ */
/*-
* Copyright (c) 1998 maximum entropy. All rights reserved.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.29 2010/03/16 17:56:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.30 2010/04/13 11:31:11 tsutsui Exp $");
#include "opt_inet.h"
@@ -197,7 +197,7 @@
val = bus_space_read_2(lesc->sc_iot, lesc->sc_ioh, LER_RDP);
splx(s);
- return (val);
+ return val;
}
static int
@@ -228,14 +228,17 @@
if ((le_ap->irq != IRQUNK) && (va->va_irq != le_ap->irq))
continue;
- if (bus_space_map(iot, le_ap->reg_addr, le_ap->reg_size, 0, &ioh)) {
+ if (bus_space_map(iot, le_ap->reg_addr, le_ap->reg_size, 0,
+ &ioh)) {
aprint_error("leprobe: cannot map io-area\n");
- return (0);
+ return 0;
}
if (le_ap->mem_size == VMECF_MEMSIZ_DEFAULT) {
if (bvme410_probe(iot, ioh)) {
- bus_space_write_2(iot, ioh, BVME410_BAR, 0x1); /* XXX */
- le_ap->mem_size = bvme410_mem_size(memt, le_ap->mem_addr);
+ bus_space_write_2(iot, ioh,
+ BVME410_BAR, 0x1); /* XXX */
+ le_ap->mem_size =
+ bvme410_mem_size(memt, le_ap->mem_addr);
}
}
if (le_ap->mem_size == VMECF_MEMSIZ_DEFAULT) {
@@ -243,10 +246,11 @@
continue;
}
- if (bus_space_map(memt, le_ap->mem_addr, le_ap->mem_size, 0, &memh)) {
+ if (bus_space_map(memt, le_ap->mem_addr, le_ap->mem_size, 0,
+ &memh)) {
bus_space_unmap(iot, ioh, le_ap->reg_size);
aprint_error("leprobe: cannot map memory-area\n");
- return (0);
+ return 0;
}
found = probe_addresses(&iot, &memt, &ioh, &memh);
bus_space_unmap(iot, ioh, le_ap->reg_size);
@@ -262,8 +266,8 @@
va->va_irq = le_ap->irq;
return 1;
}
- }
- return (0);
+ }
+ return 0;
}
static int
@@ -373,39 +377,36 @@
/*
* Go on to find board type
*/
- if ((le_ap->type_hint & LE_PAM)
- && bus_space_peek_1(va->va_iot, ioh, LER_EEPROM)) {
+ if ((le_ap->type_hint & LE_PAM) &&
+ bus_space_peek_1(va->va_iot, ioh, LER_EEPROM)) {
aprint_normal("PAM card");
lesc->sc_type = LE_PAM;
bus_space_read_1(va->va_iot, ioh, LER_MEME);
- }
- else if((le_ap->type_hint & LE_BVME410)
- && bvme410_probe(va->va_iot, ioh)) {
+ } else if ((le_ap->type_hint & LE_BVME410) &&
+ bvme410_probe(va->va_iot, ioh)) {
aprint_normal("BVME410");
lesc->sc_type = LE_BVME410;
- }
- else if (le_ap->type_hint & (LE_NEW_RIEBL|LE_OLD_RIEBL)) {
+ } else if (le_ap->type_hint & (LE_NEW_RIEBL|LE_OLD_RIEBL)) {
aprint_normal("Riebl card");
- if(bus_space_read_4(va->va_memt, memh, RIEBL_MAGIC_ADDR)
- == RIEBL_MAGIC)
+ if (bus_space_read_4(va->va_memt, memh, RIEBL_MAGIC_ADDR) ==
+ RIEBL_MAGIC)
lesc->sc_type = LE_NEW_RIEBL;
else {
aprint_normal("(without battery) ");
lesc->sc_type = LE_OLD_RIEBL;
}
- }
- else
+ } else
aprint_error("le_vme_attach: Unsupported card!");
switch (lesc->sc_type) {
- case LE_BVME410:
+ case LE_BVME410:
sc->sc_copytodesc = bvme410_copytobuf;
sc->sc_copyfromdesc = lance_copyfrombuf_contig;
sc->sc_copytobuf = bvme410_copytobuf;
sc->sc_copyfrombuf = lance_copyfrombuf_contig;
sc->sc_zerobuf = bvme410_zerobuf;
break;
- default:
+ default:
sc->sc_copytodesc = lance_copytobuf_contig;
sc->sc_copyfromdesc = lance_copyfrombuf_contig;
sc->sc_copytobuf = lance_copytobuf_contig;
@@ -426,16 +427,16 @@
* Get MAC address
*/
switch (lesc->sc_type) {
- case LE_OLD_RIEBL:
+ case LE_OLD_RIEBL:
memcpy(sc->sc_enaddr, riebl_def_mac,
sizeof(sc->sc_enaddr));
break;
- case LE_NEW_RIEBL:
+ case LE_NEW_RIEBL:
for (i = 0; i < sizeof(sc->sc_enaddr); i++)
sc->sc_enaddr[i] =
bus_space_read_1(va->va_memt, memh, i + RIEBL_MAC_ADDR);
break;
- case LE_PAM:
+ case LE_PAM:
i = bus_space_read_1(va->va_iot, ioh, LER_EEPROM);
for (i = 0; i < sizeof(sc->sc_enaddr); i++) {
sc->sc_enaddr[i] =
@@ -444,7 +445,7 @@
}
i = bus_space_read_1(va->va_iot, ioh, LER_MEME);
break;
- case LE_BVME410:
+ case LE_BVME410:
for (i = 0; i < (sizeof(sc->sc_enaddr) >> 1); i++) {
uint16_t tmp;
@@ -464,7 +465,7 @@
* XXX: We always use uservector 64....
*/
if ((lesc->sc_intr = intr_establish(64, USER_VEC, 0,
- (hw_ifun_t)le_intr, lesc)) == NULL) {
+ (hw_ifun_t)le_intr, lesc)) == NULL) {
aprint_error("le_vme_attach: Can't establish interrupt\n");
return;
}
@@ -475,14 +476,16 @@
switch (lesc->sc_type) {
case LE_OLD_RIEBL:
case LE_NEW_RIEBL:
- bus_space_write_2(va->va_memt, memh, RIEBL_IVEC_ADDR,
- 64 + 64);
+ bus_space_write_2(va->va_memt, memh,
+ RIEBL_IVEC_ADDR, 64 + 64);
break;
case LE_PAM:
- bus_space_write_1(va->va_iot, ioh, LER_IVEC, 64 + 64);
+ bus_space_write_1(va->va_iot, ioh,
+ LER_IVEC, 64 + 64);
break;
case LE_BVME410:
- bus_space_write_2(va->va_iot, ioh, BVME410_IVEC, 64 + 64);
+ bus_space_write_2(va->va_iot, ioh,
+ BVME410_IVEC, 64 + 64);
break;
}
@@ -504,17 +507,17 @@
int offset = 0;
int i;
- for(i = 0; i < sc->sc_nrbuf; i++) {
- if (WITHIN(sc->sc_rbufaddr[i], LEBLEN, RIEBL_RES_START)
- || WITHIN(sc->sc_rbufaddr[i], LEBLEN, RIEBL_RES_END)) {
+ for (i = 0; i < sc->sc_nrbuf; i++) {
+ if (WITHIN(sc->sc_rbufaddr[i], LEBLEN, RIEBL_RES_START) ||
+ WITHIN(sc->sc_rbufaddr[i], LEBLEN, RIEBL_RES_END)) {
offset = RIEBL_RES_END - sc->sc_rbufaddr[i];
}
sc->sc_rbufaddr[i] += offset;
}
- for(i = 0; i < sc->sc_ntbuf; i++) {
- if (WITHIN(sc->sc_tbufaddr[i], LEBLEN, RIEBL_RES_START)
- || WITHIN(sc->sc_tbufaddr[i], LEBLEN, RIEBL_RES_END)) {
+ for (i = 0; i < sc->sc_ntbuf; i++) {
+ if (WITHIN(sc->sc_tbufaddr[i], LEBLEN, RIEBL_RES_START) ||
+ WITHIN(sc->sc_tbufaddr[i], LEBLEN, RIEBL_RES_END)) {
offset = RIEBL_RES_END - sc->sc_tbufaddr[i];
}
sc->sc_tbufaddr[i] += offset;
Index: src/sys/arch/atari/vme/vme_machdep.c
diff -u src/sys/arch/atari/vme/vme_machdep.c:1.18 src/sys/arch/atari/vme/vme_machdep.c:1.19
--- src/sys/arch/atari/vme/vme_machdep.c:1.18 Sat Mar 14 21:04:08 2009
+++ src/sys/arch/atari/vme/vme_machdep.c Tue Apr 13 11:31:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.18 2009/03/14 21:04:08 dsl Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.19 2010/04/13 11:31:11 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.18 2009/03/14 21:04:08 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.19 2010/04/13 11:31:11 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -58,11 +58,12 @@
int
vmebusmatch(struct device *pdp, struct cfdata *cfp, void *auxp)
{
- if(atari_realconfig == 0)
- return (0);
+
+ if (atari_realconfig == 0)
+ return 0;
if (strcmp((char *)auxp, "avmebus") || vmebus_attached)
- return(0);
- return(machineid & ATARI_FALCON ? 0 : 1);
+ return 0;
+ return (machineid & ATARI_FALCON) ? 0 : 1;
}
void
@@ -93,7 +94,8 @@
int
vmebusprint(void *auxp, const char *name)
{
- if(name == NULL)
- return(UNCONF);
- return(QUIET);
+
+ if (name == NULL)
+ return UNCONF;
+ return QUIET;
}
