X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fata.c;h=ceb08f2de76e73d3a44bdecf1b1011c157291b53;hb=59c7574767838cd53419779e4cbc2162c14a4ac6;hp=add1d67b4cd7de8d7c5ccf1216d17c42afef864a;hpb=1ca05b0f393c0201c0e8efe87831edddb6a53532;p=seabios.git

diff --git a/src/ata.c b/src/ata.c
index add1d67..ceb08f2 100644
--- a/src/ata.c
+++ b/src/ata.c
@@ -381,6 +381,8 @@ struct sff_dma_prd {
 static int
 ata_try_dma(struct disk_op_s *op, int iswrite, int blocksize)
 {
+    if (! CONFIG_ATA_DMA)
+        return -1;
     u32 dest = (u32)op->buf_fl;
     if (dest & 1)
         // Need minimum alignment of 1.
@@ -434,6 +436,8 @@ ata_try_dma(struct disk_op_s *op, int iswrite, int blocksize)
 static int
 ata_dma_transfer(struct disk_op_s *op)
 {
+    if (! CONFIG_ATA_DMA)
+        return -1;
     dprintf(16, "ata_dma_transfer id=%p buf=%p\n"
             , op->drive_g, op->buf_fl);
 
@@ -513,6 +517,8 @@ fail:
 static int
 ata_dma_cmd_data(struct disk_op_s *op, struct ata_pio_command *cmd)
 {
+    if (! CONFIG_ATA_DMA)
+        return -1;
     int ret = send_cmd(op->drive_g, cmd);
     if (ret)
         return ret;
@@ -1005,7 +1011,7 @@ ata_init(void)
         u8 pciirq = pci_config_readb(bdf, PCI_INTERRUPT_LINE);
         u8 prog_if = pci_config_readb(bdf, PCI_CLASS_PROG);
         int master = 0;
-        if (prog_if & 0x80) {
+        if (CONFIG_ATA_DMA && prog_if & 0x80) {
             // Check for bus-mastering.
             u32 bar = pci_config_readl(bdf, PCI_BASE_ADDRESS_4);
             if (bar & PCI_BASE_ADDRESS_SPACE_IO) {
@@ -1054,6 +1060,7 @@ ata_init(void)
 void
 ata_setup(void)
 {
+    ASSERT32FLAT();
     if (!CONFIG_ATA)
         return;