From c2aae4ccb63158f197c3d0629082e7699dfe8e25 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Mon, 14 Dec 2015 07:51:19 +0100 Subject: correct linking, putting the assembly code in .text with proper linking script made ld recognise the functions as thumb instructions. --- test1.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test1.cpp') diff --git a/test1.cpp b/test1.cpp index 0e6ffe6..85dee38 100644 --- a/test1.cpp +++ b/test1.cpp @@ -18,6 +18,7 @@ extern "C" void high(); extern "C" void low(); SCB_Type *__SCB = ((SCB_Type *) SCB_BASE); +//extern SCB_Type *__SCB; struct hardfault_data_t { uint32_t r0; @@ -54,10 +55,11 @@ void HardFault_Handler_C(uint32_t * hardfault_args) { */ int main() { -// SystemInit(); + SystemInit(); + SCB->SHCSR |= SCB_SHCSR_USGFAULTENA_Msk | SCB_SHCSR_MEMFAULTPENDED_Msk | SCB_SHCSR_BUSFAULTENA_Msk; -// RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE); -// RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC | RCC_APB2Periph_GPIOA, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE); + RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC | RCC_APB2Periph_GPIOA, ENABLE); // GPIO_InitTypeDef init; // GPIO_StructInit(&init); -- cgit v1.2.3