Module Name: src
Committed By: tsutsui
Date: Thu Sep 3 14:37:58 UTC 2009
Modified Files:
src/sys/dev/ic: aic7xxx.c
Log Message:
Misc cosmetics:
- remove c++ style comment
- wrap long lines
- remove unnecessary casts against void pointers
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/ic/aic7xxx.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/dev/ic/aic7xxx.c
diff -u src/sys/dev/ic/aic7xxx.c:1.128 src/sys/dev/ic/aic7xxx.c:1.129
--- src/sys/dev/ic/aic7xxx.c:1.128 Sat Mar 14 21:04:19 2009
+++ src/sys/dev/ic/aic7xxx.c Thu Sep 3 14:37:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.128 2009/03/14 21:04:19 dsl Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.128 2009/03/14 21:04:19 dsl Exp $
+ * $Id: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.128 2009/03/14 21:04:19 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -211,7 +211,9 @@
struct scb *scb);
#endif
-//static bus_dmamap_callback_t ahc_dmamap_cb;
+#if 0
+static bus_dmamap_callback_t ahc_dmamap_cb;
+#endif
static void ahc_build_free_scb_list(struct ahc_softc *ahc);
static int ahc_init_scbdata(struct ahc_softc *ahc);
static void ahc_fini_scbdata(struct ahc_softc *ahc);
@@ -341,7 +343,8 @@
*/
modnext = ahc->qoutfifonext & ~0x3;
*((uint32_t *)(&ahc->qoutfifo[modnext])) = 0xFFFFFFFFUL;
- ahc_dmamap_sync(ahc, ahc->parent_dmat /*shared_data_dmat*/,
+ ahc_dmamap_sync(ahc,
+ ahc->parent_dmat /*shared_data_dmat*/,
ahc->shared_data_dmamap,
/*offset*/modnext, /*len*/4,
BUS_DMASYNC_PREREAD);
@@ -517,7 +520,8 @@
&tstate);
tinfo = &targ_info->curr;
sg = scb->sg_list;
- sc = (struct scsi_request_sense *)(&hscb->shared_data.cdb);
+ sc = (struct scsi_request_sense *)
+ (&hscb->shared_data.cdb);
/*
* Save off the residual if there is one.
*/
@@ -1277,7 +1281,8 @@
CAM_LUN_WILDCARD,
SCB_LIST_NULL,
ROLE_INITIATOR)) {
- ahc_set_transaction_status(scb, CAM_REQ_CMP);
+ ahc_set_transaction_status(scb,
+ CAM_REQ_CMP);
}
#endif
ahc_compile_devinfo(&devinfo,
@@ -1568,8 +1573,7 @@
&& ahc->enabled_targets[scsi_id] != master_tstate)
panic("%s: ahc_alloc_tstate - Target already allocated",
ahc_name(ahc));
- tstate = (struct ahc_tmode_tstate*)malloc(sizeof(*tstate),
- M_DEVBUF, M_NOWAIT);
+ tstate = malloc(sizeof(*tstate), M_DEVBUF, M_NOWAIT);
if (tstate == NULL)
return (NULL);
@@ -3920,8 +3924,10 @@
case 1:
bus_dmamap_unload(ahc->parent_dmat, ahc->shared_data_dmamap);
bus_dmamap_destroy(ahc->parent_dmat, ahc->shared_data_dmamap);
- bus_dmamem_unmap(ahc->parent_dmat, (void *)ahc->qoutfifo, ahc->shared_data_size);
- bus_dmamem_free(ahc->parent_dmat, &ahc->shared_data_seg, ahc->shared_data_nseg);
+ bus_dmamem_unmap(ahc->parent_dmat, (void *)ahc->qoutfifo,
+ ahc->shared_data_size);
+ bus_dmamem_free(ahc->parent_dmat, &ahc->shared_data_seg,
+ ahc->shared_data_nseg);
break;
case 0:
break;
@@ -3973,7 +3979,7 @@
struct ahc_softc *ahc;
int i;
- ahc = (struct ahc_softc *)arg;
+ ahc = arg;
/* This will reset most registers to 0, but not all */
ahc_reset(ahc);
@@ -4062,7 +4068,8 @@
ahc->features |= AHC_TWIN;
break;
default:
- printf(" Unsupported adapter type (0x%x). Ignoring\n", sblkctl);
+ printf(" Unsupported adapter type (0x%x). Ignoring\n",
+ sblkctl);
return(-1);
}
@@ -4176,9 +4183,8 @@
SLIST_INIT(&scb_data->sg_maps);
/* Allocate SCB resources */
- scb_data->scbarray =
- (struct scb *)malloc(sizeof(struct scb) * AHC_SCB_MAX_ALLOC,
- M_DEVBUF, M_NOWAIT);
+ scb_data->scbarray = malloc(sizeof(struct scb) * AHC_SCB_MAX_ALLOC,
+ M_DEVBUF, M_NOWAIT);
if (scb_data->scbarray == NULL)
return (ENOMEM);
memset(scb_data->scbarray, 0, sizeof(struct scb) * AHC_SCB_MAX_ALLOC);
@@ -4330,7 +4336,8 @@
if (ahc_createdmamem(ahc->parent_dmat, PAGE_SIZE, ahc->sc_dmaflags,
&sg_map->sg_dmamap,
(void **)&sg_map->sg_vaddr, &sg_map->sg_physaddr,
- &sg_map->sg_dmasegs, &sg_map->sg_nseg, ahc_name(ahc),
+ &sg_map->sg_dmasegs, &sg_map->sg_nseg,
+ ahc_name(ahc),
"SG space") < 0) {
free(sg_map, M_DEVBUF);
return (0);
@@ -4347,8 +4354,7 @@
struct scb_platform_data *pdata;
int error;
- pdata = (struct scb_platform_data *)malloc(sizeof(*pdata),
- M_DEVBUF, M_WAITOK);
+ pdata = malloc(sizeof(*pdata), M_DEVBUF, M_WAITOK);
if (pdata == NULL)
break;
next_scb->platform_data = pdata;
@@ -4509,7 +4515,8 @@
ahc->sc_dmaflags,
&ahc->shared_data_dmamap, (void **)&ahc->qoutfifo,
&ahc->shared_data_busaddr, &ahc->shared_data_seg,
- &ahc->shared_data_nseg, ahc_name(ahc), "shared data") < 0)
+ &ahc->shared_data_nseg, ahc_name(ahc),
+ "shared data") < 0)
return (ENOMEM);
ahc->init_level++;
@@ -4580,7 +4587,9 @@
}
#endif /* AHC_DEBUG */
- /* Set the SCSI Id, SXFRCTL0, SXFRCTL1, and SIMODE1, for both channels*/
+ /*
+ * Set the SCSI Id, SXFRCTL0, SXFRCTL1, and SIMODE1, for both channels
+ */
if (ahc->features & AHC_TWIN) {
/*
@@ -5464,7 +5473,8 @@
if (cstat != CAM_REQ_CMP)
ahc_freeze_scb(scb);
if ((scb->flags & SCB_ACTIVE) == 0)
- printf("Inactive SCB in Waiting List\n");
+ printf("Inactive SCB in "
+ "Waiting List\n");
ahc_done(ahc, scb);
/* FALLTHROUGH */
}
@@ -7367,7 +7377,9 @@
#endif
static int
-ahc_createdmamem(bus_dma_tag_t tag, int size, int flags, bus_dmamap_t *mapp, void **vaddr, bus_addr_t *baddr, bus_dma_segment_t *seg, int *nseg, const char *myname, const char *what)
+ahc_createdmamem(bus_dma_tag_t tag, int size, int flags, bus_dmamap_t *mapp,
+ void **vaddr, bus_addr_t *baddr, bus_dma_segment_t *seg, int *nseg,
+ const char *myname, const char *what)
{
int error, level = 0;
@@ -7426,7 +7438,8 @@
}
static void
-ahc_freedmamem(bus_dma_tag_t tag, int size, bus_dmamap_t map, void *vaddr, bus_dma_segment_t *seg, int nseg)
+ahc_freedmamem(bus_dma_tag_t tag, int size, bus_dmamap_t map, void *vaddr,
+ bus_dma_segment_t *seg, int nseg)
{
bus_dmamap_unload(tag, map);
