Skip to content

Add possibility to redefine SD detection pin irq handlers at application level #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aggarg merged 4 commits into from
May 22, 2025
Merged

Add possibility to redefine SD detection pin irq handlers at application level #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e1cac1
Add possibility to redefine irq handlers at application level
mallenbach May 21, 2025
70e52ac
Move the default definition to ff_sddisk.c files
aggarg May 22, 2025
0758704
Update Ubuntu version for formatting workflow
aggarg May 22, 2025
ab8b94e
Fix formatting check
aggarg May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 22 additions & 12 deletions portable/STM32F4xx/ff_sddisk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


/*-----------------------------------------------------------*/

/*
Expand Down Expand Up @@ -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*/
/*-----------------------------------------------------------*/
33 changes: 21 additions & 12 deletions portable/STM32F7xx/ff_sddisk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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*/
/*-----------------------------------------------------------*/