Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133589
b: refs/heads/master
c: 22ddbd1
h: refs/heads/master
i:
  133587: bfae404
v: v3
  • Loading branch information
Erik Inge Bolsø authored and Jeff Garzik committed Mar 25, 2009
1 parent 4179f57 commit 081014c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2f9c0614e664708978c53eca4a5963e92830e88
refs/heads/master: 22ddbd1e036ce035c1cccb2496aefafac79aba2c
6 changes: 6 additions & 0 deletions trunk/include/linux/ata.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ enum {
ATA_PIO5 = ATA_PIO4 | (1 << 5),
ATA_PIO6 = ATA_PIO5 | (1 << 6),

ATA_PIO4_ONLY = (1 << 4),

ATA_SWDMA0 = (1 << 0),
ATA_SWDMA1 = ATA_SWDMA0 | (1 << 1),
ATA_SWDMA2 = ATA_SWDMA1 | (1 << 2),
Expand All @@ -117,6 +119,8 @@ enum {
ATA_MWDMA0 = (1 << 0),
ATA_MWDMA1 = ATA_MWDMA0 | (1 << 1),
ATA_MWDMA2 = ATA_MWDMA1 | (1 << 2),
ATA_MWDMA3 = ATA_MWDMA2 | (1 << 3),
ATA_MWDMA4 = ATA_MWDMA3 | (1 << 4),

ATA_MWDMA12_ONLY = (1 << 1) | (1 << 2),
ATA_MWDMA2_ONLY = (1 << 2),
Expand All @@ -131,6 +135,8 @@ enum {
ATA_UDMA7 = ATA_UDMA6 | (1 << 7),
/* ATA_UDMA7 is just for completeness... doesn't exist (yet?). */

ATA_UDMA24_ONLY = (1 << 2) | (1 << 4),

ATA_UDMA_MASK_40C = ATA_UDMA2, /* udma0-2 */

/* DMA-related */
Expand Down

0 comments on commit 081014c

Please sign in to comment.