Browse Source

[bsp][lpc54114-lite] 移除c99语法特性, 并移除错误Kconfig脚本.

流光 6 years ago
parent
commit
0ac963ac3a

+ 0 - 4
bsp/lpc54114-lite/drivers/SConscript

@@ -9,10 +9,6 @@ clock_config.c
 
 CPPPATH = [cwd]
 
-# remove no need file.
-if GetDepend('RT_USING_LWIP') == False:
-    SrcRemove(src, 'drv_emac.c')
-
 # add driver code
 if GetDepend('BSP_USING_UART0'):
     src = src + ['drv_uart.c'] 

+ 8 - 9
bsp/lpc54114-lite/drivers/drv_i2c.c

@@ -91,18 +91,13 @@ static rt_err_t i2c_bus_control(struct rt_i2c_bus_device *bus, rt_uint32_t cmd,
 
 static const struct rt_i2c_bus_device_ops ops =
 {
-    .master_xfer     = master_xfer, 
-    .slave_xfer      = slave_xfer,
-    .i2c_bus_control = i2c_bus_control,
+    master_xfer, 
+    slave_xfer,
+    i2c_bus_control,
 }; 
 
 #if defined(BSP_USING_I2C4)
-static struct lpc_i2c i2c4 = 
-{
-    .base = I2C4,
-    .device_name = "i2c4", 
-    .bus.ops = &ops
-}; 
+static struct lpc_i2c i2c4 = {0}; 
 #endif
 
 int rt_hw_i2c_init(void)
@@ -113,6 +108,10 @@ int rt_hw_i2c_init(void)
     CLOCK_AttachClk(kFRO12M_to_FLEXCOMM4);
     RESET_PeripheralReset(kFC4_RST_SHIFT_RSTn);
     
+    i2c4.base = I2C4;
+    i2c4.device_name = "i2c4"; 
+    i2c4.bus.ops = &ops; 
+    
     IOCON_PinMuxSet(IOCON, 1, 1, IOCON_MODE_PULLUP | IOCON_FUNC5 | IOCON_DIGITAL_EN | IOCON_INPFILT_OFF);
     IOCON_PinMuxSet(IOCON, 1, 2, IOCON_MODE_PULLUP | IOCON_FUNC5 | IOCON_DIGITAL_EN | IOCON_INPFILT_OFF);
 

+ 8 - 10
bsp/lpc54114-lite/drivers/drv_spi.c

@@ -160,20 +160,14 @@ static rt_uint32_t spixfer(struct rt_spi_device *device, struct rt_spi_message *
 }
 
 #if defined(BSP_USING_SPI2)
-static struct lpc_spi spi2 = 
-{
-    .base = SPI2
-}; 
-static struct rt_spi_bus spi2_bus = 
-{
-    .parent.user_data = &spi2
-}; 
+static struct lpc_spi spi2 = {0}; 
+static struct rt_spi_bus spi2_bus = {0}; 
 #endif
 
 static struct rt_spi_ops lpc_spi_ops = 
 {
-    .configure = configure, 
-    .xfer      = spixfer
+    configure, 
+    spixfer
 }; 
 
 int rt_hw_spi_init(void)
@@ -183,6 +177,10 @@ int rt_hw_spi_init(void)
 #if defined(BSP_USING_SPI2)
     CLOCK_AttachClk(kFRO12M_to_FLEXCOMM2);
     RESET_PeripheralReset(kFC2_RST_SHIFT_RSTn);
+
+    spi2.base = SPI2; 
+    spi2.cfg = RT_NULL; 
+    spi2_bus.parent.user_data = &spi2; 
     
     IOCON_PinMuxSet(IOCON, 0,  8, (IOCON_FUNC1 | IOCON_MODE_PULLUP | IOCON_GPIO_MODE | IOCON_DIGITAL_EN));  /* SPI2_MOSI */
     IOCON_PinMuxSet(IOCON, 0,  9, (IOCON_FUNC1 | IOCON_MODE_PULLUP | IOCON_GPIO_MODE | IOCON_DIGITAL_EN));  /* SPI2_MISO */