[src/netbsd-1-4]: src/sys/arch/amiga/dev Pull up revision 1.39.

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

details:   https://anonhg.NetBSD.org/src/rev/4b6bf6c59717
branches:  netbsd-1-4
changeset: 468295:4b6bf6c59717
user:      mhitch <mhitch%NetBSD.org@localhost>
date:      Fri Apr 16 20:34:40 1999 +0000

description:
Pull up revision 1.39.
Change reading ATAPI IDENTIFY data to prevent ZIP drive from hanging
system on boot.

diffstat:

 sys/arch/amiga/dev/idesc.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 1a321c7b0168 -r 4b6bf6c59717 sys/arch/amiga/dev/idesc.c
--- a/sys/arch/amiga/dev/idesc.c        Fri Apr 16 20:28:42 1999 +0000
+++ b/sys/arch/amiga/dev/idesc.c        Fri Apr 16 20:34:40 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: idesc.c,v 1.38 1999/04/01 16:22:57 mhitch Exp $        */
+/*     $NetBSD: idesc.c,v 1.38.2.1 1999/04/16 20:34:40 mhitch Exp $    */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -458,7 +458,7 @@
                                continue;
                        }
                        if (idecommand(&sc->sc_ide[i], 0, 0, 0,
-                           sizeof(struct ataparams), ATAPI_IDENTIFY) != 0 ||
+                           DEV_BSIZE, ATAPI_IDENTIFY) != 0 ||
                            wait_for_drq(sc) != 0) {
 #ifdef DEBUG_ATAPI
                                printf("\nATAPI_IDENTIFY failed for drive %d",
@@ -466,10 +466,10 @@
 #endif
                                continue;
                        }
-                       len = rp->ide_cyl_lo + rp->ide_cyl_hi * 256;
+                       len = DEV_BSIZE;
 #ifdef DEBUG_ATAPI
                        printf("\nATAPI_IDENTIFY returned %d/%d bytes",
-                           len, sizeof(struct ataparams));
+                           rp->ide_cyl_lo + rp->ide_cyl_hi * 256, DEV_BSIZE);
 #endif
                        while (len) {
                                if (p < (u_short *)(&id + 1))