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

Trivial simplification.

Browse Source
This commit is contained in:
mycroft 1995-01-16 21:34:10 +00:00
parent e71e917e9d
commit 4a1e51751b
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/scsipi/scsi_base.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_base.c,v 1.25 1995/01/13 14:38:13 mycroft Exp $ */ /* $NetBSD: scsi_base.c,v 1.26 1995/01/16 21:34:10 mycroft Exp $ */
/* /*
* Copyright (c) 1994 Charles Hannum. All rights reserved. * Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -336,7 +336,7 @@ scsi_start_and_wait(sc_link, n, flags)
sc_print_addr(sc_link); sc_print_addr(sc_link);
printf("waiting for device to come ready\n"); printf("waiting for device to come ready\n");
} }
while (n--) { for (; n; n--) {
if ((flags & SCSI_POLL) != 0) if ((flags & SCSI_POLL) != 0)
delay(1000000); delay(1000000);
else else
@ -344,17 +344,12 @@ scsi_start_and_wait(sc_link, n, flags)
if ((error = scsi_execute_xs(xs)) != EIO || if ((error = scsi_execute_xs(xs)) != EIO ||
xs->error != XS_SENSE || xs->error != XS_SENSE ||
(xs->sense.error_code & SSD_ERRCODE) != 0x70 || (xs->sense.error_code & SSD_ERRCODE) != 0x70 ||
(xs->sense.extended_flags & SSD_KEY) != 0x2) { (xs->sense.extended_flags & SSD_KEY) != 0x2)
if (!silent) { break;
sc_print_addr(sc_link);
printf("ready\n");
}
goto out;
}
} }
if (!silent) { if (!silent) {
sc_print_addr(sc_link); sc_print_addr(sc_link);
printf("not ready\n"); printf("%sready\n", n ? "" : "not ");
} }
out: out:
scsi_free_xs(xs, SCSI_NOSLEEP); scsi_free_xs(xs, SCSI_NOSLEEP);

15
sys/scsi/scsi_base.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi_base.c,v 1.25 1995/01/13 14:38:13 mycroft Exp $ */ /* $NetBSD: scsi_base.c,v 1.26 1995/01/16 21:34:10 mycroft Exp $ */
/* /*
* Copyright (c) 1994 Charles Hannum. All rights reserved. * Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -336,7 +336,7 @@ scsi_start_and_wait(sc_link, n, flags)
sc_print_addr(sc_link); sc_print_addr(sc_link);
printf("waiting for device to come ready\n"); printf("waiting for device to come ready\n");
} }
while (n--) { for (; n; n--) {
if ((flags & SCSI_POLL) != 0) if ((flags & SCSI_POLL) != 0)
delay(1000000); delay(1000000);
else else
@ -344,17 +344,12 @@ scsi_start_and_wait(sc_link, n, flags)
if ((error = scsi_execute_xs(xs)) != EIO || if ((error = scsi_execute_xs(xs)) != EIO ||
xs->error != XS_SENSE || xs->error != XS_SENSE ||
(xs->sense.error_code & SSD_ERRCODE) != 0x70 || (xs->sense.error_code & SSD_ERRCODE) != 0x70 ||
(xs->sense.extended_flags & SSD_KEY) != 0x2) { (xs->sense.extended_flags & SSD_KEY) != 0x2)
if (!silent) { break;
sc_print_addr(sc_link);
printf("ready\n");
}
goto out;
}
} }
if (!silent) { if (!silent) {
sc_print_addr(sc_link); sc_print_addr(sc_link);
printf("not ready\n"); printf("%sready\n", n ? "" : "not ");
} }
out: out:
scsi_free_xs(xs, SCSI_NOSLEEP); scsi_free_xs(xs, SCSI_NOSLEEP);