From 67e24fe39d161854dff80daaff5f6f9d3e8175e0 Mon Sep 17 00:00:00 2001
From: Patrick Owens <Patrick.Owens@microchip.com>
Date: Mon, 3 Jul 2023 09:47:48 +0100
Subject: [PATCH] Squashed 'drivers/fpga_ip/CoreTimer/' changes from
 6bc8d2c..40b2d35

40b2d35 Add Jenkinsfile
REVERT: 6bc8d2c coretimer - update header file inclusion path to support legacy and improved project directory structure
REVERT: 4d699b3 coretimer - Copyright info update

git-subtree-dir: drivers/fpga_ip/CoreTimer
git-subtree-split: 40b2d35ee563f398fe859b18ccd108cdf71a69d3
---
 Jenkinsfile      |  2 ++
 core_timer.c     | 13 +++++++------
 core_timer.h     | 38 ++++++--------------------------------
 coretimer_regs.h |  8 ++++----
 4 files changed, 19 insertions(+), 42 deletions(-)
 create mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..3f0f8f4
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,2 @@
+@Library('automated-testing-library') _
+pipelineSoftIPSrc()
\ No newline at end of file
diff --git a/core_timer.c b/core_timer.c
index bd6272f..e2d9f12 100644
--- a/core_timer.c
+++ b/core_timer.c
@@ -1,15 +1,16 @@
 /*******************************************************************************
- * (c) Copyright 2007-2022 Microchip FPGA Embedded Systems Solutions.
+ * (c) Copyright 2007-2018 Microsemi SoC Products Group. All rights reserved.
  * 
- * @file core_timer.c
- * @author Microchip FPGA Embedded Systems Solutions
- * @brief CoreTimer driver implementation. See file "core_timer.h" for 
- * description of the functions implemented in this file.
+ * CoreTimer driver implementation.
  * 
+ * SVN $Revision$
+ * SVN $Date$
  */
- 
+
 #include "core_timer.h"
 #include "coretimer_regs.h"
+#include "hal.h"
+#include "hal_assert.h"
 
 #ifndef NDEBUG
 static timer_instance_t* NULL_timer_instance;
diff --git a/core_timer.h b/core_timer.h
index 8117a80..cbf43e7 100644
--- a/core_timer.h
+++ b/core_timer.h
@@ -1,41 +1,15 @@
 /*******************************************************************************
- * (c) Copyright 2007-2022 Microchip FPGA Embedded Systems Solutions.
+ * (c) Copyright 2007-2018 Microsemi SoC Products Group. All rights reserved.
  * 
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file core_timer.h
- * @author Microchip FPGA Embedded Systems Solutions
- * @brief This file contains the application programming interface for the 
- * CoreTimer bare metal driver.
- *
+ * CoreTimer public API.
+ * 
+ * SVN $Revision$
+ * SVN $Date$
  */
 #ifndef CORE_TIMER_H_
 #define CORE_TIMER_H_
 
-#ifndef LEGACY_DIR_STRUCTURE
-#include "hal/hal.h"
-
-#else
-#include "hal.h"
-#endif
+#include "cpu_types.h"
 
 /***************************************************************************//**
  * The following definitions are used to select the CoreTimer driver operating
diff --git a/coretimer_regs.h b/coretimer_regs.h
index 350861d..6aea5db 100644
--- a/coretimer_regs.h
+++ b/coretimer_regs.h
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * (c) Copyright 2007-2022 Microchip FPGA Embedded Systems Solutions.
+ * (c) Copyright 2007-2018 Microsemi SoC Products Group. All rights reserved.
  * 
- * @file coretimer_regs.h
- * @author Microchip FPGA Embedded Systems Solutions
- * @brief CoreTimer register definitions
+ * SVN $Revision$
+ * SVN $Date$
  */
+
 #ifndef __CORE_TIMER_REGISTERS
 #define __CORE_TIMER_REGISTERS  1