andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9257 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
Giovanni Di Sirio 2016-04-09 11:10:04 +00:00
parent 9674afc283
commit 5f5901d75b
3 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/Makefile
View File

@ -115,6 +115,7 @@ CSRC = $(STARTUPSRC) \
$(BOARDSRC) \
$(TESTSRC) \
$(NASAOSALSRC) \
$(CHIBIOS)/os/common/abstractions/nasa_osal/lib/cfe_psp_chibios.c \
main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -146,7 +147,7 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(NASAOSALINC)
$(NASAOSALINC) $(CHIBIOS)/os/common/abstractions/nasa_osal/lib
#
# Project, sources and paths

71
os/common/abstractions/nasa_osal/lib/cfe_psp_chibios.c Normal file
View File

@ -0,0 +1,71 @@
/*
ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
/**
* @file cfe_psp_chibios.c
* @brief CFE PSP module code.
*
* @addtogroup nasa_cfe_psp
* @{
*/
#include "ch.h"
#include "common_types.h"
#include "osapi.h"
/*===========================================================================*/
/* Module local definitions. */
/*===========================================================================*/
/*===========================================================================*/
/* Module exported variables. */
/*===========================================================================*/
/*===========================================================================*/
/* Module local types. */
/*===========================================================================*/
/*===========================================================================*/
/* Module local variables. */
/*===========================================================================*/
/*===========================================================================*/
/* Module local functions. */
/*===========================================================================*/
/*===========================================================================*/
/* Module exported functions. */
/*===========================================================================*/
/**
* @brief Provides a common interface to the processor reset.
* @note Not currently implemented.
*/
void CFE_PSP_Restart(uint32 reset_type) {
(void)reset_type;
}
/**
* @brief Generic panic handler.
*/
void CFE_PSP_Panic(int32 ErrorCode) {
chSysHalt((char *)ErrorCode);
}
/** @} */

2
os/common/abstractions/nasa_osal/src/osapi.c
View File

@ -2120,7 +2120,7 @@ int32 OS_TaskGetIdByName(uint32 *task_id, const char *task_name) {
*/
int32 OS_TaskGetInfo(uint32 task_id, OS_task_prop_t *task_prop) {
thread_t *tp = (thread_t *)task_id;
size_t wasize = (size_t)tp - (size_t)tp->stklimit + sizeof (thread_t);
size_t wasize = (size_t)tp - (size_t)tp->wabase + sizeof (thread_t);
/* NULL pointer checks.*/
if (task_prop == NULL) {