jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Various cosmetic and coding style fixes.

Browse Source
This commit is contained in:
Uwe Hermann 2010-06-29 23:01:44 +02:00
parent 47b31246ca
commit 6ba179b361
5 changed files with 125 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/mb525/pwmleds/pwmleds.c
View File

@ -244,7 +244,8 @@ void clock_setup(void)
rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM3EN); rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM3EN);
/* Enable GPIOC, Alternate Function clocks. */ /* Enable GPIOC, Alternate Function clocks. */
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN | RCC_APB2ENR_AFIOEN); rcc_peripheral_enable_clock(&RCC_APB2ENR,
RCC_APB2ENR_IOPCEN | RCC_APB2ENR_AFIOEN);
} }
void gpio_setup(void) void gpio_setup(void)

10
examples/other/dma_mem2mem/dma.c
View File

@ -71,20 +71,20 @@ int main(void)
We want to transfer 32bit * 5 so it should fit */ We want to transfer 32bit * 5 so it should fit */
char s1[20] = "Hello STM MEM2MEM\r\n"; char s1[20] = "Hello STM MEM2MEM\r\n";
char s2[20]; char s2[20];
rcc_clock_setup_in_hse_16mhz_out_72mhz(); rcc_clock_setup_in_hse_16mhz_out_72mhz();
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();
gpio_clear(GPIOB, GPIO7); /* LED1 on */ gpio_clear(GPIOB, GPIO7); /* LED1 on */
gpio_set(GPIOB, GPIO6); /* LED2 off */ gpio_set(GPIOB, GPIO6); /* LED2 off */
my_usart_print_string(USART1, "s1 "); my_usart_print_string(USART1, "s1 ");
my_usart_print_string(USART1, s1); my_usart_print_string(USART1, s1);
rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_DMA1EN); rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_DMA1EN);
/* MEM2MEM mode for channel 1. */ /* MEM2MEM mode for channel 1. */
dma_enable_mem2mem_mode(DMA1, DMA_CHANNEL1); dma_enable_mem2mem_mode(DMA1, DMA_CHANNEL1);
/* Highest priority. */ /* Highest priority. */
@ -112,7 +112,7 @@ int main(void)
depending from your source device. */ depending from your source device. */
dma_set_number_of_data(DMA1, DMA_CHANNEL1, 5); dma_set_number_of_data(DMA1, DMA_CHANNEL1, 5);
/* Start DMA transfer. */ /* Start DMA transfer. */
dma_enable_channel(DMA1, DMA_CHANNEL1); dma_enable_channel(DMA1, DMA_CHANNEL1);
/* TODO: write a function to get the interrupt flags. */ /* TODO: write a function to get the interrupt flags. */
@ -122,7 +122,7 @@ int main(void)
dma_disable_channel(DMA1, DMA_CHANNEL1); dma_disable_channel(DMA1, DMA_CHANNEL1);
/* String s1 should now already be transferred to s2. */ /* String s1 should now already be transferred to s2. */
my_usart_print_string(USART1, "s2 "); my_usart_print_string(USART1, "s2 ");
my_usart_print_string(USART1, s2); my_usart_print_string(USART1, s2);

31
include/libopenstm32/exti.h
View File

@ -23,13 +23,14 @@
#include <libopenstm32/memorymap.h> #include <libopenstm32/memorymap.h>
#include <libopenstm32/common.h> #include <libopenstm32/common.h>
/*Define EXTI Registers */ /* --- EXTI registers ------------------------------------------------------ */
#define EXTI_IMR MMIO32(EXTI_BASE + 0x00)
#define EXTI_EMR MMIO32(EXTI_BASE + 0x04) #define EXTI_IMR MMIO32(EXTI_BASE + 0x00)
#define EXTI_RTSR MMIO32(EXTI_BASE + 0x08) #define EXTI_EMR MMIO32(EXTI_BASE + 0x04)
#define EXTI_FTSR MMIO32(EXTI_BASE + 0x0C) #define EXTI_RTSR MMIO32(EXTI_BASE + 0x08)
#define EXTI_SWIER MMIO32(EXTI_BASE + 0x10) #define EXTI_FTSR MMIO32(EXTI_BASE + 0x0c)
#define EXTI_PR MMIO32(EXTI_BASE + 0x14) #define EXTI_SWIER MMIO32(EXTI_BASE + 0x10)
#define EXTI_PR MMIO32(EXTI_BASE + 0x14)
/* EXTI number definitions */ /* EXTI number definitions */
#define EXTI0 (1 << 0) #define EXTI0 (1 << 0)
@ -53,19 +54,17 @@
#define EXTI18 (1 << 18) #define EXTI18 (1 << 18)
#define EXTI19 (1 << 19) #define EXTI19 (1 << 19)
/*Define trigger types*/ /* Trigger types */
typedef enum trigger_e{ typedef enum trigger_e {
EXTI_TRIGGER_RISING, EXTI_TRIGGER_RISING,
EXTI_TRIGGER_FALLING, EXTI_TRIGGER_FALLING,
EXTI_TRIGGER_BOTH, EXTI_TRIGGER_BOTH,
}exti_trigger_type; } exti_trigger_type;
/*Function Prototypes */ void exti_set_trigger(u32 extis, exti_trigger_type trig);
void exti_set_trigger(u32 extis,exti_trigger_type trig);
void exti_enable_request(u32 extis); void exti_enable_request(u32 extis);
void exti_disable_request(u32 extis); void exti_disable_request(u32 extis);
void exti_reset_request(u32 extis); void exti_reset_request(u32 extis);
void exti_select_source(u32 exti, u32 gpioport); void exti_select_source(u32 exti, u32 gpioport);
#endif #endif

2
include/libopenstm32/iwdg.h
View File

@ -56,7 +56,7 @@
#define IWDG_PR_DIV64 0x4 #define IWDG_PR_DIV64 0x4
#define IWDG_PR_DIV128 0x5 #define IWDG_PR_DIV128 0x5
#define IWDG_PR_DIV256 0x6 #define IWDG_PR_DIV256 0x6
/* double definition */ /* Double definition: 0x06 and 0x07 both mean DIV256 as per datasheet. */
/* #define IWDG_PR_DIV256 0x7 */ /* #define IWDG_PR_DIV256 0x7 */
/* --- IWDG_RLR values ----------------------------------------------------- */ /* --- IWDG_RLR values ----------------------------------------------------- */

195
lib/exti.c
View File

@ -22,110 +22,119 @@
void exti_set_trigger(u32 extis, exti_trigger_type trig) void exti_set_trigger(u32 extis, exti_trigger_type trig)
{ {
switch(trig) switch (trig) {
{ case EXTI_TRIGGER_RISING:
case EXTI_TRIGGER_RISING: EXTI_RTSR |= extis;
EXTI_RTSR |= extis; EXTI_FTSR &= ~extis;
EXTI_FTSR &= ~extis; break;
break; case EXTI_TRIGGER_FALLING:
case EXTI_TRIGGER_FALLING: EXTI_RTSR &= ~extis;
EXTI_RTSR &= ~extis; EXTI_FTSR |= extis;
EXTI_FTSR |= extis; break;
break; case EXTI_TRIGGER_BOTH:
case EXTI_TRIGGER_BOTH: EXTI_RTSR |= extis;
EXTI_RTSR |= extis; EXTI_FTSR |= extis;
EXTI_FTSR |= extis; break;
break; }
}
} }
void exti_enable_request(u32 extis) void exti_enable_request(u32 extis)
{ {
//enable interrupts /* Enable interrupts. */
EXTI_IMR |= extis; EXTI_IMR |= extis;
//enable events
EXTI_EMR |= extis; /* Enable events. */
EXTI_EMR |= extis;
} }
void exti_disable_request(u32 extis) void exti_disable_request(u32 extis)
{ {
//disable interrupts /* Disable interrupts. */
EXTI_IMR &= ~extis; EXTI_IMR &= ~extis;
//disable events
EXTI_EMR &= ~extis;
}
/* /* Disable events. */
Reset the interrupt request by writing a 1 to the corresponding EXTI_EMR &= ~extis;
pending bit register
*/
void exti_reset_request(u32 extis)
{
EXTI_PR |= extis;
} }
/*
* Reset the interrupt request by writing a 1 to the corresponding
* pending bit register.
*/
void exti_reset_request(u32 extis)
{
EXTI_PR |= extis;
}
/*Remap an external interrupt line to the corresponding /*
pin on the specified GPIO port TODO: this could be rewritten in less lines of code */ * Remap an external interrupt line to the corresponding pin on the
* specified GPIO port.
*
* TODO: This could be rewritten in less lines of code.
*/
void exti_select_source(u32 exti, u32 gpioport) void exti_select_source(u32 exti, u32 gpioport)
{ {
u8 shift =0; u8 shift, bits;
u8 bits = 0;
switch (exti) shift = bits = 0;
{
case EXTI0: switch (exti) {
case EXTI4: case EXTI0:
case EXTI8: case EXTI4:
case EXTI12: case EXTI8:
shift = 0; case EXTI12:
break; shift = 0;
case EXTI1: break;
case EXTI5: case EXTI1:
case EXTI9: case EXTI5:
case EXTI13: case EXTI9:
shift = 4; case EXTI13:
break; shift = 4;
case EXTI2: break;
case EXTI6: case EXTI2:
case EXTI10: case EXTI6:
case EXTI14: case EXTI10:
shift = 8; case EXTI14:
break; shift = 8;
case EXTI3: break;
case EXTI7: case EXTI3:
case EXTI11: case EXTI7:
case EXTI15: case EXTI11:
shift = 12; case EXTI15:
break; shift = 12;
} break;
}
switch (gpioport)
{ switch (gpioport) {
case GPIOA: case GPIOA:
bits = 0xF; bits = 0xf;
break; break;
case GPIOB: case GPIOB:
bits = 0xE; bits = 0xe;
break; break;
case GPIOC: case GPIOC:
bits = 0xD; bits = 0xd;
break; break;
case GPIOD: case GPIOD:
bits = 0xC; bits = 0xc;
break; break;
case GPIOE: case GPIOE:
bits = 0xB; bits = 0xb;
break; break;
case GPIOF: case GPIOF:
bits = 0xA; bits = 0xa;
break; break;
case GPIOG: case GPIOG:
bits = 0x9; bits = 0x9;
break; break;
} }
if(exti < EXTI4) AFIO_EXTICR1 &=~ ( bits << shift ); /* Ensure that only valid EXTI lines are used. */
else if (exti < EXTI8) AFIO_EXTICR2 &=~ ( bits << shift ); if (exti < EXTI4)
else if (exti < EXTI12) AFIO_EXTICR3 &=~ ( bits << shift ); AFIO_EXTICR1 &= ~(bits << shift);
else if (exti < EXTI16) AFIO_EXTICR4 &=~ ( bits << shift ); //ensure that only valid EXTI lines are used else if (exti < EXTI8)
} AFIO_EXTICR2 &= ~(bits << shift);
else if (exti < EXTI12)
AFIO_EXTICR3 &= ~(bits << shift);
else if (exti < EXTI16)
AFIO_EXTICR4 &= ~(bits << shift);
}