Revision 54:f1ef95efa5ad, committed 2014-11-27

Comitter:

mbed_official

Date:

Thu Nov 27 11:45:25 2014 +0000

Parent:

53:c35dab33c427

Child:

55:5f5ceea4fc8a

Commit message:

Synchronized with git revision 8a3087825b914b36a82ec694c2caf529295f8ad1

Full URL: https://github.com/mbedmicro/mbed/commit/8a3087825b914b36a82ec694c2caf529295f8ad1/

Targets: RZ_A1H - Fix RTOS build error (Cortex A)

Changed in this revision

--- a/rtx/TARGET_CORTEX_A/HAL_CM.c	Wed Nov 26 08:00:25 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-/*----------------------------------------------------------------------------
- *      RL-ARM - RTX
- *----------------------------------------------------------------------------
- *      Name:    HAL_CM.C
- *      Purpose: Hardware Abstraction Layer for Cortex-M
- *      Rev.:    V4.60
- *----------------------------------------------------------------------------
- *
- * Copyright (c) 1999-2009 KEIL, 2009-2012 ARM Germany GmbH
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - 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.
- *  - Neither the name of ARM  nor the names of its contributors may be used 
- *    to endorse or promote products derived from this software without 
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS AND 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.
- *---------------------------------------------------------------------------*/
-
-#include "rt_TypeDef.h"
-#include "RTX_Config.h"
-#include "rt_HAL_CM.h"
-
-
-/*----------------------------------------------------------------------------
- *      Global Variables
- *---------------------------------------------------------------------------*/
-
-#ifdef DBG_MSG
-BIT dbg_msg;
-#endif
-
-/*----------------------------------------------------------------------------
- *      Functions
- *---------------------------------------------------------------------------*/
-
-
-/*--------------------------- rt_init_stack ---------------------------------*/
-
-void rt_init_stack (P_TCB p_TCB, FUNCP task_body) {
-  /* Prepare TCB and saved context for a first time start of a task. */
-  U32 *stk,i,size;
-
-  /* Prepare a complete interrupt frame for first task start */
-  size = p_TCB->priv_stack >> 2;
-  if (size == 0) {
-    size = (U16)os_stackinfo >> 2;
-  }
-
-  /* Write to the top of stack. */
-  stk = &p_TCB->stack[size];
-
-  /* Auto correct to 8-byte ARM stack alignment. */
-  if ((U32)stk & 0x04) {
-    stk--;
-  }
-
-  stk -= 16;
-
-  /* Default xPSR and initial PC */
-  stk[15] = INITIAL_xPSR;
-  stk[14] = (U32)task_body;
-
-  /* Clear R4-R11,R0-R3,R12,LR registers. */
-  for (i = 0; i < 14; i++) {
-    stk[i] = 0;
-  }
-
-  /* Assign a void pointer to R0. */
-  stk[8] = (U32)p_TCB->msg;
-
-  /* Initial Task stack pointer. */
-  p_TCB->tsk_stack = (U32)stk;
-
-  /* Task entry point. */
-  p_TCB->ptask = task_body;
-
-  /* Set a magic word for checking of stack overflow. */
-  p_TCB->stack[0] = MAGIC_WORD;
-}
-
-
-/*--------------------------- rt_ret_val ----------------------------------*/
-
-static __inline U32 *rt_ret_regs (P_TCB p_TCB) {
-  /* Get pointer to task return value registers (R0..R3) in Stack */
-#if (__TARGET_FPU_VFP)
-  if (p_TCB->stack_frame) {
-    /* Extended Stack Frame: R4-R11,S16-S31,R0-R3,R12,LR,PC,xPSR,S0-S15,FPSCR */
-    return (U32 *)(p_TCB->tsk_stack + 8*4 + 16*4);
-  } else {
-    /* Basic Stack Frame: R4-R11,R0-R3,R12,LR,PC,xPSR */
-    return (U32 *)(p_TCB->tsk_stack + 8*4);
-  }
-#else
-  /* Stack Frame: R4-R11,R0-R3,R12,LR,PC,xPSR */
-  return (U32 *)(p_TCB->tsk_stack + 8*4);
-#endif
-}
-
-void rt_ret_val (P_TCB p_TCB, U32 v0) {
-  U32 *ret;
-
-  ret = rt_ret_regs(p_TCB);
-  ret[0] = v0;
-}
-
-void rt_ret_val2(P_TCB p_TCB, U32 v0, U32 v1) {
-  U32 *ret;
-
-  ret = rt_ret_regs(p_TCB);
-  ret[0] = v0;
-  ret[1] = v1;
-}
-
-
-/*--------------------------- dbg_init --------------------------------------*/
-
-#ifdef DBG_MSG
-void dbg_init (void) {
-  if ((DEMCR & DEMCR_TRCENA)     && 
-      (ITM_CONTROL & ITM_ITMENA) &&
-      (ITM_ENABLE & (1UL << 31))) {
-    dbg_msg = __TRUE;
-  }
-}
-#endif
-
-/*--------------------------- dbg_task_notify -------------------------------*/
-
-#ifdef DBG_MSG
-void dbg_task_notify (P_TCB p_tcb, BOOL create) {
-  while (ITM_PORT31_U32 == 0);
-  ITM_PORT31_U32 = (U32)p_tcb->ptask;
-  while (ITM_PORT31_U32 == 0);
-  ITM_PORT31_U16 = (create << 8) | p_tcb->task_id;
-}
-#endif
-
-/*--------------------------- dbg_task_switch -------------------------------*/
-
-#ifdef DBG_MSG
-void dbg_task_switch (U32 task_id) {
-  while (ITM_PORT31_U32 == 0);
-  ITM_PORT31_U8 = task_id;
-}
-#endif
-
-
-/*----------------------------------------------------------------------------
- * end of file
- *---------------------------------------------------------------------------*/
-

--- a/rtx/TARGET_CORTEX_A/rt_Timer.c	Wed Nov 26 08:00:25 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*----------------------------------------------------------------------------
- *      RL-ARM - RTX
- *----------------------------------------------------------------------------
- *      Name:    RT_TIMER.C
- *      Purpose: User timer functions
- *      Rev.:    V4.60
- *----------------------------------------------------------------------------
- *
- * Copyright (c) 1999-2009 KEIL, 2009-2012 ARM Germany GmbH
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - 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.
- *  - Neither the name of ARM  nor the names of its contributors may be used 
- *    to endorse or promote products derived from this software without 
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDERS AND 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.
- *---------------------------------------------------------------------------*/
-
-#include "rt_TypeDef.h"
-#include "RTX_Config.h"
-#include "rt_Timer.h"
-#include "rt_MemBox.h"
-
-
-/*----------------------------------------------------------------------------
- *      Global Variables
- *---------------------------------------------------------------------------*/
-
-/* User Timer list pointer */
-struct OS_XTMR os_tmr;
-
-/*----------------------------------------------------------------------------
- *      Functions
- *---------------------------------------------------------------------------*/
-
-/*--------------------------- rt_tmr_tick -----------------------------------*/
-
-void rt_tmr_tick (void) {
-  /* Decrement delta count of timer list head. Timers having the value of   */
-  /* zero are removed from the list and the callback function is called.    */
-  P_TMR p;
-
-  if (os_tmr.next == NULL) {
-    return;
-  }
-  os_tmr.tcnt--;
-  while (os_tmr.tcnt == 0 && (p = os_tmr.next) != NULL) {
-    /* Call a user provided function to handle an elapsed timer */
-    os_tmr_call (p->info);
-    os_tmr.tcnt = p->tcnt;
-    os_tmr.next = p->next;
-    rt_free_box ((U32 *)m_tmr, p);
-  }
-}
-
-/*--------------------------- rt_tmr_create ---------------------------------*/
-
-OS_ID rt_tmr_create (U16 tcnt, U16 info)  {
-  /* Create an user timer and put it into the chained timer list using      */
-  /* a timeout count value of "tcnt". User parameter "info" is used as a    */
-  /* parameter for the user provided callback function "os_tmr_call ()".    */
-  P_TMR p_tmr, p;
-  U32 delta,itcnt = tcnt;
-
-  if (tcnt == 0 || m_tmr == NULL)  {
-    return (NULL);
-  }
-  p_tmr = rt_alloc_box ((U32 *)m_tmr);
-  if (!p_tmr)  {
-    return (NULL);
-  }
-  p_tmr->info = info;
-  p = (P_TMR)&os_tmr;
-  delta = p->tcnt;
-  while (delta < itcnt && p->next != NULL) {
-    p = p->next;
-    delta += p->tcnt;
-  }
-  /* Right place found, insert timer into the list */
-  p_tmr->next = p->next;
-  p_tmr->tcnt = (U16)(delta - itcnt);
-  p->next = p_tmr;
-  p->tcnt -= p_tmr->tcnt;
-  return (p_tmr);
-}
-
-/*--------------------------- rt_tmr_kill -----------------------------------*/
-
-OS_ID rt_tmr_kill (OS_ID timer)  {
-  /* Remove user timer from the chained timer list. */
-  P_TMR p, p_tmr;
-
-  p_tmr = (P_TMR)timer;
-  p = (P_TMR)&os_tmr;
-  /* Search timer list for requested timer */
-  while (p->next != p_tmr)  {
-    if (p->next == NULL) {
-      /* Failed, "timer" is not in the timer list */
-      return (p_tmr);
-    }
-    p = p->next;
-  }
-  /* Timer was found, remove it from the list */
-  p->next = p_tmr->next;
-  p->tcnt += p_tmr->tcnt;
-  rt_free_box ((U32 *)m_tmr, p_tmr);
-  /* Timer killed */
-  return (NULL);
-}
-
-/*----------------------------------------------------------------------------
- * end of file
- *---------------------------------------------------------------------------*/