Fix nasa#367, Scrub FS defines

Deprecated FS_BASED, RAM_DISK, EEPROM_DISK, ATA_DISK, NUM_TABLE_ENTRIES, replace with OS_ prefixed defines OS_CHK_ONLY and OS_REPAIR removed (unused)
skliper · Apr 10, 2020 · 8b0af52 · 8b0af52
1 parent 7d9c4c8
commit 8b0af52
Showing 1 changed file with 22 additions and 7 deletions.
diff --git a/src/os/inc/osapi-os-filesys.h b/src/os/inc/osapi-os-filesys.h
@@ -35,22 +35,37 @@
 #define OS_SEEK_END         2  /**< Seek offset end */
 /**@}*/
 
-#define OS_CHK_ONLY         0  /**< Unused, API takes bool */
-#define OS_REPAIR           1  /**< Unused, API takes bool */
+#ifndef OSAL_OMIT_DEPRECATED
+
+#define OS_CHK_ONLY         0  /**< Unused, API takes bool @deprecated */
+#define OS_REPAIR           1  /**< Unused, API takes bool @deprecated */
+
+#define FS_BASED            OS_FS_BASED    /**< @deprecated */
+#define RAM_DISK            OS_RAM_DISK    /**< @deprecated */
+#define EEPROM_DISK         OS_EEPROM_DISK /**< @deprecated */
+#define ATA_DISK            OS_ATA_DISK    /**< @deprecated */
+
+#endif
 
 /** @defgroup OSVolType OSAL Volume Type Defines
  * @{
  */
-#define FS_BASED            0  /**< Volume type FS based */
-#define RAM_DISK            1  /**< Volume type RAM disk */
-#define EEPROM_DISK         2  /**< Volume type EEPROM disk */
-#define ATA_DISK            3  /**< Volume type ATA disk */
+#define OS_FS_BASED            0  /**< Volume type FS based */
+#define OS_RAM_DISK            1  /**< Volume type RAM disk */
+#define OS_EEPROM_DISK         2  /**< Volume type EEPROM disk */
+#define OS_ATA_DISK            3  /**< Volume type ATA disk */
 /**@}*/
 
 /**
  * @brief Number of entries in the internal volume table
  */
-#define NUM_TABLE_ENTRIES 14
+#define OS_NUM_TABLE_ENTRIES 14
+
+#ifndef OSAL_OMIT_DEPRECATED
+
+#define NUM_TABLE_ENTRIES    OS_NUM_TABLE_ENTRIES  /**< @deprecated */
+
+#endif
 
 /*
 ** Length of a Device and Volume name