From f3a2b348daf9fa6063c38d2d69563f732a2f80e7 Mon Sep 17 00:00:00 2001 From: rgrimes Date: Tue, 30 May 1995 06:12:45 +0000 Subject: Remove trailing whitespace. --- sys/dev/syscons/blank/blank_saver.c | 10 +++++----- sys/dev/syscons/fade/fade_saver.c | 6 +++--- sys/dev/syscons/green/green_saver.c | 10 +++++----- sys/dev/syscons/snake/snake_saver.c | 8 ++++---- sys/dev/syscons/star/star_saver.c | 18 +++++++++--------- 5 files changed, 26 insertions(+), 26 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c index 9362c0b..e48e037 100644 --- a/sys/dev/syscons/blank/blank_saver.c +++ b/sys/dev/syscons/blank/blank_saver.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: blank_saver.c,v 1.1 1995/02/22 13:45:30 sos Exp $ */ #include @@ -42,17 +42,17 @@ MOD_MISC("blank_saver") void (*current_saver)(); void (*old_saver)(); -static void +static void blank_saver(int blank) { u_char val; if (blank) { scrn_blanked = 1; - outb(TSIDX, 0x01); val = inb(TSREG); + outb(TSIDX, 0x01); val = inb(TSREG); outb(TSIDX, 0x01); outb(TSREG, val | 0x20); } else { - outb(TSIDX, 0x01); val = inb(TSREG); + outb(TSIDX, 0x01); val = inb(TSREG); outb(TSIDX, 0x01); outb(TSREG, val & 0xDF); scrn_blanked = 0; } diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c index a58eaa0..e639fca 100644 --- a/sys/dev/syscons/fade/fade_saver.c +++ b/sys/dev/syscons/fade/fade_saver.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: fade_saver.c,v 1.1 1995/02/22 13:46:32 sos Exp $ */ #include @@ -42,7 +42,7 @@ MOD_MISC("fade_saver") void (*current_saver)(); void (*old_saver)(); -static void +static void fade_saver(int blank) { static int count = 0; diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c index e6ed074..8dfe086 100644 --- a/sys/dev/syscons/green/green_saver.c +++ b/sys/dev/syscons/green/green_saver.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: green_saver.c,v 1.1 1995/02/22 13:47:14 sos Exp $ */ #include @@ -42,19 +42,19 @@ MOD_MISC("green_saver") void (*current_saver)(); void (*old_saver)(); -static void +static void green_saver(int blank) { u_char val; if (blank) { scrn_blanked = 1; - outb(TSIDX, 0x01); val = inb(TSREG); + outb(TSIDX, 0x01); val = inb(TSREG); outb(TSIDX, 0x01); outb(TSREG, val | 0x20); outb(crtc_addr, 0x17); val = inb(crtc_addr + 1); outb(crtc_addr + 1, val & ~0x80); } else { - outb(TSIDX, 0x01); val = inb(TSREG); + outb(TSIDX, 0x01); val = inb(TSREG); outb(TSIDX, 0x01); outb(TSREG, val & 0xDF); outb(crtc_addr, 0x17); val = inb(crtc_addr + 1); outb(crtc_addr + 1, val | 0x80); diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c index e2c970c..c7deb6b 100644 --- a/sys/dev/syscons/snake/snake_saver.c +++ b/sys/dev/syscons/snake/snake_saver.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: snake_saver.c,v 1.2 1995/03/30 15:10:20 sos Exp $ + * $Id: snake_saver.c,v 1.3 1995/05/16 19:10:11 sos Exp $ */ #include @@ -42,7 +42,7 @@ MOD_MISC("snake_saver") void (*current_saver)(); void (*old_saver)(); -static void +static void snake_saver(int blank) { const char saves[] = {"FreeBSD-2.0.5"}; @@ -70,7 +70,7 @@ snake_saver(int blank) outb(crtc_addr+1, f & 0xff); scrn_blanked = 1; } - if (scrn_blanked++ < 4) + if (scrn_blanked++ < 4) return; scrn_blanked = 1; *(savs[sizeof(saves)-2]) = scr_map[0x20]; diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c index d6d0319..d023228 100644 --- a/sys/dev/syscons/star/star_saver.c +++ b/sys/dev/syscons/star/star_saver.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: star_saver.c,v 1.1 1995/02/22 13:47:36 sos Exp $ + * $Id: star_saver.c,v 1.2 1995/03/30 15:10:03 sos Exp $ */ #include @@ -48,31 +48,31 @@ void (*old_saver)(); * Alternate saver that got its inspiration from a well known utility * package for an inferior^H^H^H^H^H^Hfamous OS. */ -void +void star_saver(int blank) { scr_stat *scp = cur_console; int cell, i; char pattern[] = {"...........++++*** "}; - char colors[] = {FG_DARKGREY, FG_LIGHTGREY, + char colors[] = {FG_DARKGREY, FG_LIGHTGREY, FG_WHITE, FG_LIGHTCYAN}; static u_short stars[NUM_STARS][2]; - + if (blank) { if (!scrn_blanked) { scrn_blanked = 1; - fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat, + fillw((FG_LIGHTGREY|BG_BLACK)<<8|scr_map[0x20], Crtat, scp->xsize * scp->ysize); set_border(0); for(i=0; ixsize*scp->ysize); stars[i][1] = 0; } } cell = random() % NUM_STARS; - *((u_short*)(Crtat + stars[cell][0])) = - scr_map[pattern[stars[cell][1]]] | + *((u_short*)(Crtat + stars[cell][0])) = + scr_map[pattern[stars[cell][1]]] | colors[random()%sizeof(colors)] << 8; if ((stars[cell][1]+=(random()%4)) >= sizeof(pattern)-1) { stars[cell][0] = random() % (scp->xsize*scp->ysize); -- cgit v1.1