EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Michael Ossmann
2012-06-04 12:44:41 -06:00
parent b55d006d02 154f67598b
commit 245e1d6f07
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/stm32/f1/gpio.c
View File

@@ -147,5 +147,8 @@ void gpio_port_config_lock(u32 gpioport, u16 gpios)
reg32 = GPIO_LCKR(gpioport); /* Read LCKK. */ reg32 = GPIO_LCKR(gpioport); /* Read LCKK. */
reg32 = GPIO_LCKR(gpioport); /* Read LCKK again. */ reg32 = GPIO_LCKR(gpioport); /* Read LCKK again. */
/* Tell the compiler the variable is actually used. It will get optimized out anyways. */
reg32 = reg32;
/* If (reg32 & GPIO_LCKK) is true, the lock is now active. */ /* If (reg32 & GPIO_LCKK) is true, the lock is now active. */
} }

3
lib/stm32/f2/gpio.c
View File

@@ -135,5 +135,8 @@ void gpio_port_config_lock(u32 gpioport, u16 gpios)
reg32 = GPIO_LCKR(gpioport); /* Read LCKK. */ reg32 = GPIO_LCKR(gpioport); /* Read LCKK. */
reg32 = GPIO_LCKR(gpioport); /* Read LCKK again. */ reg32 = GPIO_LCKR(gpioport); /* Read LCKK again. */
/* Tell the compiler the variable is actually used. It will get optimized out anyways. */
reg32 = reg32;
/* If (reg32 & GPIO_LCKK) is true, the lock is now active. */ /* If (reg32 & GPIO_LCKK) is true, the lock is now active. */
} }

3
lib/stm32/f4/gpio.c
View File

@@ -135,5 +135,8 @@ void gpio_port_config_lock(u32 gpioport, u16 gpios)
reg32 = GPIO_LCKR(gpioport); /* Read LCKK. */ reg32 = GPIO_LCKR(gpioport); /* Read LCKK. */
reg32 = GPIO_LCKR(gpioport); /* Read LCKK again. */ reg32 = GPIO_LCKR(gpioport); /* Read LCKK again. */
/* Tell the compiler the variable is actually used. It will get optimized out anyways. */
reg32 = reg32;
/* If (reg32 & GPIO_LCKK) is true, the lock is now active. */ /* If (reg32 & GPIO_LCKK) is true, the lock is now active. */
} }

2
lib/stm32/nvic.c
View File

@@ -57,7 +57,7 @@ u8 nvic_get_irq_enabled(u8 irqn)
void nvic_set_priority(u8 irqn, u8 priority) void nvic_set_priority(u8 irqn, u8 priority)
{ {
NVIC_IPR(irqn / 4) |= (priority << ((irqn % 4) * 8)); NVIC_IPR(irqn) = priority;
} }
void nvic_generate_software_interrupt(u8 irqn) void nvic_generate_software_interrupt(u8 irqn)