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

Minor rearrangement. Whitespace and #include cleanup.

This commit is contained in:
mycroft 2004-09-18 00:21:03 +00:00
parent 8f93b96f00
commit a7aa9498f3
7 changed files with 56 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
sys/dev/scsipi/scsipi_base.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsipi_base.c,v 1.116 2004/09/18 00:08:16 mycroft Exp $ */
/* $NetBSD: scsipi_base.c,v 1.117 2004/09/18 00:21:03 mycroft Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.116 2004/09/18 00:08:16 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.117 2004/09/18 00:21:03 mycroft Exp $");
#include "opt_scsi.h"
@ -1056,21 +1056,21 @@ scsipi_size(struct scsipi_periph *periph, int flags)
int
scsipi_test_unit_ready(struct scsipi_periph *periph, int flags)
{
int retries;
struct scsipi_test_unit_ready cmd;
int retries;
/* some ATAPI drives don't support TEST_UNIT_READY. Sigh */
if (periph->periph_quirks & PQUIRK_NOTUR)
return (0);
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = TEST_UNIT_READY;
if (flags & XS_CTL_DISCOVERY)
retries = 0;
else
retries = SCSIPIRETRIES;
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = TEST_UNIT_READY;
return (scsipi_command(periph, (void *)&cmd, sizeof(cmd), 0, 0,
retries, 10000, NULL, flags));
}
@ -1084,12 +1084,9 @@ int
scsipi_inquire(struct scsipi_periph *periph, struct scsipi_inquiry_data *inqbuf,
int flags)
{
int retries;
struct scsipi_inquiry cmd;
int error;
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = INQUIRY;
int retries;
if (flags & XS_CTL_DISCOVERY)
retries = 0;
@ -1107,15 +1104,24 @@ scsipi_inquire(struct scsipi_periph *periph, struct scsipi_inquiry_data *inqbuf,
* data iff the "additional length" field indicates there is more.
* - mycroft, 2003/10/16
*/
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = INQUIRY;
cmd.length = SCSIPI_INQUIRY_LENGTH_SCSI2;
error = scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)inqbuf, SCSIPI_INQUIRY_LENGTH_SCSI2, retries,
10000, NULL, XS_CTL_DATA_IN | flags);
if (!error && inqbuf->additional_length > SCSIPI_INQUIRY_LENGTH_SCSI2 - 4) {
10000, NULL, flags | XS_CTL_DATA_IN);
if (!error &&
inqbuf->additional_length > SCSIPI_INQUIRY_LENGTH_SCSI2 - 4) {
#if 0
printf("inquire: addlen=%d, retrying\n", inqbuf->additional_length);
#endif
cmd.length = SCSIPI_INQUIRY_LENGTH_SCSI3;
error = scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)inqbuf, SCSIPI_INQUIRY_LENGTH_SCSI3, retries,
10000, NULL, XS_CTL_DATA_IN | flags);
10000, NULL, flags | XS_CTL_DATA_IN);
#if 0
printf("inquire: error=%d\n", error);
#endif
}
#ifdef SCSI_OLD_NOINQUIRY
@ -1144,10 +1150,10 @@ scsipi_inquire(struct scsipi_periph *periph, struct scsipi_inquiry_data *inqbuf,
* This board gives an empty response to an INQUIRY command.
*/
else if (error == 0 &&
inqbuf->device == (SID_QUAL_LU_PRESENT | T_DIRECT) &&
inqbuf->dev_qual2 == 0 &&
inqbuf->version == 0 &&
inqbuf->response_format == SID_FORMAT_SCSI1) {
inqbuf->device == (SID_QUAL_LU_PRESENT | T_DIRECT) &&
inqbuf->dev_qual2 == 0 &&
inqbuf->version == 0 &&
inqbuf->response_format == SID_FORMAT_SCSI1) {
/*
* Fill out the INQUIRY response.
*/
@ -1210,7 +1216,6 @@ scsipi_mode_sense(struct scsipi_periph *periph, int byte2, int page,
int timeout)
{
struct scsipi_mode_sense cmd;
int error;
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = MODE_SENSE;
@ -1218,11 +1223,8 @@ scsipi_mode_sense(struct scsipi_periph *periph, int byte2, int page,
cmd.page = page;
cmd.length = len & 0xff;
error = scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)data, len, retries, timeout, NULL, flags | XS_CTL_DATA_IN);
SC_DEBUG(periph, SCSIPI_DB2,
("scsipi_mode_sense: error=%d\n", error));
return (error);
return (scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)data, len, retries, timeout, NULL, flags | XS_CTL_DATA_IN));
}
int
@ -1231,7 +1233,6 @@ scsipi_mode_sense_big(struct scsipi_periph *periph, int byte2, int page,
int timeout)
{
struct scsipi_mode_sense_big cmd;
int error;
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = MODE_SENSE_BIG;
@ -1239,11 +1240,8 @@ scsipi_mode_sense_big(struct scsipi_periph *periph, int byte2, int page,
cmd.page = page;
_lto2b(len, cmd.length);
error = scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)data, len, retries, timeout, NULL, flags | XS_CTL_DATA_IN);
SC_DEBUG(periph, SCSIPI_DB2,
("scsipi_mode_sense_big: error=%d\n", error));
return (error);
return (scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)data, len, retries, timeout, NULL, flags | XS_CTL_DATA_IN));
}
int
@ -1252,18 +1250,14 @@ scsipi_mode_select(struct scsipi_periph *periph, int byte2,
int timeout)
{
struct scsipi_mode_select cmd;
int error;
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = MODE_SELECT;
cmd.byte2 = byte2;
cmd.length = len & 0xff;
error = scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)data, len, retries, timeout, NULL, flags | XS_CTL_DATA_OUT);
SC_DEBUG(periph, SCSIPI_DB2,
("scsipi_mode_select: error=%d\n", error));
return (error);
return (scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)data, len, retries, timeout, NULL, flags | XS_CTL_DATA_OUT));
}
int
@ -1272,18 +1266,14 @@ scsipi_mode_select_big(struct scsipi_periph *periph, int byte2,
int timeout)
{
struct scsipi_mode_select_big cmd;
int error;
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = MODE_SELECT_BIG;
cmd.byte2 = byte2;
_lto2b(len, cmd.length);
error = scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)data, len, retries, timeout, NULL, flags | XS_CTL_DATA_OUT);
SC_DEBUG(periph, SCSIPI_DB2,
("scsipi_mode_select_big: error=%d\n", error));
return (error);
return (scsipi_command(periph, (void *)&cmd, sizeof(cmd),
(void *)data, len, retries, timeout, NULL, flags | XS_CTL_DATA_OUT));
}
/*
@ -1669,7 +1659,7 @@ scsipi_request_sense(struct scsipi_xfer *xs)
0, 1000, NULL, flags);
periph->periph_flags &= ~PERIPH_SENSE;
periph->periph_xscheck = NULL;
switch(error) {
switch (error) {
case 0:
/* we have a valid sense */
xs->error = XS_SENSE;

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

@ -1,4 +1,4 @@
/* $NetBSD: scsipiconf.c,v 1.26 2004/09/17 23:43:17 mycroft Exp $ */
/* $NetBSD: scsipiconf.c,v 1.27 2004/09/18 00:21:03 mycroft Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.26 2004/09/17 23:43:17 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.27 2004/09/18 00:21:03 mycroft Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -63,8 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.26 2004/09/17 23:43:17 mycroft Exp
#include <sys/device.h>
#include <sys/proc.h>
#include <uvm/uvm_extern.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsipiconf.h>
#include <dev/scsipi/scsipi_base.h>

9
sys/dev/scsipi/ses.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ses.c,v 1.25 2004/09/17 23:43:17 mycroft Exp $ */
/* $NetBSD: ses.c,v 1.26 2004/09/18 00:21:03 mycroft Exp $ */
/*
* Copyright (C) 2000 National Aeronautics & Space Administration
* All rights reserved.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.25 2004/09/17 23:43:17 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.26 2004/09/18 00:21:03 mycroft Exp $");
#include "opt_scsi.h"
@ -50,10 +50,11 @@ __KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.25 2004/09/17 23:43:17 mycroft Exp $");
#include <machine/stdarg.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_disk.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsi_disk.h>
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsipiconf.h>
#include <dev/scsipi/scsipi_base.h>
#include <dev/scsipi/ses.h>
/*

8
sys/dev/scsipi/ss_mustek.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ss_mustek.c,v 1.24 2004/09/18 00:08:16 mycroft Exp $ */
/* $NetBSD: ss_mustek.c,v 1.25 2004/09/18 00:21:03 mycroft Exp $ */
/*
* Copyright (c) 1995 Joachim Koenig-Baltes. All rights reserved.
@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.24 2004/09/18 00:08:16 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.25 2004/09/18 00:21:03 mycroft Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -62,10 +62,10 @@ __KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.24 2004/09/18 00:08:16 mycroft Exp $
#include <sys/conf.h> /* for cdevsw */
#include <sys/scanio.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsi_scanner.h>
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsipiconf.h>
#include <dev/scsipi/scsipi_base.h>
#include <dev/scsipi/ssvar.h>
#include <dev/scsipi/ss_mustek.h>

8
sys/dev/scsipi/ss_scanjet.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ss_scanjet.c,v 1.35 2004/09/18 00:08:16 mycroft Exp $ */
/* $NetBSD: ss_scanjet.c,v 1.36 2004/09/18 00:21:03 mycroft Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.35 2004/09/18 00:08:16 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.36 2004/09/18 00:21:03 mycroft Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,10 +50,10 @@ __KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.35 2004/09/18 00:08:16 mycroft Exp
#include <sys/scanio.h>
#include <sys/kernel.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsi_scanner.h>
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsipiconf.h>
#include <dev/scsipi/scsipi_base.h>
#include <dev/scsipi/ssvar.h>

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

@ -1,4 +1,4 @@
/* $NetBSD: st.c,v 1.170 2004/09/18 00:08:16 mycroft Exp $ */
/* $NetBSD: st.c,v 1.171 2004/09/18 00:21:03 mycroft Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.170 2004/09/18 00:08:16 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.171 2004/09/18 00:21:03 mycroft Exp $");
#include "opt_scsi.h"
@ -76,10 +76,12 @@ __KERNEL_RCSID(0, "$NetBSD: st.c,v 1.170 2004/09/18 00:08:16 mycroft Exp $");
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsi_tape.h>
#include <dev/scsipi/stvar.h>
#include <dev/scsipi/scsipiconf.h>
#include <dev/scsipi/scsipi_base.h>
#include <dev/scsipi/stvar.h>
/* Defines for device specific stuff */
#define DEF_FIXED_BSIZE 512

8
sys/dev/scsipi/st_scsi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: st_scsi.c,v 1.14 2004/09/18 00:08:16 mycroft Exp $ */
/* $NetBSD: st_scsi.c,v 1.15 2004/09/18 00:21:03 mycroft Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.14 2004/09/18 00:08:16 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.15 2004/09/18 00:21:03 mycroft Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@ -69,9 +69,9 @@ __KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.14 2004/09/18 00:08:16 mycroft Exp $")
#include <sys/kernel.h>
#include <sys/systm.h>
#include <dev/scsipi/stvar.h>
#include <dev/scsipi/scsi_tape.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsi_tape.h>
#include <dev/scsipi/stvar.h>
static int st_scsibus_match(struct device *, struct cfdata *, void *);
static void st_scsibus_attach(struct device *, struct device *, void *);