Changeset ebb1489 in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/drv/block/ahci/ahci.c (modified) (3 diffs)

uspace/drv/block/ahci/ahci.c

@@ -162 +162 @@
 }
 
-/** Get AHCI structure from DDF device. */
-static ahci_dev_t *dev_ahci_dev(ddf_dev_t *dev)
-{
-        return ddf_dev_data_get(dev);
-}
-
 /** Get SATA device name.
  *
@@ -891 +885 @@
  *
  * @param icall The IPC call structure.
- * @param dev   DDF device structure.
- *
- */
-static void ahci_interrupt(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        ahci_dev_t *ahci = dev_ahci_dev(dev);
+ * @param arg   Argument (ahci_dev_t *)
+ */
+static void ahci_interrupt(ipc_call_t *icall, void *arg)
+{
+        ahci_dev_t *ahci = (ahci_dev_t *)arg;
         unsigned int port = ipc_get_arg1(icall);
         ahci_port_is_t pxis = ipc_get_arg2(icall);
@@ -1186 +1179 @@
         cap_irq_handle_t irq_cap;
         errno_t rc = register_interrupt_handler(dev,
-            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, (void *)ahci, &ct,
+            &irq_cap);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");