Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/scsipi Minor rearrangement. Whitespace and #include...
details: https://anonhg.NetBSD.org/src/rev/ccb8aca83ac6
branches: trunk
changeset: 570028:ccb8aca83ac6
user: mycroft <mycroft%NetBSD.org@localhost>
date: Sat Sep 18 00:21:03 2004 +0000
description:
Minor rearrangement. Whitespace and #include cleanup.
diffstat:
sys/dev/scsipi/scsipi_base.c | 74 +++++++++++++++++++------------------------
sys/dev/scsipi/scsipiconf.c | 6 +--
sys/dev/scsipi/ses.c | 9 ++--
sys/dev/scsipi/ss_mustek.c | 8 ++--
sys/dev/scsipi/ss_scanjet.c | 8 ++--
sys/dev/scsipi/st.c | 8 ++-
sys/dev/scsipi/st_scsi.c | 8 ++--
7 files changed, 56 insertions(+), 65 deletions(-)
diffs (truncated from 379 to 300 lines):
diff -r 4f637aa69ab6 -r ccb8aca83ac6 sys/dev/scsipi/scsipi_base.c
--- a/sys/dev/scsipi/scsipi_base.c Sat Sep 18 00:08:16 2004 +0000
+++ b/sys/dev/scsipi/scsipi_base.c Sat Sep 18 00:21:03 2004 +0000
@@ -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 @@
int
scsipi_test_unit_ready(struct scsipi_periph *periph, int flags)
{
+ struct scsipi_test_unit_ready cmd;
int retries;
- struct scsipi_test_unit_ready cmd;
/* 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 @@
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 @@
* 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 @@
* 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 @@
int timeout)
{
struct scsipi_mode_sense cmd;
- int error;
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = MODE_SENSE;
@@ -1218,11 +1223,8 @@
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 @@
int timeout)
{
struct scsipi_mode_sense_big cmd;
- int error;
memset(&cmd, 0, sizeof(cmd));
cmd.opcode = MODE_SENSE_BIG;
@@ -1239,11 +1240,8 @@
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 @@
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 @@
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 @@
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;
diff -r 4f637aa69ab6 -r ccb8aca83ac6 sys/dev/scsipi/scsipiconf.c
--- a/sys/dev/scsipi/scsipiconf.c Sat Sep 18 00:08:16 2004 +0000
+++ b/sys/dev/scsipi/scsipiconf.c Sat Sep 18 00:21:03 2004 +0000
@@ -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 @@
#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>
diff -r 4f637aa69ab6 -r ccb8aca83ac6 sys/dev/scsipi/ses.c
--- a/sys/dev/scsipi/ses.c Sat Sep 18 00:08:16 2004 +0000
+++ b/sys/dev/scsipi/ses.c Sat Sep 18 00:21:03 2004 +0000
@@ -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 @@
#include <machine/stdarg.h>
#include <dev/scsipi/scsipi_all.h>
+#include <dev/scsipi/scsipi_disk.h>
#include <dev/scsipi/scsi_all.h>
-#include <dev/scsipi/scsipi_disk.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>
/*
diff -r 4f637aa69ab6 -r ccb8aca83ac6 sys/dev/scsipi/ss_mustek.c
--- a/sys/dev/scsipi/ss_mustek.c Sat Sep 18 00:08:16 2004 +0000
+++ b/sys/dev/scsipi/ss_mustek.c Sat Sep 18 00:21:03 2004 +0000
@@ -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 @@
#include <sys/conf.h> /* for cdevsw */
#include <sys/scanio.h>
+#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_all.h>
-#include <dev/scsipi/scsipi_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>
diff -r 4f637aa69ab6 -r ccb8aca83ac6 sys/dev/scsipi/ss_scanjet.c
--- a/sys/dev/scsipi/ss_scanjet.c Sat Sep 18 00:08:16 2004 +0000
+++ b/sys/dev/scsipi/ss_scanjet.c Sat Sep 18 00:21:03 2004 +0000
@@ -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 $");
Home |
Main Index |
Thread Index |
Old Index