mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

scsi_tape.h had some old cruft that looked like missing typedefs or

Browse Source 
something.  Cleanup  some lint in sd.c and st.c.
This commit is contained in:
Poul-Henning Kamp 1995-12-09 20:42:38 +00:00
parent 7dfe504fe2
commit b2c3ac73a8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=12703
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/scsi/scsi_tape.h
View File

@ -21,7 +21,7 @@
/*
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*
* $Id: scsi_tape.h,v 1.13 1995/05/30 08:13:43 rgrimes Exp $
* $Id: scsi_tape.h,v 1.14 1995/11/30 07:43:46 pst Exp $
*/
#ifndef SCSI_SCSI_TAPE_H
#define SCSI_SCSI_TAPE_H 1
@ -40,7 +40,7 @@ struct scsi_rw_tape
#define SRWT_FIXED 0x01
u_char len[3];
u_char control;
} rw_tape;
};
struct scsi_space
{
@ -49,7 +49,7 @@ struct scsi_space
#define SS_CODE 0x03
u_char number[3];
u_char control;
} space;
};
#define SP_BLKS 0
#define SP_FILEMARKS 1
#define SP_SEQ_FILEMARKS 2
@ -61,7 +61,7 @@ struct scsi_write_filemarks
u_char byte2;
u_char number[3];
u_char control;
} write_filemarks;
};
struct scsi_rewind
{
@ -70,7 +70,7 @@ struct scsi_rewind
#define SR_IMMED 0x01
u_char unused[3];
u_char control;
} rewind;
};
/*
** Tape erase - AKL: Andreas Klemm <andreas@knobel.gun.de>
@ -87,7 +87,7 @@ struct scsi_erase
#define SE_IMMED 0x02
u_char unused[3];
u_char control;
} erase;
};
struct scsi_load
{
@ -97,7 +97,7 @@ struct scsi_load
u_char unused[2];
u_char how;
u_char control;
} load;
};
#define LD_UNLOAD 0
#define LD_LOAD 1
#define LD_RETEN 2
@ -109,7 +109,7 @@ struct scsi_blk_limits
u_char byte2;
u_char unused[3];
u_char control;
} blk_limits;
};
/*
* Opcodes

5
sys/scsi/sd.c
View File

@ -14,7 +14,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
*
* $Id: sd.c,v 1.76 1995/12/08 11:18:53 julian Exp $
* $Id: sd.c,v 1.77 1995/12/08 23:22:25 phk Exp $
*/
#define SPLSD splbio
@ -45,7 +45,7 @@
#include <machine/md_var.h>
#include <i386/i386/cons.h> /* XXX *//* for aborting dump */
u_int32 sdstrats, sdqueues;
static u_int32 sdstrats, sdqueues;
#define SECSIZE 512
#define SDOUTSTANDING 4
@ -188,7 +188,6 @@ sdattach(struct scsi_link *sc_link)
{
u_int32 unit;
struct disk_parms *dp;
char name[32];
struct scsi_data *sd = sc_link->sd;

11
sys/scsi/st.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: st.c,v 1.49 1995/12/08 11:18:59 julian Exp $
* $Id: st.c,v 1.50 1995/12/08 23:22:28 phk Exp $
*/
/*
@ -365,7 +365,6 @@ static errval
stattach(struct scsi_link *sc_link)
{
u_int32 unit;
char name[32];
struct scsi_data *st = sc_link->sd;
@ -1040,7 +1039,7 @@ st_strategy(struct buf *bp, struct scsi_link *sc_link)
*/
if (st->flags & ST_FIXEDBLOCKS) {
if (bp->b_bcount % st->blksiz) {
printf("st%d: bad request, must be multiple of %ld\n",
printf("st%ld: bad request, must be multiple of %ld\n",
unit, st->blksiz);
bp->b_error = EIO;
goto bad;
@ -1052,13 +1051,13 @@ st_strategy(struct buf *bp, struct scsi_link *sc_link)
*/
else {
if ((bp->b_bcount < st->blkmin || bp->b_bcount > st->blkmax)) {
printf("st%d: bad request, must be between %ld and %ld\n",
printf("st%ld: bad request, must be between %ld and %ld\n",
unit, st->blkmin, st->blkmax);
bp->b_error = EIO;
goto bad;
}
if (len != bp->b_bcount) {
printf("st%d: bad request, must be less than %ld bytes\n",
printf("st%ld: bad request, must be less than %ld bytes\n",
unit, bp->b_bcount + 1);
bp->b_error = EIO;
goto bad;
@ -1396,7 +1395,7 @@ struct proc *p, struct scsi_link *sc_link)
* drive. If not, put it back the way it was.
*/
if ( (errcode = st_mode_select(unit, 0, NULL, 0)) ) { /* put back as it was */
printf("st%d: Cannot set selected mode", unit);
printf("st%ld: Cannot set selected mode", unit);
st->density = hold_density;
st->blksiz = hold_blksiz;
if (st->blksiz) {