Fix stm32f1 filenames and path

2011-10-12 23:58:27 -04:00
parent 878c094871
commit 8ceeb99902
95 changed files with 184 additions and 184 deletions
--- a/examples/stm32f1/stm32-h103/button/button.c
+++ b/examples/stm32f1/stm32-h103/button/button.c
@@ -18,9 +18,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/exti.h>

 u16 exti_line_state;
--- a/examples/stm32f1/stm32-h103/button/button.ld
+++ b/examples/stm32f1/stm32-h103/button/button.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/exti_both/exti_both.c
+++ b/examples/stm32f1/stm32-h103/exti_both/exti_both.c
@@ -18,9 +18,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/exti.h>

 u16 exti_line_state;
--- a/examples/stm32f1/stm32-h103/exti_both/exti_both.ld
+++ b/examples/stm32f1/stm32-h103/exti_both/exti_both.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
+++ b/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
@@ -18,9 +18,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/exti.h>

 #define FALLING 0
--- a/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
+++ b/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
+++ b/examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
@@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>

 /* Set STM32 to 72 MHz. */
 void clock_setup(void)
--- a/examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
+++ b/examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
+++ b/examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
@@ -26,8 +26,8 @@

 #include <stdlib.h>

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>

 #define SPI_BANK GPIOB
 #define SCLK_PIN GPIO13
--- a/examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
+++ b/examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/miniblink/miniblink.c
+++ b/examples/stm32f1/stm32-h103/miniblink/miniblink.c
@@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>

 void gpio_setup(void)
 {
--- a/examples/stm32f1/stm32-h103/miniblink/miniblink.ld
+++ b/examples/stm32f1/stm32-h103/miniblink/miniblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
+++ b/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
@@ -17,10 +17,10 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/exti.h>

 #define FALLING 0
--- a/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
+++ b/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/spi/spi.c
+++ b/examples/stm32f1/stm32-h103/spi/spi.c
@@ -17,7 +17,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/stm32/spi.h>

 void clock_setup(void)
--- a/examples/stm32f1/stm32-h103/spi/spi.ld
+++ b/examples/stm32f1/stm32-h103/spi/spi.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/timer/timer.c
+++ b/examples/stm32f1/stm32-h103/timer/timer.c
@@ -17,10 +17,10 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/exti.h>

 u16 frequency_sequence[18] = {
--- a/examples/stm32f1/stm32-h103/timer/timer.ld
+++ b/examples/stm32f1/stm32-h103/timer/timer.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/traceswo/traceswo.c
+++ b/examples/stm32f1/stm32-h103/traceswo/traceswo.c
@@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>

 #include <libopencm3/stm32/dbgmcu.h>
 #include <libopencm3/cm3/scs.h>
--- a/examples/stm32f1/stm32-h103/traceswo/traceswo.ld
+++ b/examples/stm32f1/stm32-h103/traceswo/traceswo.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/usart/usart.c
+++ b/examples/stm32f1/stm32-h103/usart/usart.c
@@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>

 void clock_setup(void)
@@ -40,7 +40,7 @@ void usart_setup(void)
                      GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);

 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 38400);
+	usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_mode(USART1, USART_MODE_TX);
@@ -55,7 +55,7 @@ void usart_setup(void)
                      GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);

 	/* Setup UART parameters. */
-	usart_set_baudrate(USART2, 38400);
+	usart_set_baudrate(USART2, 38400, rcc_ppre1_frequency);
 	usart_set_databits(USART2, 8);
 	usart_set_stopbits(USART2, USART_STOPBITS_1);
 	usart_set_mode(USART2, USART_MODE_TX);
@@ -70,7 +70,7 @@ void usart_setup(void)
                      GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX);

 	/* Setup UART parameters. */
-	usart_set_baudrate(USART3, 38400);
+	usart_set_baudrate(USART3, 38400, rcc_ppre1_frequency);
 	usart_set_databits(USART3, 8);
 	usart_set_stopbits(USART3, USART_STOPBITS_1);
 	usart_set_mode(USART3, USART_MODE_TX);
--- a/examples/stm32f1/stm32-h103/usart/usart.ld
+++ b/examples/stm32f1/stm32-h103/usart/usart.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
+++ b/examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
@@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/nvic.h>

@@ -49,7 +49,7 @@ void usart_setup(void)
 		      GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);

 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 230400);
+	usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_parity(USART1, USART_PARITY_NONE);
--- a/examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
+++ b/examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
+++ b/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
@@ -18,8 +18,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/systick.h>
@@ -145,7 +145,7 @@ void usart_setup(void)
 		      GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);

 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 230400);
+	usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_parity(USART1, USART_PARITY_NONE);
--- a/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
+++ b/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
+++ b/examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
@@ -18,8 +18,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/nvic.h>

@@ -46,7 +46,7 @@ void usart_setup(void)
                      GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);

 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 230400);
+	usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_parity(USART1, USART_PARITY_NONE);
--- a/examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
+++ b/examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
+++ b/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
@@ -18,8 +18,8 @@
 */

 #include <stdlib.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/cdc.h>

--- a/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
+++ b/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
@@ -18,10 +18,10 @@
 */

 #include <string.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/dfu.h>

--- a/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
+++ b/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
@@ -25,5 +25,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/usb_hid/usbhid.c
+++ b/examples/stm32f1/stm32-h103/usb_hid/usbhid.c
@@ -18,8 +18,8 @@
 */

 #include <stdlib.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/systick.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/hid.h>
@@ -28,7 +28,7 @@
 #define INCLUDE_DFU_INTERFACE

 #ifdef INCLUDE_DFU_INTERFACE
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/dfu.h>
 #endif

--- a/examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
+++ b/examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld

--- a/examples/stm32f1/stm32-h103/usb_iap/usbiap.c
+++ b/examples/stm32f1/stm32-h103/usb_iap/usbiap.c
@@ -18,10 +18,10 @@
 */

 #include <string.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/dfu.h>

--- a/examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
+++ b/examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
@@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld