mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-09-10 16:17:44 -04:00
Compare commits
2 commits
2da35debfd
...
e9440d4079
Author | SHA1 | Date | |
---|---|---|---|
|
e9440d4079 | ||
|
c5bec0e4b2 |
4 changed files with 15 additions and 15 deletions
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
.arm
|
.arm
|
||||||
.syntax unified
|
.syntax unified
|
||||||
.section freertos_system_calls
|
.section freertos_system_calls, "ax"
|
||||||
|
|
||||||
#define FREERTOS_ASSEMBLY
|
#define FREERTOS_ASSEMBLY
|
||||||
#include "FreeRTOSConfig.h"
|
#include "FreeRTOSConfig.h"
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
.arm
|
.arm
|
||||||
.syntax unified
|
.syntax unified
|
||||||
.section privileged_functions
|
.section privileged_functions, "ax"
|
||||||
|
|
||||||
#define FREERTOS_ASSEMBLY
|
#define FREERTOS_ASSEMBLY
|
||||||
#include "portmacro_asm.h"
|
#include "portmacro_asm.h"
|
||||||
|
|
|
@ -33,6 +33,14 @@
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
|
|
||||||
|
#ifdef WIN32_LEAN_AND_MEAN
|
||||||
|
#include <winsock2.h>
|
||||||
|
#else
|
||||||
|
#include <winsock.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <timeapi.h>
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#include "mmsystem.h"
|
#include "mmsystem.h"
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -29,17 +29,6 @@
|
||||||
#ifndef PORTMACRO_H
|
#ifndef PORTMACRO_H
|
||||||
#define PORTMACRO_H
|
#define PORTMACRO_H
|
||||||
|
|
||||||
#ifdef WIN32_LEAN_AND_MEAN
|
|
||||||
#include <winsock2.h>
|
|
||||||
#else
|
|
||||||
#include <winsock.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
#include <timeapi.h>
|
|
||||||
#include <mmsystem.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
@ -156,22 +145,25 @@ void vPortExitCritical( void );
|
||||||
: "cc" )
|
: "cc" )
|
||||||
|
|
||||||
#else /* __GNUC__ */
|
#else /* __GNUC__ */
|
||||||
|
#include <intrin.h>
|
||||||
|
|
||||||
/* BitScanReverse returns the bit position of the most significant '1'
|
/* BitScanReverse returns the bit position of the most significant '1'
|
||||||
* in the word. */
|
* in the word. */
|
||||||
#if defined( __x86_64__ ) || defined( _M_X64 )
|
#if defined( __x86_64__ ) || defined( _M_X64 )
|
||||||
|
#pragma intrinsic(_BitScanReverse64)
|
||||||
|
|
||||||
#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) \
|
#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) \
|
||||||
do \
|
do \
|
||||||
{ \
|
{ \
|
||||||
DWORD ulTopPriority; \
|
unsigned long ulTopPriority; \
|
||||||
_BitScanReverse64( &ulTopPriority, ( uxReadyPriorities ) ); \
|
_BitScanReverse64( &ulTopPriority, ( uxReadyPriorities ) ); \
|
||||||
uxTopPriority = ulTopPriority; \
|
uxTopPriority = ulTopPriority; \
|
||||||
} while( 0 )
|
} while( 0 )
|
||||||
|
|
||||||
#else /* #if defined( __x86_64__ ) || defined( _M_X64 ) */
|
#else /* #if defined( __x86_64__ ) || defined( _M_X64 ) */
|
||||||
|
#pragma intrinsic(_BitScanReverse)
|
||||||
|
|
||||||
#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) _BitScanReverse( ( DWORD * ) &( uxTopPriority ), ( uxReadyPriorities ) )
|
#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) _BitScanReverse( ( unsigned long * ) &( uxTopPriority ), ( uxReadyPriorities ) )
|
||||||
|
|
||||||
#endif /* #if defined( __x86_64__ ) || defined( _M_X64 ) */
|
#endif /* #if defined( __x86_64__ ) || defined( _M_X64 ) */
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue