Browse Source

[DM/FIXUP] Fixup bitmap to new type

Signed-off-by: GuEe-GUI <2991707448@qq.com>
GuEe-GUI 6 months ago
parent
commit
76d3cf3b86
2 changed files with 4 additions and 4 deletions
  1. 3 3
      components/drivers/ata/ahci.c
  2. 1 1
      components/drivers/pic/pic-gicv2m.c

+ 3 - 3
components/drivers/ata/ahci.c

@@ -510,13 +510,13 @@ static void ahci_isr(int irqno, void *param)
 {
     int id;
     rt_uint32_t isr;
-    bitmap_t int_map;
+    rt_bitmap_t int_map;
     struct rt_ahci_port *port;
     struct rt_ahci_host *host = param;
 
     int_map = HWREG32(host->regs + RT_AHCI_HBA_INTS);
 
-    bitmap_for_each_set_bit(&int_map, id, host->ports_nr)
+    rt_bitmap_for_each_set_bit(&int_map, id, host->ports_nr)
     {
         port = &host->ports[id];
 
@@ -535,7 +535,7 @@ static void ahci_isr(int irqno, void *param)
         HWREG32(port->regs + RT_AHCI_PORT_INTS) = isr;
     }
 
-    HWREG32(host->regs + RT_AHCI_HBA_INTS) = isr;
+    HWREG32(host->regs + RT_AHCI_HBA_INTS) = int_map;
 }
 
 rt_err_t rt_ahci_host_register(struct rt_ahci_host *host)

+ 1 - 1
components/drivers/pic/pic-gicv2m.c

@@ -341,7 +341,7 @@ rt_err_t gicv2m_ofw_probe(struct rt_ofw_node *np, const struct rt_ofw_node_id *i
             }
         }
 
-        bitmap_size = RT_BITMAP_LEN(v2m->spis_nr) * sizeof(bitmap_t);
+        bitmap_size = RT_BITMAP_LEN(v2m->spis_nr) * sizeof(rt_bitmap_t);
 
         if (!(v2m->vectors = rt_calloc(1, bitmap_size)))
         {