Attachment 14838 Details for Bug 27750 – file.diff

[patch] file.diff

file.diff (text/plain), 2.36 KB, created by jswank on 2001-05-29 20:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jswank

Created: 2001-05-29 20:50:01 UTC

Size: 2.36 KB

patch

obsolete

>--- ata-dma.c   Tue May 29 07:36:50 2001
>+++ ata-dma.c.orig      Tue May 29 07:36:28 2001
>@@ -723,14 +723,13 @@
>     case 0x4d38105a:   /* Promise Ultra/FastTrak 66 controllers */
>     case 0x4d30105a:   /* Promise Ultra/FastTrak 100 controllers */
>     case 0x0d30105a:   /* Promise OEM ATA100 controllers */
>-    case 0x4d68105a:   /* Promise Ultra100 TX2 controllers */
>        /* the Promise can only do DMA on ATA disks not on ATAPI devices */
>        if ((device == ATA_MASTER && scp->devices & ATA_ATAPI_MASTER) ||
>            (device == ATA_SLAVE && scp->devices & ATA_ATAPI_SLAVE))
>            break;
> 
>-       if (udmamode >= 5 && (scp->chiptype == 0x4d30105a || 
>-           scp->chiptype == 0x0d30105a || scp->chiptype == 0x4d68105a) &&
>+       if (udmamode >= 5 &&                                                    +           (scp->chiptype == 0x4d30105a || scp->chiptype == 0x0d30105a) &&
>            !(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){
>            error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
>                                ATA_UDMA5, ATA_C_F_SETXFER, ATA_WAIT_READY);    @@ -745,11 +744,10 @@
>            }
>        }
>        if (udmamode >= 4 && (scp->chiptype == 0x4d38105a || 
>-           scp->chiptype == 0x4d30105a || scp->chiptype == 0x0d30105a ||
>-                       scp->chiptype == 0x4d68105a) && !(pci_read_config(parent
>, 0x50, 2)
>-                       &(scp->channel ? 1<<11 : 1<<10))){
>-                       error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0
>, 0,
>-                         ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);
>+           scp->chiptype == 0x4d30105a || scp->chiptype == 0x0d30105a) &&
>+           !(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){
>+           error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
>+                               ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);
>            if (bootverbose)
>                ata_printf(scp, device,
>                           "%s setting UDMA4 on Promise chip\n",
>@@ -1043,7 +1041,6 @@
>     case 0x4d38105a:  /* Promise Ultra/Fasttrak 66 */
>     case 0x4d30105a:  /* Promise Ultra/Fasttrak 100 */
>     case 0x0d30105a:  /* Promise OEM ATA 100 */
>-    case 0x4d68105a:  /* Promise Ultra100 TX2 */
>        switch (mode) {
>        default:
>        case ATA_PIO0:  t->pa = 15; t->pb = 31; t->mb = 7; t->mc = 15; break;

Actions: View | Diff

Attachments on bug 27750: 14838 | 14839