Merge branch 'release' into release-main

analogdevicesinc · Oct 1, 2024 · 07b1c0e · 07b1c0e
2 parents aee8e41 + f8d2e36
commit 07b1c0e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,3 @@ mxc_version.h
 mxc_version.mk
 Packetcraft-ADI
 packetcraft-adi
-
diff --git a/Libraries/CMSIS/Device/Maxim/GCC/gcc.mk b/Libraries/CMSIS/Device/Maxim/GCC/gcc.mk
@@ -57,7 +57,6 @@ endif
 endif
 endif
 
-
 ifneq "$(wildcard $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk)" ""
 include $(MAXIM_PATH)/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk
 endif

diff --git a/Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c b/Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c
@@ -7,6 +7,8 @@
  *  Copyright (c) 2013-2019 Arm Ltd. All Rights Reserved.
  *
  *  Copyright (c) 2019-2020 Packetcraft, Inc.
+ *
+ *  Portions Copyright (c) 2024 Analog Devices, Inc.
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h b/Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h
@@ -7,6 +7,8 @@
  *  Copyright (c) 2013-2019 Arm Ltd. All Rights Reserved.
  *
  *  Copyright (c) 2019-2020 Packetcraft, Inc.
+ *
+ *  Portions Copyright (c) 2024 Analog Devices, Inc.
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

diff --git a/Libraries/Cordio/platform/include/pal_bb.h b/Libraries/Cordio/platform/include/pal_bb.h
@@ -7,6 +7,8 @@
  *  Copyright (c) 2016-2019 Arm Ltd. All Rights Reserved.
  *
  *  Copyright (c) 2019-2020 Packetcraft, Inc.
+ *
+ *  Portions Copyright (c) 2024 Analog Devices, Inc.
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -172,7 +174,6 @@ typedef struct {
 } PalBbPhyVersion_t;
 
 
-
 /**************************************************************************************************
   Function Declarations
 **************************************************************************************************/
@@ -346,8 +347,6 @@ static inline bool PalBbIsValidPrbsType(uint8_t maybeType)
     default:
         return false;
     }
-
-
 }
 
 /*! \} */ /* PAL_BB */