Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-30 20:24:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

epiphany/include/rtems/score/types.h: Eliminate this file

Browse Source 
Updates #3327.
This commit is contained in:
Joel Sherrill
2018-03-12 14:29:38 -05:00
parent c98d4748b7
commit c83d16943c
3 changed files with 4 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/score/cpu/epiphany/headers.am
-1
View File
@@ -12,4 +12,3 @@ include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h
include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
include_rtems_score_HEADERS += include/rtems/score/epiphany-utility.h
include_rtems_score_HEADERS += include/rtems/score/epiphany.h
include_rtems_score_HEADERS += include/rtems/score/types.h
cpukit/score/cpu/epiphany/include/rtems/score/cpu.h
+4 -1
View File
@@ -39,8 +39,8 @@
extern "C" {
#endif
#include <rtems/score/basedefs.h>
#include <rtems/score/epiphany.h> /* pick up machine definitions */
#include <rtems/score/types.h>
#ifndef ASM
#include <rtems/bspIo.h>
#include <stdint.h>
@@ -864,6 +864,9 @@ static inline CPU_Counter_ticks _CPU_Counter_difference(
return second - first;
}
/** Type that can store a 32-bit integer or a pointer. */
typedef uintptr_t CPU_Uint32ptr;
#endif /* ASM */
#ifdef __cplusplus
cpukit/score/cpu/epiphany/include/rtems/score/types.h
-67
View File
@@ -1,67 +0,0 @@
/**
* @file
*
* @brief Epiphany Architecture Types API
*/
/*
* Copyright (c) 2015 University of York.
* Hesham ALMatary <hmka501@york.ac.uk>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _RTEMS_SCORE_TYPES_H
#define _RTEMS_SCORE_TYPES_H
#include <rtems/score/basedefs.h>
#ifndef ASM
#ifdef __cplusplus
extern "C" {
#endif
/**
* @addtogroup ScoreCPU
*/
/**@{**/
/*
* This section defines the basic types for this processor.
*/
/** Type that can store a 32-bit integer or a pointer. */
typedef uintptr_t CPU_Uint32ptr;
typedef void epiphany_isr;
typedef void ( *epiphany_isr_entry )( void );
/** @} */
#ifdef __cplusplus
}
#endif
#endif /* !ASM */
#endif