Skip to content

Commit b53a9ea

Browse files
author
Cruz Monrreal
authored
Merge pull request #7780 from artokin/nsrc510_p1
Rename nanostack configuration (.cfg) files
2 parents 36ee9b9 + 0ee4029 commit b53a9ea

40 files changed

+295
-110
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/* Config Flags for Ethernet Bootstrap */
19+
20+
#define HAVE_ETHERNET
21+
22+
#define HAVE_IPV6_ND
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
#define HAVE_LOCAL_SOCKET
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/* Config Flags for 6LoWPAN Border router */
19+
#include "cfg_lowpan_router.h"
20+
21+
#define HAVE_RPL_ROOT
22+
#define HAVE_RPL_DAO_HANDLING
23+
#define HAVE_6LOWPAN_BORDER_ROUTER
24+
#define WHITEBOARD
25+
#define HAVE_ND_PROXY
26+
#define MULTICAST_FORWARDING
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/* Config Flags for 6LoWPAN Host */
19+
#define HAVE_IPV6_ND
20+
#define HAVE_6LOWPAN_ND
21+
#define HAVE_MPL
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/* Config Flags for 6LoWPAN Router */
19+
#include "cfg_lowpan_host.h"
20+
21+
#define HAVE_6LOWPAN_ROUTER
22+
#define HAVE_RPL
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
#define HAVE_RF_TUNNEL
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
#include "cfg_thread_router.h"
19+
20+
#define HAVE_THREAD_BORDER_ROUTER
21+
#define HAVE_ND_PROXY
22+
#define MULTICAST_FORWARDING
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/* Thread feature is active with minimal functionality */
19+
#define HAVE_THREAD
20+
21+
#define HAVE_MPL
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
/**
19+
* Thread Full End Device configuration file.
20+
*/
21+
#include "cfg_thread_end_device.h"
22+
23+
/* Flag to enable Thread Neighbor discovery */
24+
#define HAVE_THREAD_NEIGHBOR_DISCOVERY
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright (c) 2016-2018, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
#include "cfg_thread_full_end_device.h"
19+
20+
/* Enable DHCP server functionality */
21+
#define HAVE_DHCPV6_SERVER
22+
23+
/* Flag for Thread router specific functionality */
24+
#define HAVE_THREAD_ROUTER
25+
26+
/* Flag to enable Thread leader capability */
27+
#define HAVE_THREAD_LEADER_SERVICE

features/nanostack/sal-stack-nanostack/source/configs/base/ethernet.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/local_socket.cfg

Lines changed: 0 additions & 1 deletion
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_border_router.cfg

Lines changed: 0 additions & 9 deletions
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_host.cfg

Lines changed: 0 additions & 4 deletions
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/lowpan_router.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/rf_tunnel.cfg

Lines changed: 0 additions & 1 deletion
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/thread_border_router.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/thread_end_device.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/thread_full_end_device.cfg

Lines changed: 0 additions & 7 deletions
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/base/thread_router.cfg

Lines changed: 0 additions & 11 deletions
This file was deleted.

features/nanostack/sal-stack-nanostack/source/configs/ethernet_host.cfg renamed to features/nanostack/sal-stack-nanostack/source/configs/cfg_ethernet_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, Arm Limited and affiliates.
2+
* Copyright (c) 2016, 2018, Arm Limited and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,6 @@
1616
*/
1717

1818

19-
#include "base/ethernet.cfg"
19+
#include "base/cfg_ethernet.h"
2020

2121
#define NO_RADV_TX

features/nanostack/sal-stack-nanostack/source/configs/generic.cfg renamed to features/nanostack/sal-stack-nanostack/source/configs/cfg_generic.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2016-2017, Arm Limited and affiliates.
2+
* Copyright (c) 2014, 2016-2018, Arm Limited and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +15,11 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include "base/thread_border_router.cfg"
19-
#include "base/ethernet.cfg"
20-
#include "base/lowpan_border_router.cfg"
21-
#include "base/local_socket.cfg"
22-
#include "base/rf_tunnel.cfg"
18+
#include "base/cfg_thread_border_router.h"
19+
#include "base/cfg_ethernet.h"
20+
#include "base/cfg_lowpan_border_router.h"
21+
#include "base/cfg_local_socket.h"
22+
#include "base/cfg_rf_tunnel.h"
2323

2424
#define FEA_TRACE_SUPPORT
2525
#define EXTRA_CONSISTENCY_CHECKS

features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router.cfg renamed to features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2016, Arm Limited and affiliates.
2+
* Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,9 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include "base/lowpan_border_router.cfg"
19-
#include "base/ethernet.cfg"
20-
#include "base/local_socket.cfg"
18+
#include "base/cfg_lowpan_border_router.h"
19+
#include "base/cfg_ethernet.h"
20+
#include "base/cfg_local_socket.h"
2121

2222
#define HAVE_AES
2323
#define FEA_TRACE_SUPPORT

features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel.cfg renamed to features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2017, Arm Limited and affiliates.
2+
* Copyright (c) 2015-2018, Arm Limited and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
1515
* limitations under the License.
1616
*/
1717
/* This is for linux router which use RF tunnel interface */
18-
#include "base/lowpan_border_router.cfg"
19-
#include "base/ethernet.cfg"
20-
#include "base/local_socket.cfg"
21-
#include "base/rf_tunnel.cfg"
18+
#include "base/cfg_lowpan_border_router.h"
19+
#include "base/cfg_ethernet.h"
20+
#include "base/cfg_local_socket.h"
21+
#include "base/cfg_rf_tunnel.h"
2222

2323
#define HAVE_AES
2424
#define FEA_TRACE_SUPPORT

features/nanostack/sal-stack-nanostack/source/configs/lowpan_border_router_rf_tunnel_ecc.cfg renamed to features/nanostack/sal-stack-nanostack/source/configs/cfg_lowpan_border_router_rf_tunnel_ecc.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2016, Arm Limited and affiliates.
2+
* Copyright (c) 2015-2016, 2018, Arm Limited and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,10 @@
1515
* limitations under the License.
1616
*/
1717
/* This is for linux router which use RF tunnel interface */
18-
#include "base/lowpan_border_router.cfg"
19-
#include "base/ethernet.cfg"
20-
#include "base/local_socket.cfg"
21-
#include "base/rf_tunnel.cfg"
18+
#include "base/cfg_lowpan_border_router.h"
19+
#include "base/cfg_ethernet.h"
20+
#include "base/cfg_local_socket.h"
21+
#include "base/cfg_rf_tunnel.h"
2222

2323
#define ECC
2424
#define HAVE_AES

0 commit comments

Comments
 (0)