Start to re-arrange files to include FreeRTOS+ in main download.

[freertos] / Demo / Common / drivers / LuminaryMicro / cpu.h

diff --git a/Demo/Common/drivers/LuminaryMicro/cpu.h b/Demo/Common/drivers/LuminaryMicro/cpu.h
index 6cabc3393b4df067e2128357a4befa6f6f7807aa..e33baff292a4336a226efeffaa08e9ce02732880 100644 (file)
--- a/Demo/Common/drivers/LuminaryMicro/cpu.h
+++ b/Demo/Common/drivers/LuminaryMicro/cpu.h
@@ -2,7 +2,7 @@
 //\r
 // cpu.h - Prototypes for the CPU instruction wrapper functions.\r
 //\r
-// Copyright (c) 2006-2007 Luminary Micro, Inc.  All rights reserved.\r
+// Copyright (c) 2006-2008 Luminary Micro, Inc.  All rights reserved.\r
 // \r
 // Software License Agreement\r
 // \r
@@ -10,10 +10,11 @@
 // exclusively on LMI's microcontroller products.\r
 // \r
 // The software is owned by LMI and/or its suppliers, and is protected under\r
-// applicable copyright laws.  All rights are reserved.  Any use in violation\r
-// of the foregoing restrictions may subject the user to criminal sanctions\r
-// under applicable laws, as well as to civil liability for the breach of the\r
-// terms and conditions of this license.\r
+// applicable copyright laws.  All rights are reserved.  You may not combine\r
+// this software with "viral" open-source software in order to form a larger\r
+// program.  Any use in violation of the foregoing restrictions may subject\r
+// the user to criminal sanctions under applicable laws, as well as to civil\r
+// liability for the breach of the terms and conditions of this license.\r
 // \r
 // THIS SOFTWARE IS PROVIDED "AS IS".  NO WARRANTIES, WHETHER EXPRESS, IMPLIED\r
 // OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF\r
@@ -21,20 +22,40 @@
 // LMI SHALL NOT, IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR\r
 // CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER.\r
 // \r
-// This is part of revision 1582 of the Stellaris Peripheral Driver Library.\r
+// This is part of revision 2523 of the Stellaris Peripheral Driver Library.\r
 //\r
 //*****************************************************************************\r
 \r
 #ifndef __CPU_H__\r
 #define __CPU_H__\r
 \r
+//*****************************************************************************\r
+//\r
+// If building with a C++ compiler, make all of the definitions in this header\r
+// have a C binding.\r
+//\r
+//*****************************************************************************\r
+#ifdef __cplusplus\r
+extern "C"\r
+{\r
+#endif\r
+\r
 //*****************************************************************************\r
 //\r
 // Prototypes.\r
 //\r
 //*****************************************************************************\r
-extern void CPUcpsid(void);\r
-extern void CPUcpsie(void);\r
+extern unsigned long CPUcpsid(void);\r
+extern unsigned long CPUcpsie(void);\r
 extern void CPUwfi(void);\r
 \r
+//*****************************************************************************\r
+//\r
+// Mark the end of the C bindings section for C++ compilers.\r
+//\r
+//*****************************************************************************\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+\r
 #endif // __CPU_H__\r