Changeset 64cf7a3 in mainline for uspace/drv/block/ata_bd/ata_bd.h

Timestamp:

2024-05-06T18:33:22Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

2791fbb7

Parents:

21989e5

Message:

ATA Block Driver support for IRQ

You can fall back to PIO mode by not assigning an IRQ resource to
the driver instance.

File:

• uspace/drv/block/ata_bd/ata_bd.h (modified) (5 diffs)

uspace/drv/block/ata_bd/ata_bd.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <ddf/driver.h>
 #include <fibril_synch.h>
+#include <stdbool.h>
 #include <str.h>
 #include <stdint.h>
@@ -47 +48 @@
 #define NAME "ata_bd"
 
-/** Base addresses for ATA I/O blocks. */
+/** ATA hardware resources */
 typedef struct {
         uintptr_t cmd;  /**< Command block base address. */
         uintptr_t ctl;  /**< Control block base address. */
-} ata_base_t;
+        int irq;        /**< IRQ */
+} ata_hwres_t;
 
 /** Timeout definitions. Unit is 10 ms. */
@@ -140 +142 @@
         /** Control registers */
         ata_ctl_t *ctl;
+        /** IRQ (-1 if not used) */
+        int irq;
+        /** IRQ handle */
+        cap_irq_handle_t ihandle;
 
         /** Per-disk state. */
         disk_t disk[MAX_DISKS];
 
+        /** Synchronize controller access */
         fibril_mutex_t lock;
+        /** Synchronize access to irq_fired/irq_status */
+        fibril_mutex_t irq_lock;
+        /** Signalled by IRQ handler */
+        fibril_condvar_t irq_cv;
+        /** Set to true when interrupt occurs */
+        bool irq_fired;
+        /** Value of status register read by interrupt handler */
+        uint8_t irq_status;
 } ata_ctrl_t;
 
@@ -153 +168 @@
 } ata_fun_t;
 
-extern errno_t ata_ctrl_init(ata_ctrl_t *, ata_base_t *);
+extern errno_t ata_ctrl_init(ata_ctrl_t *, ata_hwres_t *);
 extern errno_t ata_ctrl_remove(ata_ctrl_t *);
 extern errno_t ata_ctrl_gone(ata_ctrl_t *);