From b1617cc336747b5f983bcfeb3515b5abdc4d8499 Mon Sep 17 00:00:00 2001
From: RichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Sat, 24 May 2008 18:56:04 +0000
Subject: [PATCH] Add usage of portREMOVE_STATIC_QUALIFIER.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@388 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 Source/portable/MPLAB/PIC18F/portmacro.h      |  5 +++++
 Source/portable/MPLAB/PIC24_dsPIC/portmacro.h |  4 ++++
 Source/portable/MPLAB/PIC32MX/portmacro.h     | 10 +++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Source/portable/MPLAB/PIC18F/portmacro.h b/Source/portable/MPLAB/PIC18F/portmacro.h
index 95ace9425..c12e3a438 100644
--- a/Source/portable/MPLAB/PIC18F/portmacro.h
+++ b/Source/portable/MPLAB/PIC18F/portmacro.h
@@ -116,6 +116,11 @@ extern void vPortYield( void );
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
 /*-----------------------------------------------------------*/
 
+/* Required by the kernel aware debugger. */
+#ifdef __DEBUG
+	#define portREMOVE_STATIC_QUALIFIER
+#endif
+
 
 #define portNOP()				_asm	\
 									NOP \
diff --git a/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h b/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
index 51d677525..2f4722693 100644
--- a/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
+++ b/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
@@ -113,6 +113,10 @@ extern void vPortYield( void );
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
 /*-----------------------------------------------------------*/
 
+/* Required by the kernel aware debugger. */
+#ifdef __DEBUG
+	#define portREMOVE_STATIC_QUALIFIER
+#endif
 
 #define portNOP()				asm volatile ( "NOP" )
 
diff --git a/Source/portable/MPLAB/PIC32MX/portmacro.h b/Source/portable/MPLAB/PIC32MX/portmacro.h
index a04cad68d..7ffe11516 100644
--- a/Source/portable/MPLAB/PIC32MX/portmacro.h
+++ b/Source/portable/MPLAB/PIC32MX/portmacro.h
@@ -152,7 +152,15 @@ unsigned portLONG ulStatus;						\
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
 /*-----------------------------------------------------------*/
 
-#define portEND_SWITCHING_ISR( vSwitchRequired ) if( vSwitchRequired ) SetCoreSW0()
+#define portEND_SWITCHING_ISR( xSwitchRequired )	if( xSwitchRequired )	\
+													{						\
+														portYIELD();		\
+													}
+
+/* Required by the kernel aware debugger. */
+#ifdef __DEBUG
+	#define portREMOVE_STATIC_QUALIFIER
+#endif
 
 #ifdef __cplusplus
 }
-- 
2.39.2