Attachment 10376 Details for Bug 20834 – file.diff

[patch] file.diff

file.diff (text/plain), 4.03 KB, created by gerti-FreeBSD on 2000-08-25 08:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gerti-FreeBSD

Created: 2000-08-25 08:10:01 UTC

Size: 4.03 KB

patch

obsolete

>*** ata-all.c.orig	Wed Aug 23 23:13:05 2000
>--- ata-all.c	Thu Aug 24 22:55:38 2000
>***************
>*** 298,303 ****
>--- 298,304 ----
>  	return "Promise ATA66 controller";
>  
>      case 0x4d30105a:
>+ 	case 0x0d30105a:
>  	return "Promise ATA100 controller";
>  
>      case 0x00041103:
>***************
>*** 397,403 ****
>      }
>      else {
>      	if (type == 0x4d33105a || type == 0x4d38105a || 
>! 	    type == 0x4d30105a || type == 0x00041103) {
>  	    /* Promise and HighPoint controllers support busmastering DMA */
>  	    rid = 0x20;
>  	    sc->bmio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
>--- 398,404 ----
>      }
>      else {
>      	if (type == 0x4d33105a || type == 0x4d38105a || 
>! 	    type == 0x4d30105a || type == 0x00041103 || type == 0x0d30105a) {
>  	    /* Promise and HighPoint controllers support busmastering DMA */
>  	    rid = 0x20;
>  	    sc->bmio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
>***************
>*** 417,422 ****
>--- 418,424 ----
>  
>      case 0x4d38105a: /* Promise 66's need their clock changed */
>      case 0x4d30105a: /* Promise 100's too */
>+     case 0x0d30105a: /* Promise 100's too */
>  	outb(rman_get_start(sc->bmio) + 0x11, 
>  	     inb(rman_get_start(sc->bmio) + 0x11) | 0x0a);
>  	/* FALLTHROUGH */
>***************
>*** 1085,1090 ****
>--- 1087,1093 ----
>      case 0x4d33105a:	/* Promise 33's */
>      case 0x4d38105a:	/* Promise 66's */
>      case 0x4d30105a:	/* Promise 100's */
>+     case 0x0d30105a:	/* Promise 100's */
>      {
>  	struct ata_pci_softc *sc=device_get_softc(device_get_parent(scp->dev));
>  
>*** ata-dma.c.orig	Wed Aug 23 23:13:06 2000
>--- ata-dma.c	Thu Aug 24 22:55:38 2000
>***************
>*** 474,485 ****
>      case 0x4d33105a:	/* Promise Ultra33 / FastTrak33 controllers */
>      case 0x4d38105a:	/* Promise Ultra66 / FastTrak66 controllers */
>      case 0x4d30105a:	/* Promise Ultra100 / FastTrak100 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 &&
>  	    !(pci_read_config(parent, 0x50, 2)&(scp->unit ? 1<<11 : 1<<10))) {
>  	    error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
>  				ATA_UDMA5, ATA_C_F_SETXFER, ATA_WAIT_READY);
>--- 474,486 ----
>      case 0x4d33105a:	/* Promise Ultra33 / FastTrak33 controllers */
>      case 0x4d38105a:	/* Promise Ultra66 / FastTrak66 controllers */
>      case 0x4d30105a:	/* Promise Ultra100 / FastTrak100 controllers */
>+     case 0x0d30105a:	/* Promise Ultra100 / FastTrak100 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) &&
>  	    !(pci_read_config(parent, 0x50, 2)&(scp->unit ? 1<<11 : 1<<10))) {
>  	    error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
>  				ATA_UDMA5, ATA_C_F_SETXFER, ATA_WAIT_READY);
>***************
>*** 494,500 ****
>  	    }
>  	}
>  	if (udmamode >=4 && 
>! 	    (scp->chiptype == 0x4d38105a || scp->chiptype == 0x4d30105a) &&
>  	    !(pci_read_config(parent, 0x50, 2)&(scp->unit ? 1<<11 : 1<<10))) {
>  	    error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
>  				ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);
>--- 495,501 ----
>  	    }
>  	}
>  	if (udmamode >=4 && 
>! 	    (scp->chiptype == 0x4d38105a || scp->chiptype == 0x4d30105a || scp->chiptype == 0x0d30105a) &&
>  	    !(pci_read_config(parent, 0x50, 2)&(scp->unit ? 1<<11 : 1<<10))) {
>  	    error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
>  				ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);
>***************
>*** 770,775 ****
>--- 771,777 ----
>  
>      case 0x4d38105a:  /* Promise 66's */
>      case 0x4d30105a:  /* Promise 100's */
>+     case 0x0d30105a:  /* Promise 100's */
>  	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 20834: 10376