Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong

Ubiquitous/XiZi/board/ok1052-c/third_party_driver/ethernet/enet_ethernetif.c

@@ -99,7 +99,7 @@ void ethernetif_clk_init(void)
 {
     const clock_enet_pll_config_t config = {.enableClkOutput = true, .enableClkOutput25M = false, .loopDivider = 1};
     CLOCK_InitEnetPll(&config);
-    SysTick_Config(USEC_TO_COUNT(1000U, CLOCK_GetFreq(kCLOCK_CoreSysClk)));
+    SysTick_Config(SystemCoreClock / TICK_PER_SECOND);
 }
 
 void ethernetif_gpio_init(void)
@@ -109,9 +109,7 @@ void ethernetif_gpio_init(void)
     IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, true);
 
     GPIO_PinInit(GPIO1, 3, &gpio_config);
-    GPIO_PinInit(GPIO1, 10, &gpio_config);
     /* pull up the ENET_INT before RESET. */
-    GPIO_WritePinOutput(GPIO1, 10, 1);
     GPIO_WritePinOutput(GPIO1, 3, 0);
     enet_delay();
     GPIO_WritePinOutput(GPIO1, 3, 1);

Ubiquitous/XiZi/board/ok1052-c/third_party_driver/uart/connect_uart.c

@@ -41,11 +41,9 @@ void LPUART1_IRQHandler(int irqn, void *arg)
 {
     x_base lock = 0;
     // KPrintf("LPUART1_IRQHandler \n");
-    lock = DISABLE_INTERRUPT();
-
+    lock = DisableIRQ(UART1_IRQn);
     UartIsr(&serial_bus_1, &serial_driver_1, &serial_device_1);
-
-    ENABLE_INTERRUPT(lock);
+    EnableIRQ(UART1_IRQn);
 }
 DECLARE_HW_IRQ(UART1_IRQn, LPUART1_IRQHandler, NONE);
 #endif

Ubiquitous/XiZi/board/xidatong/board.c

@@ -59,6 +59,10 @@ extern int ExtSramInit(void);
 #endif
 #endif
 
+#ifdef BSP_USING_LWIP
+extern int ETH_BSP_Config();
+#endif
+
 void BOARD_SD_Pin_Config(uint32_t speed, uint32_t strength)
 {
     IOMUXC_SetPinConfig(IOMUXC_GPIO_SD_B0_00_USDHC1_CMD,
@@ -278,8 +282,10 @@ void InitBoardHardware()
     BOARD_InitPins();
     BOARD_BootClockRUN();
 
+#ifndef BSP_USING_LWIP
     NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
     SysTick_Config(SystemCoreClock / TICK_PER_SECOND);
+#endif
 
 #ifdef BSP_USING_GPIO
     Imxrt1052HwGpioInit();
@@ -307,6 +313,10 @@ void InitBoardHardware()
 #endif
 #endif
 
+#ifdef BSP_USING_LWIP
+    ETH_BSP_Config();
+#endif
+
 #ifdef BSP_USING_LPUART
     Imxrt1052HwUartInit();
 #endif

Ubiquitous/XiZi/board/xidatong/include/board.h

@@ -62,7 +62,7 @@ void InitBoardHardware(void);
 #define NVIC_PRIORITYGROUP_4         0x00000003U /*!< 4 bits for pre-emption priority*/
 
 /*! @brief The ENET PHY address. */
-#define BOARD_ENET0_PHY_ADDRESS (0x02U) /* Phy address of enet port 0. */
+#define BOARD_ENET0_PHY_ADDRESS (0x0U) /* Phy address of enet port 0. */
 
 /* USB PHY condfiguration */
 #define BOARD_USB_PHY_D_CAL (0x0CU)

Ubiquitous/XiZi/path_kernel.mk

@@ -305,7 +305,7 @@ KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/connection/zigbee
 endif
 
 ifeq ($(CONFIG_ADAPTER_HFA21_ETHERCAT), y)
-KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/connection/ethercat #
+KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/connection/industrial_ethernet/ethercat #
 endif
 
 ifeq ($(CONFIG_SUPPORT_KNOWING_FRAMEWORK), y)

Ubiquitous/XiZi/resources/ethernet/LwIP/arch/sys_arch.c

@@ -184,7 +184,7 @@ sys_sem_free(sys_sem_t *sem)
 
 int sys_sem_valid(sys_sem_t *sem)
 {
-  return (*sem >= SYS_SEM_NULL);
+  return (*sem > SYS_SEM_NULL);
 }
 
 void
@@ -212,7 +212,7 @@ u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout)
 
 
   if(KSemaphoreObtain(*sem, wait_time) == EOK)
-    return ((CurrentTicksGain()-start_tick)*MS_PER_SYSTICK_F407);
+    return ((CurrentTicksGain()-start_tick)*MS_PER_SYSTICK);
   else
     return SYS_ARCH_TIMEOUT;
 }
@@ -226,7 +226,7 @@ void sys_sem_signal(sys_sem_t *sem)
 err_t sys_mutex_new(sys_mutex_t *mutex)
 {
   *mutex = KMutexCreate();
-  if(*mutex >= 0)
+  if(*mutex > SYS_MRTEX_NULL)
     return ERR_OK;
   else
   {
@@ -344,7 +344,7 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *q, void **msg, u32_t timeout)
     wait_time = timeout;
 
   if(KMsgQueueRecv(*q, &(*msg), sizeof(void *), wait_time) == EOK)
-    return ((CurrentTicksGain()-start_tick)*MS_PER_SYSTICK_F407);
+    return ((CurrentTicksGain()-start_tick)*MS_PER_SYSTICK);
   else{
     *msg = NULL;
     return SYS_ARCH_TIMEOUT;

Ubiquitous/XiZi/resources/ethernet/LwIP/arch/sys_arch.h

@@ -62,7 +62,7 @@
 
 /* USER CODE END 0 */
 #define SYS_MBOX_NULL  -1
-#define SYS_SEM_NULL   0
+#define SYS_SEM_NULL   -1
 #define SYS_MRTEX_NULL SYS_SEM_NULL
 
 typedef int32 sys_sem_t;
@@ -71,7 +71,7 @@ typedef int32 sys_mbox_t;
 typedef int32 sys_thread_t;
 typedef x_base sys_prot_t;
 
-#define MS_PER_SYSTICK_F407 (1000 / TICK_PER_SECOND)
+#define MS_PER_SYSTICK (1000 / TICK_PER_SECOND)
 
 //debug rtos with IRQ
 //#define FSL_RTOS_XIUOS

Ubiquitous/XiZi/tool/shell/letter-shell/shell.c

@@ -1652,7 +1652,6 @@ void shellTask(void *param)
                 shellHandler(shell, data[i]);
             }
         }
-        KPrintf("");
     }
 }