Remove white-spaces.
This commit is contained in:
kiyohara
parent
5e9a0d7ca4
commit
ca66853e78
|
|
@ -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 @@ cninit(void)
|
|||
ofwoea_bootstrap_console();
|
||||
|
||||
OFPRINTF("console node: %08x\n", console_node);
|
||||
|
||||
|
||||
if (console_node == -1)
|
||||
goto nocons;
|
||||
|
||||
|
|
@ -254,15 +254,15 @@ cninit_kd(void)
|
|||
* 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 @@ cninit_kd(void)
|
|||
* 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 @@ cninit_kd(void)
|
|||
*/
|
||||
|
||||
/*
|
||||
* 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 @@ cninit_kd(void)
|
|||
#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 @@ ofkbd_cngetc(dev_t dev)
|
|||
* Bootstrap console support functions
|
||||
*/
|
||||
|
||||
static int
|
||||
static int
|
||||
ofwbootcons_cngetc(dev_t dev)
|
||||
{
|
||||
unsigned char ch = '\0';
|
||||
|
|
@ -463,7 +463,7 @@ ofwoea_bootstrap_console(void)
|
|||
node = OF_instance_to_package(stdout);
|
||||
console_node = node;
|
||||
console_instance = stdout;
|
||||
|
||||
|
||||
return;
|
||||
nocons:
|
||||
panic("No /chosen could be found!\n");
|
||||
|
|
|
|||
|
|
@ -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.Distribution@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 @@ rascons_cnattach(void)
|
|||
|
||||
/* 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 @@ rascons_cnattach(void)
|
|||
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 @@ rascons_cnattach(void)
|
|||
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 @@ copy_rom_font(void)
|
|||
* 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 @@ rascons_init_rasops(int node, struct rasops_info *ri)
|
|||
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 @@ rascons_init_rasops(int node, struct rasops_info *ri)
|
|||
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 @@ rascons_init_rasops(int node, struct rasops_info *ri)
|
|||
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;
|
||||
|
|
|
|||
|
|
@ -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 @@ restore_ofmap(struct ofw_translations *map, int len)
|
|||
}
|
||||
}
|
||||
pmap_update(&ofw_pmap);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -403,7 +403,7 @@ ofwoea_batinit(void)
|
|||
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 @@ ofwoea_map_space(int rangetype, int iomem, int node,
|
|||
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]));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: intr.c,v 1.6 2008/04/29 06:53:02 martin Exp $ */
|
||||
/* $NetBSD: intr.c,v 1.7 2010/03/10 18:28:30 kiyohara Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2007 Michael Lorenz
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.6 2008/04/29 06:53:02 martin Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.7 2010/03/10 18:28:30 kiyohara Exp $");
|
||||
|
||||
#include "opt_multiprocessor.h"
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ pic_add(struct pic_ops *pic)
|
|||
pic->pic_intrbase = max_base;
|
||||
max_base += pic->pic_numintrs;
|
||||
num_pics++;
|
||||
|
||||
|
||||
return pic->pic_intrbase;
|
||||
}
|
||||
|
||||
|
|
@ -399,7 +399,7 @@ intr_calculatemasks(void)
|
|||
/* IPL_SERIAL must block IPL_TTY */
|
||||
imask[IPL_SERIAL] |= imask[IPL_TTY];
|
||||
|
||||
/* IPL_HIGH must block all other priority levels */
|
||||
/* IPL_HIGH must block all other priority levels */
|
||||
for (i = IPL_NONE; i < IPL_HIGH; i++)
|
||||
imask[IPL_HIGH] |= imask[i];
|
||||
#else /* !SLOPPY_IPLS */
|
||||
|
|
@ -431,7 +431,7 @@ intr_calculatemasks(void)
|
|||
for (i = 0; i < current->pic_numintrs; i++)
|
||||
current->pic_disable_irq(current, i);
|
||||
}
|
||||
|
||||
|
||||
for (irq = 0, is = intrsources; irq < NVIRQ; irq++, is++) {
|
||||
if (is->is_hand)
|
||||
pic_enable_irq(is->is_hwirq);
|
||||
|
|
@ -459,13 +459,13 @@ pic_mark_pending(int irq)
|
|||
|
||||
v = virq[irq];
|
||||
if (v == 0)
|
||||
printf("IRQ %d maps to 0\n", irq);
|
||||
printf("IRQ %d maps to 0\n", irq);
|
||||
|
||||
msr = mfmsr();
|
||||
mtmsr(msr & ~PSL_EE);
|
||||
ci->ci_ipending |= 1 << v;
|
||||
mtmsr(msr);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
pic_do_pending_int(void)
|
||||
|
|
@ -624,7 +624,7 @@ start:
|
|||
/* this interrupt is no longer pending */
|
||||
ci->ci_ipending &= ~r_imen;
|
||||
ci->ci_idepth++;
|
||||
|
||||
|
||||
splraise(is->is_mask);
|
||||
mtmsr(msr | PSL_EE);
|
||||
ih = is->is_hand;
|
||||
|
|
@ -645,7 +645,7 @@ start:
|
|||
}
|
||||
mtmsr(msr);
|
||||
ci->ci_cpl = pcpl;
|
||||
|
||||
|
||||
uvmexp.intrs++;
|
||||
is->is_ev.ev_count++;
|
||||
ci->ci_idepth--;
|
||||
|
|
@ -683,7 +683,7 @@ splraise(int ncpl)
|
|||
int ocpl;
|
||||
|
||||
__asm volatile("sync; eieio"); /* don't reorder.... */
|
||||
|
||||
|
||||
ocpl = ci->ci_cpl;
|
||||
ci->ci_cpl = ocpl | ncpl;
|
||||
__asm volatile("sync; eieio"); /* reorder protect */
|
||||
|
|
@ -694,7 +694,7 @@ void
|
|||
splx(int ncpl)
|
||||
{
|
||||
struct cpu_info *ci = curcpu();
|
||||
|
||||
|
||||
__asm volatile("sync; eieio"); /* reorder protect */
|
||||
ci->ci_cpl = ncpl;
|
||||
if (ci->ci_ipending & ~ncpl)
|
||||
|
|
|
|||
Loading…
Reference in New Issue