Merge pull request #582 from nasa/integration-candidate

Integration Candidate: 2020-08-26

CMakeLists.txt

@@ -177,12 +177,6 @@ set(BSP_SRCLIST
     src/bsp/shared/src/bsp_default_symtab.c
 )
 
-if (NOT OMIT_DEPRECATED)
-    list(APPEND BSP_SRCLIST
-        src/bsp/shared/src/bsp_default_voltab.c
-    )
-endif (NOT OMIT_DEPRECATED)
-
 # Define the external "osal_bsp" static library target
 add_library(osal_bsp STATIC
     ${BSP_SRCLIST}
@@ -264,16 +258,6 @@ if (OSAL_CONFIG_DEBUG_PRINTF)
 endif (OSAL_CONFIG_DEBUG_PRINTF)
 
 
-# The FPU and interrupt modules are deprecated.
-# If the "OMIT_DEPRECATED" switch is set, then these are not built.
-if (NOT OMIT_DEPRECATED)
-    list(APPEND OSAL_SRCLIST
-        src/os/shared/src/osapi-fpu.c
-        src/os/shared/src/osapi-interrupts.c
-    )
-endif (NOT OMIT_DEPRECATED)
-
-
 # Define the external "osal" static library target
 # This is a combination of the generic parts with the low level
 # system-specific parts

README.md

@@ -10,6 +10,11 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Version History
 
+### Development Build: 5.1.0-rc1+dev16
+
+ - In the next major OSAL release, this code will be no longer supported at all. It should be removed early in the cycle to avoid needing to maintain this compatibility code. This code was already conditional on the OSAL_OMIT_DEPRECATED flag and as such the CCB has already tested/verified running the code in this configuration as part of CI scripts. After this change, the build should be equivalent to the result of building with OMIT_DEPRECATED=true.
+- See <https://github.com/nasa/osal/pull/582>
+
 ### Development Build: 5.1.0-rc1+dev12
 
 - Removes internal functions that are no longer used or defined but whose prototypes and stubs were still present in OS_ObjectIdMap

src/bsp/shared/inc/bsp-impl.h

@@ -101,14 +101,6 @@ typedef struct
  */
 extern OS_BSP_GlobalData_t OS_BSP_Global;
 
-#ifndef OSAL_OMIT_DEPRECATED
-/*
- * Volume Table declaration (supplied by BSP; typically defined in bsp_voltab.c)
- * @deprecated Use OS File System API to register volumes.
- */
-extern OS_VolumeInfo_t OS_VolumeTable[OS_MAX_FILE_SYSTEMS];
-#endif
-
 /********************************************************************/
 /* INTERNAL BSP IMPLEMENTATION FUNCTIONS                            */
 /********************************************************************/

src/os/inc/common_types.h

@@ -96,44 +96,6 @@
   typedef size_t                                cpusize;
   typedef ptrdiff_t                             cpudiff;
 
-#ifndef OSAL_OMIT_DEPRECATED
-
-/*
- * Define the "osalbool" type for backward compatibility.
- * This will be removed in a future release.
- */
-typedef bool                                  osalbool; /**< @deprecated Use bool */
-
-/*
- * Boolean type for compatibility --
- *
- * Note it is a bad idea to typedef "bool" or "boolean" -- MANY other projects
- * and libraries also define a boolean type due to the lack of a standard bool in C89.
- * But calling it simply "bool" or "boolean" almost guarantees a namespace conflict
- * if trying to use OSAL with one of those other existing projects.
- *
- * RTEMS 4.11 no longer defines boolean type by default (deprecated) probably also
- * due to the high likelihood of name conflicts.
- *
- * In order to preserve compatibility for apps written against prior versions of
- * OSAL, the name "boolean" is typedefed as well, but this may be turned off
- * in a future version whenever appropriate.
- */
-
-#if (!defined(_USING_RTEMS_INCLUDES_) || !defined(RTEMS_DEPRECATED_TYPES))
-  typedef osalbool boolean; /**< @deprecated Use bool */
-#endif
-
-#ifndef TRUE              /* Boolean true */
-#define TRUE     true  /**< @deprecated Use true */
-#endif
-
-#ifndef FALSE              /* Boolean false */
-#define FALSE    false /**< @deprecated Use false */
-#endif
-
-
-#endif /* OSAL_OMIT_DEPRECATED */
 
 
 #ifndef NULL              /* pointer to nothing */