This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit a53ac351f6a0b7518138e1b27dd1fc3e616509ef
Author: Alin Jerpelea <alin.jerpe...@sony.com>
AuthorDate: Fri Dec 20 05:58:52 2024 +0100
modbus: migrate to SPDX identifier
Most tools used for compliance and SBOM generation use SPDX identifiers
This change brings us a step closer to an easy SBOM generation.
Signed-off-by: Alin Jerpelea <alin.jerpe...@sony.com>
---
modbus/CMakeLists.txt | 20 +-------------------
modbus/Make.defs | 2 ++
modbus/Makefile | 2 ++
modbus/ascii/Make.defs | 2 ++
modbus/ascii/mbascii.c | 5 ++---
modbus/ascii/mbascii.h | 5 ++---
modbus/functions/Make.defs | 2 ++
modbus/functions/mbfunccoils.c | 5 ++---
modbus/functions/mbfunccoils_m.c | 5 ++---
modbus/functions/mbfuncdiag.c | 5 ++---
modbus/functions/mbfuncdisc.c | 5 ++---
modbus/functions/mbfuncdisc_m.c | 5 ++---
modbus/functions/mbfuncholding.c | 5 ++---
modbus/functions/mbfuncholding_m.c | 5 ++---
modbus/functions/mbfuncinput.c | 5 ++---
modbus/functions/mbfuncinput_m.c | 5 ++---
modbus/functions/mbfuncother.c | 5 ++---
modbus/functions/mbutils.c | 5 ++---
modbus/mb.c | 5 ++---
modbus/mb_m.c | 4 ++--
modbus/nuttx/Make.defs | 2 ++
modbus/nuttx/port.h | 5 ++---
modbus/nuttx/portevent.c | 5 ++---
modbus/nuttx/portevent_m.c | 7 +++----
modbus/nuttx/portother.c | 5 ++---
modbus/nuttx/portother_m.c | 5 ++---
modbus/nuttx/portserial.c | 5 ++---
modbus/nuttx/portserial_m.c | 7 +++----
modbus/nuttx/porttimer.c | 5 ++---
modbus/nuttx/porttimer_m.c | 7 +++----
modbus/rtu/Make.defs | 2 ++
modbus/rtu/mbcrc.c | 5 ++---
modbus/rtu/mbcrc.h | 5 ++---
modbus/rtu/mbrtu.c | 5 ++---
modbus/rtu/mbrtu.h | 5 ++---
modbus/rtu/mbrtu_m.c | 5 ++---
modbus/rtu/mbrtu_m.h | 5 ++---
modbus/tcp/Make.defs | 2 ++
modbus/tcp/mbtcp.c | 5 ++---
modbus/tcp/mbtcp.h | 5 ++---
40 files changed, 82 insertions(+), 117 deletions(-)
diff --git a/modbus/CMakeLists.txt b/modbus/CMakeLists.txt
index 27acd1fbe..ca4f56b5e 100644
--- a/modbus/CMakeLists.txt
+++ b/modbus/CMakeLists.txt
@@ -1,25 +1,7 @@
#
##############################################################################
# apps/modbus/CMakeLists.txt
#
-# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
-# license agreements. See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership. The ASF licenses this
-# file to you under the Apache License, Version 2.0 (the "License"); you may
not
-# use this file except in compliance with the License. You may obtain a copy
of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-#
-#
##############################################################################
-
-#
##############################################################################
-# apps/modbus/CMakeLists.txt
+# SPDX-License-Identifier: Apache-2.0
#
# Licensed to the Apache Software Foundation (ASF) under one or more
contributor
# license agreements. See the NOTICE file distributed with this work for
diff --git a/modbus/Make.defs b/modbus/Make.defs
index 99d262bf0..10fd914c3 100644
--- a/modbus/Make.defs
+++ b/modbus/Make.defs
@@ -1,6 +1,8 @@
############################################################################
# apps/modbus/Make.defs
#
+# SPDX-License-Identifier: Apache-2.0
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
diff --git a/modbus/Makefile b/modbus/Makefile
index 3589d9017..ce7eac1d5 100644
--- a/modbus/Makefile
+++ b/modbus/Makefile
@@ -1,6 +1,8 @@
############################################################################
# apps/modbus/Makefile
#
+# SPDX-License-Identifier: Apache-2.0
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
diff --git a/modbus/ascii/Make.defs b/modbus/ascii/Make.defs
index 4d671d314..972cd903f 100644
--- a/modbus/ascii/Make.defs
+++ b/modbus/ascii/Make.defs
@@ -1,6 +1,8 @@
############################################################################
# apps/modbus/ascii/Make.defs
#
+# SPDX-License-Identifier: Apache-2.0
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
diff --git a/modbus/ascii/mbascii.c b/modbus/ascii/mbascii.c
index a4bf5a186..2394ecca5 100644
--- a/modbus/ascii/mbascii.c
+++ b/modbus/ascii/mbascii.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/ascii/mbascii.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/ascii/mbascii.h b/modbus/ascii/mbascii.h
index 71d63117b..355484103 100644
--- a/modbus/ascii/mbascii.h
+++ b/modbus/ascii/mbascii.h
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/ascii/mbascii.h
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/Make.defs b/modbus/functions/Make.defs
index 979cf5d79..a4e6ea90c 100644
--- a/modbus/functions/Make.defs
+++ b/modbus/functions/Make.defs
@@ -1,6 +1,8 @@
############################################################################
# apps/modbus/functions/Make.defs
#
+# SPDX-License-Identifier: Apache-2.0
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
diff --git a/modbus/functions/mbfunccoils.c b/modbus/functions/mbfunccoils.c
index 0be07d56f..b742de064 100644
--- a/modbus/functions/mbfunccoils.c
+++ b/modbus/functions/mbfunccoils.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/functions/mbfunccoils.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfunccoils_m.c b/modbus/functions/mbfunccoils_m.c
index 710504268..c258d757d 100644
--- a/modbus/functions/mbfunccoils_m.c
+++ b/modbus/functions/mbfunccoils_m.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/functions/mbfunccoils_m.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (C) 2013 Armink <armink....@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2013 Armink <armink....@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfuncdiag.c b/modbus/functions/mbfuncdiag.c
index a6ee8fa68..b34581e6e 100644
--- a/modbus/functions/mbfuncdiag.c
+++ b/modbus/functions/mbfuncdiag.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/functions/mbfuncdiag.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfuncdisc.c b/modbus/functions/mbfuncdisc.c
index 058bdd643..3f2907277 100644
--- a/modbus/functions/mbfuncdisc.c
+++ b/modbus/functions/mbfuncdisc.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/functions/mbfuncdisc.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfuncdisc_m.c b/modbus/functions/mbfuncdisc_m.c
index 24b620cb7..29386996d 100644
--- a/modbus/functions/mbfuncdisc_m.c
+++ b/modbus/functions/mbfuncdisc_m.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/functions/mbfuncdisc_m.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (C) 2013 Armink <armink....@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2013 Armink <armink....@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfuncholding.c b/modbus/functions/mbfuncholding.c
index 1f8b99898..964db7a79 100644
--- a/modbus/functions/mbfuncholding.c
+++ b/modbus/functions/mbfuncholding.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/functions/mbfuncholding.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfuncholding_m.c
b/modbus/functions/mbfuncholding_m.c
index 040782563..b017be715 100644
--- a/modbus/functions/mbfuncholding_m.c
+++ b/modbus/functions/mbfuncholding_m.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/functions/mbfuncholding_m.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (C) 2013 Armink <armink....@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2013 Armink <armink....@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfuncinput.c b/modbus/functions/mbfuncinput.c
index 73eebb056..3874cf966 100644
--- a/modbus/functions/mbfuncinput.c
+++ b/modbus/functions/mbfuncinput.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/functions/mbfuncinput.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfuncinput_m.c b/modbus/functions/mbfuncinput_m.c
index b9577a5cb..4ca7e8113 100644
--- a/modbus/functions/mbfuncinput_m.c
+++ b/modbus/functions/mbfuncinput_m.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/functions/mbfuncinput_m.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (C) 2013 Armink <armink....@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2013 Armink <armink....@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbfuncother.c b/modbus/functions/mbfuncother.c
index b0ebaaa59..ede3fae0c 100644
--- a/modbus/functions/mbfuncother.c
+++ b/modbus/functions/mbfuncother.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/functions/mbfuncother.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/functions/mbutils.c b/modbus/functions/mbutils.c
index 3db155eb0..816fbe8b2 100644
--- a/modbus/functions/mbutils.c
+++ b/modbus/functions/mbutils.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/functions/mbutils.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/mb.c b/modbus/mb.c
index 7a8155779..16f5567d8 100644
--- a/modbus/mb.c
+++ b/modbus/mb.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/mb.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/mb_m.c b/modbus/mb_m.c
index 16323d770..108fdf678 100644
--- a/modbus/mb_m.c
+++ b/modbus/mb_m.c
@@ -1,8 +1,8 @@
/****************************************************************************
* FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
*
- * Copyright (C) 2013 Armink <armink....@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2013 Armink <armink....@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/Make.defs b/modbus/nuttx/Make.defs
index 11f82abac..7960ecee4 100644
--- a/modbus/nuttx/Make.defs
+++ b/modbus/nuttx/Make.defs
@@ -1,6 +1,8 @@
############################################################################
# apps/modbus/nuttx/Make.defs
#
+# SPDX-License-Identifier: Apache-2.0
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
diff --git a/modbus/nuttx/port.h b/modbus/nuttx/port.h
index 4b75aceab..aada110ed 100644
--- a/modbus/nuttx/port.h
+++ b/modbus/nuttx/port.h
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/nuttx/port.h
*
- * FreeModbus Library: NuttX Port
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/portevent.c b/modbus/nuttx/portevent.c
index d45c8bad6..bce6e9c54 100644
--- a/modbus/nuttx/portevent.c
+++ b/modbus/nuttx/portevent.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/nuttx/portevent.c
*
- * FreeModbus Library: NuttX Port
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/portevent_m.c b/modbus/nuttx/portevent_m.c
index 2f6143943..fb40f4dee 100644
--- a/modbus/nuttx/portevent_m.c
+++ b/modbus/nuttx/portevent_m.c
@@ -1,10 +1,9 @@
/****************************************************************************
* apps/modbus/nuttx/portevent_m.c
*
- * FreeModbus Library: NuttX Modbus Master Port
- * Original work (c) 2006 Christian Walter <wo...@sil.at>
- * Modified work (c) 2016 Vytautas Lukenskas <lukev...@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
+ * SPDX-FileCopyrightText: 2016 Vytautas Lukenskas <lukev...@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/portother.c b/modbus/nuttx/portother.c
index 7cb453819..797ede0dc 100644
--- a/modbus/nuttx/portother.c
+++ b/modbus/nuttx/portother.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/nuttx/portother.c
*
- * FreeModbus Library: NuttX Port
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/portother_m.c b/modbus/nuttx/portother_m.c
index 799cef6c6..1d703c192 100644
--- a/modbus/nuttx/portother_m.c
+++ b/modbus/nuttx/portother_m.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/nuttx/portother_m.c
*
- * FreeModbus Library: NuttX Port
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/portserial.c b/modbus/nuttx/portserial.c
index 3bf887940..35155a732 100644
--- a/modbus/nuttx/portserial.c
+++ b/modbus/nuttx/portserial.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/nuttx/portserial.c
*
- * FreeModbus Library: NuttX Port
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/portserial_m.c b/modbus/nuttx/portserial_m.c
index ea3ad3174..98c11eb28 100644
--- a/modbus/nuttx/portserial_m.c
+++ b/modbus/nuttx/portserial_m.c
@@ -1,10 +1,9 @@
/****************************************************************************
* apps/modbus/nuttx/portserial_m.c
*
- * FreeModbus Library: NuttX Modbus Master Port
- * Original work (c) 2006 Christian Walter <wo...@sil.at>
- * Modified work (c) 2016 Vytautas Lukenskas <lukev...@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
+ * SPDX-FileCopyrightText: 2016 Vytautas Lukenskas <lukev...@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/porttimer.c b/modbus/nuttx/porttimer.c
index 2a68654cf..1685df6ee 100644
--- a/modbus/nuttx/porttimer.c
+++ b/modbus/nuttx/porttimer.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/nuttx/porttimer.c
*
- * FreeModbus Library: NuttX Port
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/nuttx/porttimer_m.c b/modbus/nuttx/porttimer_m.c
index 96b355cc3..1e878aa00 100644
--- a/modbus/nuttx/porttimer_m.c
+++ b/modbus/nuttx/porttimer_m.c
@@ -1,10 +1,9 @@
/****************************************************************************
* apps/modbus/nuttx/porttimer_m.c
*
- * FreeModbus Library: NuttX Modbus Master Port
- * Original work (c) 2006 Christian Walter <wo...@sil.at>
- * Modified work (c) 2016 Vytautas Lukenskas <lukev...@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
+ * SPDX-FileCopyrightText: 2016 Vytautas Lukenskas <lukev...@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/rtu/Make.defs b/modbus/rtu/Make.defs
index bc5ce1829..ac4ab7e2a 100644
--- a/modbus/rtu/Make.defs
+++ b/modbus/rtu/Make.defs
@@ -1,6 +1,8 @@
############################################################################
# apps/modbus/rtu/Make.defs
#
+# SPDX-License-Identifier: Apache-2.0
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
diff --git a/modbus/rtu/mbcrc.c b/modbus/rtu/mbcrc.c
index 5996f6408..dcaddec71 100644
--- a/modbus/rtu/mbcrc.c
+++ b/modbus/rtu/mbcrc.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/rtu/mbcrc.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/rtu/mbcrc.h b/modbus/rtu/mbcrc.h
index 707feb8ef..56d3db5f8 100644
--- a/modbus/rtu/mbcrc.h
+++ b/modbus/rtu/mbcrc.h
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modutils/rtu/mbcrc.h
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/rtu/mbrtu.c b/modbus/rtu/mbrtu.c
index eb0d57d62..cc6b1088e 100644
--- a/modbus/rtu/mbrtu.c
+++ b/modbus/rtu/mbrtu.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/rtu/mbrtu.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/rtu/mbrtu.h b/modbus/rtu/mbrtu.h
index 7ef009f17..418311bff 100644
--- a/modbus/rtu/mbrtu.h
+++ b/modbus/rtu/mbrtu.h
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/rtu/mbrtu.h
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/rtu/mbrtu_m.c b/modbus/rtu/mbrtu_m.c
index 3fde50670..858274729 100644
--- a/modbus/rtu/mbrtu_m.c
+++ b/modbus/rtu/mbrtu_m.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/rtu/mbrtu_m.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2013 China Beijing Armink <armink....@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2013 China Beijing Armink <armink....@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/rtu/mbrtu_m.h b/modbus/rtu/mbrtu_m.h
index 2a58a3130..5fb2eee43 100644
--- a/modbus/rtu/mbrtu_m.h
+++ b/modbus/rtu/mbrtu_m.h
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/rtu/mbrtu_m.h
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2013 China Beijing Armink <armink....@gmail.com>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2013 China Beijing Armink <armink....@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/tcp/Make.defs b/modbus/tcp/Make.defs
index 9503ca16b..dfd220f41 100644
--- a/modbus/tcp/Make.defs
+++ b/modbus/tcp/Make.defs
@@ -1,6 +1,8 @@
############################################################################
# apps/modbus/tcp/Make.defs
#
+# SPDX-License-Identifier: Apache-2.0
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
diff --git a/modbus/tcp/mbtcp.c b/modbus/tcp/mbtcp.c
index 67d503ec7..ca9c41c43 100644
--- a/modbus/tcp/mbtcp.c
+++ b/modbus/tcp/mbtcp.c
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/tcp/mbtcp.c
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/modbus/tcp/mbtcp.h b/modbus/tcp/mbtcp.h
index b44de01f1..39fa9c8ce 100644
--- a/modbus/tcp/mbtcp.h
+++ b/modbus/tcp/mbtcp.h
@@ -1,9 +1,8 @@
/****************************************************************************
* apps/modbus/tcp/mbtcp.h
*
- * FreeModbus Library: A portable Modbus implementation for Modbus ASCII/RTU.
- * Copyright (c) 2006 Christian Walter <wo...@sil.at>
- * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SPDX-FileCopyrightText: 2006 Christian Walter <wo...@sil.at>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
