From dfb38a5a5906f1b3e9e459810fa04e207b0875b1 Mon Sep 17 00:00:00 2001 From: TitanMKD Date: Mon, 25 Jun 2012 22:02:55 +0200 Subject: [PATCH] Fix asm macro --- .../startup_systick.c | 204 +++++++++--------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/firmware/startup_systick_rom_to_ram/startup_systick.c b/firmware/startup_systick_rom_to_ram/startup_systick.c index b80a1b59..a388a241 100644 --- a/firmware/startup_systick_rom_to_ram/startup_systick.c +++ b/firmware/startup_systick_rom_to_ram/startup_systick.c @@ -64,7 +64,7 @@ void systick_setup(void) g_ulSysTickCount = 0; /* Disable IRQ globally */ - asm volatile ("cpsid i"); + __asm__("cpsid i"); /* Set processor Clock as Source Clock */ systick_set_clocksource(STK_CTRL_CLKSOURCE); @@ -90,7 +90,7 @@ void systick_setup(void) nvic_set_priority(NVIC_SYSTICK_IRQ, 0xFF); /* Enable IRQ globally */ - asm volatile ("cpsie i"); + __asm__("cpsie i"); } void scs_dwt_cycle_counter_enabled(void) @@ -166,115 +166,115 @@ u32 test_nb_instruction_per_sec(void) do { - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); - asm volatile ("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); + __asm__("nop "); nb_instructions_per_sec += 100; end = sys_tick_get_time_ms();