Skip to content
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

Fix build with modern GCC #933

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Fix build with modern GCC #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91912ce
GCC: MSP430F449: Add missing attributes
Forty-Bot Dec 21, 2023
ef1b825
GCC: MSP430F449: Make interrupts return void
Forty-Bot Dec 21, 2023
ca907b4
GCC: MSP430F449: Define portPOINTER_SIZE_TYPE
Forty-Bot Dec 21, 2023
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
8 changes: 4 additions & 4 deletions portable/GCC/MSP430F449/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ static void prvSetupTimerInterrupt( void )
* the context is saved at the start of vPortYieldFromTick(). The tick
* count is incremented after the context is saved.
*/
interrupt( TIMERA0_VECTOR ) prvTickISR( void ) __attribute__( ( naked ) );
interrupt( TIMERA0_VECTOR ) prvTickISR( void )
interrupt( TIMERA0_VECTOR ) void prvTickISR( void ) __attribute__( ( naked ) );
interrupt( TIMERA0_VECTOR ) void prvTickISR( void )
{
/* Save the context of the interrupted task. */
portSAVE_CONTEXT();
Expand All @@ -320,8 +320,8 @@ static void prvSetupTimerInterrupt( void )
* tick count. We don't need to switch context, this can only be done by
* manual calls to taskYIELD();
*/
interrupt( TIMERA0_VECTOR ) prvTickISR( void );
interrupt( TIMERA0_VECTOR ) prvTickISR( void )
interrupt( TIMERA0_VECTOR ) void prvTickISR( void );
interrupt( TIMERA0_VECTOR ) void prvTickISR( void )
{
xTaskIncrementTick();
}
Expand Down
6 changes: 6 additions & 0 deletions portable/GCC/MSP430F449/portmacro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#define portSHORT int
#define portSTACK_TYPE uint16_t
#define portBASE_TYPE short
#define portPOINTER_SIZE_TYPE uint16_t

typedef portSTACK_TYPE StackType_t;
typedef short BaseType_t;
Expand Down Expand Up @@ -118,6 +119,11 @@ extern void vPortYield( void ) __attribute__( ( naked ) );
#define portBYTE_ALIGNMENT 2
#define portSTACK_GROWTH ( -1 )
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )

/* GCC used to define these but doesn't any more */
#define interrupt(vector) __attribute__((__interrupt__(vector)))
#define wakeup __attribute__((__wakeup__))

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

/* Task function macros as described on the FreeRTOS.org WEB site. */
Expand Down
Loading