Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/atari/dev Misc KNF.
details: https://anonhg.NetBSD.org/src/rev/07d7422777fa
branches: trunk
changeset: 753905:07d7422777fa
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Tue Apr 13 13:29:35 2010 +0000
description:
Misc KNF.
diffstat:
sys/arch/atari/dev/ite_cc.c | 383 ++++++++++++++++++++++---------------------
1 files changed, 193 insertions(+), 190 deletions(-)
diffs (truncated from 715 to 300 lines):
diff -r c294021461f0 -r 07d7422777fa sys/arch/atari/dev/ite_cc.c
--- a/sys/arch/atari/dev/ite_cc.c Tue Apr 13 13:09:46 2010 +0000
+++ b/sys/arch/atari/dev/ite_cc.c Tue Apr 13 13:29:35 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_cc.c,v 1.35 2010/02/09 23:05:16 wiz Exp $ */
+/* $NetBSD: ite_cc.c,v 1.36 2010/04/13 13:29:35 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.35 2010/02/09 23:05:16 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.36 2010/04/13 13:29:35 tsutsui Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -130,9 +130,9 @@
int
grfccmatch(struct device *pdp, struct cfdata *cfp, void *auxp)
{
- static int did_consinit = 0;
- static int must_probe = 1;
- grf_auxp_t *grf_auxp = auxp;
+ static int did_consinit = 0;
+ static int must_probe = 1;
+ grf_auxp_t *grf_auxp = auxp;
extern const struct cdevsw view_cdevsw;
if (must_probe) {
@@ -140,15 +140,15 @@
* Check if the layers we depend on exist
*/
if (!(machineid & (ATARI_TT|ATARI_FALCON)))
- return (0);
+ return 0;
#ifdef TT_VIDEO
if ((machineid & ATARI_TT) && !grfabs_probe(&tt_probe_video))
- return (0);
+ return 0;
#endif /* TT_VIDEO */
#ifdef FALCON_VIDEO
- if ((machineid & ATARI_FALCON)
- && !grfabs_probe(&falcon_probe_video))
- return (0);
+ if ((machineid & ATARI_FALCON) &&
+ !grfabs_probe(&falcon_probe_video))
+ return 0;
#endif /* FALCON_VIDEO */
viewprobe();
@@ -160,12 +160,12 @@
* Early console init. Only match first unit.
*/
if (did_consinit)
- return(0);
+ return 0;
if ((*view_cdevsw.d_open)(cfp->cf_unit, 0, 0, NULL))
- return(0);
+ return 0;
cfdata_grf = cfp;
did_consinit = 1;
- return (1);
+ return 1;
}
/*
@@ -174,20 +174,20 @@
* the other configured units.
*/
if (grf_auxp->from_bus_match && (did_consinit > 1))
- return (0);
+ return 0;
if (!grf_auxp->from_bus_match && (grf_auxp->unit != cfp->cf_unit))
- return (0);
+ return 0;
/*
* 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);
+ return 1;
}
/*
@@ -197,12 +197,12 @@
void
grfccattach(struct device *pdp, struct device *dp, void *auxp)
{
- static struct grf_softc congrf;
- static int first_attach = 1;
- grf_auxp_t *grf_bus_auxp = auxp;
- grf_auxp_t grf_auxp;
- struct grf_softc *gp;
- int maj;
+ static struct grf_softc congrf;
+ static int first_attach = 1;
+ grf_auxp_t *grf_bus_auxp = auxp;
+ grf_auxp_t grf_auxp;
+ struct grf_softc *gp;
+ int maj;
extern const struct cdevsw grf_cdevsw;
/*
@@ -213,7 +213,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;
@@ -233,15 +233,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;
@@ -254,9 +253,10 @@
printf(": width %d height %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
@@ -270,7 +270,7 @@
first_attach = 0;
grf_auxp.from_bus_match = 0;
for (grf_auxp.unit=1; grf_auxp.unit < NGRFCC; grf_auxp.unit++) {
- config_found(pdp, (void*)&grf_auxp, grf_bus_auxp->busprint);
+ config_found(pdp, &grf_auxp, grf_bus_auxp->busprint);
}
}
}
@@ -278,9 +278,10 @@
int
grfccprint(void *auxp, const char *pnp)
{
- if(pnp)
+
+ if (pnp)
aprint_normal("ite at %s", pnp);
- return(UNCONF);
+ return UNCONF;
}
/*
@@ -289,7 +290,7 @@
int
grfcc_cnprobe(void)
{
- return(CN_INTERNAL);
+ return CN_INTERNAL;
}
/*
* called from grf_cc to init ite portion of
@@ -319,7 +320,7 @@
struct itewinsize wsz;
ipriv_t *cci;
- if((cci = ip->priv) != NULL)
+ if ((cci = ip->priv) != NULL)
return;
ip->itexx_ioctl = itecc_ioctl;
@@ -331,13 +332,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));
@@ -356,7 +358,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);
}
@@ -396,25 +398,26 @@
ite_default_y = view->display.y;
ite_default_depth = view->bitmap->depth;
- if(cci->row_ptr && (cci->row_ptr != con_rows)) {
+ if (cci->row_ptr && (cci->row_ptr != con_rows)) {
free(cci->row_ptr, M_DEVBUF);
cci->row_ptr = NULL;
}
- if(cci->column_offset && (cci->column_offset != con_columns)) {
+ if (cci->column_offset && (cci->column_offset != con_columns)) {
free(cci->column_offset, M_DEVBUF);
cci->column_offset = NULL;
}
- if(!atari_realconfig) {
+ if (!atari_realconfig) {
cci->row_ptr = con_rows;
cci->column_offset = con_columns;
- }
- else {
- cci->row_ptr = malloc(sizeof(u_char *) * ip->rows,M_DEVBUF,M_NOWAIT);
- cci->column_offset = malloc(sizeof(u_int)*ip->cols,M_DEVBUF,M_NOWAIT);
+ } else {
+ cci->row_ptr = malloc(sizeof(u_char *) * ip->rows,
+ M_DEVBUF, M_NOWAIT);
+ cci->column_offset = malloc(sizeof(u_int) * ip->cols,
+ M_DEVBUF, M_NOWAIT);
}
- if(!cci->row_ptr || !cci->column_offset)
+ if (!cci->row_ptr || !cci->column_offset)
panic("No memory for ite-view");
cci->width = view->bitmap->bytes_per_row << 3;
@@ -424,8 +427,8 @@
cci->ft_y = ip->font.height;
cci->row_bytes = cci->row_offset * cci->ft_y;
cci->row_ptr[0] = view->bitmap->plane;
- for(i = 1; i < ip->rows; i++)
- cci->row_ptr[i] = cci->row_ptr[i-1] + cci->row_bytes;
+ for (i = 1; i < ip->rows; i++)
+ cci->row_ptr[i] = cci->row_ptr[i - 1] + cci->row_bytes;
/*
* Initialize the column offsets to point at the correct location
@@ -433,19 +436,20 @@
*/
j = view->bitmap->depth * 2;
cci->column_offset[0] = 0;
- for(i = 1; i < ip->cols; i++)
+ for (i = 1; i < ip->cols; i++)
cci->column_offset[i] = ((i >> 1) * j) + (i & 1);
/* initialize the font cell pointers */
cci->font_cell[ip->font.font_lo] = ip->font.font_p;
- for(i = ip->font.font_lo+1; i <= ip->font.font_hi; i++)
- cci->font_cell[i] = cci->font_cell[i-1] + ip->font.height;
+ for (i = ip->font.font_lo + 1; i <= ip->font.font_hi; i++)
+ cci->font_cell[i] = cci->font_cell[i - 1] + ip->font.height;
- return(error);
+ return error;
}
int
-itecc_ioctl(struct ite_softc *ip, u_long cmd, void * addr, int flag, struct lwp *l)
+itecc_ioctl(struct ite_softc *ip, u_long cmd, void * addr, int flag,
+ struct lwp *l)
{
struct winsize ws;
struct itewinsize *is;
@@ -458,7 +462,7 @@
case ITEIOCSWINSZ:
is = (struct itewinsize *)addr;
- if(ite_newsize(ip, is))
+ if (ite_newsize(ip, is))
Home |
Main Index |
Thread Index |
Old Index