Module Name:    src
Committed By:   skrll
Date:           Fri May 19 07:40:58 UTC 2017

Modified Files:
        src/sys/arch/evbmips/ingenic: autoconf.c clock.c cpu.c machdep.c
            mainbus.c

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/ingenic/autoconf.c \
    src/sys/arch/evbmips/ingenic/cpu.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/ingenic/clock.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/ingenic/machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/ingenic/mainbus.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/evbmips/ingenic/autoconf.c
diff -u src/sys/arch/evbmips/ingenic/autoconf.c:1.2 src/sys/arch/evbmips/ingenic/autoconf.c:1.3
--- src/sys/arch/evbmips/ingenic/autoconf.c:1.2	Thu Oct  8 17:51:15 2015
+++ src/sys/arch/evbmips/ingenic/autoconf.c	Fri May 19 07:40:58 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.2 2015/10/08 17:51:15 macallan Exp $ */
+/* $NetBSD: autoconf.c,v 1.3 2017/05/19 07:40:58 skrll Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.2 2015/10/08 17:51:15 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2017/05/19 07:40:58 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -46,7 +46,7 @@ void ingenic_set_enaddr(uint8_t *);
 
 /*
  * Configure all devices on system
- */     
+ */
 void
 cpu_configure(void)
 {
@@ -72,7 +72,7 @@ device_register(device_t dev, void *aux)
 	if (device_is_a(dev, "dme") && have_enaddr) {
 		prop_dictionary_t dict;
 		prop_data_t blob;
-		
+
 		dict = device_properties(dev);
 
 		blob = prop_data_create_data(enaddr, ETHER_ADDR_LEN);
Index: src/sys/arch/evbmips/ingenic/cpu.c
diff -u src/sys/arch/evbmips/ingenic/cpu.c:1.2 src/sys/arch/evbmips/ingenic/cpu.c:1.3
--- src/sys/arch/evbmips/ingenic/cpu.c:1.2	Fri Aug 26 13:54:18 2016
+++ src/sys/arch/evbmips/ingenic/cpu.c	Fri May 19 07:40:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.2 2016/08/26 13:54:18 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.3 2017/05/19 07:40:58 skrll Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.2 2016/08/26 13:54:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.3 2017/05/19 07:40:58 skrll Exp $");
 
 #include "opt_ingenic.h"
 #include "opt_multiprocessor.h"
@@ -79,7 +79,7 @@ cpu_attach(device_t parent, device_t sel
 #ifdef MULTIPROCESSOR
 		uint32_t vec, reg;
 		int bail = 10000;
-		
+
 		startup_cpu_info = cpu_info_alloc(NULL, unit, 0, unit, 0);
 		startup_cpu_info->ci_cpu_freq = ci->ci_cpu_freq;
 		ci = startup_cpu_info;

Index: src/sys/arch/evbmips/ingenic/clock.c
diff -u src/sys/arch/evbmips/ingenic/clock.c:1.8 src/sys/arch/evbmips/ingenic/clock.c:1.9
--- src/sys/arch/evbmips/ingenic/clock.c:1.8	Fri Aug 26 15:45:48 2016
+++ src/sys/arch/evbmips/ingenic/clock.c	Fri May 19 07:40:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.8 2016/08/26 15:45:48 skrll Exp $ */
+/*	$NetBSD: clock.c,v 1.9 2017/05/19 07:40:58 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.8 2016/08/26 15:45:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.9 2017/05/19 07:40:58 skrll Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -87,7 +87,7 @@ cpu_initclocks(void)
 	 * that to work yet ( all I get is INT0 which is for hardware interrupts
 	 * in general )
 	 * So if we can get OST to fire on INT2 we can just block INT0 on core1
-	 * and have a timer interrupt on both cores, if not the regular timer 
+	 * and have a timer interrupt on both cores, if not the regular timer
 	 * would be more convenient but we'd have to shoot an IPI to core1 on
 	 * every tick.
 	 * For now, use OST and hope we'll figure out how to make it fire on
@@ -129,7 +129,7 @@ cpu_initclocks(void)
 	printf("cnt5: %08x\n", readreg(JZ_TC_TCNT(5)));
 	printf("CR: %08x\n", MFC0(MIPS_COP_0_CAUSE, 0));
 	printf("SR: %08x\n", MFC0(MIPS_COP_0_STATUS, 0));
-	
+
 	printf("INTC %08x %08x\n", readreg(JZ_ICSR0), readreg(JZ_ICSR1));
 	delay(3000000);
 	printf("%s %d\n", __func__, MFC0(12, 3));
@@ -209,8 +209,8 @@ ingenic_clockintr(struct clockframe *cf)
 	/* Check for lost clock interrupts */
 	new_cnt = readreg(JZ_OST_CNT_LO);
 
-	/* 
-	 * Missed one or more clock interrupts, so let's start 
+	/*
+	 * Missed one or more clock interrupts, so let's start
 	 * counting again from the current value.
 	 */
 	if ((ci->ci_next_cp0_clk_intr - new_cnt) & 0x80000000) {

Index: src/sys/arch/evbmips/ingenic/machdep.c
diff -u src/sys/arch/evbmips/ingenic/machdep.c:1.12 src/sys/arch/evbmips/ingenic/machdep.c:1.13
--- src/sys/arch/evbmips/ingenic/machdep.c:1.12	Thu Dec 22 14:47:57 2016
+++ src/sys/arch/evbmips/ingenic/machdep.c	Fri May 19 07:40:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.12 2016/12/22 14:47:57 cherry Exp $ */
+/*	$NetBSD: machdep.c,v 1.13 2017/05/19 07:40:58 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2016/12/22 14:47:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2017/05/19 07:40:58 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -97,7 +97,7 @@ cal_timer(void)
 	 */
 	curcpu()->ci_cpu_freq = 1200000000;	/* for now */
 	cntfreq = 12000000;	/* EXTCLK / 4 */
-	
+
 	curcpu()->ci_cctr_freq = cntfreq;
 	curcpu()->ci_cycles_per_hz = (cntfreq + hz / 2) / hz;
 
@@ -350,5 +350,5 @@ ingenic_reset(void)
 	writereg(JZ_WDOG_TCNT, 0);	/* reset counter */
 	writereg(JZ_WDOG_TDR, 128);	/* wait for ~1s */
 	writereg(JZ_WDOG_TCSR, TCSR_RTC_EN | TCSR_DIV_256);
-	writereg(JZ_WDOG_TCER, TCER_ENABLE);	/* fire! */	
+	writereg(JZ_WDOG_TCER, TCER_ENABLE);	/* fire! */
 }

Index: src/sys/arch/evbmips/ingenic/mainbus.c
diff -u src/sys/arch/evbmips/ingenic/mainbus.c:1.5 src/sys/arch/evbmips/ingenic/mainbus.c:1.6
--- src/sys/arch/evbmips/ingenic/mainbus.c:1.5	Fri Jan 29 01:54:14 2016
+++ src/sys/arch/evbmips/ingenic/mainbus.c	Fri May 19 07:40:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.5 2016/01/29 01:54:14 macallan Exp $ */
+/*	$NetBSD: mainbus.c,v 1.6 2017/05/19 07:40:58 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 Michael Lorenz
@@ -25,9 +25,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2016/01/29 01:54:14 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2017/05/19 07:40:58 skrll Exp $");
 
 #include "opt_multiprocessor.h"
 

Reply via email to