2011-07-15 Jennifer Averett <Jennifer.Averett@OARcorp.com>

* score/Makefile.am, score/preinstall.am,
	score/include/rtems/score/isr.h, score/include/rtems/score/percpu.h:
	Split isrlevel into its own file to avoid a circular dependancy in
	smp code.
	* score/include/rtems/score/isrlevel.h: New file.
This commit is contained in:
Jennifer Averett
2011-07-15 14:36:37 +00:00
parent 593fb9e3c5
commit df00777ccf
6 changed files with 57 additions and 6 deletions

View File

@@ -1,3 +1,11 @@
2011-07-15 Jennifer Averett <Jennifer.Averett@OARcorp.com>
* score/Makefile.am, score/preinstall.am,
score/include/rtems/score/isr.h, score/include/rtems/score/percpu.h:
Split isrlevel into its own file to avoid a circular dependancy in
smp code.
* score/include/rtems/score/isrlevel.h: New file.
2011-07-14 Gene Smith <gene.smith@siemens.com>
PR 1381/networking

View File

@@ -33,6 +33,7 @@ include_rtems_score_HEADERS += include/rtems/score/heap.h
include_rtems_score_HEADERS += include/rtems/score/protectedheap.h
include_rtems_score_HEADERS += include/rtems/score/interr.h
include_rtems_score_HEADERS += include/rtems/score/isr.h
include_rtems_score_HEADERS += include/rtems/score/isrlevel.h
include_rtems_score_HEADERS += include/rtems/score/object.h
include_rtems_score_HEADERS += include/rtems/score/percpu.h
include_rtems_score_HEADERS += include/rtems/score/priority.h

View File

@@ -40,12 +40,6 @@
extern "C" {
#endif
/**
* The following type defines the control block used to manage
* the interrupt level portion of the status register.
*/
typedef uint32_t ISR_Level;
/**
* The following type defines the type used to manage the vectors.
*/

View File

@@ -0,0 +1,43 @@
/**
* @file rtems/score/isrlevel.h
*
* This include file defines the ISR Level type. It exists to
* simplify include dependencies. It is part of the ISR Handler.
*/
/*
* COPYRIGHT (c) 1989-2011.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
* $Id$
*/
#ifndef _RTEMS_SCORE_ISR_LEVEL_h
#define _RTEMS_SCORE_ISR_LEVEL_h
#ifdef __cplusplus
extern "C" {
#endif
/**
* @addtogroup ScoreISR ISR Handler
*/
/**@{*/
/**
* The following type defines the control block used to manage
* the interrupt level portion of the status register.
*/
typedef uint32_t ISR_Level;
/**@}*/
#ifdef __cplusplus
}
#endif
#endif

View File

@@ -24,6 +24,7 @@
#ifdef ASM
#include <rtems/asm.h>
#else
#include <rtems/score/isrlevel.h>
#include <rtems/score/timestamp.h>
#if defined(RTEMS_SMP)
#include <rtems/score/smplock.h>

View File

@@ -99,6 +99,10 @@ $(PROJECT_INCLUDE)/rtems/score/isr.h: include/rtems/score/isr.h $(PROJECT_INCLUD
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isr.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isr.h
$(PROJECT_INCLUDE)/rtems/score/isrlevel.h: include/rtems/score/isrlevel.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/isrlevel.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/isrlevel.h
$(PROJECT_INCLUDE)/rtems/score/object.h: include/rtems/score/object.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.h