Removed added docs

nasa · Sep 4, 2021 · 7a3c037 · 7a3c037
1 parent f2b4324
commit 7a3c037
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 58 deletions.
diff --git a/docs/src/mnem_maps/cfe_es_tlm_mnem_map b/docs/src/mnem_maps/cfe_es_tlm_mnem_map
@@ -68,9 +68,6 @@ ES_APPFILENAME=$sc_$cpu_ES_AppFilename[OS_MAX_PATH_LEN] \
 ES_STACKSIZE=$sc_$cpu_ES_StackSize \
 ES_MODULEID=$sc_$cpu_ES_ModuleID \
 ES_ADDRVALID=$sc_$cpu_ES_AddrsValid \
-ES_CODE=$sc_$cpu_ES_Code \
-ES_DATA=$sc_$cpu_ES_Data \
-ES_BSS=$sc_$cpu_ES_BSS \
 ES_STARTADDR=$sc_$cpu_ES_StartAddr \
 ES_EXCEPTNACTN=$sc_$cpu_ES_ExceptnActn \
 ES_PRIORITY=$sc_$cpu_ES_Priority \
@@ -83,6 +80,4 @@ ES_POOLSIZE=$sc_$cpu_ES_PoolSize \
 ES_BLKSREQ=$sc_$cpu_ES_BlksREQ \
 ES_BLKERRCTR=$sc_$cpu_ES_BlkErrCTR \
 ES_FREEBYTES=$sc_$cpu_ES_FreeBytes \
-ES_BLKSTATS=$sc_$cpu_ES_BlkStats[BLK_SIZES] \
-ES_MEM_ADDR=$sc_$cpu_ES_Address \
-ES_MEM_OFF=$sc_$cpu_ES_Size
+ES_BLKSTATS=$sc_$cpu_ES_BlkStats[BLK_SIZES]
diff --git a/modules/core_api/fsw/inc/cfe_es_extern_typedefs.h b/modules/core_api/fsw/inc/cfe_es_extern_typedefs.h
@@ -428,17 +428,15 @@ typedef uint32 CFE_ES_MemAddress_t;
 #define CFE_ES_MEMADDRESS_C(x) ((CFE_ES_MemAddress_t)((cpuaddr)(x)&0xFFFFFFFF))
 
 /**
- * \brief Memory Address and Memory Offset combination
+ * Memory Address and Memory Offset combination
  *
  * A combination of #CFE_ES_MemAddress_t and #CFE_ES_MemOffset_t, since they are often used together.
  */
 typedef struct CFE_ES_MemAddOff
 {
-    CFE_ES_MemAddress_t Address; /**< \cfetlmmnemonic \ES_MEM_ADDR
-                                      \brief Application or Library ID for this resource */
+    CFE_ES_MemAddress_t Address;
 
-    CFE_ES_MemOffset_t Size; /**< \cfetlmmnemonic \ES_MEM_OFF
-                                  \brief Application or Library ID for this resource */
+    CFE_ES_MemOffset_t Size;
 
 } CFE_ES_MemAddOff_t;
 
@@ -470,19 +468,16 @@ typedef struct CFE_ES_AppInfo
     char FileName[CFE_MISSION_MAX_PATH_LEN];  /**< \cfetlmmnemonic \ES_APPFILENAME
                                                    \brief The Filename of the file containing the Application */
 
-    CFE_ES_MemOffset_t StackSize;                  /**< \cfetlmmnemonic \ES_STACKSIZE
-                                                        \brief The Stack Size of the Application */
-    uint32 AddressesAreValid;                      /**< \cfetlmmnemonic \ES_ADDRVALID
-                                                        \brief Indicates that the Code, Data, and BSS addresses/sizes are valid */
-    CFE_ES_MemAddOff_t Code;                       /**< \cfetlmmnemonic \ES_CODE
-                                                        \brief Contains the Address of the Application Code Segment and the Code
-                                                        Size of the Application*/
-    CFE_ES_MemAddOff_t Data;                       /**< \cfetlmmnemonic \ES_DATA
-                                                        \brief Contains the Address of the Application Data Segment and the Data
-                                                        Size of the Application*/
-    CFE_ES_MemAddOff_t BSS;                        /**< \cfetlmmnemonic \ES_BSS
-                                                        \brief Contains the Address of the Application BSS Segment and the BSS
-                                                        Size of the Application*/
+    CFE_ES_MemOffset_t StackSize; /**< \cfetlmmnemonic \ES_STACKSIZE
+                                       \brief The Stack Size of the Application */
+    uint32 AddressesAreValid;     /**< \cfetlmmnemonic \ES_ADDRVALID
+                                       \brief Indicates that the Code, Data, and BSS addresses/sizes are valid */
+    CFE_ES_MemAddOff_t Code;
+
+    CFE_ES_MemAddOff_t Data;
+
+    CFE_ES_MemAddOff_t BSS;
+
     CFE_ES_MemAddress_t StartAddress;              /**< \cfetlmmnemonic \ES_STARTADDR
                                                         \brief The Start Address of the Application */
     CFE_ES_ExceptionAction_Enum_t ExceptionAction; /**< \cfetlmmnemonic \ES_EXCEPTNACTN

diff --git a/modules/es/eds/cfe_es.xml b/modules/es/eds/cfe_es.xml
@@ -126,25 +126,6 @@
         </DimensionList>
       </ArrayDataType>
 
-      <ContainerDataType name="MemAddOff">
-        <LongDescription>
-          CFE_ES_MemAddOff_t is a structure used to store/group information 
-          about a memory address and a memory offset.
-        </LongDescription>
-        <EntryList>
-          <Entry name="Address" type="BASE_TYPES/CpuAddress" shortDescription="See #CFE_ES_MemAddress_t">
-            <LongDescription>
-              \cfetlmmnemonic  \ES_MEM_ADDR
-            </LongDescription>
-          </Entry>
-          <Entry name="Size" type="BASE_TYPES/CpuAddress" shortDescription="See #CFE_ES_MemOffset_t">
-            <LongDescription>
-              \cfetlmmnemonic  \ES_MEM_OFF
-            </LongDescription>
-          </Entry>
-        </EntryList>
-      </ContainerDataType>
-
       <ContainerDataType name="AppInfo">
         <LongDescription>
           CFE_ES_AppInfo_t is a structure that is used to provide
@@ -192,21 +173,6 @@
                \cfetlmmnemonic  \ES_ADDRVALID
             </LongDescription>
           </Entry>
-          <Entry name="Code" type="" shortDescription="Struct containing the Address of the Application Code Segment and the Code Size of the Application">
-            <LongDescription>
-              \cfetlmmnemonic   \ES_CODE
-            </LongDescription>
-          </Entry>
-          <Entry name="Data" type="" shortDescription="Struct containing the Address of the Application Data Segment and the Data Size of the Application">
-            <LongDescription>
-              \cfetlmmnemonic   \ES_DATA
-            </LongDescription>
-          </Entry>
-          <Entry name="BSS" type="" shortDescription="Struct containing the Address of the Application BSS Segment and the BSS Size of the Application">
-            <LongDescription>
-              \cfetlmmnemonic   \ES_BSS
-            </LongDescription>
-          </Entry>
           <Entry name="StartAddress" type="BASE_TYPES/CpuAddress" shortDescription="The Start Address of the Application">
             <LongDescription>
                \cfetlmmnemonic  \ES_STARTADDR