Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

b_un.b_addr -> b_data

Browse Source
This commit is contained in:
mycroft 1994-06-16 01:07:30 +00:00
parent 507802da61
commit a69dd750a2
26 changed files with 73 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/arch/i386/i386/disksubr.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* $Id: disksubr.c,v 1.6 1994/03/08 02:38:08 cgd Exp $
* $Id: disksubr.c,v 1.7 1994/06/16 01:07:30 mycroft Exp $
*/
#include "param.h"
@ -116,8 +116,8 @@ readdisklabel(dev, strat, lp, osdep)
goto done;
} else {
/* XXX how do we check veracity/bounds of this? */
bcopy(bp->b_un.b_addr + DOSPARTOFF, dp,
NDOSPART * sizeof(*dp));
bcopy(bp->b_data + DOSPARTOFF, dp,
NDOSPART * sizeof(*dp));
for (i = 0; i < NDOSPART; i++, dp++)
/* is this ours? */
if (dp->dp_size &&
@ -156,8 +156,8 @@ readdisklabel(dev, strat, lp, osdep)
if (biowait(bp)) {
msg = "disk label I/O error";
goto done;
} else for (dlp = (struct disklabel *)bp->b_un.b_addr;
dlp <= (struct disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));
} else for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)(bp->b_data + DEV_BSIZE - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)
@ -196,7 +196,7 @@ readdisklabel(dev, strat, lp, osdep)
if (biowait(bp)) {
msg = "bad sector table I/O error";
} else {
db = (struct dkbad *)(bp->b_un.b_addr);
db = (struct dkbad *)(bp->b_data);
#define DKBAD_MAGIC 0x4321
if (db->bt_mbz == 0
&& db->bt_flag == DKBAD_MAGIC) {
@ -312,8 +312,8 @@ writedisklabel(dev, strat, lp, osdep)
bp->b_cylin = DOSBBSECTOR / lp->d_secpercyl;
(*strat)(bp);
if ((error = biowait(bp)) == 0) {
bcopy(bp->b_un.b_addr + DOSPARTOFF, dp,
NDOSPART * sizeof(*dp));
bcopy(bp->b_data + DOSPARTOFF, dp,
NDOSPART * sizeof(*dp));
for (i = 0; i < NDOSPART; i++, dp++)
if(dp->dp_size && dp->dp_typ == DOSPTYP_386BSD
&& dospartoff == 0) {
@ -343,9 +343,8 @@ writedisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if (error = biowait(bp))
goto done;
for (dlp = (struct disklabel *)bp->b_un.b_addr;
dlp <= (struct disklabel *)
(bp->b_un.b_addr + lp->d_secsize - sizeof(*dlp));
for (dlp = (struct disklabel *)(bp->b_data);
dlp <= (struct disklabel *)(bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {

10
sys/arch/i386/i386/vm_machdep.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* $Id: vm_machdep.c,v 1.24 1994/05/29 06:47:51 mycroft Exp $
* $Id: vm_machdep.c,v 1.25 1994/06/16 01:07:32 mycroft Exp $
*/
/*
@ -382,12 +382,12 @@ vmapbuf(bp)
if ((flags & B_PHYS) == 0)
panic("vmapbuf");
addr = bp->b_saveaddr = bp->b_un.b_addr;
addr = bp->b_saveaddr = bp->b_data;
off = (int)addr & PGOFSET;
p = bp->b_proc;
npf = btoc(round_page(bp->b_bcount + off));
kva = kmem_alloc_wait(phys_map, ctob(npf));
bp->b_un.b_addr = (caddr_t) (kva + off);
bp->b_data = (caddr_t) (kva + off);
while (npf--) {
pa = pmap_extract(&p->p_vmspace->vm_pmap, (vm_offset_t)addr);
if (pa == 0)
@ -407,7 +407,7 @@ vunmapbuf(bp)
register struct buf *bp;
{
register int npf;
register caddr_t addr = bp->b_un.b_addr;
register caddr_t addr = bp->b_data;
vm_offset_t kva;
if ((bp->b_flags & B_PHYS) == 0)
@ -415,7 +415,7 @@ vunmapbuf(bp)
npf = btoc(round_page(bp->b_bcount + ((int)addr & PGOFSET)));
kva = (vm_offset_t)((int)addr & ~PGOFSET);
kmem_free_wakeup(phys_map, kva, ctob(npf));
bp->b_un.b_addr = bp->b_saveaddr;
bp->b_data = bp->b_saveaddr;
bp->b_saveaddr = NULL;
}

8
sys/arch/i386/isa/fd.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.47 1994/05/27 13:00:27 cgd Exp $
* $Id: fd.c,v 1.48 1994/06/16 01:08:18 mycroft Exp $
*/
#include <sys/param.h>
@ -874,10 +874,10 @@ again:
#endif
read = bp->b_flags & B_READ;
#ifdef NEWCONFIG
at_dma(read, bp->b_un.b_addr + fd->sc_skip, nblks * FDC_BSIZE,
at_dma(read, bp->b_data + fd->sc_skip, nblks * FDC_BSIZE,
fdc->sc_drq);
#else
isa_dmastart(read, bp->b_un.b_addr + fd->sc_skip, nblks * FDC_BSIZE,
isa_dmastart(read, bp->b_data + fd->sc_skip, nblks * FDC_BSIZE,
fdc->sc_drq);
#endif
outb(iobase + fdctl, type->rate);
@ -952,7 +952,7 @@ again:
#ifdef NEWCONFIG
at_dma_terminate(fdc->sc_drq);
#else
isa_dmadone(bp->b_flags & B_READ, bp->b_un.b_addr + fd->sc_skip,
isa_dmadone(bp->b_flags & B_READ, bp->b_data + fd->sc_skip,
nblks * FDC_BSIZE, fdc->sc_drq);
#endif
fd->sc_skip += nblks * FDC_BSIZE;

4
sys/arch/i386/isa/lpt.c
View File

@ -46,7 +46,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.21 1994/05/27 08:54:52 mycroft Exp $
* $Id: lpt.c,v 1.22 1994/06/16 01:08:21 mycroft Exp $
*/
/*
@ -474,7 +474,7 @@ lptwrite(dev, uio)
int error = 0;
while (n = min(LPT_BSIZE, uio->uio_resid)) {
uiomove(sc->sc_cp = sc->sc_inbuf->b_un.b_addr, n, uio);
uiomove(sc->sc_cp = sc->sc_inbuf->b_data, n, uio);
sc->sc_count = n;
error = pushbytes(sc);
if (error) {

4
sys/arch/i386/isa/mcd.c
View File

@ -35,7 +35,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.15 1994/05/11 09:49:23 mycroft Exp $
* $Id: mcd.c,v 1.16 1994/06/16 01:08:23 mycroft Exp $
*/
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
@ -964,7 +964,7 @@ loop:
MCD_TRACE("doread: got data delay=%d\n",
RDELAY_WAITREAD - mbx->count, 0, 0, 0);
/* Data is ready. */
addr = bp->b_un.b_addr + mbx->skip;
addr = bp->b_data + mbx->skip;
outb(iobase + mcd_ctl2, 0x04); /* XXX */
for (i = 0; i < mbx->sz; i++)
*addr++ = inb(iobase + mcd_rdata);

4
sys/arch/i386/isa/spkr.c
View File

@ -6,7 +6,7 @@
* 386bsd only clean version, all SYSV stuff removed
* use hz value from param.c
*
* $Id: spkr.c,v 1.14 1994/05/24 07:31:16 mycroft Exp $
* $Id: spkr.c,v 1.15 1994/06/16 01:08:27 mycroft Exp $
*/
#include "speaker.h"
@ -439,7 +439,7 @@ struct uio *uio;
else
{
n = min(DEV_BSIZE, uio->uio_resid);
cp = spkr_inbuf->b_un.b_addr;
cp = spkr_inbuf->b_data;
error = uiomove(cp, n, uio);
if (!error)
playstring(cp, n);

8
sys/arch/i386/isa/wd.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.83 1994/06/09 20:00:13 pk Exp $
* $Id: wd.c,v 1.84 1994/06/16 01:08:31 mycroft Exp $
*/
#define INSTRUMENT /* instrumentation stuff by Brad Parker */
@ -666,7 +666,7 @@ loop:
}
#ifdef WDDEBUG
printf("sector %d cylin %d head %d addr %x sts %x\n", sector,
cylin, head, bp->b_un.b_addr, inb(wd->sc_iobase+wd_altsts));
cylin, head, bp->b_data, inb(wd->sc_iobase+wd_altsts));
#endif
}
@ -681,7 +681,7 @@ loop:
}
/* Then send it! */
outsw(wdc->sc_iobase+wd_data, bp->b_un.b_addr + wd->sc_skip * DEV_BSIZE,
outsw(wdc->sc_iobase+wd_data, bp->b_data + wd->sc_skip * DEV_BSIZE,
DEV_BSIZE / sizeof(short));
}
@ -768,7 +768,7 @@ wdcintr(wdc)
/* Suck in data. */
insw(wdc->sc_iobase+wd_data,
bp->b_un.b_addr + wd->sc_skip * DEV_BSIZE,
bp->b_data + wd->sc_skip * DEV_BSIZE,
DEV_BSIZE / sizeof(short));
}

4
sys/arch/i386/isa/wd7000.c
View File

@ -16,7 +16,7 @@
* scatter gather is done by the board, then look at one of the Adaptec
* drivers to finish off the job..
*
* $Id: wd7000.c,v 1.16 1994/03/25 07:40:59 mycroft Exp $
* $Id: wd7000.c,v 1.17 1994/06/16 01:08:35 mycroft Exp $
*/
#include "wds.h"
#if NWDS > 0
@ -237,7 +237,7 @@ wdsprobe(struct isa_device *dev)
void
wds_minphys(struct buf *bp)
{
int base = (int)bp->b_un.b_addr & (PAGESIZ-1);
int base = (int)bp->b_data & (PAGESIZ-1);
if(base + bp->b_bcount > PAGESIZ)
bp->b_bcount = PAGESIZ - base;

4
sys/arch/i386/isa/wt.c
View File

@ -16,7 +16,7 @@
* This driver is derived from the old 386bsd Wangtek streamer tape driver,
* made by Robert Baron at CMU, based on Intel sources.
*
* $Id: wt.c,v 1.15 1994/05/05 08:31:44 mycroft Exp $
* $Id: wt.c,v 1.16 1994/06/16 01:08:37 mycroft Exp $
*/
/*
@ -578,7 +578,7 @@ wtstrategy(bp)
sc->flags &= ~TPEXCEP;
s = splbio();
if (wtstart(sc, bp->b_flags, bp->b_un.b_addr, bp->b_bcount)) {
if (wtstart(sc, bp->b_flags, bp->b_data, bp->b_bcount)) {
wtwait(sc, 0, (bp->b_flags & B_READ) ? "wtread" : "wtwrite");
bp->b_resid -= sc->dmacount;
}

8
sys/dev/ata/wd.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.83 1994/06/09 20:00:13 pk Exp $
* $Id: wd.c,v 1.84 1994/06/16 01:08:31 mycroft Exp $
*/
#define INSTRUMENT /* instrumentation stuff by Brad Parker */
@ -666,7 +666,7 @@ loop:
}
#ifdef WDDEBUG
printf("sector %d cylin %d head %d addr %x sts %x\n", sector,
cylin, head, bp->b_un.b_addr, inb(wd->sc_iobase+wd_altsts));
cylin, head, bp->b_data, inb(wd->sc_iobase+wd_altsts));
#endif
}
@ -681,7 +681,7 @@ loop:
}
/* Then send it! */
outsw(wdc->sc_iobase+wd_data, bp->b_un.b_addr + wd->sc_skip * DEV_BSIZE,
outsw(wdc->sc_iobase+wd_data, bp->b_data + wd->sc_skip * DEV_BSIZE,
DEV_BSIZE / sizeof(short));
}
@ -768,7 +768,7 @@ wdcintr(wdc)
/* Suck in data. */
insw(wdc->sc_iobase+wd_data,
bp->b_un.b_addr + wd->sc_skip * DEV_BSIZE,
bp->b_data + wd->sc_skip * DEV_BSIZE,
DEV_BSIZE / sizeof(short));
}

4
sys/dev/ic/lpt.c
View File

@ -46,7 +46,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.21 1994/05/27 08:54:52 mycroft Exp $
* $Id: lpt.c,v 1.22 1994/06/16 01:08:21 mycroft Exp $
*/
/*
@ -474,7 +474,7 @@ lptwrite(dev, uio)
int error = 0;
while (n = min(LPT_BSIZE, uio->uio_resid)) {
uiomove(sc->sc_cp = sc->sc_inbuf->b_un.b_addr, n, uio);
uiomove(sc->sc_cp = sc->sc_inbuf->b_data, n, uio);
sc->sc_count = n;
error = pushbytes(sc);
if (error) {

4
sys/dev/ic/lptvar.h
View File

@ -46,7 +46,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lptvar.h,v 1.21 1994/05/27 08:54:52 mycroft Exp $
* $Id: lptvar.h,v 1.22 1994/06/16 01:08:21 mycroft Exp $
*/
/*
@ -474,7 +474,7 @@ lptwrite(dev, uio)
int error = 0;
while (n = min(LPT_BSIZE, uio->uio_resid)) {
uiomove(sc->sc_cp = sc->sc_inbuf->b_un.b_addr, n, uio);
uiomove(sc->sc_cp = sc->sc_inbuf->b_data, n, uio);
sc->sc_count = n;
error = pushbytes(sc);
if (error) {

4
sys/dev/isa/lpt.c
View File

@ -46,7 +46,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt.c,v 1.21 1994/05/27 08:54:52 mycroft Exp $
* $Id: lpt.c,v 1.22 1994/06/16 01:08:21 mycroft Exp $
*/
/*
@ -474,7 +474,7 @@ lptwrite(dev, uio)
int error = 0;
while (n = min(LPT_BSIZE, uio->uio_resid)) {
uiomove(sc->sc_cp = sc->sc_inbuf->b_un.b_addr, n, uio);
uiomove(sc->sc_cp = sc->sc_inbuf->b_data, n, uio);
sc->sc_count = n;
error = pushbytes(sc);
if (error) {

4
sys/dev/isa/lpt_isa.c
View File

@ -46,7 +46,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: lpt_isa.c,v 1.21 1994/05/27 08:54:52 mycroft Exp $
* $Id: lpt_isa.c,v 1.22 1994/06/16 01:08:21 mycroft Exp $
*/
/*
@ -474,7 +474,7 @@ lptwrite(dev, uio)
int error = 0;
while (n = min(LPT_BSIZE, uio->uio_resid)) {
uiomove(sc->sc_cp = sc->sc_inbuf->b_un.b_addr, n, uio);
uiomove(sc->sc_cp = sc->sc_inbuf->b_data, n, uio);
sc->sc_count = n;
error = pushbytes(sc);
if (error) {

4
sys/dev/isa/mcd.c
View File

@ -35,7 +35,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.15 1994/05/11 09:49:23 mycroft Exp $
* $Id: mcd.c,v 1.16 1994/06/16 01:08:23 mycroft Exp $
*/
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
@ -964,7 +964,7 @@ loop:
MCD_TRACE("doread: got data delay=%d\n",
RDELAY_WAITREAD - mbx->count, 0, 0, 0);
/* Data is ready. */
addr = bp->b_un.b_addr + mbx->skip;
addr = bp->b_data + mbx->skip;
outb(iobase + mcd_ctl2, 0x04); /* XXX */
for (i = 0; i < mbx->sz; i++)
*addr++ = inb(iobase + mcd_rdata);

8
sys/dev/isa/wd.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.83 1994/06/09 20:00:13 pk Exp $
* $Id: wd.c,v 1.84 1994/06/16 01:08:31 mycroft Exp $
*/
#define INSTRUMENT /* instrumentation stuff by Brad Parker */
@ -666,7 +666,7 @@ loop:
}
#ifdef WDDEBUG
printf("sector %d cylin %d head %d addr %x sts %x\n", sector,
cylin, head, bp->b_un.b_addr, inb(wd->sc_iobase+wd_altsts));
cylin, head, bp->b_data, inb(wd->sc_iobase+wd_altsts));
#endif
}
@ -681,7 +681,7 @@ loop:
}
/* Then send it! */
outsw(wdc->sc_iobase+wd_data, bp->b_un.b_addr + wd->sc_skip * DEV_BSIZE,
outsw(wdc->sc_iobase+wd_data, bp->b_data + wd->sc_skip * DEV_BSIZE,
DEV_BSIZE / sizeof(short));
}
@ -768,7 +768,7 @@ wdcintr(wdc)
/* Suck in data. */
insw(wdc->sc_iobase+wd_data,
bp->b_un.b_addr + wd->sc_skip * DEV_BSIZE,
bp->b_data + wd->sc_skip * DEV_BSIZE,
DEV_BSIZE / sizeof(short));
}

4
sys/dev/isa/wd7000.c
View File

@ -16,7 +16,7 @@
* scatter gather is done by the board, then look at one of the Adaptec
* drivers to finish off the job..
*
* $Id: wd7000.c,v 1.16 1994/03/25 07:40:59 mycroft Exp $
* $Id: wd7000.c,v 1.17 1994/06/16 01:08:35 mycroft Exp $
*/
#include "wds.h"
#if NWDS > 0
@ -237,7 +237,7 @@ wdsprobe(struct isa_device *dev)
void
wds_minphys(struct buf *bp)
{
int base = (int)bp->b_un.b_addr & (PAGESIZ-1);
int base = (int)bp->b_data & (PAGESIZ-1);
if(base + bp->b_bcount > PAGESIZ)
bp->b_bcount = PAGESIZ - base;

4
sys/dev/isa/wt.c
View File

@ -16,7 +16,7 @@
* This driver is derived from the old 386bsd Wangtek streamer tape driver,
* made by Robert Baron at CMU, based on Intel sources.
*
* $Id: wt.c,v 1.15 1994/05/05 08:31:44 mycroft Exp $
* $Id: wt.c,v 1.16 1994/06/16 01:08:37 mycroft Exp $
*/
/*
@ -578,7 +578,7 @@ wtstrategy(bp)
sc->flags &= ~TPEXCEP;
s = splbio();
if (wtstart(sc, bp->b_flags, bp->b_un.b_addr, bp->b_bcount)) {
if (wtstart(sc, bp->b_flags, bp->b_data, bp->b_bcount)) {
wtwait(sc, 0, (bp->b_flags & B_READ) ? "wtread" : "wtwrite");
bp->b_resid -= sc->dmacount;
}

4
sys/dev/scsipi/cd.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cd.c,v 1.27 1994/05/11 09:53:52 mycroft Exp $
* $Id: cd.c,v 1.28 1994/06/16 01:11:40 mycroft Exp $
*/
/*
@ -490,7 +490,7 @@ cdstart(unit)
* Note: we cannot sleep as we may be an interrupt
*/
if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd,
sizeof(cmd), (u_char *) bp->b_un.b_addr, bp->b_bcount,
sizeof(cmd), (u_char *) bp->b_data, bp->b_bcount,
CDRETRIES, 30000, bp, SCSI_NOSLEEP |
((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT))
!= SUCCESSFULLY_QUEUED) {

6
sys/dev/scsipi/scsipi_ioctl.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: scsipi_ioctl.c,v 1.5 1994/04/11 03:54:04 mycroft Exp $
* $Id: scsipi_ioctl.c,v 1.6 1994/06/16 01:11:44 mycroft Exp $
*/
/*
@ -268,7 +268,7 @@ scsistrategy(bp)
flags |= SCSI_ESCAPE;
err = scsi_scsi_cmd(sc_link, (struct scsi_generic *)screq->cmd,
screq->cmdlen, (u_char *)bp->b_un.b_addr, screq->datalen,
screq->cmdlen, (u_char *)bp->b_data, screq->datalen,
0, /* user must do the retries *//* ignored */
screq->timeout, bp, flags | SCSI_USER);
@ -355,7 +355,7 @@ scsi_do_ioctl(sc_link, cmd, addr, f)
#endif
} else {
/* if no data, no need to translate it.. */
bp->b_un.b_addr = 0;
bp->b_data = 0;
bp->b_dev = -1; /* irrelevant info */
bp->b_flags = 0;
scsistrategy(bp);

4
sys/dev/scsipi/sd.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: sd.c,v 1.30 1994/05/09 07:40:53 chopps Exp $
* $Id: sd.c,v 1.31 1994/06/16 01:11:47 mycroft Exp $
*/
/*
@ -513,7 +513,7 @@ sdstart(unit)
* Note: we cannot sleep as we may be an interrupt
*/
if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd,
sizeof(cmd), (u_char *) bp->b_un.b_addr, bp->b_bcount,
sizeof(cmd), (u_char *) bp->b_data, bp->b_bcount,
SDRETRIES, 10000, bp, SCSI_NOSLEEP |
((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT))
!= SUCCESSFULLY_QUEUED) {

4
sys/dev/scsipi/st.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: st.c,v 1.31 1994/05/11 09:53:45 mycroft Exp $
* $Id: st.c,v 1.32 1994/06/16 01:11:51 mycroft Exp $
*/
/*
@ -1057,7 +1057,7 @@ ststart(unit)
* go ask the adapter to do all this for us
*/
if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd,
sizeof(cmd), (u_char *) bp->b_un.b_addr, bp->b_bcount, 0,
sizeof(cmd), (u_char *) bp->b_data, bp->b_bcount, 0,
100000, bp, flags | SCSI_NOSLEEP) != SUCCESSFULLY_QUEUED) {
badnews:
printf("%s: not queued\n", st->sc_dev.dv_xname);

4
sys/scsi/cd.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cd.c,v 1.27 1994/05/11 09:53:52 mycroft Exp $
* $Id: cd.c,v 1.28 1994/06/16 01:11:40 mycroft Exp $
*/
/*
@ -490,7 +490,7 @@ cdstart(unit)
* Note: we cannot sleep as we may be an interrupt
*/
if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd,
sizeof(cmd), (u_char *) bp->b_un.b_addr, bp->b_bcount,
sizeof(cmd), (u_char *) bp->b_data, bp->b_bcount,
CDRETRIES, 30000, bp, SCSI_NOSLEEP |
((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT))
!= SUCCESSFULLY_QUEUED) {

6
sys/scsi/scsi_ioctl.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: scsi_ioctl.c,v 1.5 1994/04/11 03:54:04 mycroft Exp $
* $Id: scsi_ioctl.c,v 1.6 1994/06/16 01:11:44 mycroft Exp $
*/
/*
@ -268,7 +268,7 @@ scsistrategy(bp)
flags |= SCSI_ESCAPE;
err = scsi_scsi_cmd(sc_link, (struct scsi_generic *)screq->cmd,
screq->cmdlen, (u_char *)bp->b_un.b_addr, screq->datalen,
screq->cmdlen, (u_char *)bp->b_data, screq->datalen,
0, /* user must do the retries *//* ignored */
screq->timeout, bp, flags | SCSI_USER);
@ -355,7 +355,7 @@ scsi_do_ioctl(sc_link, cmd, addr, f)
#endif
} else {
/* if no data, no need to translate it.. */
bp->b_un.b_addr = 0;
bp->b_data = 0;
bp->b_dev = -1; /* irrelevant info */
bp->b_flags = 0;
scsistrategy(bp);

4
sys/scsi/sd.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: sd.c,v 1.30 1994/05/09 07:40:53 chopps Exp $
* $Id: sd.c,v 1.31 1994/06/16 01:11:47 mycroft Exp $
*/
/*
@ -513,7 +513,7 @@ sdstart(unit)
* Note: we cannot sleep as we may be an interrupt
*/
if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd,
sizeof(cmd), (u_char *) bp->b_un.b_addr, bp->b_bcount,
sizeof(cmd), (u_char *) bp->b_data, bp->b_bcount,
SDRETRIES, 10000, bp, SCSI_NOSLEEP |
((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT))
!= SUCCESSFULLY_QUEUED) {

4
sys/scsi/st.c
View File

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: st.c,v 1.31 1994/05/11 09:53:45 mycroft Exp $
* $Id: st.c,v 1.32 1994/06/16 01:11:51 mycroft Exp $
*/
/*
@ -1057,7 +1057,7 @@ ststart(unit)
* go ask the adapter to do all this for us
*/
if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd,
sizeof(cmd), (u_char *) bp->b_un.b_addr, bp->b_bcount, 0,
sizeof(cmd), (u_char *) bp->b_data, bp->b_bcount, 0,
100000, bp, flags | SCSI_NOSLEEP) != SUCCESSFULLY_QUEUED) {
badnews:
printf("%s: not queued\n", st->sc_dev.dv_xname);