Module Name: src
Committed By: kiyohara
Date: Wed Mar 10 18:36:05 UTC 2010
Modified Files:
src/sys/arch/powerpc/oea: ofw_consinit.c ofw_rascons.c ofwoea_machdep.c
Log Message:
Remove white-spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/oea/ofw_consinit.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/oea/ofw_rascons.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/oea/ofwoea_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/powerpc/oea/ofw_consinit.c
diff -u src/sys/arch/powerpc/oea/ofw_consinit.c:1.8 src/sys/arch/powerpc/oea/ofw_consinit.c:1.9
--- src/sys/arch/powerpc/oea/ofw_consinit.c:1.8 Thu Sep 25 14:47:54 2008
+++ src/sys/arch/powerpc/oea/ofw_consinit.c Wed Mar 10 18:36:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_consinit.c,v 1.8 2008/09/25 14:47:54 macallan Exp $ */
+/* $NetBSD: ofw_consinit.c,v 1.9 2010/03/10 18:36:05 kiyohara Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.8 2008/09/25 14:47:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_consinit.c,v 1.9 2010/03/10 18:36:05 kiyohara Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -135,7 +135,7 @@
ofwoea_bootstrap_console();
OFPRINTF("console node: %08x\n", console_node);
-
+
if (console_node == -1)
goto nocons;
@@ -254,15 +254,15 @@
* This is not enough, we have a few more problems:
*
* (1) The stupid Macintosh firmware uses a
- * `psuedo-hid' (no typo) or `pseudo-hid',
- * which apparently merges all keyboards
- * input into a single input stream.
- * Because of this, we can't actually
- * determine which controller or keyboard
+ * `psuedo-hid' (no typo) or `pseudo-hid',
+ * which apparently merges all keyboards
+ * input into a single input stream.
+ * Because of this, we can't actually
+ * determine which controller or keyboard
* is really the console keyboard!
*
* (2) Even if we could, the keyboard can be USB,
- * and this requires a lot of the kernel to
+ * and this requires a lot of the kernel to
* be running in order for it to work.
*
* (3) If the keyboard is behind isa, we don't have enough
@@ -271,9 +271,9 @@
* So, what we do is this:
*
* (1) First check for OpenFirmware implementation
- * that will not let us distinguish between
- * USB and ADB. In that situation, try attaching
- * anything as we can, and hope things get better
+ * that will not let us distinguish between
+ * USB and ADB. In that situation, try attaching
+ * anything as we can, and hope things get better
* at autoconfiguration time.
*
* (2) Assume the keyboard is USB.
@@ -288,7 +288,7 @@
*/
/*
- * stdin is /pseudo-hid/keyboard. There is no
+ * stdin is /pseudo-hid/keyboard. There is no
* `adb-kbd-ihandle or `usb-kbd-ihandles methods
* available. Try attaching as ADB.
* But only if ADB support is actually present.
@@ -309,7 +309,7 @@
#endif
} else {
/* must be USB */
- printf("No ADB support present, assuming USB "
+ printf("No ADB support present, assuming USB "
"keyboard\n");
#if NUKBD > 0
ukbd_cnattach();
@@ -413,7 +413,7 @@
* Bootstrap console support functions
*/
-static int
+static int
ofwbootcons_cngetc(dev_t dev)
{
unsigned char ch = '\0';
@@ -463,7 +463,7 @@
node = OF_instance_to_package(stdout);
console_node = node;
console_instance = stdout;
-
+
return;
nocons:
panic("No /chosen could be found!\n");
Index: src/sys/arch/powerpc/oea/ofw_rascons.c
diff -u src/sys/arch/powerpc/oea/ofw_rascons.c:1.3 src/sys/arch/powerpc/oea/ofw_rascons.c:1.4
--- src/sys/arch/powerpc/oea/ofw_rascons.c:1.3 Wed Mar 18 10:22:34 2009
+++ src/sys/arch/powerpc/oea/ofw_rascons.c Wed Mar 10 18:36:05 2010
@@ -1,21 +1,21 @@
-/* $NetBSD: ofw_rascons.c,v 1.3 2009/03/18 10:22:34 cegger Exp $ */
+/* $NetBSD: ofw_rascons.c,v 1.4 2010/03/10 18:36:05 kiyohara Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
* Author: Chris G. Demetriou
- *
+ *
* Permission to use, copy, modify and distribute this software and
* its documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
*
* Software Distribution Coordinator or software.distribut...@cs.cmu.edu
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.3 2009/03/18 10:22:34 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.4 2010/03/10 18:36:05 kiyohara Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -95,12 +95,12 @@
/* move (rom monitor) cursor to the lowest line - 1 */
OF_interpret("#lines 2 - to line#", 0, 0);
-
+
wsfont_init();
if (copy_rom_font() == 0) {
romfont_loaded = 1;
}
-
+
/* set up rasops */
rascons_init_rasops(console_node, ri);
@@ -117,7 +117,7 @@
crow = 0;
}
#endif
-
+
rascons_stdscreen.nrows = ri->ri_rows;
rascons_stdscreen.ncols = ri->ri_cols;
rascons_stdscreen.textops = &ri->ri_ops;
@@ -126,7 +126,7 @@
ri->ri_ops.allocattr(ri, 0, 0, 0, &defattr);
wsdisplay_preattach(&rascons_stdscreen, ri, 0, max(0,
min(crow, ri->ri_rows - 1)), defattr);
-
+
#if notyet
rascons_init_cmap(NULL);
#endif
@@ -154,7 +154,7 @@
* virtual address space.
*/
OF_call_method("translate", mmu, 1, 3, romfont, &romfont, &m, &e);
-
+
/* Get character size */
OF_interpret("char-width", 0, 1, &char_width);
OF_interpret("char-height", 0, 1, &char_height);
@@ -199,7 +199,7 @@
if (rascons_enable_cache) {
vaddr_t va;
/*
- * Let's try to find an empty BAT to use
+ * Let's try to find an empty BAT to use
*/
for (va = SEGMENT_LENGTH; va < (USER_SR << ADDR_SR_SHFT);
va += SEGMENT_LENGTH) {
@@ -229,9 +229,9 @@
if (romfont_loaded) {
int cols, rows;
- /*
- * XXX this assumes we're the console which may or may not
- * be the case
+ /*
+ * XXX this assumes we're the console which may or may not
+ * be the case
*/
OF_interpret("#lines", 0, 1, &rows);
OF_interpret("#columns", 0, 1, &cols);
@@ -240,7 +240,7 @@
rasops_init(ri, rows, cols);
ri->ri_xorigin = (width - cols * ri->ri_font->fontwidth) >> 1;
- ri->ri_yorigin = (height - rows * ri->ri_font->fontheight)
+ ri->ri_yorigin = (height - rows * ri->ri_font->fontheight)
>> 1;
ri->ri_bits = (char *)fbaddr + ri->ri_xorigin +
ri->ri_stride * ri->ri_yorigin;
Index: src/sys/arch/powerpc/oea/ofwoea_machdep.c
diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.18 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.19
--- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.18 Sun Jan 17 16:47:17 2010
+++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Wed Mar 10 18:36:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.18 2010/01/17 16:47:17 phx Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.19 2010/03/10 18:36:05 kiyohara Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,11 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.18 2010/01/17 16:47:17 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.19 2010/03/10 18:36:05 kiyohara Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
-#include "opt_ddb.h"
+#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_ipkdb.h"
#include "opt_modular.h"
@@ -344,7 +344,7 @@
}
}
pmap_update(&ofw_pmap);
-}
+}
@@ -403,7 +403,7 @@
node = OF_finddevice("/");
bitmap = ranges_bitmap(node, 0);
oea_batinit(0);
-
+
#ifdef macppc
/* XXX this is a macppc-specific hack */
bitmap = 0x8f00;
@@ -671,7 +671,7 @@
tag->pbs_offset = 0;
tag->pbs_base = region.addr;
tag->pbs_limit = region.size + region.addr;
- }
+ }
error = bus_space_init(tag, name, ex_storage[exmap],
sizeof(ex_storage[exmap]));
