Module Name: src
Committed By: tsutsui
Date: Thu Jul 14 20:13:21 UTC 2022
Modified Files:
src/sys/arch/luna68k/dev: lunafb.c
Log Message:
Misc KNF and cosmetics.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/luna68k/dev/lunafb.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/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.45 src/sys/arch/luna68k/dev/lunafb.c:1.46
--- src/sys/arch/luna68k/dev/lunafb.c:1.45 Thu Jul 14 19:55:56 2022
+++ src/sys/arch/luna68k/dev/lunafb.c Thu Jul 14 20:13:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.45 2022/07/14 19:55:56 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.46 2022/07/14 20:13:21 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.45 2022/07/14 19:55:56 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.46 2022/07/14 20:13:21 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -322,20 +322,24 @@ static int
omgetcmap(struct omfb_softc *sc, struct wsdisplay_cmap *p)
{
u_int index = p->index, count = p->count;
- int cmsize, error;
+ u_int cmsize;
+ int error;
cmsize = sc->sc_dc->dc_cmsize;
if (index >= cmsize || count > cmsize - index)
return EINVAL;
error = copyout(&sc->sc_dc->dc_cmap.r[index], p->red, count);
- if (error)
+ if (error != 0)
return error;
error = copyout(&sc->sc_dc->dc_cmap.g[index], p->green, count);
- if (error)
+ if (error != 0)
return error;
error = copyout(&sc->sc_dc->dc_cmap.b[index], p->blue, count);
- return error;
+ if (error != 0)
+ return error;
+
+ return 0;
}
static int
@@ -343,20 +347,22 @@ omsetcmap(struct omfb_softc *sc, struct
{
struct hwcmap cmap;
u_int index = p->index, count = p->count;
- int cmsize, i, error;
+ u_int cmsize;
+ int i, error;
cmsize = sc->sc_dc->dc_cmsize;
+
if (index >= cmsize || count > cmsize - index)
return EINVAL;
error = copyin(p->red, &cmap.r[index], count);
- if (error)
+ if (error != 0)
return error;
error = copyin(p->green, &cmap.g[index], count);
- if (error)
+ if (error != 0)
return error;
error = copyin(p->blue, &cmap.b[index], count);
- if (error)
+ if (error != 0)
return error;
memcpy(&sc->sc_dc->dc_cmap.r[index], &cmap.r[index], count);
@@ -495,7 +501,7 @@ omfb_getdevconfig(paddr_t paddr, struct
ri = &dc->dc_ri;
ri->ri_width = dc->dc_wid;
ri->ri_height = dc->dc_ht;
- ri->ri_depth = 1; /* since planes are independently addressed */
+ ri->ri_depth = 1; /* since planes are independently addressed */
ri->ri_stride = dc->dc_rowbytes;
ri->ri_bits = (void *)dc->dc_videobase;
ri->ri_flg = RI_CENTER;
