Merge pull request #151 from martinayotte/master

STM32F4 - fix LeafLab code for spi_config_gpios()

Author: rogerclarkmelbourne

STM32F4/cores/maple/libmaple/HardwareSPI.cpp

@@ -385,21 +385,15 @@ static void configure_gpios(spi_dev *dev, bool as_master) {
 #endif
 
 		if(nssi) {
-		    spi_gpio_cfg(as_master,
-                 nssi->gpio_device,
-                 nssi->gpio_bit,
-                 scki->gpio_device,
-                 scki->gpio_bit,
-                 misoi->gpio_bit,
-                 mosii->gpio_bit);
+                    spi_config_gpios(dev, as_master, nssi->gpio_device, nssi->gpio_bit,
+                                                     scki->gpio_device, scki->gpio_bit, 
+                                                     misoi->gpio_device, misoi->gpio_bit,
+                                                     mosii->gpio_device, mosii->gpio_bit);
 		} else {
-		    spi_gpio_cfg(as_master,
-                 NULL,
-                 -1,
-                 scki->gpio_device,
-                 scki->gpio_bit,
-                 misoi->gpio_bit,
-                 mosii->gpio_bit);
+                    spi_config_gpios(dev, as_master, NULL, -1,
+                                                     scki->gpio_device, scki->gpio_bit, 
+                                                     misoi->gpio_device, misoi->gpio_bit,
+                                                     mosii->gpio_device, mosii->gpio_bit);
 		}
 }
 

STM32F4/cores/maple/libmaple/bkp.c

@@ -0,0 +1 @@
+bkp.c.xxx

STM32F4/cores/maple/libmaple/bkp.c.xxx

@@ -0,0 +1 @@
+bkp.h.xxx

STM32F4/cores/maple/libmaple/bkp.h

@@ -74,7 +74,7 @@ static const struct rcc_dev_info rcc_dev_table[] = {
     [RCC_SPI2]    = { .clk_domain = APB1, .line_num = 14 }, //unchanged
     [RCC_DMA1]    = { .clk_domain = AHB1, .line_num = 21 }, //*
     [RCC_PWR]     = { .clk_domain = APB1, .line_num = 28},  //unchanged
-//    [RCC_BKP]     = { .clk_domain = AHB1, .line_num = 18},  //*
+    [RCC_BKP]     = { .clk_domain = AHB1, .line_num = 18},  //*
     [RCC_I2C1]    = { .clk_domain = APB1, .line_num = 21 }, //unchanged
     [RCC_I2C2]    = { .clk_domain = APB1, .line_num = 22 }, //unchanged
     [RCC_CRC]     = { .clk_domain = AHB1, .line_num = 12},  //*