Skip to content

Commit 54fc6fc

Browse files
committed
Fix #131, Remove duplicate header + includes from ds_dispatch.c
1 parent 7404b97 commit 54fc6fc

3 files changed

Lines changed: 10 additions & 51 deletions

File tree

fsw/inc/ds_extern_typedefs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/************************************************************************
2-
* NASA Docket No. GSC-18,447-1, and identified as “CFS CFDP (CF)
3-
* Application version 3.0.0
2+
* NASA Docket No. GSC-18,917-1, and identified as “CFS Data Storage
3+
* (DS) application version 2.6.1
44
*
55
* Copyright (c) 2019 United States Government as represented by the
66
* Administrator of the National Aeronautics and Space Administration.

fsw/inc/ds_msg.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,8 @@ typedef struct
185185

186186
/**
187187
* \brief Set Ena/Dis State For Destination File Table Entry
188-
* \brief Set Filename Type Payload
189188
*
190-
* Used with #DS_DestTypeCmd_t
189+
* Used with #DS_DestStateCmd_t
191190
*
192191
* For command details see #DS_SET_DEST_STATE_CC
193192
*/

fsw/src/ds_dispatch.c

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,3 @@
1-
/************************************************************************
2-
* NASA Docket No. GSC-18,917-1, and identified as “CFS Data Storage
3-
* (DS) application version 2.6.1”
4-
*
5-
* Copyright (c) 2021 United States Government as represented by the
6-
* Administrator of the National Aeronautics and Space Administration.
7-
* All Rights Reserved.
8-
*
9-
* Licensed under the Apache License, Version 2.0 (the "License"); you may
10-
* not use this file except in compliance with the License. You may obtain
11-
* a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing, software
14-
* distributed under the License is distributed on an "AS IS" BASIS,
15-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16-
* See the License for the specific language governing permissions and
17-
* limitations under the License.
18-
************************************************************************/
19-
20-
/**
21-
* @file
22-
* The CFS Data Storage (DS) Application file containing the application
23-
* initialization routines, the main routine and the command interface.
24-
*/
25-
26-
#include "cfe.h"
27-
#include "ds_perfids.h"
28-
#include "ds_msgids.h"
29-
#include "ds_platform_cfg.h"
30-
#include "ds_dispatch.h"
31-
#include "ds_msg.h"
32-
#include "ds_app.h"
33-
#include "ds_cmds.h"
34-
#include "ds_file.h"
35-
#include "ds_table.h"
36-
#include "ds_events.h"
37-
#include "ds_msgdefs.h"
38-
39-
#include <stdio.h>
40-
411
/************************************************************************
422
* NASA Docket No. GSC-18,917-1, and identified as “CFS Data Storage
433
* (DS) application version 2.6.1”
@@ -65,17 +25,17 @@
6525
#include "cfe.h"
6626

6727
#include "ds_platform_cfg.h"
68-
#include "ds_verify.h"
6928

29+
#include "ds_app.h"
7030
#include "ds_appdefs.h"
71-
#include "ds_msgids.h"
31+
#include "ds_cmds.h"
32+
#include "ds_dispatch.h"
7233
#include "ds_events.h"
73-
7434
#include "ds_msg.h"
75-
#include "ds_app.h"
76-
#include "ds_cmds.h"
77-
78-
#include <stdio.h>
35+
#include "ds_msgdefs.h"
36+
#include "ds_msgids.h"
37+
#include "ds_platform_cfg.h"
38+
#include "ds_table.h"
7939

8040
bool DS_VerifyLength(const CFE_SB_Buffer_t *BufPtr, size_t ExpectedLength, uint16 FailEventID, const char *CommandName)
8141
{

0 commit comments

Comments
 (0)