Changeset a796812c in mainline

Timestamp:

2025-02-03T08:15:30Z (27 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

8c174e0, c3d9aaf5

Parents:

56210a7

Message:

Fix ISA IDE

Location:

uspace

Files:

• drv/block/isa-ide/isa-ide.c (modified) (3 diffs)
• lib/ata/src/ata.c (modified) (2 diffs)

uspace/drv/block/isa-ide/isa-ide.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -103 +103 @@
         ddf_msg(LVL_DEBUG, "isa_ide_ctrl_init()");
 
+        memset(&params, 0, sizeof(params));
+
         chan->ctrl = ctrl;
         chan->chan_id = chan_id;
@@ -136 +138 @@
 
         params.arg = (void *)chan;
+        params.use_dma = false;
         params.have_irq = (chan->irq >= 0) ? true : false;
         params.write_data_16 = isa_ide_write_data_16;

uspace/lib/ata/src/ata.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -1534 +1534 @@
          * exceed DMA buffer size.
          */
-        dma_maxnb = d->chan->params.max_dma_xfer / d->block_size;
-        if (dma_maxnb < maxnb)
-                maxnb = dma_maxnb;
+        if (d->chan->params.use_dma) {
+                dma_maxnb = d->chan->params.max_dma_xfer / d->block_size;
+                if (dma_maxnb < maxnb)
+                        maxnb = dma_maxnb;
+        }
 
         return maxnb;