From 8f2f08091a7a20ecd33dd9feb56b4b00ad623f3e Mon Sep 17 00:00:00 2001 From: lucianomartin Date: Fri, 3 Nov 2023 16:16:06 +0000 Subject: [PATCH 1/4] Remove duplicated lines --- .../src/individual_tests/uart/local/tx_write_rx_read_test.c | 1 - test/rtos_drivers/wifi/filesystem_support/wifi_profile.py | 1 - xmos_cmake_toolchain | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/rtos_drivers/hil_add/src/individual_tests/uart/local/tx_write_rx_read_test.c b/test/rtos_drivers/hil_add/src/individual_tests/uart/local/tx_write_rx_read_test.c index e8f853cc..7067a537 100644 --- a/test/rtos_drivers/hil_add/src/individual_tests/uart/local/tx_write_rx_read_test.c +++ b/test/rtos_drivers/hil_add/src/individual_tests/uart/local/tx_write_rx_read_test.c @@ -1,6 +1,5 @@ // Copyright 2023 XMOS LIMITED. // This Software is subject to the terms of the XMOS Public Licence: Version 1. -// This Software is subject to the terms of the XMOS Public Licence: Version 1. /* System headers */ #include diff --git a/test/rtos_drivers/wifi/filesystem_support/wifi_profile.py b/test/rtos_drivers/wifi/filesystem_support/wifi_profile.py index fc300fb1..9887a892 100755 --- a/test/rtos_drivers/wifi/filesystem_support/wifi_profile.py +++ b/test/rtos_drivers/wifi/filesystem_support/wifi_profile.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # Copyright 2020-2023 XMOS LIMITED. # This Software is subject to the terms of the XMOS Public Licence: Version 1. -# This Software is subject to the terms of the XMOS Public Licence: Version 1. import getpass import struct diff --git a/xmos_cmake_toolchain b/xmos_cmake_toolchain index ea6b9c4b..e577fbcf 160000 --- a/xmos_cmake_toolchain +++ b/xmos_cmake_toolchain @@ -1 +1 @@ -Subproject commit ea6b9c4b7bd99044953b7dcdecc9768e737a5635 +Subproject commit e577fbcf147346264dbe25f82c5cc0e46e648cd6 From f6b4274b60dc7a7f3890e8f19fb771fe26b4a34d Mon Sep 17 00:00:00 2001 From: lucianomartin Date: Fri, 3 Nov 2023 16:16:42 +0000 Subject: [PATCH 2/4] Undo change --- xmos_cmake_toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmos_cmake_toolchain b/xmos_cmake_toolchain index e577fbcf..ea6b9c4b 160000 --- a/xmos_cmake_toolchain +++ b/xmos_cmake_toolchain @@ -1 +1 @@ -Subproject commit e577fbcf147346264dbe25f82c5cc0e46e648cd6 +Subproject commit ea6b9c4b7bd99044953b7dcdecc9768e737a5635 From afb0aff3e0b6f5d9d555ef2da63216ed2a95e6e0 Mon Sep 17 00:00:00 2001 From: lucianomartin Date: Fri, 3 Nov 2023 16:21:59 +0000 Subject: [PATCH 3/4] Remove XMOS license --- .xmos_ignore_source_check | 1 + modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c | 4 +--- modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.xmos_ignore_source_check b/.xmos_ignore_source_check index 8ad078c7..b667374e 100644 --- a/.xmos_ignore_source_check +++ b/.xmos_ignore_source_check @@ -1,4 +1,5 @@ modules/FreeRTOS +mqtt/FreeRTOS modules/drivers/wifi fatfs_mkimage/argtable/ fatfs_mkimage/src/tinydir.h diff --git a/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c b/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c index b972ea70..b5239a20 100644 --- a/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c +++ b/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c @@ -1,5 +1,3 @@ -// Copyright 2020-2023 XMOS LIMITED. -// This Software is subject to the terms of the XMOS Public Licence: Version 1. /******************************************************************************* * Copyright (c) 2014, 2015 IBM Corp. * @@ -29,7 +27,7 @@ #include "mbedtls/pk.h" #include "mbedtls_support.h" -/* Allow application override +/* Allow application override * This stack requirement will vary based on network port, tls configuration, etc. */ #ifndef MQTT_TASK_STACK_SIZE diff --git a/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.h b/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.h index b6ef2d79..dd64c391 100644 --- a/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.h +++ b/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.h @@ -1,5 +1,3 @@ -// Copyright 2020-2023 XMOS LIMITED. -// This Software is subject to the terms of the XMOS Public Licence: Version 1. /******************************************************************************* * Copyright (c) 2014, 2015 IBM Corp. * From 64f401ab1630be54d726deb6fab973246ae130d8 Mon Sep 17 00:00:00 2001 From: lucianomartin Date: Fri, 3 Nov 2023 16:25:20 +0000 Subject: [PATCH 4/4] Undo change --- modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c b/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c index b5239a20..ba1de22b 100644 --- a/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c +++ b/modules/sw_services/mqtt/FreeRTOS/MQTTFreeRTOS.c @@ -27,7 +27,7 @@ #include "mbedtls/pk.h" #include "mbedtls_support.h" -/* Allow application override +/* Allow application override * This stack requirement will vary based on network port, tls configuration, etc. */ #ifndef MQTT_TASK_STACK_SIZE