[src/trunk]: src/sys/dev/ic Don't bother searching the qinfifo for SCBs to re...

[fvdl <fvdl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6b05d210aba4
branches:  trunk
changeset: 486733:6b05d210aba4
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Sun May 28 00:19:59 2000 +0000

description:
Don't bother searching the qinfifo for SCBs to requeue in the BUSY
and QUEUE FULL cases; this is already done for all BAD_STATUS cases.

Make sure to requeue the SCB in the above cases internally in the driver,
the SCSI layer doesn't know how to deal with it properly.

diffstat:

 sys/dev/ic/aic7xxx.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 2f159078fa0c -r 6b05d210aba4 sys/dev/ic/aic7xxx.c
--- a/sys/dev/ic/aic7xxx.c      Sat May 27 23:59:58 2000 +0000
+++ b/sys/dev/ic/aic7xxx.c      Sun May 28 00:19:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic7xxx.c,v 1.52 2000/05/27 21:58:16 fvdl Exp $        */
+/*     $NetBSD: aic7xxx.c,v 1.53 2000/05/28 00:19:59 fvdl Exp $        */
 
 /*
  * Generic driver for the aic7xxx based adaptec SCSI controllers
@@ -1889,11 +1889,11 @@
                        printf("queue full\n");
                case SCSI_STATUS_BUSY:
                        /*
-                        * Requeue any transactions that haven't been
-                        * sent yet.
+                        * XXX middle layer doesn't handle XS_BUSY well.
+                        * So, requeue this ourselves internally.
                         */
-                       ahc_freeze_devq(ahc, xs->sc_link);
-                       ahc_freeze_ccb(scb);
+                       xs->error = XS_BUSY;
+                       scb->flags |= SCB_REQUEUE;
                        break;
                }
                break;