Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware/: Use uint32_t instead of u32

Browse Source
This commit is contained in:
Ben Gamari
2013-07-07 17:44:15 -04:00
parent 1bbe375746
commit 3dbe817b09
6 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/blinky/blinky.c
View File

@ -24,7 +24,7 @@
#include "hackrf_core.h" #include "hackrf_core.h"
u32 boot0, boot1, boot2, boot3; uint32_t boot0, boot1, boot2, boot3;
int main(void) int main(void)
{ {

2
firmware/libopencm3

Submodule firmware/libopencm3 updated: 7d095fe5f4...8769073266

2
firmware/startup/startup.c
View File

@ -27,7 +27,7 @@
int main(void) int main(void)
{ {
u32 i; uint32_t i;
pin_setup(); pin_setup();

18
firmware/startup_systick/startup_systick.c
View File

@ -29,12 +29,12 @@
#include "hackrf_core.h" #include "hackrf_core.h"
/* Global counter incremented by SysTick Interrupt each millisecond */ /* Global counter incremented by SysTick Interrupt each millisecond */
volatile u32 g_ulSysTickCount; volatile uint32_t g_ulSysTickCount;
u32 g_NbCyclePerSecond; uint32_t g_NbCyclePerSecond;
void systick_setup(void) void systick_setup(void)
{ {
u32 systick_reload_val; uint32_t systick_reload_val;
g_ulSysTickCount = 0; g_ulSysTickCount = 0;
/* Disable IRQ globally */ /* Disable IRQ globally */
@ -73,15 +73,15 @@ void scs_dwt_cycle_counter_enabled(void)
SCS_DWT_CTRL |= SCS_DWT_CTRL_CYCCNTENA; SCS_DWT_CTRL |= SCS_DWT_CTRL_CYCCNTENA;
} }
u32 sys_tick_get_time_ms(void) uint32_t sys_tick_get_time_ms(void)
{ {
return g_ulSysTickCount; return g_ulSysTickCount;
} }
u32 sys_tick_delta_time_ms(u32 start, u32 end) uint32_t sys_tick_delta_time_ms(uint32_t start, uint32_t end)
{ {
#define MAX_T_U32 ((2^32)-1) #define MAX_T_U32 ((2^32)-1)
u32 diff; uint32_t diff;
if(end > start) if(end > start)
{ {
@ -94,10 +94,10 @@ u32 sys_tick_delta_time_ms(u32 start, u32 end)
return diff; return diff;
} }
void sys_tick_wait_time_ms(u32 wait_ms) void sys_tick_wait_time_ms(uint32_t wait_ms)
{ {
u32 start, end; uint32_t start, end;
u32 tickms; uint32_t tickms;
start = sys_tick_get_time_ms(); start = sys_tick_get_time_ms();

42
firmware/startup_systick_perfo/perf_mips.c
View File

@ -29,17 +29,17 @@
#include "hackrf_core.h" #include "hackrf_core.h"
/* Global counter incremented by SysTick Interrupt each millisecond */ /* Global counter incremented by SysTick Interrupt each millisecond */
extern volatile u32 g_ulSysTickCount; extern volatile uint32_t g_ulSysTickCount;
extern u32 g_NbCyclePerSecond; extern uint32_t g_NbCyclePerSecond;
extern u32 sys_tick_get_time_ms(void); extern uint32_t sys_tick_get_time_ms(void);
extern u32 sys_tick_delta_time_ms(u32 start, u32 end); extern uint32_t sys_tick_delta_time_ms(uint32_t start, uint32_t end);
extern void sys_tick_wait_time_ms(u32 wait_ms); extern void sys_tick_wait_time_ms(uint32_t wait_ms);
u32 test_nb_instruction_per_sec_100_nop_asm(void) uint32_t test_nb_instruction_per_sec_100_nop_asm(void)
{ {
register u32 val __asm__("r0"); register uint32_t val __asm__("r0");
__asm__(" ldr r1, =g_ulSysTickCount"); __asm__(" ldr r1, =g_ulSysTickCount");
__asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */ __asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */
@ -165,9 +165,9 @@ u32 test_nb_instruction_per_sec_100_nop_asm(void)
return val; return val;
}; };
u32 test_nb_instruction_per_sec_105_nop_asm(void) uint32_t test_nb_instruction_per_sec_105_nop_asm(void)
{ {
register u32 val __asm__("r0"); register uint32_t val __asm__("r0");
__asm__(" ldr r1, =g_ulSysTickCount"); __asm__(" ldr r1, =g_ulSysTickCount");
__asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */ __asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */
@ -302,9 +302,9 @@ u32 test_nb_instruction_per_sec_105_nop_asm(void)
return val; return val;
}; };
u32 test_nb_instruction_per_sec_110_nop_asm(void) uint32_t test_nb_instruction_per_sec_110_nop_asm(void)
{ {
register u32 val __asm__("r0"); register uint32_t val __asm__("r0");
__asm__(" ldr r1, =g_ulSysTickCount"); __asm__(" ldr r1, =g_ulSysTickCount");
__asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */ __asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */
@ -444,9 +444,9 @@ u32 test_nb_instruction_per_sec_110_nop_asm(void)
return val; return val;
}; };
u32 test_nb_instruction_per_sec_115_nop_asm(void) uint32_t test_nb_instruction_per_sec_115_nop_asm(void)
{ {
register u32 val __asm__("r0"); register uint32_t val __asm__("r0");
__asm__(" ldr r1, =g_ulSysTickCount"); __asm__(" ldr r1, =g_ulSysTickCount");
__asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */ __asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */
@ -592,9 +592,9 @@ u32 test_nb_instruction_per_sec_115_nop_asm(void)
return val; return val;
}; };
u32 test_nb_instruction_per_sec_120_nop_asm(void) uint32_t test_nb_instruction_per_sec_120_nop_asm(void)
{ {
register u32 val __asm__("r0"); register uint32_t val __asm__("r0");
__asm__(" ldr r1, =g_ulSysTickCount"); __asm__(" ldr r1, =g_ulSysTickCount");
__asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */ __asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */
@ -745,9 +745,9 @@ u32 test_nb_instruction_per_sec_120_nop_asm(void)
return val; return val;
}; };
u32 test_nb_instruction_per_sec_150_nop_asm(void) uint32_t test_nb_instruction_per_sec_150_nop_asm(void)
{ {
register u32 val __asm__("r0"); register uint32_t val __asm__("r0");
__asm__(" ldr r1, =g_ulSysTickCount"); __asm__(" ldr r1, =g_ulSysTickCount");
__asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */ __asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */
@ -931,9 +931,9 @@ u32 test_nb_instruction_per_sec_150_nop_asm(void)
return val; return val;
}; };
u32 test_nb_instruction_per_sec_200_nop_asm(void) uint32_t test_nb_instruction_per_sec_200_nop_asm(void)
{ {
register u32 val __asm__("r0"); register uint32_t val __asm__("r0");
__asm__(" ldr r1, =g_ulSysTickCount"); __asm__(" ldr r1, =g_ulSysTickCount");
__asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */ __asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */
@ -1163,9 +1163,9 @@ u32 test_nb_instruction_per_sec_200_nop_asm(void)
return val; return val;
}; };
u32 test_nb_instruction_per_sec_1000_nop_asm(void) uint32_t test_nb_instruction_per_sec_1000_nop_asm(void)
{ {
register u32 val __asm__("r0"); register uint32_t val __asm__("r0");
__asm__(" ldr r1, =g_ulSysTickCount"); __asm__(" ldr r1, =g_ulSysTickCount");
__asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */ __asm__(" ldr r2, [r1]"); /* g_ulSysTickCount */

36
firmware/startup_systick_perfo/startup_systick.c
View File

@ -29,12 +29,12 @@
#include "hackrf_core.h" #include "hackrf_core.h"
/* Global counter incremented by SysTick Interrupt each millisecond */ /* Global counter incremented by SysTick Interrupt each millisecond */
volatile u32 g_ulSysTickCount; volatile uint32_t g_ulSysTickCount;
u32 g_NbCyclePerSecond; uint32_t g_NbCyclePerSecond;
void systick_setup(void) void systick_setup(void)
{ {
u32 systick_reload_val; uint32_t systick_reload_val;
g_ulSysTickCount = 0; g_ulSysTickCount = 0;
/* Disable IRQ globally */ /* Disable IRQ globally */
@ -73,15 +73,15 @@ void scs_dwt_cycle_counter_enabled(void)
SCS_DWT_CTRL |= SCS_DWT_CTRL_CYCCNTENA; SCS_DWT_CTRL |= SCS_DWT_CTRL_CYCCNTENA;
} }
u32 sys_tick_get_time_ms(void) uint32_t sys_tick_get_time_ms(void)
{ {
return g_ulSysTickCount; return g_ulSysTickCount;
} }
u32 sys_tick_delta_time_ms(u32 start, u32 end) uint32_t sys_tick_delta_time_ms(uint32_t start, uint32_t end)
{ {
#define MAX_T_U32 ((2^32)-1) #define MAX_T_U32 ((2^32)-1)
u32 diff; uint32_t diff;
if(end > start) if(end > start)
{ {
@ -94,10 +94,10 @@ u32 sys_tick_delta_time_ms(u32 start, u32 end)
return diff; return diff;
} }
void sys_tick_wait_time_ms(u32 wait_ms) void sys_tick_wait_time_ms(uint32_t wait_ms)
{ {
u32 start, end; uint32_t start, end;
u32 tickms; uint32_t tickms;
start = sys_tick_get_time_ms(); start = sys_tick_get_time_ms();
@ -127,16 +127,16 @@ void sys_tick_handler(void)
g_ulSysTickCount++; g_ulSysTickCount++;
} }
u32 nb_inst_per_sec[16]; uint32_t nb_inst_per_sec[16];
extern u32 test_nb_instruction_per_sec_100_nop_asm(); extern uint32_t test_nb_instruction_per_sec_100_nop_asm();
extern u32 test_nb_instruction_per_sec_105_nop_asm(); extern uint32_t test_nb_instruction_per_sec_105_nop_asm();
extern u32 test_nb_instruction_per_sec_110_nop_asm(); extern uint32_t test_nb_instruction_per_sec_110_nop_asm();
extern u32 test_nb_instruction_per_sec_115_nop_asm(); extern uint32_t test_nb_instruction_per_sec_115_nop_asm();
extern u32 test_nb_instruction_per_sec_120_nop_asm(); extern uint32_t test_nb_instruction_per_sec_120_nop_asm();
extern u32 test_nb_instruction_per_sec_150_nop_asm(); extern uint32_t test_nb_instruction_per_sec_150_nop_asm();
extern u32 test_nb_instruction_per_sec_200_nop_asm(); extern uint32_t test_nb_instruction_per_sec_200_nop_asm();
extern u32 test_nb_instruction_per_sec_1000_nop_asm(); extern uint32_t test_nb_instruction_per_sec_1000_nop_asm();
#define LED1_TOGGLE() (gpio_toggle(PORT_LED1_3, (PIN_LED1))) #define LED1_TOGGLE() (gpio_toggle(PORT_LED1_3, (PIN_LED1)))