Module Name: src
Committed By: tsutsui
Date: Sun Jun 30 02:11:56 UTC 2019
Modified Files:
src/sys/arch/luna68k/dev: if_le.c lcd.c lunafb.c siotty.c
Log Message:
Misc KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/dev/if_le.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/luna68k/dev/lcd.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/luna68k/dev/lunafb.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/luna68k/dev/siotty.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/if_le.c
diff -u src/sys/arch/luna68k/dev/if_le.c:1.7 src/sys/arch/luna68k/dev/if_le.c:1.8
--- src/sys/arch/luna68k/dev/if_le.c:1.7 Mon Sep 23 17:27:09 2013
+++ src/sys/arch/luna68k/dev/if_le.c Sun Jun 30 02:11:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.7 2013/09/23 17:27:09 tsutsui Exp $ */
+/* $NetBSD: if_le.c,v 1.8 2019/06/30 02:11:56 tsutsui Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.7 2013/09/23 17:27:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.8 2019/06/30 02:11:56 tsutsui Exp $");
#include "opt_inet.h"
@@ -152,7 +152,7 @@ lerdcsr(struct lance_softc *sc, uint16_t
ler1->ler1_rap = port;
val = ler1->ler1_rdp;
- return (val);
+ return val;
}
static int
@@ -161,9 +161,9 @@ le_match(device_t parent, cfdata_t cf, v
struct mainbus_attach_args *ma = aux;
if (strcmp(ma->ma_name, le_cd.cd_name))
- return (0);
+ return 0;
- return (1);
+ return 1;
}
void
Index: src/sys/arch/luna68k/dev/lcd.c
diff -u src/sys/arch/luna68k/dev/lcd.c:1.9 src/sys/arch/luna68k/dev/lcd.c:1.10
--- src/sys/arch/luna68k/dev/lcd.c:1.9 Thu Mar 8 03:12:02 2018
+++ src/sys/arch/luna68k/dev/lcd.c Sun Jun 30 02:11:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lcd.c,v 1.9 2018/03/08 03:12:02 mrg Exp $ */
+/* $NetBSD: lcd.c,v 1.10 2019/06/30 02:11:56 tsutsui Exp $ */
/* $OpenBSD: lcd.c,v 1.7 2015/02/10 22:42:35 miod Exp $ */
/*-
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lcd.c,v 1.9 2018/03/08 03:12:02 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcd.c,v 1.10 2019/06/30 02:11:56 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,10 +71,10 @@ __KERNEL_RCSID(0, "$NetBSD: lcd.c,v 1.9
#define LCD_MAXBUFLEN 80
struct pio {
- volatile u_int8_t portA;
- volatile u_int8_t portB;
- volatile u_int8_t portC;
- volatile u_int8_t cntrl;
+ volatile uint8_t portA;
+ volatile uint8_t portB;
+ volatile uint8_t portC;
+ volatile uint8_t cntrl;
};
/* Autoconf stuff */
@@ -344,6 +344,7 @@ lcdshow(char *s)
void
greeting(void)
{
+
lcdctrl(LCD_INIT);
lcdctrl(LCD_ENTRY);
lcdctrl(LCD_ON);
Index: src/sys/arch/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.37 src/sys/arch/luna68k/dev/lunafb.c:1.38
--- src/sys/arch/luna68k/dev/lunafb.c:1.37 Wed Jan 24 05:35:58 2018
+++ src/sys/arch/luna68k/dev/lunafb.c Sun Jun 30 02:11:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.37 2018/01/24 05:35:58 riastradh Exp $ */
+/* $NetBSD: lunafb.c,v 1.38 2019/06/30 02:11:56 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.37 2018/01/24 05:35:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.38 2019/06/30 02:11:56 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -346,7 +346,7 @@ omsetcmap(struct omfb_softc *sc, struct
cmsize = sc->sc_dc->dc_cmsize;
if (index >= cmsize || count > cmsize - index)
- return (EINVAL);
+ return EINVAL;
error = copyin(p->red, &cmap.r[index], count);
if (error)
Index: src/sys/arch/luna68k/dev/siotty.c
diff -u src/sys/arch/luna68k/dev/siotty.c:1.44 src/sys/arch/luna68k/dev/siotty.c:1.45
--- src/sys/arch/luna68k/dev/siotty.c:1.44 Fri Aug 21 10:48:06 2015
+++ src/sys/arch/luna68k/dev/siotty.c Sun Jun 30 02:11:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.44 2015/08/21 10:48:06 christos Exp $ */
+/* $NetBSD: siotty.c,v 1.45 2019/06/30 02:11:56 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: siotty.c,v 1.44 2015/08/21 10:48:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.45 2019/06/30 02:11:56 tsutsui Exp $");
#include "opt_ddb.h"
@@ -602,7 +602,7 @@ siopoll(dev_t dev, int events, struct lw
sc = device_lookup_private(&siotty_cd, minor(dev));
tp = sc->sc_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, l));
+ return (*tp->t_linesw->l_poll)(tp, events, l);
}
int
