From 81c36d77b9116fb1d0dba1115495b1e80898e340 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 16 Jul 2008 20:33:36 +0200 Subject: [PATCH] --- yaml --- r: 102071 b: refs/heads/master c: f0ffc9872e972e9d9fe8f7ae577ff046dbdba51b h: refs/heads/master i: 102069: be90dd9a45a2cdef6836249a8f7c62dcd35f9bf2 102067: e1956a3850b4511e900edd450a1193112381886b 102063: bb2ecb427d4b623fe25b8a8ccc4fa6fe5bae0997 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-timing.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ae57f4b604c1..3fd805290b7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4e8d02f56f5c0cefc6713384629e068193d706a +refs/heads/master: f0ffc9872e972e9d9fe8f7ae577ff046dbdba51b diff --git a/trunk/drivers/ide/ide-timing.h b/trunk/drivers/ide/ide-timing.h index 2e91c5870b4c..a20c4cbbfcdb 100644 --- a/trunk/drivers/ide/ide-timing.h +++ b/trunk/drivers/ide/ide-timing.h @@ -28,9 +28,6 @@ #include #include -#define XFER_PIO_5 0x0d -#define XFER_UDMA_SLOW 0x4f - struct ide_timing { short mode; short setup; /* t1 */ @@ -61,12 +58,10 @@ static struct ide_timing ide_timing[] = { { XFER_UDMA_1, 0, 0, 0, 0, 0, 0, 0, 80 }, { XFER_UDMA_0, 0, 0, 0, 0, 0, 0, 0, 120 }, - { XFER_UDMA_SLOW, 0, 0, 0, 0, 0, 0, 0, 150 }, - { XFER_MW_DMA_2, 25, 0, 0, 0, 70, 25, 120, 0 }, { XFER_MW_DMA_1, 45, 0, 0, 0, 80, 50, 150, 0 }, { XFER_MW_DMA_0, 60, 0, 0, 0, 215, 215, 480, 0 }, - + { XFER_SW_DMA_2, 60, 0, 0, 0, 120, 120, 240, 0 }, { XFER_SW_DMA_1, 90, 0, 0, 0, 240, 240, 480, 0 }, { XFER_SW_DMA_0, 120, 0, 0, 0, 480, 480, 960, 0 },