ok

.gitmodules

@@ -7,12 +7,12 @@
 [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/kendryte-sdk/kendryte-sdk-source"]
 	path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/kendryte-sdk/kendryte-sdk-source
 	url = https://code.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git
-[submodule "Ubiquitous/Nuttx_Fusion_XiUOS/apps"]
-	path = Ubiquitous/Nuttx_Fusion_XiUOS/apps
-	url = https://code.gitlink.org.cn/wgzAIIT/incubator-nuttx-apps.git
-[submodule "Ubiquitous/Nuttx_Fusion_XiUOS/nuttx"]
-	path = Ubiquitous/Nuttx_Fusion_XiUOS/nuttx
-	url = https://code.gitlink.org.cn/wgzAIIT/incubator-nuttx.git
 [submodule "Ubiquitous/XiZi/fs/lwext4/lwext4_submodule"]
 	path = Ubiquitous/XiZi/fs/lwext4/lwext4_submodule
 	url = https://gitlink.org.cn/xuos/lwext4_filesystem_support_XiUOS.git
+[submodule "Ubiquitous/Nuttx_Fusion_XiUOS/nuttx"]
+	path = Ubiquitous/Nuttx_Fusion_XiUOS/nuttx
+	url = https://code.gitlink.org.cn/wgzAIIT/incubator-nuttx.git
+[submodule "Ubiquitous/Nuttx_Fusion_XiUOS/apps"]
+	path = Ubiquitous/Nuttx_Fusion_XiUOS/apps
+	url = https://code.gitlink.org.cn/wgzAIIT/incubator-nuttx-apps.git

APP_Framework/Framework/connection/wifi/Make.defs

@@ -0,0 +1,7 @@
+############################################################################
+# APP_Framework/Framework/connection/zigbee/Make.defs
+############################################################################
+ifneq ($(CONFIG_CONNECTION_ADAPTER_WIFI),)
+CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Framework/connection/wifi
+endif
+include $(wildcard $(APPDIR)/../../../APP_Framework/Framework/connection/wifi/*/Make.defs)

APP_Framework/Framework/connection/wifi/Makefile

@@ -1,3 +1,12 @@
+include $(KERNEL_ROOT)/.config
+ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
+    include $(APPDIR)/Make.defs
+    CSRCS += adapter_wifi.c
+    include $(APPDIR)/Application.mk
+
+endif
+
+ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
 SRC_FILES := adapter_wifi.c
 
 ifeq ($(CONFIG_ADAPTER_HFA21_WIFI),y)
@@ -9,3 +18,4 @@ ifeq ($(CONFIG_ADAPTER_ESP07S_WIFI),y)
 endif
 
 include $(KERNEL_ROOT)/compiler.mk
+endif

APP_Framework/Framework/connection/wifi/adapter_wifi.c

@@ -100,6 +100,7 @@ int AdapterWifiInit(void)
 }
 
 /******************wifi TEST*********************/
+#ifdef ADD_XIZI_FETURES
 int AdapterWifiTest(void)
 {
     char cmd[64];
@@ -107,7 +108,6 @@ int AdapterWifiTest(void)
 
     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
 
-
 #ifdef ADAPTER_HFA21_DRIVER_EXT_PORT
     static BusType ch438_pin;
     ch438_pin = PinBusInitGet();
@@ -155,7 +155,6 @@ int AdapterWifiTest(void)
     PrivClose(pin_fd);
 #endif
 
-
     AdapterDeviceOpen(adapter);
     // AdapterDeviceControl(adapter, OPE_INT, &baud_rate);
 
@@ -182,8 +181,8 @@ int AdapterWifiTest(void)
         AdapterDeviceRecv(adapter, wifi_recv_msg, 128);
         PrivTaskDelay(1000);
     }
-    
 }
+#endif
 
 #ifdef ADD_RTTHREAD_FETURES
 MSH_CMD_EXPORT(AdapterWifiTest,a wifi adpter sample);
@@ -195,8 +194,7 @@ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHE
 int wifiopen(void)
 {
     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-
+    return AdapterDeviceOpen(adapter);
-    AdapterDeviceOpen(adapter);
 }
 #ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, wifiopen, wifiopen, open adapter wifi );
@@ -204,8 +202,7 @@ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHE
 int wificlose(void)
 {
     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-
+    return AdapterDeviceClose(adapter);
-    AdapterDeviceClose(adapter);
 }
 #ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, wificlose, wificlose, close adapter wifi );
@@ -215,12 +212,12 @@ int wifisetup(int argc, char *argv[])
     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
     struct WifiParam param;
     memset(&param,0,sizeof(struct WifiParam));
-    strncpy(param.wifi_ssid, argv[1], strlen(argv[1]));
+    strncpy((char *)param.wifi_ssid, argv[1], strlen(argv[1]));
-    strncpy(param.wifi_pwd, argv[2], strlen(argv[2]));
+    strncpy((char *)param.wifi_pwd, argv[2], strlen(argv[2]));
 
     adapter->adapter_param = &param;
 
-    AdapterDeviceSetUp(adapter);
+    return AdapterDeviceSetUp(adapter);
 }
 #ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(3)|SHELL_CMD_DISABLE_RETURN, wifisetup, wifisetup, setup adapter wifi );
@@ -234,7 +231,7 @@ int wifiaddrset(int argc, char *argv[])
 
     AdapterDeviceSetAddr(adapter, ip, gateway, netmask);
     AdapterDevicePing(adapter, "36.152.44.95");///< ping www.baidu.com
-    AdapterDeviceNetstat(adapter);
+    return AdapterDeviceNetstat(adapter);
 }
 #ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(4)|SHELL_CMD_DISABLE_RETURN, wifiaddrset, wifiaddrset, addrset adapter wifi);
@@ -243,7 +240,7 @@ int wifiping(int argc, char *argv[])
 {
     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
     printf("ping %s\n",argv[1]);
-    AdapterDevicePing(adapter, argv[1]);
+    return AdapterDevicePing(adapter, argv[1]);
 }
 #ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(3), wifiping, wifiping, wifiping adapter );
@@ -264,7 +261,7 @@ int wificonnect(int argc, char *argv[])
         adapter->socket.protocal = SOCKET_PROTOCOL_UDP;
     }
 
-    AdapterDeviceConnect(adapter, net_role, ip, port, ip_type);
+    return AdapterDeviceConnect(adapter, net_role, ip, port, ip_type);
 }
 #ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(4)|SHELL_CMD_DISABLE_RETURN, wificonnect, wificonnect, wificonnect adapter);
@@ -279,6 +276,7 @@ int wifisend(int argc, char *argv[])
         AdapterDeviceSend(adapter, wifi_msg, len);
         PrivTaskDelay(1000);
     }
+    return 0;
 }
 #ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(3)|SHELL_CMD_DISABLE_RETURN, wifisend, wifisend, wifisend adapter wifi information);
@@ -297,3 +295,117 @@ int wifirecv(int argc, char *argv[])
 #ifdef ADD_XIZI_FETURES
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(3)|SHELL_CMD_DISABLE_RETURN, wifirecv, wifirecv, wifirecv adapter wifi information);
 #endif
+
+#ifdef ADD_NUTTX_FETURES
+
+enum
+{
+    APT_WIFI_PARAM_IP,
+    APT_WIFI_PARAM_PORT,
+    APT_WIFI_PARAM_SSID,
+    APT_WIFI_PARAM_PWD,
+    APT_WIFI_PARAM_GW,
+    APT_WIFI_PARAM_SERVER,
+    APT_WIFI_PARAM_MASK,
+    APT_WIFI_PARAM_PING,
+    APT_WIFI_PARAM_NUM
+};
+
+#define APT_WIFI_PARAM_LEN 20
+
+char wifi_param[APT_WIFI_PARAM_NUM][APT_WIFI_PARAM_LEN] = {0};
+
+#define CHECK_RET(__func) \
+ret = __func; \
+if(ret != 0){ \
+    printf("%s %d failed\n", __func__, __LINE__); \
+    AdapterDeviceClose(adapter); \
+    return ret; \
+};
+
+void AdapterWifiGetParam(int argc, char *argv[])
+{
+    int i, j;
+    char *param_str[] = {"ip", "port", "ssid", "pwd", "gw", "server", "mask", "ping"};
+    char *default_str[] =
+    {"192.168.137.34", "12345", "test", "tttttttt", "192.168.137.71", "192.168.137.1", "255.255.255.0", "220.181.38.251"};
+
+    for(i = 0; i < APT_WIFI_PARAM_NUM; i ++)
+    {
+        memset(wifi_param[i], 0, APT_WIFI_PARAM_LEN);
+        strcpy(wifi_param[i], default_str[i]);
+    }
+
+    for(i = 0; i < argc; i ++)
+    {
+        for(j = 0; j < APT_WIFI_PARAM_NUM; j ++)
+        {
+            if(strncmp(argv[i], param_str[j], strlen(param_str[j])) == 0)
+            {
+                printf("wifi %d: %s\n", j, argv[i] + strlen(param_str[j]) + 1);
+                strcpy(wifi_param[j], argv[i] + strlen(param_str[j]) + 1);
+            }
+        }
+    }
+
+    printf("--- wifi parameter ---\n");
+    for(i = 0; i < APT_WIFI_PARAM_NUM; i ++)
+    {
+        printf("%7.7s = %s\n", param_str[i], wifi_param[i]);
+    }
+    printf("----------------------\n");
+}
+
+
+int AdapterWifiTest(int argc, char *argv[])
+{
+    int i, ret;
+
+    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
+    AdapterWifiGetParam(argc, argv);
+
+    enum NetRoleType net_role = CLIENT;
+    enum IpType ip_type = IPV4;
+    struct WifiParam param;
+    memset(&param, 0, sizeof(struct WifiParam));
+    strncpy((char *)param.wifi_ssid, wifi_param[APT_WIFI_PARAM_SSID], strlen(wifi_param[APT_WIFI_PARAM_SSID]));
+    strncpy((char *)param.wifi_pwd, wifi_param[APT_WIFI_PARAM_PWD], strlen(wifi_param[APT_WIFI_PARAM_PWD]));
+
+    adapter->adapter_param = &param;
+
+    CHECK_RET(AdapterDeviceOpen(adapter));
+    CHECK_RET(AdapterDeviceSetUp(adapter));
+
+    CHECK_RET(AdapterDeviceSetAddr(adapter, wifi_param[APT_WIFI_PARAM_IP], wifi_param[APT_WIFI_PARAM_GW],
+        wifi_param[APT_WIFI_PARAM_MASK]));
+
+    CHECK_RET(AdapterDeviceNetstat(adapter));
+
+    adapter->socket.protocal = SOCKET_PROTOCOL_TCP;
+    CHECK_RET(AdapterDeviceConnect(adapter, net_role, wifi_param[APT_WIFI_PARAM_SERVER],
+        wifi_param[APT_WIFI_PARAM_PORT], ip_type));
+
+    const char *wifi_msg = "Wifi Test";
+    for(i = 0; i < 10; i++)
+    {
+        AdapterDeviceSend(adapter, wifi_msg, strlen(wifi_msg));
+        PrivTaskDelay(4000);
+    }
+
+    char wifi_recv_msg[128];
+    for(i = 0; i < 10; i ++)
+    {
+        AdapterDeviceRecv(adapter, wifi_recv_msg, 128);
+        PrivTaskDelay(1000);
+    }
+
+//    printf("ping %s\n", wifi_param[APT_WIFI_PARAM_PING]);
+//
+//    CHECK_RET(AdapterDevicePing(adapter, wifi_param[APT_WIFI_PARAM_PING]));
+//    AdapterDeviceDisconnect(adapter, NULL);
+    ret = AdapterDeviceClose(adapter);
+    return ret;
+}
+
+#endif
+

APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig

@@ -8,6 +8,27 @@ if ADD_XIZI_FETURES
                 bool "Using extra uart to support wifi"
                 default n
 
+        config ADAPTER_ESP07S_DRIVER
+                string "ESP07S device uart driver path"
+                default "/dev/ttyS2"
+                depends on !ADAPTER_ESP07S_DRIVER_EXTUART
+
+        if ADAPTER_ESP07S_DRIVER_EXTUART
+                config ADAPTER_ESP07S_DRIVER
+                        string "ESP07S device extra uart driver path"
+                        default "/dev/extuart_dev6"
+
+                config ADAPTER_ESP07S_DRIVER_EXT_PORT
+                        int "if ESP07S device using extuart, choose port"
+                        default "6"
+        endif
+endif
+
+if ADD_NUTTX_FETURES
+        config ADAPTER_ESP07S_DRIVER_EXTUART
+                bool "Using extra uart to support wifi"
+                default n
+
         config ADAPTER_ESP07S_DRIVER
                 string "ESP07S device uart driver path"
                 default "/dev/uart2_dev2"
@@ -24,10 +45,6 @@ if ADD_XIZI_FETURES
         endif
 endif
 
-if ADD_NUTTX_FETURES
-
-endif
-
 if ADD_RTTHREAD_FETURES
 
 endif

APP_Framework/Framework/connection/wifi/esp07s_wifi/Make.defs

@@ -0,0 +1,6 @@
+############################################################################
+# APP_Framework/Framework/connection/zigbee/e18/Make.defs
+############################################################################
+ifneq ($(CONFIG_ADAPTER_ESP07S_WIFI),)
+CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Framework/connection/wifi/esp07s_wifi
+endif

APP_Framework/Framework/connection/wifi/esp07s_wifi/Makefile

@@ -1,3 +1,13 @@
+include $(KERNEL_ROOT)/.config
+ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
+    include $(APPDIR)/Make.defs
+    CSRCS += esp07s_wifi.c
+    include $(APPDIR)/Application.mk
+
+endif
+
+ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
 SRC_FILES := esp07s_wifi.c
 
 include $(KERNEL_ROOT)/compiler.mk
+endif

APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c

@@ -25,6 +25,11 @@
 
 #define LEN_PARA_BUF 128
 
+#ifdef ADD_NUTTX_FETURES
+#define EOK 0
+#define x_err_t int
+#endif
+
 static int Esp07sWifiSetDown(struct Adapter *adapter_at);
 
 /**

Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/configs/wifinsh/defconfig

@@ -0,0 +1,61 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+CONFIG_ADD_NUTTX_FETURES=y
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="xidatong"
+CONFIG_ARCH_BOARD_XIDATONG=y
+CONFIG_ARCH_CHIP="imxrt"
+CONFIG_ARCH_CHIP_IMXRT=y
+CONFIG_ARCH_CHIP_MIMXRT1052CVL5B=y
+CONFIG_ARCH_INTERRUPTSTACK=10240
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARMV7M_DCACHE=y
+CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
+CONFIG_ARMV7M_ICACHE=y
+CONFIG_ARMV7M_USEBASEPRI=y
+CONFIG_BOARD_LOOPSPERMSEC=104926
+CONFIG_BUILTIN=y
+CONFIG_CLOCK_MONOTONIC=y
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_IMXRT_GPIO_IRQ=y
+CONFIG_IMXRT_GPIO3_0_15_IRQ=y
+CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_IMXRT_LPUART1=y
+CONFIG_IMXRT_LPUART2=y
+CONFIG_INTELHEX_BINARY=y
+CONFIG_LPUART1_SERIAL_CONSOLE=y
+CONFIG_LPUART2_SERIALDRIVER=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_RAM_SIZE=524288
+CONFIG_RAM_START=0x20200000
+CONFIG_RAW_BINARY=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=14
+CONFIG_START_MONTH=3
+CONFIG_SYSTEM_NSH=y
+CONFIG_DEV_GPIO=y
+CONFIG_READLINE_CMD_HISTORY=y
+CONFIG_READLINE_CMD_HISTORY_LEN=100
+CONFIG_READLINE_CMD_HISTORY_LINELEN=120
+CONFIG_READLINE_TABCOMPLETION=y
+CONFIG_FS_ROMFS=y
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_ARCHROMFS=y
+CONFIG_BOARDCTL_RESET=y
+CONFIG_CONNECTION_FRAMEWORK_DEBUG=y
+CONFIG_CONNECTION_ADAPTER_WIFI=y
+CONFIG_ADAPTER_ESP07S_WIFI=y
+CONFIG_ADAPTER_WIFI_ESP07S="esp07s_wifi"
+CONFIG_ADAPTER_ESP07S_DRIVER="/dev/ttyS2"
+CONFIG_USER_ENTRYPOINT="nsh_main"

Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/Kconfig

@@ -684,6 +684,10 @@ config NSH_DISABLE_ADAPTER_BLUETOOTH_TEST
 	bool "Disable hc08  AdapterBlueToothTest."
 	default n
 
+config NSH_DISABLE_ADAPTER_WIFI_TEST
+	bool "Disable esp07s  AdapterWIFITest."
+	default n
+
 config NSH_DISABLE_K210_FFT
 	bool "Disable the K210 fft device."
 	default n

Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh.h

@@ -1515,6 +1515,10 @@ int nsh_foreach_var(FAR struct nsh_vtbl_s *vtbl, nsh_foreach_var_t cb,
   int cmd_AdapterBlueToothTest(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #endif
 
+#if defined(CONFIG_ADAPTER_ESP07S_WIFI) && !defined(CONFIG_NSH_DISABLE_ADAPTER_WIFI_TEST)
+  int cmd_AdapterWifiTest(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
+#endif
+
 #if defined(CONFIG_K210_FFT_TEST) && !defined(CONFIG_NSH_DISABLE_K210_FFT)
   int cmd_fft(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv);
 #endif

Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_Applicationscmd.c

@@ -283,6 +283,17 @@ int cmd_recvzigbee(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 }
 #endif
 
+#if defined(CONFIG_ADAPTER_ESP07S_WIFI) && !defined(CONFIG_NSH_DISABLE_ADAPTER_WIFI_TEST)
+extern int AdapterWifiTest(int argc, char *argv[]);
+int cmd_AdapterWifiTest(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+    nsh_output(vtbl, "Hello, world!\n");
+    FrameworkInit();
+    AdapterWifiTest(argc, argv);
+    return OK;
+}
+#endif
+
 #if (defined(CONFIG_ADAPTER_LORA_SX1278) || defined(CONFIG_ADAPTER_LORA_E220)) && !defined(CONFIG_NSH_DISABLE_ADAPTER_LORATEST)
 extern int AdapterLoraTest(void);
 int cmd_AdapterLoraTest(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)

Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/nsh_command.c

@@ -687,6 +687,10 @@ static const struct cmdmap_s g_cmdmap[] =
   { "AdapterBlueToothTest",       cmd_AdapterBlueToothTest,       1, 1, "[BlueTooth hc08 test.]" },
 #endif
 
+#if defined(CONFIG_ADAPTER_ESP07S_WIFI) && !defined(CONFIG_NSH_DISABLE_ADAPTER_WIFI_TEST)
+  { "wifitest",       cmd_AdapterWifiTest,       1, 8, "[WIFI test.]" },
+#endif
+
 #if defined(CONFIG_K210_FFT_TEST) && !defined(CONFIG_NSH_DISABLE_K210_FFT)
   { "fft",       cmd_fft,       1, 1, "[K210 fft function.]" },
 #endif