Diff for /src/sys/dev/disk/ata/ata-dma.c between versions 1.10 and 1.11

version 1.10, 2004/01/28 12:48:49 version 1.11, 2004/02/18 00:50:00
Line 79  ata_dmafree(struct ata_channel *ch, void Line 79  ata_dmafree(struct ata_channel *ch, void
 }  }
   
 void  void
ata_dmainit(struct ata_channel *ch, int device,ata_dmainit(struct ata_device *atadev, int apiomode, int wdmamode, int udmamode)
            int apiomode, int wdmamode, int udmamode) 
 {  {
    struct ata_device *atadev = &ch->device[ATA_DEV(device)];    struct ata_channel *ch = atadev->channel;
     int device = atadev->unit;
     device_t parent = device_get_parent(ch->dev);      device_t parent = device_get_parent(ch->dev);
     int devno = (ch->unit << 1) + ATA_DEV(device);      int devno = (ch->unit << 1) + ATA_DEV(device);
     int error;      int error;
Line 1255  ata_dmastart(struct ata_channel *ch, int Line 1255  ata_dmastart(struct ata_channel *ch, int
 }  }
   
 int  int
ata_dmadone(struct ata_channel *ch)ata_dmadone(struct ata_device *atadev)
 {  {
       struct ata_channel *ch;
     int error;      int error;
   
       ch = atadev->channel;
   
     ATA_OUTB(ch->r_bmio, ATA_BMCMD_PORT,       ATA_OUTB(ch->r_bmio, ATA_BMCMD_PORT, 
                 ATA_INB(ch->r_bmio, ATA_BMCMD_PORT) & ~ATA_BMCMD_START_STOP);                  ATA_INB(ch->r_bmio, ATA_BMCMD_PORT) & ~ATA_BMCMD_START_STOP);
     ch->flags &= ~ATA_DMA_ACTIVE;      ch->flags &= ~ATA_DMA_ACTIVE;

Removed from v.1.10  
changed lines
  Added in v.1.11