diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b7f324..92fdd4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: # Currently no unit tests formatting: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Check Formatting of Files diff --git a/portable/STM32F4xx/ff_sddisk.c b/portable/STM32F4xx/ff_sddisk.c index ac48ee2..50083ca 100644 --- a/portable/STM32F4xx/ff_sddisk.c +++ b/portable/STM32F4xx/ff_sddisk.c @@ -82,6 +82,12 @@ #define sdARRAY_SIZE( x ) ( int ) ( sizeof( x ) / sizeof( x )[ 0 ] ) #endif +#ifndef ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER + /* Set to 0 to remove SD detection interrupt handlers definition. */ + #define ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER 1 +#endif + + /*-----------------------------------------------------------*/ /* @@ -1153,20 +1159,24 @@ static const char * prvSDCodePrintable( uint32_t ulCode ) #endif /* SDIO_USES_DMA != 0 */ /*-----------------------------------------------------------*/ -void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) -{ - BaseType_t xHigherPriorityTaskWoken = pdFALSE; - - if( GPIO_Pin == configSD_DETECT_PIN ) +#if ( ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER != 0 ) + void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) { - vApplicationCardDetectChangeHookFromISR( &xHigherPriorityTaskWoken ); - portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); + BaseType_t xHigherPriorityTaskWoken = pdFALSE; + + if( GPIO_Pin == configSD_DETECT_PIN ) + { + vApplicationCardDetectChangeHookFromISR( &xHigherPriorityTaskWoken ); + portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); + } } -} +#endif /* ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER != 0*/ /*-----------------------------------------------------------*/ -void EXTI15_10_IRQHandler( void ) -{ - HAL_GPIO_EXTI_IRQHandler( configSD_DETECT_PIN ); /* GPIO PIN H.13 */ -} +#if ( ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER != 0 ) + void EXTI15_10_IRQHandler( void ) + { + HAL_GPIO_EXTI_IRQHandler( configSD_DETECT_PIN ); /* GPIO PIN H.13 */ + } +#endif /* ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER != 0*/ /*-----------------------------------------------------------*/ diff --git a/portable/STM32F7xx/ff_sddisk.c b/portable/STM32F7xx/ff_sddisk.c index eb2aad3..99d7120 100644 --- a/portable/STM32F7xx/ff_sddisk.c +++ b/portable/STM32F7xx/ff_sddisk.c @@ -94,6 +94,11 @@ #define sdARRAY_SIZE( x ) ( int ) ( sizeof( x ) / sizeof( x )[ 0 ] ) #endif +#ifndef ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER + /* Set to 0 to remove SD detection interrupt handlers definition. */ + #define ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER 1 +#endif + #ifdef STM32F7xx #define SRAM1_MAX_SIZE ( 368U * 1024U ) @@ -1263,20 +1268,24 @@ static const char * prvSDCodePrintable( uint32_t ulCode ) #endif /* SDIO_USES_DMA != 0 */ /*-----------------------------------------------------------*/ -void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) -{ - BaseType_t xHigherPriorityTaskWoken = pdFALSE; - - if( GPIO_Pin == configSD_DETECT_PIN ) +#if ( ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER != 0 ) + void HAL_GPIO_EXTI_Callback( uint16_t GPIO_Pin ) { - vApplicationCardDetectChangeHookFromISR( &xHigherPriorityTaskWoken ); - portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); + BaseType_t xHigherPriorityTaskWoken = pdFALSE; + + if( GPIO_Pin == configSD_DETECT_PIN ) + { + vApplicationCardDetectChangeHookFromISR( &xHigherPriorityTaskWoken ); + portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); + } } -} +#endif /* ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER != 0*/ /*-----------------------------------------------------------*/ -void EXTI15_10_IRQHandler( void ) -{ - HAL_GPIO_EXTI_IRQHandler( configSD_DETECT_PIN ); /* GPIO PIN H.13 */ -} +#if ( ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER != 0 ) + void EXTI15_10_IRQHandler( void ) + { + HAL_GPIO_EXTI_IRQHandler( configSD_DETECT_PIN ); /* GPIO PIN H.13 */ + } +#endif /* ffconfigSDIO_DRIVER_DEFINES_SD_DETECTION_INTERRUPT_HANDLER != 0*/ /*-----------------------------------------------------------*/