vserver 1.9.5.x5

[linux-2.6.git] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index af91795..f178894 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -24,6 +24,8 @@
 #ifndef __LINUX_ATA_H__
 #define __LINUX_ATA_H__
 
+#include <linux/types.h>
+
 /* defines only for the constants which don't work well as enums */
 #define ATA_DMA_BOUNDARY       0xffffUL
 #define ATA_DMA_MASK           0xffffffffULL
@@ -33,8 +35,6 @@ enum {
        ATA_MAX_DEVICES         = 2,    /* per bus/port */
        ATA_MAX_PRD             = 256,  /* we could make these 256/256 */
        ATA_SECT_SIZE           = 512,
-       ATA_SECT_SIZE_MASK      = (ATA_SECT_SIZE - 1),
-       ATA_SECT_DWORDS         = ATA_SECT_SIZE / sizeof(u32),
 
        ATA_ID_WORDS            = 256,
        ATA_ID_PROD_OFS         = 27,
@@ -123,6 +123,8 @@ enum {
        ATA_CMD_PIO_WRITE_EXT   = 0x34,
        ATA_CMD_SET_FEATURES    = 0xEF,
        ATA_CMD_PACKET          = 0xA0,
+       ATA_CMD_VERIFY          = 0x40,
+       ATA_CMD_VERIFY_EXT      = 0x42,
 
        /* SETFEATURES stuff */
        SETFEATURES_XFER        = 0x03,
@@ -142,6 +144,10 @@ enum {
        XFER_PIO_2              = 0x0A,
        XFER_PIO_1              = 0x09,
        XFER_PIO_0              = 0x08,
+       XFER_SW_DMA_2           = 0x12,
+       XFER_SW_DMA_1           = 0x11,
+       XFER_SW_DMA_0           = 0x10,
+       XFER_PIO_SLOW           = 0x00,
 
        /* ATAPI stuff */
        ATAPI_PKT_DMA           = (1 << 0),
@@ -217,24 +223,24 @@ struct ata_taskfile {
        u8                      command;        /* IO operation */
 };
 
-#define ata_id_is_ata(dev)     (((dev)->id[0] & (1 << 15)) == 0)
-#define ata_id_rahead_enabled(dev) ((dev)->id[85] & (1 << 6))
-#define ata_id_wcache_enabled(dev) ((dev)->id[85] & (1 << 5))
-#define ata_id_has_flush(dev) ((dev)->id[83] & (1 << 12))
-#define ata_id_has_flush_ext(dev) ((dev)->id[83] & (1 << 13))
-#define ata_id_has_lba48(dev)  ((dev)->id[83] & (1 << 10))
-#define ata_id_has_wcache(dev) ((dev)->id[82] & (1 << 5))
-#define ata_id_has_pm(dev)     ((dev)->id[82] & (1 << 3))
-#define ata_id_has_lba(dev)    ((dev)->id[49] & (1 << 9))
-#define ata_id_has_dma(dev)    ((dev)->id[49] & (1 << 8))
-#define ata_id_removeable(dev) ((dev)->id[0] & (1 << 7))
-#define ata_id_u32(dev,n)      \
-       (((u32) (dev)->id[(n) + 1] << 16) | ((u32) (dev)->id[(n)]))
-#define ata_id_u64(dev,n)      \
-       ( ((u64) dev->id[(n) + 3] << 48) |      \
-         ((u64) dev->id[(n) + 2] << 32) |      \
-         ((u64) dev->id[(n) + 1] << 16) |      \
-         ((u64) dev->id[(n) + 0]) )
+#define ata_id_is_ata(id)      (((id)[0] & (1 << 15)) == 0)
+#define ata_id_rahead_enabled(id) ((id)[85] & (1 << 6))
+#define ata_id_wcache_enabled(id) ((id)[85] & (1 << 5))
+#define ata_id_has_flush(id) ((id)[83] & (1 << 12))
+#define ata_id_has_flush_ext(id) ((id)[83] & (1 << 13))
+#define ata_id_has_lba48(id)   ((id)[83] & (1 << 10))
+#define ata_id_has_wcache(id)  ((id)[82] & (1 << 5))
+#define ata_id_has_pm(id)      ((id)[82] & (1 << 3))
+#define ata_id_has_lba(id)     ((id)[49] & (1 << 9))
+#define ata_id_has_dma(id)     ((id)[49] & (1 << 8))
+#define ata_id_removeable(id)  ((id)[0] & (1 << 7))
+#define ata_id_u32(id,n)       \
+       (((u32) (id)[(n) + 1] << 16) | ((u32) (id)[(n)]))
+#define ata_id_u64(id,n)       \
+       ( ((u64) (id)[(n) + 3] << 48) | \
+         ((u64) (id)[(n) + 2] << 32) | \
+         ((u64) (id)[(n) + 1] << 16) | \
+         ((u64) (id)[(n) + 0]) )
 
 static inline int atapi_cdb_len(u16 *dev_id)
 {