[src/trunk]: src/sys/dev/ata - rename WDC_CAP_LBA48 to ATA_CMD2_LBA48.

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

details:   https://anonhg.NetBSD.org/src/rev/f78196bf99e7
branches:  trunk
changeset: 555832:f78196bf99e7
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sun Nov 30 13:57:12 2003 +0000

description:
- rename WDC_CAP_LBA48 to ATA_CMD2_LBA48.
- remove WDC_CAP_QUEUE. (there's already ATA_CMD2_RWQ.)

as discussed on tech-kern@.

diffstat:

 sys/dev/ata/atareg.h |  5 ++---
 sys/dev/ata/wd.c     |  6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r f99e2a91f51c -r f78196bf99e7 sys/dev/ata/atareg.h
--- a/sys/dev/ata/atareg.h      Sun Nov 30 13:22:32 2003 +0000
+++ b/sys/dev/ata/atareg.h      Sun Nov 30 13:57:12 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atareg.h,v 1.12 2003/11/26 15:03:14 yamt Exp $ */
+/*     $NetBSD: atareg.h,v 1.13 2003/11/30 13:57:12 yamt Exp $ */
 
 /*
  * Drive parameter structure for ATA/ATAPI.
@@ -131,6 +131,7 @@
 #define WDC_CMD1_SEC   0x0002
 #define WDC_CMD1_SMART 0x0001
     u_int16_t  atap_cmd_set2;          /* 83: command set supported */
+#define        ATA_CMD2_LBA48  0x0400
 #define WDC_CMD2_RMSN  0x0010
 #define WDC_CMD2_DM    0x0001
 #define ATA_CMD2_APM   0x0008
@@ -140,8 +141,6 @@
     u_int16_t  atap_cmd1_en;           /* 85: cmd/features enabled */
 /* bits are the same as atap_cmd_set1 */
     u_int16_t  atap_cmd2_en;           /* 86: cmd/features enabled */
-#define        WDC_CAP_LBA48   (1L << 10)
-#define        WDC_CAP_QUEUE   (1L << 1)
 /* bits are the same as atap_cmd_set2 */
     u_int16_t  atap_cmd_def;           /* 87: cmd/features default */
 #if BYTE_ORDER == LITTLE_ENDIAN
diff -r f99e2a91f51c -r f78196bf99e7 sys/dev/ata/wd.c
--- a/sys/dev/ata/wd.c  Sun Nov 30 13:22:32 2003 +0000
+++ b/sys/dev/ata/wd.c  Sun Nov 30 13:57:12 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wd.c,v 1.267 2003/11/07 04:10:56 mycroft Exp $ */
+/*     $NetBSD: wd.c,v 1.268 2003/11/30 13:57:12 yamt 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.267 2003/11/07 04:10:56 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.268 2003/11/30 13:57:12 yamt Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -332,7 +332,7 @@
            wd->sc_dev.dv_xname, wd->sc_multi);
 
        /* 48-bit LBA addressing */
-       if ((wd->sc_params.atap_cmd2_en & WDC_CAP_LBA48) != 0)
+       if ((wd->sc_params.atap_cmd2_en & ATA_CMD2_LBA48) != 0)
                wd->sc_flags |= WDF_LBA48;
 
        /* Prior to ATA-4, LBA was optional. */