Module Name: src
Committed By: skrll
Date: Fri Dec 17 06:26:14 UTC 2021
Modified Files:
src/sys/arch/arc/isa: isadma_bounce.c
src/sys/arch/atari/isa: isa_dma.c
src/sys/arch/evbmips/isa: isadma_bounce.c
src/sys/arch/powerpc/isa: isadma_machdep.c
src/sys/arch/x68k/dev: intio.c
src/sys/arch/x86/isa: isa_machdep.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arc/isa/isadma_bounce.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/atari/isa/isa_dma.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/isa/isadma_bounce.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/isa/isadma_machdep.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/x68k/dev/intio.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/x86/isa/isa_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/arc/isa/isadma_bounce.c
diff -u src/sys/arch/arc/isa/isadma_bounce.c:1.16 src/sys/arch/arc/isa/isadma_bounce.c:1.17
--- src/sys/arch/arc/isa/isadma_bounce.c:1.16 Wed Nov 18 02:14:13 2020
+++ src/sys/arch/arc/isa/isadma_bounce.c Fri Dec 17 06:26:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.16 2020/11/18 02:14:13 thorpej Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.17 2021/12/17 06:26:13 skrll Exp $ */
/* NetBSD: isadma_bounce.c,v 1.2 2000/06/01 05:49:36 thorpej Exp */
/*-
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.16 2020/11/18 02:14:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.17 2021/12/17 06:26:13 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,7 +164,7 @@ isadma_bounce_cookiesize(bus_dmamap_t co
static int
isadma_bounce_cookie_alloc(bus_dma_tag_t const t, bus_dmamap_t const map,
int const flags)
-{
+{
struct isadma_bounce_cookie *cookie;
int cookieflags = isadma_bounce_cookieflags(t, map);
@@ -181,7 +181,7 @@ isadma_bounce_cookie_alloc(bus_dma_tag_t
static void
isadma_bounce_cookie_free(bus_dmamap_t const map)
-{
+{
struct isadma_bounce_cookie *cookie = map->_dm_cookie;
if (cookie != NULL) {
Index: src/sys/arch/atari/isa/isa_dma.c
diff -u src/sys/arch/atari/isa/isa_dma.c:1.13 src/sys/arch/atari/isa/isa_dma.c:1.14
--- src/sys/arch/atari/isa/isa_dma.c:1.13 Mon Jan 4 18:23:10 2021
+++ src/sys/arch/atari/isa/isa_dma.c Fri Dec 17 06:26:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_dma.c,v 1.13 2021/01/04 18:23:10 thorpej Exp $ */
+/* $NetBSD: isa_dma.c,v 1.14 2021/12/17 06:26:13 skrll Exp $ */
#define ISA_DMA_STATS
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.13 2021/01/04 18:23:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.14 2021/12/17 06:26:13 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -180,7 +180,7 @@ isadma_bounce_cookieflags(bus_dma_tag_t
*/
if (avail_end <= t->_bounce_thresh ||
(flags & ISABUS_DMA_32BIT) != 0) {
- /* Bouncing not necessary due to memory size. */
+ /* Bouncing not necessary due to memory size. */
map->_dm_bounce_thresh = 0;
}
if (map->_dm_bounce_thresh != 0 ||
@@ -364,7 +364,7 @@ _isa_bus_dmamap_load(bus_dma_tag_t t, bu
*/
int
_isa_bus_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m0,
- int flags)
+ int flags)
{
struct atari_isa_dma_cookie *cookie = map->_dm_cookie;
int error;
Index: src/sys/arch/evbmips/isa/isadma_bounce.c
diff -u src/sys/arch/evbmips/isa/isadma_bounce.c:1.12 src/sys/arch/evbmips/isa/isadma_bounce.c:1.13
--- src/sys/arch/evbmips/isa/isadma_bounce.c:1.12 Fri Feb 26 18:15:59 2016
+++ src/sys/arch/evbmips/isa/isadma_bounce.c Fri Dec 17 06:26:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.12 2016/02/26 18:15:59 christos Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.13 2021/12/17 06:26:13 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.12 2016/02/26 18:15:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.13 2021/12/17 06:26:13 skrll Exp $");
#define _MIPS_BUS_DMA_PRIVATE
@@ -223,7 +223,7 @@ isadma_bounce_dmamap_load(bus_dma_tag_t
*/
int
isadma_bounce_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map,
- struct mbuf *m0, int flags)
+ struct mbuf *m0, int flags)
{
struct mips_bus_dma_cookie *cookie = map->_dm_cookie;
int error;
Index: src/sys/arch/powerpc/isa/isadma_machdep.c
diff -u src/sys/arch/powerpc/isa/isadma_machdep.c:1.11 src/sys/arch/powerpc/isa/isadma_machdep.c:1.12
--- src/sys/arch/powerpc/isa/isadma_machdep.c:1.11 Fri Dec 23 07:15:27 2016
+++ src/sys/arch/powerpc/isa/isadma_machdep.c Fri Dec 17 06:26:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.11 2016/12/23 07:15:27 cherry Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.12 2021/12/17 06:26:13 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.11 2016/12/23 07:15:27 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.12 2021/12/17 06:26:13 skrll Exp $");
#define ISA_DMA_STATS
@@ -130,7 +130,7 @@ struct powerpc_bus_dma_tag isa_bus_dma_t
_bus_dmamem_free,
_bus_dmamem_map,
_bus_dmamem_unmap,
- _bus_dmamem_mmap,
+ _bus_dmamem_mmap,
};
/**********************************************************************
@@ -570,7 +570,7 @@ _isa_bus_dmamap_sync(bus_dma_tag_t t, bu
*/
break;
}
-
+
case ID_BUFTYPE_UIO:
panic("_isa_bus_dmamap_sync: ID_BUFTYPE_UIO");
break;
Index: src/sys/arch/x68k/dev/intio.c
diff -u src/sys/arch/x68k/dev/intio.c:1.49 src/sys/arch/x68k/dev/intio.c:1.50
--- src/sys/arch/x68k/dev/intio.c:1.49 Sat Aug 7 16:19:07 2021
+++ src/sys/arch/x68k/dev/intio.c Fri Dec 17 06:26:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intio.c,v 1.49 2021/08/07 16:19:07 thorpej Exp $ */
+/* $NetBSD: intio.c,v 1.50 2021/12/17 06:26:13 skrll Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.49 2021/08/07 16:19:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.50 2021/12/17 06:26:13 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -445,7 +445,7 @@ _intio_bus_dmamap_create(bus_dma_tag_t t
/*
* Allocate our cookie.
*/
- cookie = malloc(cookiesize, M_DMAMAP,
+ cookie = malloc(cookiesize, M_DMAMAP,
((flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK) | M_ZERO);
if (cookie == NULL) {
error = ENOMEM;
Index: src/sys/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.49 src/sys/arch/x86/isa/isa_machdep.c:1.50
--- src/sys/arch/x86/isa/isa_machdep.c:1.49 Sat Oct 16 13:15:01 2021
+++ src/sys/arch/x86/isa/isa_machdep.c Fri Dec 17 06:26:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.49 2021/10/16 13:15:01 jmcneill Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.50 2021/12/17 06:26:14 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.49 2021/10/16 13:15:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.50 2021/12/17 06:26:14 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -255,7 +255,7 @@ isa_intr_disestablish(isa_chipset_tag_t
panic("intr_disestablish: bogus irq");
intr_disestablish(ih);
-#endif
+#endif
}
void
