Changes in uspace/lib/ata/src/ata.c [743f2cdd:0dab4850] in mainline

File:

• uspace/lib/ata/src/ata.c (modified) (7 diffs)

uspace/lib/ata/src/ata.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -151 +151 @@
 {
         ata_channel_t *chan;
+        int i;
 
         chan = calloc(1, sizeof(ata_channel_t));
@@ -162 +163 @@
         fibril_mutex_initialize(&chan->irq_lock);
         fibril_condvar_initialize(&chan->irq_cv);
+
+        for (i = 0; i < MAX_DEVICES; i++)
+                chan->device[i].chan = chan;
 
         *rchan = chan;
@@ -253 +257 @@
 
         for (i = 0; i < MAX_DEVICES; i++) {
+                if (chan->device[i].present == false)
+                        continue;
+
                 rc = ata_device_remove(&chan->device[i]);
                 if (rc != EOK) {
                         ata_msg_error(chan, "Unable to remove device %d.", i);
+                        fibril_mutex_unlock(&chan->lock);
                         return rc;
                 }
@@ -262 +270 @@
         ata_bd_fini_irq(chan);
         fibril_mutex_unlock(&chan->lock);
-
-        return EOK;
+        free(chan);
+
+        return rc;
 }
 
@@ -493 +502 @@
         unsigned i;
 
-        d->chan = chan;
         d->device_id = device_id;
         d->present = false;
@@ -1529 +1537 @@
          * 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;