Revision 312:2eb678194348, committed 2014-09-10

Comitter:

mbed_official

Date:

Wed Sep 10 14:15:06 2014 +0100

Parent:

311:70c5759967c1

Child:

313:b7d035234249

Commit message:

Synchronized with git revision 33434f3c4ac0ab9dd20761d6e2c627b6ef4f9274

Full URL: https://github.com/mbedmicro/mbed/commit/33434f3c4ac0ab9dd20761d6e2c627b6ef4f9274/

This reverts commit 99d14db8c172b775cffbfe65f8d9d0342cd9fba3.

Changed in this revision

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/bootloader_dfu/bootloader_util_arm.c	Tue Sep 09 11:30:06 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/* Copyright (c) 2013 Nordic Semiconductor. All Rights Reserved.
- *
- * The information contained herein is property of Nordic Semiconductor ASA.
- * Terms and conditions of usage are described in detail in NORDIC
- * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
- *
- * Licensees are granted free, non-transferable use of the information. NO
- * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
- * the file.
- *
- */
-
-#include "bootloader_util.h"
-#include <stdint.h>
-
-
-/**
- * @brief Function for aborting current handler mode and jump to to other application/bootloader.
- *
- * @details This functions will use the address provide (reset handler) to be executed after 
- *          handler mode is exited. It creates an initial stack to ensure correct reset behavior 
- *          when the reset handler is executed.
- *
- * @param[in]  reset_handler  Address of the reset handler to be executed when handler mode exits.
- *
- * @note This function must never be called directly from 'C' but is intended only to be used from 
- *       \ref bootloader_util_reset. This function will never return but issue a reset into 
- *       provided address.
- */
-__asm void isr_abort(uint32_t reset_handler)
-{
-xPSR_RESET      EQU 0x21000000  ; Default value of xPSR after System Reset.
-EXC_RETURN_CMD  EQU 0xFFFFFFF9  ; EXC_RETURN for ARM Cortex. When loaded to PC the current interrupt service routine (handler mode) willl exit and the stack will be popped. Execution will continue in thread mode.
-
-    LDR   R4,=MASK_ONES         ; Fill with ones before jumping to reset handling. We be popped as R12 when exiting ISR (Cleaning up the registers).
-    LDR   R5,=MASK_ONES         ; Fill with ones before jumping to reset handling. We be popped as LR when exiting ISR. Ensures no return to application.
-    MOV   R6, R0                ; Move address of reset handler to R6. Will be popped as PC when exiting ISR. Ensures the reset handler will be executed when exist ISR.
-    LDR   R7,=xPSR_RESET        ; Move reset value of xPSR to R7. Will be popped as xPSR when exiting ISR.
-    PUSH  {r4-r7}               ; Push everything to new stack to allow interrupt handler to fetch it on exiting the ISR.
-    
-    LDR   R4,=MASK_ZEROS        ; Fill with zeros before jumping to reset handling. We be popped as R0 when exiting ISR (Cleaning up of the registers).
-    LDR   R5,=MASK_ZEROS        ; Fill with zeros before jumping to reset handling. We be popped as R1 when exiting ISR (Cleaning up of the registers).
-    LDR   R6,=MASK_ZEROS        ; Fill with zeros before jumping to reset handling. We be popped as R2 when exiting ISR (Cleaning up of the registers).
-    LDR   R7,=MASK_ZEROS        ; Fill with zeros before jumping to reset handling. We be popped as R3 when exiting ISR (Cleaning up of the registers).
-    PUSH  {r4-r7}               ; Push zeros (R4-R7) to stack to prepare for exiting the interrupt routine.
-    
-    LDR   R0,=EXC_RETURN_CMD    ; Load the execution return command into register.
-    BX    R0                    ; No return - Handler mode will be exited. Stack will be popped and execution will continue in reset handler initializing other application.
-    ALIGN
-}
-
-
-/**
- * @brief Function for aborting current application/bootloader jump to to other app/bootloader.
- *
- * @details This functions will use the address provide to swap the stack pointer and then load 
- *          the address of the reset handler to be executed. It will check current system mode 
- *          (thread/handler) and if in thread mode it will reset into other application.
- *          If in handler mode \ref isr_abort will be executed to ensure correct exit of handler 
- *          mode and jump into reset handler of other application.
- *
- * @param[in]  start_addr  Start address of other application. This address must point to the 
-               initial stack pointer of the application.
- *
- * @note This function will never return but issue a reset into provided application.
- */
-__asm static void bootloader_util_reset(uint32_t start_addr)
-{
-MASK_ONES       EQU 0xFFFFFFFF  ; Ones, to be loaded into register as default value before reset.
-MASK_ZEROS      EQU 0x00000000  ; Zeros, to be loaded into register as default value before reset.
-
-    LDR   R1, [R0]              ; Get App initial MSP for bootloader.
-    MSR   MSP, R1               ; Set the main stack pointer to the applications MSP.
-    LDR   R0,[R0, #0x04]        ; Load Reset handler into register 0.
-    
-    LDR   R2, =MASK_ZEROS       ; Load zeros to R2
-    MRS   R3, IPSR              ; Load IPSR to R3 to check for handler or thread mode 
-    CMP   R2, R3                ; Compare, if 0 then we are in thread mode and can continue to reset handler of bootloader
-    BNE   isr_abort             ; If not zero we need to exit current ISR and jump to reset handler of bootloader
-
-    LDR   R4, =MASK_ONES        ; Load ones to R4 to be placed in Link Register.
-    MOV   LR, R4                ; Clear the link register and set to ones to ensure no return.
-    BX    R0                    ; Branch to reset handler of bootloader
-    ALIGN
-}
-
-
-void bootloader_util_app_start(uint32_t start_addr)
-{
-    bootloader_util_reset(start_addr);
-}

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/Lib/bootloader_dfu/dfu_app_handler.c	Tue Sep 09 11:30:06 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/* Copyright (c) 2012 Nordic Semiconductor. All Rights Reserved.
- *
- * The information contained herein is property of Nordic Semiconductor ASA.
- * Terms and conditions of usage are described in detail in NORDIC
- * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
- *
- * Licensees are granted free, non-transferable use of the information. NO
- * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
- * the file.
- *
- */
-
-#include "dfu_app_handler.h"
-#include "bootloader_util.h"
-#include "nrf_sdm.h"
-#include "app_error.h"
-
-#define IRQ_ENABLED             0x01                                            /**< Field identifying if an interrupt is enabled. */
-#define MAX_NUMBER_INTERRUPTS   32                                              /**< Maximum number of interrupts available. */
-
-static void                     dfu_app_reset_prepare(void);                    /**< Forward declare of default reset handler. */
-static dfu_app_reset_prepare_t  m_reset_prepare = dfu_app_reset_prepare;        /**< Callback function to application to prepare for system reset. Allows application to cleanup of service and memory prior to reset. */
-
-
-/**@brief Default reset prepare handler if application hasn't registered a handler.
- */
-static void dfu_app_reset_prepare(void)
-{
-    // Reset prepare should be handled by application.
-    // This function can be extended to include default handling if application does not implement
-    // own handler.
-}
-
-
-/**@brief Function for disabling all interrupts before jumping from bootloader to application.
- */
-static void interrupts_disable(void)
-{
-    uint32_t interrupt_setting_mask;
-    uint32_t irq = 0; // We start from first interrupt, i.e. interrupt 0.
-
-    // Fetch the current interrupt settings.
-    interrupt_setting_mask = NVIC->ISER[0];
-
-    for (; irq < MAX_NUMBER_INTERRUPTS; irq++)
-    {
-        if (interrupt_setting_mask & (IRQ_ENABLED << irq))
-        {
-            // The interrupt was enabled, and hence disable it.
-            NVIC_DisableIRQ((IRQn_Type)irq);
-        }
-    }
-}
-
-
-/**@brief Function for preparing the reset, disabling SoftDevice and jump to the bootloader.
- */
-void bootloader_start(void)
-{
-    m_reset_prepare();
-
-    uint32_t err_code = sd_power_gpregret_set(BOOTLOADER_DFU_START);
-    APP_ERROR_CHECK(err_code);
-
-    err_code = sd_softdevice_disable();
-    APP_ERROR_CHECK(err_code);
-
-    interrupts_disable();
-
-    err_code = sd_softdevice_vector_table_base_set(NRF_UICR->BOOTLOADERADDR);
-    APP_ERROR_CHECK(err_code);
-
-    bootloader_util_app_start(NRF_UICR->BOOTLOADERADDR);
-}
-
-
-
-void dfu_app_reset_prepare_set(dfu_app_reset_prepare_t reset_prepare_func)
-{
-    m_reset_prepare = reset_prepare_func;
-}