Skip to content

Commit

Permalink
Squashed 'drivers/fpga_ip/CoreTimer/' changes from 6bc8d2c..40b2d35
Browse files Browse the repository at this point in the history
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
  • Loading branch information
p-owens committed Jul 3, 2023
1 parent 189b1c0 commit 67e24fe
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 42 deletions.
2 changes: 2 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@Library('automated-testing-library') _
pipelineSoftIPSrc()
13 changes: 7 additions & 6 deletions core_timer.c
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
38 changes: 6 additions & 32 deletions core_timer.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions coretimer_regs.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit 67e24fe

Please sign in to comment.