Module Name: src
Committed By: tsutsui
Date: Sun Mar 6 14:51:22 UTC 2011
Modified Files:
src/sys/arch/hp300/conf: majors.hp300
src/sys/arch/hp300/dev: dio.c dioreg.h mtreg.h
src/sys/arch/hp300/hp300: locore.s
src/sys/arch/hp300/include: intr.h
Log Message:
Remove trailing spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hp300/conf/majors.hp300
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hp300/dev/dio.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/dev/dioreg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp300/dev/mtreg.h
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hp300/include/intr.h
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/hp300/conf/majors.hp300
diff -u src/sys/arch/hp300/conf/majors.hp300:1.23 src/sys/arch/hp300/conf/majors.hp300:1.24
--- src/sys/arch/hp300/conf/majors.hp300:1.23 Sun Feb 6 18:26:53 2011
+++ src/sys/arch/hp300/conf/majors.hp300 Sun Mar 6 14:51:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors.hp300,v 1.23 2011/02/06 18:26:53 tsutsui Exp $
+# $NetBSD: majors.hp300,v 1.24 2011/03/06 14:51:21 tsutsui Exp $
#
# Device majors for hp300
#
@@ -52,5 +52,5 @@
device-major nsmb char 98 nsmb
# Majors up to 143 are reserved for machine-dependant drivers.
-# New machine-independent driver majors are assigned in
+# New machine-independent driver majors are assigned in
# sys/conf/majors.
Index: src/sys/arch/hp300/dev/dio.c
diff -u src/sys/arch/hp300/dev/dio.c:1.37 src/sys/arch/hp300/dev/dio.c:1.38
--- src/sys/arch/hp300/dev/dio.c:1.37 Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/dev/dio.c Sun Mar 6 14:51:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dio.c,v 1.37 2008/04/28 20:23:19 martin Exp $ */
+/* $NetBSD: dio.c,v 1.38 2011/03/06 14:51:21 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.37 2008/04/28 20:23:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.38 2011/03/06 14:51:21 tsutsui Exp $");
#define _HP300_INTR_H_PRIVATE
@@ -365,7 +365,7 @@
return *(volatile uint8_t *)(bsh + (offset << 1) + 1);
}
-static void
+static void
dio_bus_space_write_oddbyte_1(bus_space_tag_t bst, bus_space_handle_t bsh,
bus_size_t offset, uint8_t val)
{
Index: src/sys/arch/hp300/dev/dioreg.h
diff -u src/sys/arch/hp300/dev/dioreg.h:1.7 src/sys/arch/hp300/dev/dioreg.h:1.8
--- src/sys/arch/hp300/dev/dioreg.h:1.7 Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/dev/dioreg.h Sun Mar 6 14:51:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dioreg.h,v 1.7 2008/04/28 20:23:19 martin Exp $ */
+/* $NetBSD: dioreg.h,v 1.8 2011/03/06 14:51:21 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -23,7 +23,7 @@
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -60,9 +60,9 @@
* e.g. a display framebuffer.
*
* DIO-II ranges from select codes 132-255 at physical addresses given by:
- * 0x1000000 + (sc - 132) * 0x400000
+ * 0x1000000 + (sc - 132) * 0x400000
* The address range of DIO-II space is thus [0x1000000-0x20000000).
- *
+ *
* DIO/DIO-II space is too large to map in its entirety, instead devices
* are mapped into kernel virtual address space allocated from a range
* of EIOMAPSIZE pages (vmparam.h) starting at ``extiobase''.
Index: src/sys/arch/hp300/dev/mtreg.h
diff -u src/sys/arch/hp300/dev/mtreg.h:1.4 src/sys/arch/hp300/dev/mtreg.h:1.5
--- src/sys/arch/hp300/dev/mtreg.h:1.4 Sun Dec 11 12:17:14 2005
+++ src/sys/arch/hp300/dev/mtreg.h Sun Mar 6 14:51:21 2011
@@ -1,6 +1,6 @@
-/* $NetBSD: mtreg.h,v 1.4 2005/12/11 12:17:14 christos Exp $ */
+/* $NetBSD: mtreg.h,v 1.5 2011/03/06 14:51:21 tsutsui Exp $ */
-/*
+/*
* Copyright (c) 1992, The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.158 src/sys/arch/hp300/hp300/locore.s:1.159
--- src/sys/arch/hp300/hp300/locore.s:1.158 Thu Jan 6 13:03:47 2011
+++ src/sys/arch/hp300/hp300/locore.s Sun Mar 6 14:51:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.158 2011/01/06 13:03:47 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.159 2011/03/06 14:51:21 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -571,7 +571,7 @@
jbsr _C_LABEL(pmap_bootstrap_finalize)
/* set kernel stack, user SP */
movl _C_LABEL(lwp0uarea),%a1 |
- lea %a1@(USPACE-4),%sp | set kernel stack to end of area
+ lea %a1@(USPACE-4),%sp | set kernel stack to end of area
movl #USRSTACK-4,%a2
movl %a2,%usp | init user SP
@@ -615,7 +615,7 @@
/*
* Trap/interrupt vector routines
- */
+ */
#include <m68k/m68k/trap_subr.s>
.data
@@ -662,7 +662,7 @@
Lberr3:
movl %d1,%sp@-
movl %d0,%sp@- | code is FSLW now.
- andw #0x1f80,%d0
+ andw #0x1f80,%d0
jeq Lberr60 | it is a bus error
movl #T_MMUFLT,%sp@- | show that we are an MMU fault
jra _ASM_LABEL(faultstkadj) | and deal with it
@@ -1220,7 +1220,7 @@
/*
* Primitives
- */
+ */
/*
* Use common m68k support routines.
Index: src/sys/arch/hp300/include/intr.h
diff -u src/sys/arch/hp300/include/intr.h:1.33 src/sys/arch/hp300/include/intr.h:1.34
--- src/sys/arch/hp300/include/intr.h:1.33 Thu Apr 9 10:29:09 2009
+++ src/sys/arch/hp300/include/intr.h Sun Mar 6 14:51:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.33 2009/04/09 10:29:09 tsutsui Exp $ */
+/* $NetBSD: intr.h,v 1.34 2011/03/06 14:51:22 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@@ -65,9 +65,9 @@
extern int idepth;
static inline bool
-cpu_intr_p(void)
+cpu_intr_p(void)
{
-
+
return idepth != 0;
}
