Use symbolic interrupt priority for SDMMC. (#382)

* Use symbolic interrupt priority for SDMMC. * arch/ARM/STM32/drivers/sd/stm32-sdmmc_interrupt.ads (SDMMC_Interrupt_Handler): Supply the required interrupt priority via a discriminant. * Added omitted 'with System'. * arch/ARM/STM32/drivers/sd/stm32-sdmmc_interrupt.ads: as summary. * Matching change for boards where SDCard is used. * boards/stm32_common/sdcard/sdcard.adb (SD_Interrupt_Handler): include Priority discriminant.
AdaCore · Mar 11, 2021 · f100ce7 · f100ce7
1 parent 663a729
commit f100ce7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/arch/ARM/STM32/drivers/sd/stm32-sdmmc_interrupt.ads b/arch/ARM/STM32/drivers/sd/stm32-sdmmc_interrupt.ads
@@ -1,6 +1,6 @@
 ------------------------------------------------------------------------------
 --                                                                          --
---                     Copyright (C) 2016-2017, AdaCore                     --
+--                     Copyright (C) 2016-2021, AdaCore                     --
 --                                                                          --
 --  Redistribution and use in source and binary forms, with or without      --
 --  modification, are permitted provided that the following conditions are  --
@@ -34,6 +34,7 @@
 
 with HAL.SDMMC;           use HAL.SDMMC;
 with Ada.Interrupts;
+with System;
 
 limited with STM32.SDMMC;
 
@@ -44,9 +45,10 @@ package STM32.SDMMC_Interrupt is
    ------------------
 
    protected type SDMMC_Interrupt_Handler
-     (Interrupt_ID : Ada.Interrupts.Interrupt_ID)
+     (Interrupt_ID : Ada.Interrupts.Interrupt_ID;
+      Priority     : System.Interrupt_Priority)
    is
-      pragma Interrupt_Priority (250);
+      pragma Interrupt_Priority (Priority);
 
       procedure Set_Transfer_State (This : in out STM32.SDMMC.SDMMC_Controller);
       procedure Clear_Transfer_State;

diff --git a/boards/stm32_common/sdcard/sdcard.adb b/boards/stm32_common/sdcard/sdcard.adb
@@ -1,6 +1,6 @@
 ------------------------------------------------------------------------------
 --                                                                          --
---                     Copyright (C) 2015-2016, AdaCore                     --
+--                     Copyright (C) 2015-2021, AdaCore                     --
 --                                                                          --
 --  Redistribution and use in source and binary forms, with or without      --
 --  modification, are permitted provided that the following conditions are  --
@@ -39,9 +39,13 @@ with STM32.GPIO;              use STM32.GPIO;
 with STM32.SDMMC;             use STM32.SDMMC;
 with STM32.SDMMC_Interrupt;   use STM32.SDMMC_Interrupt;
 
+with System;
+
 package body SDCard is
 
-   SD_Interrupt_Handler : aliased SDMMC_Interrupt_Handler (SD_Interrupt);
+   SD_Interrupt_Handler : aliased SDMMC_Interrupt_Handler
+     (Interrupt_ID => SD_Interrupt,
+      Priority     => System.Interrupt_Priority'Last);
 
    ----------------
    -- Initialize --