[src/netbsd-1-6]: src/sys/dev/ata Pull up revision 1.256 (requested by bouyer...

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

details:   https://anonhg.NetBSD.org/src/rev/bd6c8dd031a3
branches:  netbsd-1-6
changeset: 530571:bd6c8dd031a3
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Aug 15 19:33:23 2003 +0000

description:
Pull up revision 1.256 (requested by bouyer in ticket #1370):
Don't use LBA48 if we don't have to (that is, if the request is inside the
first 128GB). Tested by Andreas Johansson.

diffstat:

 sys/dev/ata/wd.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 2517832c68c6 -r bd6c8dd031a3 sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Fri Aug 15 19:30:12 2003 +0000
+++ b/sys/dev/ata/wd.c  Fri Aug 15 19:33:23 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.220.10.3 2003/06/30 02:57:01 grant Exp $ */
+/*     $NetBSD: wd.c,v 1.220.10.4 2003/08/15 19:33:23 tron Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.220.10.3 2003/06/30 02:57:01 grant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.220.10.4 2003/08/15 19:33:23 tron Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -563,7 +563,7 @@
                wd->sc_wdc_bio.flags = ATA_SINGLE;
        else
                wd->sc_wdc_bio.flags = 0;
-       if (wd->sc_flags & WDF_LBA48)
+       if (wd->sc_flags & WDF_LBA48 && wd->sc_wdc_bio.blkno > 0xffffff)
                wd->sc_wdc_bio.flags |= ATA_LBA48;
        if (wd->sc_flags & WDF_LBA)
                wd->sc_wdc_bio.flags |= ATA_LBA;
@@ -1297,7 +1297,7 @@
                wd->sc_wdc_bio.flags = ATA_POLL;
                if (wddumpmulti == 1)
                        wd->sc_wdc_bio.flags |= ATA_SINGLE;
-               if (wd->sc_flags & WDF_LBA48)
+               if (wd->sc_flags & WDF_LBA48 && blkno > 0xffffff)
                        wd->sc_wdc_bio.flags |= ATA_LBA48;
                if (wd->sc_flags & WDF_LBA)
                        wd->sc_wdc_bio.flags |= ATA_LBA;