summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2005-10-08 23:46:12 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2005-10-08 23:46:12 +0000
commit7db3a0c0925ca6ac71d356c4650828b68cb2887f (patch)
tree69a56ec563aed91ae955c1d21a5136a40ede86f6 /sys
parent0cc08ec4f383d661018947843b9006ffdd0f2172 (diff)
More trailing whitespace removal (perry via NetBSD).
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/siop_common.c8
-rw-r--r--sys/dev/microcode/siop/siop.ss12
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index 9cf0891f0a7..5c3fd53cf11 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siop_common.c,v 1.22 2005/10/08 19:21:10 krw Exp $ */
+/* $OpenBSD: siop_common.c,v 1.23 2005/10/08 23:46:11 krw Exp $ */
/* $NetBSD: siop_common.c,v 1.31 2002/09/27 15:37:18 provos Exp $ */
/*
@@ -21,7 +21,7 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * IN NO EVENT SHALL THE AUTHOR 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 INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -68,7 +68,7 @@ siop_common_attach(sc)
* Allocate DMA-safe memory for the script and map it.
*/
if ((sc->features & SF_CHIP_RAM) == 0) {
- error = bus_dmamem_alloc(sc->sc_dmat, PAGE_SIZE,
+ error = bus_dmamem_alloc(sc->sc_dmat, PAGE_SIZE,
PAGE_SIZE, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT);
if (error) {
printf("%s: unable to allocate script DMA memory, "
@@ -441,7 +441,7 @@ siop_ppr_neg(siop_cmd)
siop_target->period = 0;
goto reject;
}
-
+
if (offset > sc->maxoff || sync < sc->dt_minsync ||
sync > sc->dt_maxsync) {
printf("%s: ppr negotiation for target %d: "
diff --git a/sys/dev/microcode/siop/siop.ss b/sys/dev/microcode/siop/siop.ss
index fcc59776238..e52a3424450 100644
--- a/sys/dev/microcode/siop/siop.ss
+++ b/sys/dev/microcode/siop/siop.ss
@@ -1,9 +1,9 @@
-; $OpenBSD: siop.ss,v 1.5 2003/07/01 17:15:06 krw Exp $
+; $OpenBSD: siop.ss,v 1.6 2005/10/08 23:46:11 krw Exp $
; $NetBSD: siop.ss,v 1.17 2002/07/26 14:11:34 wiz Exp $
;
; Copyright (c) 2000 Manuel Bouyer.
-;
+;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions
; are met:
@@ -17,11 +17,11 @@
; This product includes software developed by Manuel Bouyer.
; 4. The name of the author may not be used to endorse or promote products
; derived from this software without specific prior written permission.
-;
+;
; THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+; IN NO EVENT SHALL THE AUTHOR 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 INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -150,7 +150,7 @@ script_sched:
MOVE 0xff to DSA3;
MOVE 0 to SCRATCHA0 ; flags
MOVE 0 to SCRATCHA1 ; DSA offset (for S/G save data pointer)
-; the script scheduler: siop_start() we set the absolute jump addr, and then
+; the script scheduler: siop_start() we set the absolute jump addr, and then
; changes the FALSE to TRUE. The select script will change it back to false
; once the target is selected.
; The RAM could hold 370 slot entry, we limit it to 40. Should be more than
@@ -265,7 +265,7 @@ handle_msgin:
MOVE SCRATCHA0 & flag_sdp TO SFBR;
JUMP REL(script_sched), if 0x00;
MOVE SCRATCHA1 TO SFBR;
- JUMP REL(script_sched), if 0x00;
+ JUMP REL(script_sched), if 0x00;
; Ok, we need to save data pointers
INT int_disc;
msgin_ack: