From 5060261413daff8ebf599ad1b7c5d9bf1ad8ee9c Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 20 Dec 2010 19:52:51 +0100 Subject: [PATCH] Cosmetics. --- examples/obldc/led/Makefile | 2 +- examples/obldc/led/led.c | 9 +++------ examples/obldc/led/led.ld | 2 +- examples/obldc/systick/Makefile | 2 +- examples/obldc/systick/systick.c | 17 +++++++++-------- examples/obldc/systick/systick.ld | 2 +- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/examples/obldc/led/Makefile b/examples/obldc/led/Makefile index 3add5b9c..40d30f3e 100644 --- a/examples/obldc/led/Makefile +++ b/examples/obldc/led/Makefile @@ -17,6 +17,6 @@ ## along with this program. If not, see . ## -BINARY = led +BINARY = led include ../../Makefile.include diff --git a/examples/obldc/led/led.c b/examples/obldc/led/led.c index 5fe30137..44695f84 100644 --- a/examples/obldc/led/led.c +++ b/examples/obldc/led/led.c @@ -31,20 +31,17 @@ void clock_setup(void) /* Enable GPIOB clock. */ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN); - } void gpio_setup(void) { /* Set GPIO6 and 7 (in GPIO port A) to 'output push-pull'. */ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ, - GPIO_CNF_OUTPUT_PUSHPULL, - GPIO6 | GPIO7); + GPIO_CNF_OUTPUT_PUSHPULL, GPIO6 | GPIO7); /* Set GPIO0 and 1 (in GPIO port B) to 'output push-pull'. */ gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, - GPIO_CNF_OUTPUT_PUSHPULL, - GPIO0 | GPIO1); + GPIO_CNF_OUTPUT_PUSHPULL, GPIO0 | GPIO1); } int main(void) @@ -54,7 +51,7 @@ int main(void) clock_setup(); gpio_setup(); - /* Blink the LED (PC12) on the board. */ + /* Blink the LEDs on the board. */ while (1) { gpio_toggle(GPIOA, GPIO6); /* LED on/off */ for (i = 0; i < 800000; i++); /* Wait (needs -O0 CFLAGS). */ diff --git a/examples/obldc/led/led.ld b/examples/obldc/led/led.ld index b3bb9a44..c8683d5e 100644 --- a/examples/obldc/led/led.ld +++ b/examples/obldc/led/led.ld @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -/* Linker script for Olimex STM32-H103 (STM32F103RBT6, 128K flash, 20K RAM). */ +/* Linker script for Open-BLDC (STM32F103CBT6, 128K flash, 20K RAM). */ /* Define memory regions. */ MEMORY diff --git a/examples/obldc/systick/Makefile b/examples/obldc/systick/Makefile index 20c889f1..a83b7ff6 100644 --- a/examples/obldc/systick/Makefile +++ b/examples/obldc/systick/Makefile @@ -17,6 +17,6 @@ ## along with this program. If not, see . ## -BINARY = systick +BINARY = systick include ../../Makefile.include diff --git a/examples/obldc/systick/systick.c b/examples/obldc/systick/systick.c index 56769a03..b190ac5a 100644 --- a/examples/obldc/systick/systick.c +++ b/examples/obldc/systick/systick.c @@ -30,6 +30,7 @@ void gpio_setup(void) { /* Enable GPIOA clock. */ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); + /* Enable GPIOB clock. */ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN); @@ -51,11 +52,11 @@ void gpio_setup(void) GPIO_CNF_OUTPUT_PUSHPULL, GPIO1); } -void sys_tick_handler() +void sys_tick_handler(void) { temp32++; - - /* we call this handler every 1ms so 1000ms = 1s on/off */ + + /* We call this handler every 1ms so 1000ms = 1s on/off. */ if (temp32 == 1000) { gpio_toggle(GPIOA, GPIO6); /* LED2 on/off */ temp32 = 0; @@ -64,12 +65,12 @@ void sys_tick_handler() int main(void) { - rcc_clock_setup_in_hse_16mhz_out_72mhz(); + rcc_clock_setup_in_hse_16mhz_out_72mhz(); gpio_setup(); gpio_clear(GPIOA, GPIO7); /* LED1 on */ gpio_set(GPIOA, GPIO6); /* LED2 off */ - + temp32 = 0; /* 72MHz / 8 => 9000000 counts per second */ @@ -80,10 +81,10 @@ int main(void) systick_interrupt_enable(); - /* start counting */ + /* Start counting. */ systick_counter_enable(); - - while(1); /* Halt. */ + + while (1); /* Halt. */ return 0; } diff --git a/examples/obldc/systick/systick.ld b/examples/obldc/systick/systick.ld index a1e9de5e..0d79751d 100644 --- a/examples/obldc/systick/systick.ld +++ b/examples/obldc/systick/systick.ld @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -/* Linker script for an STM32F103RBT6 board (128K flash, 20K RAM). */ +/* Linker script for an STM32F103CBT6 board (128K flash, 20K RAM). */ /* Define memory regions. */ MEMORY