Module Name: src
Committed By: tsutsui
Date: Tue May 3 09:15:20 UTC 2011
Modified Files:
src/sys/arch/cobalt/cobalt: bus.c
src/sys/arch/cobalt/conf: GENERIC INSTALL RAMDISK majors.cobalt
src/sys/arch/cobalt/dev: panel.c
src/sys/arch/cobalt/include: cpu.h
src/sys/arch/cobalt/pci: pci_machdep.c
Log Message:
TAB/space cosmetics.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/cobalt/cobalt/bus.c
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cobalt/conf/RAMDISK
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/cobalt/conf/majors.cobalt
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cobalt/dev/panel.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/cobalt/include/cpu.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/cobalt/pci/pci_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/cobalt/cobalt/bus.c
diff -u src/sys/arch/cobalt/cobalt/bus.c:1.39 src/sys/arch/cobalt/cobalt/bus.c:1.40
--- src/sys/arch/cobalt/cobalt/bus.c:1.39 Sun Feb 20 07:54:10 2011
+++ src/sys/arch/cobalt/cobalt/bus.c Tue May 3 09:15:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.39 2011/02/20 07:54:10 matt Exp $ */
+/* $NetBSD: bus.c,v 1.40 2011/05/03 09:15:20 tsutsui Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.39 2011/02/20 07:54:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.40 2011/05/03 09:15:20 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -683,6 +683,6 @@
rv = _bus_dmamem_mmap_common(t, segs, nsegs, off, prot, flags);
if (rv == (bus_addr_t)-1)
return (-1);
-
+
return (mips_btop((char *)rv));
}
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.129 src/sys/arch/cobalt/conf/GENERIC:1.130
--- src/sys/arch/cobalt/conf/GENERIC:1.129 Sun Mar 6 17:08:21 2011
+++ src/sys/arch/cobalt/conf/GENERIC Tue May 3 09:15:20 2011
@@ -1,7 +1,7 @@
-# $NetBSD: GENERIC,v 1.129 2011/03/06 17:08:21 bouyer Exp $
+# $NetBSD: GENERIC,v 1.130 2011/05/03 09:15:20 tsutsui Exp $
#
# GENERIC machine description file
-#
+#
# This machine description file is used to generate the default NetBSD
# kernel. The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.129 $"
+#ident "GENERIC-$Revision: 1.130 $"
maxusers 32
@@ -37,7 +37,7 @@
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-# Enable experimental buffer queue strategy for better responsiveness under
+# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
#options BUFQ_READPRIO
#options BUFQ_PRIOCSCAN
Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.43 src/sys/arch/cobalt/conf/INSTALL:1.44
--- src/sys/arch/cobalt/conf/INSTALL:1.43 Sun Mar 6 17:08:21 2011
+++ src/sys/arch/cobalt/conf/INSTALL Tue May 3 09:15:20 2011
@@ -1,16 +1,16 @@
-# $NetBSD: INSTALL,v 1.43 2011/03/06 17:08:21 bouyer Exp $
+# $NetBSD: INSTALL,v 1.44 2011/05/03 09:15:20 tsutsui Exp $
#
# INSTALL -- installation and rescue kernel.
#
# This kernel should be derived from GENERIC with most features
# commented out to shoehorn into Cobalt kernel size limitations.
-#
+#
include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.43 $"
+#ident "INSTALL-$Revision: 1.44 $"
makeoptions COPTS="-Os -mmemcpy"
makeoptions CPUFLAGS="-march=vr5000 -mabi=32"
@@ -32,7 +32,7 @@
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-# Enable experimental buffer queue strategy for better responsiveness under
+# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
#options BUFQ_READPRIO
#options BUFQ_PRIOCSCAN
Index: src/sys/arch/cobalt/conf/RAMDISK
diff -u src/sys/arch/cobalt/conf/RAMDISK:1.4 src/sys/arch/cobalt/conf/RAMDISK:1.5
--- src/sys/arch/cobalt/conf/RAMDISK:1.4 Tue Nov 23 11:13:55 2010
+++ src/sys/arch/cobalt/conf/RAMDISK Tue May 3 09:15:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.4 2010/11/23 11:13:55 hannken Exp $
+# $NetBSD: RAMDISK,v 1.5 2011/05/03 09:15:20 tsutsui Exp $
#
# memory disk based configuration file
#
@@ -14,4 +14,4 @@
makeoptions COPTS="-Os -mmemcpy" # generates smaller code than -O2, -O1
-pseudo-device md
+pseudo-device md
Index: src/sys/arch/cobalt/conf/majors.cobalt
diff -u src/sys/arch/cobalt/conf/majors.cobalt:1.28 src/sys/arch/cobalt/conf/majors.cobalt:1.29
--- src/sys/arch/cobalt/conf/majors.cobalt:1.28 Sat Mar 6 23:45:39 2010
+++ src/sys/arch/cobalt/conf/majors.cobalt Tue May 3 09:15:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors.cobalt,v 1.28 2010/03/06 23:45:39 plunky Exp $
+# $NetBSD: majors.cobalt,v 1.29 2011/05/03 09:15:20 tsutsui Exp $
#
# Device majors for cobalt
#
@@ -63,5 +63,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/cobalt/dev/panel.c
diff -u src/sys/arch/cobalt/dev/panel.c:1.20 src/sys/arch/cobalt/dev/panel.c:1.21
--- src/sys/arch/cobalt/dev/panel.c:1.20 Mon Aug 31 15:18:55 2009
+++ src/sys/arch/cobalt/dev/panel.c Tue May 3 09:15:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: panel.c,v 1.20 2009/08/31 15:18:55 tsutsui Exp $ */
+/* $NetBSD: panel.c,v 1.21 2011/05/03 09:15:20 tsutsui Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.20 2009/08/31 15:18:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.21 2011/05/03 09:15:20 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,7 +211,7 @@
uint8_t dat)
{
- if (rs)
+ if (rs)
bus_space_write_4(hd->sc_iot, hd->sc_iodr, 0x00, dat << 24);
else
bus_space_write_4(hd->sc_iot, hd->sc_ioir, 0x00, dat << 24);
Index: src/sys/arch/cobalt/include/cpu.h
diff -u src/sys/arch/cobalt/include/cpu.h:1.14 src/sys/arch/cobalt/include/cpu.h:1.15
--- src/sys/arch/cobalt/include/cpu.h:1.14 Wed May 28 14:04:07 2008
+++ src/sys/arch/cobalt/include/cpu.h Tue May 3 09:15:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.14 2008/05/28 14:04:07 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.15 2011/05/03 09:15:20 tsutsui Exp $ */
#ifndef _COBALT_CPU_H_
#define _COBALT_CPU_H_
@@ -12,7 +12,7 @@
#define COBALT_ID_QUBE2700 3
#define COBALT_ID_RAQ 4
#define COBALT_ID_QUBE2 5
-#define COBALT_ID_RAQ2 6
+#define COBALT_ID_RAQ2 6
/*
* Memory map and register definitions.
Index: src/sys/arch/cobalt/pci/pci_machdep.c
diff -u src/sys/arch/cobalt/pci/pci_machdep.c:1.29 src/sys/arch/cobalt/pci/pci_machdep.c:1.30
--- src/sys/arch/cobalt/pci/pci_machdep.c:1.29 Mon Apr 4 20:37:47 2011
+++ src/sys/arch/cobalt/pci/pci_machdep.c Tue May 3 09:15:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.29 2011/04/04 20:37:47 dyoung Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.30 2011/05/03 09:15:20 tsutsui Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.29 2011/04/04 20:37:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.30 2011/05/03 09:15:20 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -267,7 +267,7 @@
if (bus == 0 && dev == 31)
return 0;
- /* Don't configure the bridge and PCI probe. */
+ /* Don't configure the bridge and PCI probe. */
if (PCI_VENDOR(id) == PCI_VENDOR_MARVELL &&
PCI_PRODUCT(id) == PCI_PRODUCT_MARVELL_GT64011)
return 0;
