Module Name: src
Committed By: skrll
Date: Mon Jan 4 15:13:50 UTC 2021
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_intr.c
src/sys/arch/sparc64/doc: TODO
src/sys/dev/ic: wdc.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/xscale/pxa2x0_intr.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/doc/TODO
cvs rdiff -u -r1.304 -r1.305 src/sys/dev/ic/wdc.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/arm/xscale/pxa2x0_intr.c
diff -u src/sys/arch/arm/xscale/pxa2x0_intr.c:1.22 src/sys/arch/arm/xscale/pxa2x0_intr.c:1.23
--- src/sys/arch/arm/xscale/pxa2x0_intr.c:1.22 Mon Jan 4 15:13:06 2021
+++ src/sys/arch/arm/xscale/pxa2x0_intr.c Mon Jan 4 15:13:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_intr.c,v 1.22 2021/01/04 15:13:06 skrll Exp $ */
+/* $NetBSD: pxa2x0_intr.c,v 1.23 2021/01/04 15:13:50 skrll Exp $ */
/*
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
@@ -16,7 +16,7 @@
* must display the following acknowledgement:
* This product includes software developed for the NetBSD Project by
* Genetec Corporation.
- * 4. The name of Genetec Corporation may not be used to endorse or
+ * 4. The name of Genetec Corporation may not be used to endorse or
* promote products derived from this software without specific prior
* written permission.
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.22 2021/01/04 15:13:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.23 2021/01/04 15:13:50 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ static int stray_interrupt(void *);
static void init_interrupt_masks(void);
/*
- * interrupt dispatch table.
+ * interrupt dispatch table.
*/
#ifdef MULTIPLE_HANDLERS_ON_ONE_IRQ
struct intrhand {
@@ -173,14 +173,14 @@ pxa2x0_irq_handler(void *arg)
/* Enable interrupt */
#endif
#ifndef MULTIPLE_HANDLERS_ON_ONE_IRQ
- (* handler[irqno].func)(
+ (* handler[irqno].func)(
handler[irqno].cookie == 0
? frame : handler[irqno].cookie );
#else
/* process all handlers for this interrupt.
XXX not yet */
#endif
-
+
#ifdef notyet
/* Disable interrupt */
#endif
Index: src/sys/arch/sparc64/doc/TODO
diff -u src/sys/arch/sparc64/doc/TODO:1.30 src/sys/arch/sparc64/doc/TODO:1.31
--- src/sys/arch/sparc64/doc/TODO:1.30 Mon Jan 4 15:13:06 2021
+++ src/sys/arch/sparc64/doc/TODO Mon Jan 4 15:13:50 2021
@@ -1,4 +1,4 @@
- /* $NetBSD: TODO,v 1.30 2021/01/04 15:13:06 skrll Exp $ */
+/* $NetBSD: TODO,v 1.31 2021/01/04 15:13:50 skrll Exp $ */
Things to be done:
@@ -11,7 +11,7 @@ sun4u:
- GENERIC.UP kernel hangs on v445 (missing interrupt?)
sun4v:
- - current status: The kernel boots and starts the init process.
+ - current status: The kernel boots and starts the init process.
The following processes seem to crash on and on so more debugging to be done...
- 64-bit kernel support
Index: src/sys/dev/ic/wdc.c
diff -u src/sys/dev/ic/wdc.c:1.304 src/sys/dev/ic/wdc.c:1.305
--- src/sys/dev/ic/wdc.c:1.304 Mon Jan 4 15:13:06 2021
+++ src/sys/dev/ic/wdc.c Mon Jan 4 15:13:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.304 2021/01/04 15:13:06 skrll Exp $ */
+/* $NetBSD: wdc.c,v 1.305 2021/01/04 15:13:50 skrll Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.304 2021/01/04 15:13:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.305 2021/01/04 15:13:50 skrll Exp $");
#include "opt_ata.h"
#include "opt_wdc.h"
@@ -718,8 +718,8 @@ wdcprobe1(struct ata_channel *chp, int p
DELAY(2000);
(void) bus_space_read_1(wdr->cmd_iot, wdr->cmd_iohs[wd_error], 0);
- if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
- bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
+ if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
+ bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_4BIT);
#ifdef WDC_NO_IDS
@@ -1038,7 +1038,7 @@ wdcreset(struct ata_channel *chp, int po
drv_mask1 = (chp->ch_drive[0].drive_type != ATA_DRIVET_NONE)
? 0x01 : 0x00;
- if (chp->ch_ndrives > 1)
+ if (chp->ch_ndrives > 1)
drv_mask1 |= (chp->ch_drive[1].drive_type != ATA_DRIVET_NONE)
? 0x02 : 0x00;
drv_mask2 = __wdcwait_reset(chp, drv_mask1,
@@ -1052,8 +1052,8 @@ wdcreset(struct ata_channel *chp, int po
aprint_normal(" drive 1");
aprint_normal("\n");
}
- if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
- bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
+ if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
+ bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_4BIT);
return (drv_mask1 != drv_mask2) ? 1 : 0;
@@ -1080,7 +1080,7 @@ wdc_do_reset(struct ata_channel *chp, in
delay(2000);
}
(void) bus_space_read_1(wdr->cmd_iot, wdr->cmd_iohs[wd_error], 0);
- if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
+ if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_4BIT | WDCTL_IDS);
delay(10); /* 400ns delay */
@@ -1451,8 +1451,8 @@ __wdccommand_start(struct ata_channel *c
}
if (ata_c->flags & AT_POLL) {
/* polled command, disable interrupts */
- if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
- bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh,
+ if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
+ bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh,
wd_aux_ctlr, WDCTL_4BIT | WDCTL_IDS);
}
if ((ata_c->flags & AT_LBA48) != 0) {
@@ -1656,12 +1656,12 @@ __wdccommand_done(struct ata_channel *ch
if ((ata_c->flags & AT_LBA48) != 0) {
if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL)) {
if ((ata_c->flags & AT_POLL) != 0)
- bus_space_write_1(wdr->ctl_iot,
+ bus_space_write_1(wdr->ctl_iot,
wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_HOB|WDCTL_4BIT|WDCTL_IDS);
else
- bus_space_write_1(wdr->ctl_iot,
- wdr->ctl_ioh, wd_aux_ctlr,
+ bus_space_write_1(wdr->ctl_iot,
+ wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_HOB|WDCTL_4BIT);
}
ata_c->r_count |= bus_space_read_1(wdr->cmd_iot,
@@ -1674,12 +1674,12 @@ __wdccommand_done(struct ata_channel *ch
wdr->cmd_iohs[wd_cyl_hi], 0) << 40;
if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL)) {
if ((ata_c->flags & AT_POLL) != 0)
- bus_space_write_1(wdr->ctl_iot,
- wdr->ctl_ioh, wd_aux_ctlr,
+ bus_space_write_1(wdr->ctl_iot,
+ wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_4BIT|WDCTL_IDS);
else
- bus_space_write_1(wdr->ctl_iot,
- wdr->ctl_ioh, wd_aux_ctlr,
+ bus_space_write_1(wdr->ctl_iot,
+ wdr->ctl_ioh, wd_aux_ctlr,
WDCTL_4BIT);
}
} else {
@@ -1696,8 +1696,8 @@ __wdccommand_done(struct ata_channel *ch
out:
if (ata_c->flags & AT_POLL) {
/* enable interrupts */
- if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
- bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh,
+ if (! (wdc->cap & WDC_CAPABILITY_NO_AUXCTL))
+ bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh,
wd_aux_ctlr, WDCTL_4BIT);
delay(10); /* some drives need a little delay here */
}
