Module Name: src
Committed By: tsutsui
Date: Fri Sep 4 18:29:53 UTC 2009
Modified Files:
src/sys/dev/ic: esiop.c esiopvar.h siop.c siop_common.c
siopvar_common.h
Log Message:
Remove unnecessary whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/esiop.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/esiopvar.h
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/ic/siop.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/siop_common.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/siopvar_common.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/esiop.c
diff -u src/sys/dev/ic/esiop.c:1.47 src/sys/dev/ic/esiop.c:1.48
--- src/sys/dev/ic/esiop.c:1.47 Sat May 16 03:57:57 2009
+++ src/sys/dev/ic/esiop.c Fri Sep 4 18:29:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: esiop.c,v 1.47 2009/05/16 03:57:57 tsutsui Exp $ */
+/* $NetBSD: esiop.c,v 1.48 2009/09/04 18:29:52 tsutsui Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -33,7 +33,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.47 2009/05/16 03:57:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.48 2009/09/04 18:29:52 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@
void esiop_unqueue(struct esiop_softc *, int, int);
int esiop_handle_qtag_reject(struct esiop_cmd *);
static void esiop_start(struct esiop_softc *, struct esiop_cmd *);
-void esiop_timeout(void *);
+void esiop_timeout(void *);
void esiop_scsipi_request(struct scsipi_channel *,
scsipi_adapter_req_t, void *);
void esiop_dump_script(struct esiop_softc *);
@@ -482,7 +482,7 @@
xs = esiop_cmd->cmd_c.xs;
#ifdef DIAGNOSTIC
if (esiop_cmd->cmd_c.status != CMDST_ACTIVE) {
- printf("esiop_cmd (target %d lun %d) "
+ printf("esiop_cmd (target %d lun %d) "
"not active (%d)\n", target, lun,
esiop_cmd->cmd_c.status);
goto none;
@@ -1132,7 +1132,7 @@
/*
* if we got a disconnect between the last data phase
* and the status phase, offset will be 0. In this
- * case, cmd_tables->saved_offset will have the proper value
+ * case, cmd_tables->saved_offset will have the proper value
* if it got updated by the controller
*/
if (offset == 0 &&
@@ -1322,7 +1322,7 @@
void
esiop_unqueue(struct esiop_softc *sc, int target, int lun)
{
- int slot, tag;
+ int slot, tag;
uint32_t slotdsa;
struct esiop_cmd *esiop_cmd;
struct esiop_lun *esiop_lun =
@@ -1455,7 +1455,7 @@
printf("command with tag id %d reset\n", tag);
esiop_cmd->cmd_c.xs->error =
(esiop_cmd->cmd_c.flags & CMDFL_TIMEOUT) ?
- XS_TIMEOUT : XS_RESET;
+ XS_TIMEOUT : XS_RESET;
esiop_cmd->cmd_c.xs->status = SCSI_SIOP_NOCHECK;
if (tag >= 0)
esiop_lun->tactive[tag] = NULL;
Index: src/sys/dev/ic/esiopvar.h
diff -u src/sys/dev/ic/esiopvar.h:1.17 src/sys/dev/ic/esiopvar.h:1.18
--- src/sys/dev/ic/esiopvar.h:1.17 Sun Mar 15 15:52:12 2009
+++ src/sys/dev/ic/esiopvar.h Fri Sep 4 18:29:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: esiopvar.h,v 1.17 2009/03/15 15:52:12 cegger Exp $ */
+/* $NetBSD: esiopvar.h,v 1.18 2009/09/04 18:29:52 tsutsui Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -151,7 +151,7 @@
u_int32_t sc_target_table_offset;/* pointer to target DSA table */
int sc_currdoneslot; /* current done slot */
bus_dmamap_t sc_done_map; /* dma map for done ring (shared) */
- bus_addr_t sc_done_offset; /* offset of ring in sc_done_map */
+ bus_addr_t sc_done_offset; /* offset of ring in sc_done_map */
u_int32_t *sc_done_slot; /* The done ring itself */
};
Index: src/sys/dev/ic/siop.c
diff -u src/sys/dev/ic/siop.c:1.92 src/sys/dev/ic/siop.c:1.93
--- src/sys/dev/ic/siop.c:1.92 Sat May 16 03:57:57 2009
+++ src/sys/dev/ic/siop.c Fri Sep 4 18:29:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.92 2009/05/16 03:57:57 tsutsui Exp $ */
+/* $NetBSD: siop.c,v 1.93 2009/09/04 18:29:52 tsutsui Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -33,7 +33,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.92 2009/05/16 03:57:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.93 2009/09/04 18:29:52 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@
void siop_scsicmd_end(struct siop_cmd *);
void siop_unqueue(struct siop_softc *, int, int);
static void siop_start(struct siop_softc *, struct siop_cmd *);
-void siop_timeout(void *);
+void siop_timeout(void *);
int siop_scsicmd(struct scsipi_xfer *);
void siop_scsipi_request(struct scsipi_channel *,
scsipi_adapter_req_t, void *);
@@ -219,7 +219,7 @@
}
} else {
for (j = 0; j < __arraycount(siop_script); j++) {
- sc->sc_c.sc_script[j] =
+ sc->sc_c.sc_script[j] =
siop_htoc32(&sc->sc_c, siop_script[j]);
}
for (j = 0; j < __arraycount(E_abs_msgin_Used); j++) {
@@ -337,7 +337,7 @@
dsa = bus_space_read_4(sc->sc_c.sc_rt, sc->sc_c.sc_rh, SIOP_DSA);
TAILQ_FOREACH(cbdp, &sc->cmds, next) {
if (dsa >= cbdp->xferdma->dm_segs[0].ds_addr &&
- dsa < cbdp->xferdma->dm_segs[0].ds_addr + PAGE_SIZE) {
+ dsa < cbdp->xferdma->dm_segs[0].ds_addr + PAGE_SIZE) {
dsa -= cbdp->xferdma->dm_segs[0].ds_addr;
siop_cmd = &cbdp->cmds[dsa / sizeof(struct siop_xfer)];
siop_table_sync(siop_cmd,
@@ -354,7 +354,7 @@
siop_lun = siop_target->siop_lun[lun];
#ifdef DIAGNOSTIC
if (siop_cmd->cmd_c.status != CMDST_ACTIVE) {
- printf("siop_cmd (lun %d) for DSA 0x%x "
+ printf("siop_cmd (lun %d) for DSA 0x%x "
"not active (%d)\n", lun, (u_int)dsa,
siop_cmd->cmd_c.status);
xs = NULL;
@@ -617,7 +617,7 @@
*/
if ((irqcode & 0x80) == 0) {
if (siop_cmd == NULL) {
- aprint_error_dev(sc->sc_c.sc_dev,
+ aprint_error_dev(sc->sc_c.sc_dev,
"script interrupt (0x%x) with "
"invalid DSA !!!\n",
irqcode);
@@ -962,7 +962,7 @@
* case, siop_cmd->saved_offset will have the proper
* value if it got updated by the controller
*/
- if (offset == 0 &&
+ if (offset == 0 &&
siop_cmd->saved_offset != SIOP_NOOFFSET)
offset = siop_cmd->saved_offset;
siop_update_resid(&siop_cmd->cmd_c, offset);
@@ -1076,7 +1076,7 @@
void
siop_unqueue(struct siop_softc *sc, int target, int lun)
{
- int slot, tag;
+ int slot, tag;
struct siop_cmd *siop_cmd;
struct siop_lun *siop_lun =
((struct siop_target *)sc->sc_c.targets[target])->siop_lun[lun];
@@ -1212,7 +1212,7 @@
printf("command with tag id %d reset\n", tag);
siop_cmd->cmd_c.xs->error =
(siop_cmd->cmd_c.flags & CMDFL_TIMEOUT) ?
- XS_TIMEOUT : XS_RESET;
+ XS_TIMEOUT : XS_RESET;
siop_cmd->cmd_c.xs->status = SCSI_SIOP_NOCHECK;
siop_lun->siop_tag[tag].active = NULL;
siop_cmd->cmd_c.status = CMDST_DONE;
Index: src/sys/dev/ic/siop_common.c
diff -u src/sys/dev/ic/siop_common.c:1.50 src/sys/dev/ic/siop_common.c:1.51
--- src/sys/dev/ic/siop_common.c:1.50 Sat May 16 03:57:57 2009
+++ src/sys/dev/ic/siop_common.c Fri Sep 4 18:29:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_common.c,v 1.50 2009/05/16 03:57:57 tsutsui Exp $ */
+/* $NetBSD: siop_common.c,v 1.51 2009/09/04 18:29:52 tsutsui Exp $ */
/*
* Copyright (c) 2000, 2002 Manuel Bouyer.
@@ -33,7 +33,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.50 2009/05/16 03:57:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.51 2009/09/04 18:29:52 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,7 +77,7 @@
error = bus_dmamem_alloc(sc->sc_dmat, PAGE_SIZE,
PAGE_SIZE, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT);
if (error) {
- aprint_error_dev(sc->sc_dev,
+ aprint_error_dev(sc->sc_dev,
"unable to allocate script DMA memory, "
"error = %d\n", error);
return error;
@@ -363,7 +363,7 @@
/* FALLTHROUGH */
default:
/*
- * hum, we got more than what we can handle, shouldn't
+ * hum, we got more than what we can handle, shouldn't
* happen. Reject, and stay async
*/
siop_target->flags &= ~TARF_ISWIDE;
@@ -879,7 +879,7 @@
*/
if (siop_cmd->flags & CMDFL_RESID) {
table = &siop_cmd->siop_tables->data[offset];
- siop_cmd->xs->resid -=
+ siop_cmd->xs->resid -=
siop_ctoh32(sc, table->count) - siop_cmd->resid;
}
}
Index: src/sys/dev/ic/siopvar_common.h
diff -u src/sys/dev/ic/siopvar_common.h:1.37 src/sys/dev/ic/siopvar_common.h:1.38
--- src/sys/dev/ic/siopvar_common.h:1.37 Fri May 15 17:55:44 2009
+++ src/sys/dev/ic/siopvar_common.h Fri Sep 4 18:29:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: siopvar_common.h,v 1.37 2009/05/15 17:55:44 tsutsui Exp $ */
+/* $NetBSD: siopvar_common.h,v 1.38 2009/09/04 18:29:52 tsutsui Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -206,9 +206,9 @@
void siop_minphys(struct buf *);
int siop_ioctl(struct scsipi_channel *, u_long,
void *, int, struct proc *);
-void siop_ma (struct siop_common_cmd *);
-void siop_sdp(struct siop_common_cmd *, int);
-void siop_update_resid(struct siop_common_cmd *, int);
+void siop_ma (struct siop_common_cmd *);
+void siop_sdp(struct siop_common_cmd *, int);
+void siop_update_resid(struct siop_common_cmd *, int);
void siop_clearfifo(struct siop_common_softc *);
void siop_resetbus(struct siop_common_softc *);
