Module Name: src Committed By: tsutsui Date: Mon Sep 7 13:31:44 UTC 2009
Modified Files: src/sys/dev/ic: ncr53c9x.c ncr53c9xreg.h ncr53c9xvar.h Log Message: Whitespace nits. To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/sys/dev/ic/ncr53c9x.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/ncr53c9xreg.h cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ic/ncr53c9xvar.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/ncr53c9x.c diff -u src/sys/dev/ic/ncr53c9x.c:1.140 src/sys/dev/ic/ncr53c9x.c:1.141 --- src/sys/dev/ic/ncr53c9x.c:1.140 Wed Sep 2 10:34:04 2009 +++ src/sys/dev/ic/ncr53c9x.c Mon Sep 7 13:31:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ncr53c9x.c,v 1.140 2009/09/02 10:34:04 tsutsui Exp $ */ +/* $NetBSD: ncr53c9x.c,v 1.141 2009/09/07 13:31:44 tsutsui Exp $ */ /*- * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.140 2009/09/02 10:34:04 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.141 2009/09/07 13:31:44 tsutsui Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,9 +139,9 @@ #define NCR_SET_COUNT(sc, size) do { \ - NCR_WRITE_REG((sc), NCR_TCL, (size)); \ + NCR_WRITE_REG((sc), NCR_TCL, (size)); \ NCR_WRITE_REG((sc), NCR_TCM, (size) >> 8); \ - if ((sc->sc_cfg2 & NCRCFG2_FE) || \ + if ((sc->sc_cfg2 & NCRCFG2_FE) || \ (sc->sc_rev == NCR_VARIANT_FAS366)) { \ NCR_WRITE_REG((sc), NCR_TCH, (size) >> 16); \ } \ @@ -1400,7 +1400,7 @@ #if 0 #ifdef NCR53C9X_DEBUG - { + { int j; NCR_TRACE(("\n[rdfifo %s (%d):", @@ -2385,7 +2385,7 @@ ecb = sc->sc_nexus; if (sc->sc_phase != MESSAGE_IN_PHASE) { int i = (NCR_READ_REG(sc, NCR_FFLAG) & NCRFIFO_FF); - /* + /* * Things are seriously screwed up. * Pull the brakes, i.e. reset */ Index: src/sys/dev/ic/ncr53c9xreg.h diff -u src/sys/dev/ic/ncr53c9xreg.h:1.15 src/sys/dev/ic/ncr53c9xreg.h:1.16 --- src/sys/dev/ic/ncr53c9xreg.h:1.15 Sun Dec 11 12:21:28 2005 +++ src/sys/dev/ic/ncr53c9xreg.h Mon Sep 7 13:31:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ncr53c9xreg.h,v 1.15 2005/12/11 12:21:28 christos Exp $ */ +/* $NetBSD: ncr53c9xreg.h,v 1.16 2009/09/07 13:31:44 tsutsui Exp $ */ /* * Copyright (c) 1994 Peter Galbavy. All rights reserved. @@ -62,12 +62,12 @@ #define NCRCMD_TCCS 0x25 /* Target Command Comp Seq */ #define NCRCMD_DISC 0x27 /* Disconnect */ #define NCRCMD_RECMSG 0x28 /* Receive Message */ -#define NCRCMD_RECCMD 0x29 /* Receive Command */ +#define NCRCMD_RECCMD 0x29 /* Receive Command */ #define NCRCMD_RECDATA 0x2a /* Receive Data */ #define NCRCMD_RECCSEQ 0x2b /* Receive Command Sequence*/ #define NCRCMD_ABORT 0x04 /* Target Abort DMA */ #define NCRCMD_TRANS 0x10 /* Transfer Information */ -#define NCRCMD_ICCS 0x11 /* Initiator Cmd Comp Seq */ +#define NCRCMD_ICCS 0x11 /* Initiator Cmd Comp Seq */ #define NCRCMD_MSGOK 0x12 /* Message Accepted */ #define NCRCMD_TRPAD 0x18 /* Transfer Pad */ #define NCRCMD_SETATN 0x1a /* Set ATN */ @@ -82,7 +82,7 @@ #define NCRSTAT_PHASE 0x07 /* Phase bits */ #define NCR_SELID 0x04 /* WO - Select/Reselect Bus ID */ -#define NCR_BUSID_HME 0x10 /* XXX HME reselect ID */ +#define NCR_BUSID_HME 0x10 /* XXX HME reselect ID */ #define NCR_BUSID_HME32 0x40 /* XXX HME to select more than 16 */ #define NCR_INTR 0x05 /* RO - Interrupt */ @@ -134,12 +134,12 @@ #define NCR_CFG2 0x0b /* RW - Configuration #2 */ #define NCRCFG2_RSVD 0xa0 /* reserved */ -#define NCRCFG2_FE 0x40 /* Features Enable */ -#define NCRCFG2_DREQ 0x10 /* DREQ High Impedance */ -#define NCRCFG2_SCSI2 0x08 /* SCSI-2 Enable */ -#define NCRCFG2_BPA 0x04 /* Target Bad Parity Abort */ -#define NCRCFG2_RPE 0x02 /* Register Parity Error */ -#define NCRCFG2_DPE 0x01 /* DMA Parity Error */ +#define NCRCFG2_FE 0x40 /* Features Enable */ +#define NCRCFG2_DREQ 0x10 /* DREQ High Impedance */ +#define NCRCFG2_SCSI2 0x08 /* SCSI-2 Enable */ +#define NCRCFG2_BPA 0x04 /* Target Bad Parity Abort */ +#define NCRCFG2_RPE 0x02 /* Register Parity Error */ +#define NCRCFG2_DPE 0x01 /* DMA Parity Error */ #define NCRCFG2_HMEFE 0x10 /* HME feature enable */ #define NCRCFG2_HME32 0x80 /* HME 32 extended */ @@ -183,14 +183,14 @@ #define NCRF9XCFG3_T8M 0x01 /* Threshold 8 Mode */ /* Config #3 on FAS366 */ -#define NCRFASCFG3_OBAUTO 0x80 /* auto push odd-byte to DMA */ -#define NCRFASCFG3_EWIDE 0x40 /* Enable Wide-SCSI */ -#define NCRFASCFG3_IDBIT3 0x20 /* Bit 3 of HME SCSI-ID */ -#define NCRFASCFG3_IDRESCHK 0x10 /* ID message checking */ -#define NCRFASCFG3_QUENB 0x08 /* 3-byte msg support */ -#define NCRFASCFG3_CDB10 0x04 /* group 2 scsi-2 support */ -#define NCRFASCFG3_FASTSCSI 0x02 /* 10 MB/S fast scsi mode */ -#define NCRFASCFG3_FASTCLK 0x01 /* fast clock mode */ +#define NCRFASCFG3_OBAUTO 0x80 /* auto push odd-byte to DMA */ +#define NCRFASCFG3_EWIDE 0x40 /* Enable Wide-SCSI */ +#define NCRFASCFG3_IDBIT3 0x20 /* Bit 3 of HME SCSI-ID */ +#define NCRFASCFG3_IDRESCHK 0x10 /* ID message checking */ +#define NCRFASCFG3_QUENB 0x08 /* 3-byte msg support */ +#define NCRFASCFG3_CDB10 0x04 /* group 2 scsi-2 support */ +#define NCRFASCFG3_FASTSCSI 0x02 /* 10 MB/S fast scsi mode */ +#define NCRFASCFG3_FASTCLK 0x01 /* fast clock mode */ /* Config #4 only on ESP406/FAS408 */ #define NCR_CFG4 0x0d /* RW - Configuration #4 */ Index: src/sys/dev/ic/ncr53c9xvar.h diff -u src/sys/dev/ic/ncr53c9xvar.h:1.53 src/sys/dev/ic/ncr53c9xvar.h:1.54 --- src/sys/dev/ic/ncr53c9xvar.h:1.53 Wed Sep 2 10:34:05 2009 +++ src/sys/dev/ic/ncr53c9xvar.h Mon Sep 7 13:31:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ncr53c9xvar.h,v 1.53 2009/09/02 10:34:05 tsutsui Exp $ */ +/* $NetBSD: ncr53c9xvar.h,v 1.54 2009/09/07 13:31:44 tsutsui Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -119,7 +119,7 @@ uint8_t *daddr; /* Saved data pointer */ int clen; /* Size of command in cmd.cmd */ int dleft; /* Residue */ - u_char stat; /* SCSI status byte */ + u_char stat; /* SCSI status byte */ u_char tag[2]; /* TAG bytes */ u_char pad[1]; @@ -370,7 +370,7 @@ #define SEND_PARITY_ERROR 0x0002 #define SEND_INIT_DET_ERR 0x0004 #define SEND_REJECT 0x0008 -#define SEND_IDENTIFY 0x0010 +#define SEND_IDENTIFY 0x0010 #define SEND_ABORT 0x0020 #define SEND_WDTR 0x0040 #define SEND_SDTR 0x0080