28c28
< * $FreeBSD: head/sys/dev/ata/ata-dma.c 67057 2000-10-13 10:54:47Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-dma.c 67058 2000-10-13 11:21:27Z sos $
81c81
< int devno = (scp->unit << 1) + ATA_DEV(device);
---
> int devno = (scp->channel << 1) + ATA_DEV(device);
91c91
< if (scp->unit == 1) {
---
> if (scp->channel == 1) {
206c206
< if (!((pci_read_config(parent, 0x40, 4)>>(scp->unit<<8))&0x4000)){
---
> if (!((pci_read_config(parent,0x40,4)>>(scp->channel<<8))&0x4000)) {
243c243
< if (scp->unit) {
---
> if (scp->channel) {
267c267
< word40 >>= scp->unit * 16;
---
> word40 >>= scp->channel * 16;
455c455
< umode = pci_read_config(parent, scp->unit ? 0x7b : 0x73, 1);
---
> umode = pci_read_config(parent, scp->channel ? 0x7b : 0x73, 1);
458c458
< pci_write_config(parent, scp->unit ? 0x7b : 0x73, umode, 1);
---
> pci_write_config(parent, scp->channel ? 0x7b : 0x73, umode, 1);
475c475
< umode = pci_read_config(parent, scp->unit ? 0x7b : 0x73, 1);
---
> umode = pci_read_config(parent, scp->channel ? 0x7b : 0x73, 1);
478c478
< pci_write_config(parent, scp->unit ? 0x7b : 0x73, umode, 1);
---
> pci_write_config(parent, scp->channel ? 0x7b : 0x73, umode, 1);
492c492
< umode = pci_read_config(parent, scp->unit ? 0x7b : 0x73, 1);
---
> umode = pci_read_config(parent, scp->channel ? 0x7b : 0x73, 1);
495c495
< pci_write_config(parent, scp->unit ? 0x7b : 0x73, umode, 1);
---
> pci_write_config(parent, scp->channel ? 0x7b : 0x73, umode, 1);
501,502c501,502
< pci_write_config(parent, scp->unit ? 0x7b : 0x73,
< pci_read_config(parent, scp->unit ? 0x7b : 0x73, 1) &
---
> pci_write_config(parent, scp->channel ? 0x7b : 0x73,
> pci_read_config(parent, scp->channel ? 0x7b : 0x73, 1) &
533c533
< pci_write_config(scp->dev, scp->unit ? 0x4e : 0x4c, 0x2020, 2);
---
> pci_write_config(scp->dev, scp->channel ? 0x4e:0x4c, 0x2020, 2);
608c608
< int offset = (scp->unit * 2) + (device == ATA_MASTER);
---
> int offset = (scp->channel * 2) + (device == ATA_MASTER);
635c635
< !(pci_read_config(parent, 0x50, 2)&(scp->unit ? 1<<11 : 1<<10))) {
---
> !(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){
650c650
< !(pci_read_config(parent, 0x50, 2)&(scp->unit ? 1<<11 : 1<<10))) {
---
> !(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){
708c708
< !(pci_read_config(parent, 0x5a, 1) & (scp->unit ? 0x01 : 0x02))) {
---
> !(pci_read_config(parent, 0x5a, 1) & (scp->channel ? 0x01:0x02))) {
722c722
< !(pci_read_config(parent, 0x5a, 1) & (scp->unit ? 0x01 : 0x02))) {
---
> !(pci_read_config(parent, 0x5a, 1) & (scp->channel ? 0x01:0x02))) {