feat(bluetooth/controller): adjust bt/porting code structure and delete redundant code

Author: zhaoweiliang2021

components/bt/CMakeLists.txt

@@ -575,7 +575,7 @@ if(CONFIG_BT_ENABLED)
     if(CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT)
             list(APPEND srcs
                     "porting/npl/freertos/src/npl_os_freertos.c"
-                    "porting/nimble/src/os_msys_init.c"
+                    "porting/mem/os_msys_init.c"
             )
 
             if(CONFIG_BT_CONTROLLER_DISABLED)
@@ -585,7 +585,6 @@ if(CONFIG_BT_ENABLED)
             endif()
             list(APPEND include_dirs
                     porting/include
-                    porting/nimble/include
                     porting/npl/freertos/include
                     porting/transport/include
             )
@@ -727,7 +726,6 @@ if(CONFIG_BT_ENABLED)
                 "host/nimble/port/src/nvs_port.c"
             )
             list(APPEND include_dirs
-                porting/include
                 host/nimble/nimble/porting/nimble/include
                 host/nimble/port/include
                 host/nimble/nimble/nimble/transport/include
@@ -756,9 +754,8 @@ if(CONFIG_BT_ENABLED)
             endif()
 
             list(APPEND include_dirs
+                    porting/include
                     host/nimble/nimble/porting/npl/freertos/include
-                    host/nimble/nimble/porting/nimble/include
-                    host/nimble/nimble/nimble/include
             )
         endif()
 

components/bt/controller/esp32c2/bt.c

@@ -16,7 +16,10 @@
 
 #include "sdkconfig.h"
 
+#if CONFIG_BT_NIMBLE_ENABLED
 #include "nimble/nimble_port.h"
+#endif // CONFIG_BT_NIMBLE_ENABLED
+
 #include "nimble/nimble_port_freertos.h"
 
 #ifdef ESP_PLATFORM
@@ -28,7 +31,7 @@
 #endif
 
 #include "nimble/nimble_npl_os.h"
-#include "nimble/ble_hci_trans.h"
+#include "ble_hci_trans.h"
 #include "os/endian.h"
 
 #include "esp_bt.h"

components/bt/controller/esp32c5/bt.c

@@ -15,7 +15,9 @@
 
 #include "sdkconfig.h"
 
+#if CONFIG_BT_NIMBLE_ENABLED
 #include "nimble/nimble_port.h"
+#endif // CONFIG_BT_NIMBLE_ENABLED
 #include "nimble/nimble_port_freertos.h"
 #include "esp_private/esp_modem_clock.h"
 
@@ -28,7 +30,7 @@
 #endif // CONFIG_SW_COEXIST_ENABLE
 
 #include "nimble/nimble_npl_os.h"
-#include "nimble/ble_hci_trans.h"
+#include "ble_hci_trans.h"
 #include "os/endian.h"
 
 #include "esp_bt.h"

components/bt/controller/esp32c6/bt.c

@@ -15,7 +15,9 @@
 
 #include "sdkconfig.h"
 
+#if CONFIG_BT_NIMBLE_ENABLED
 #include "nimble/nimble_port.h"
+#endif // CONFIG_BT_NIMBLE_ENABLED
 #include "nimble/nimble_port_freertos.h"
 #include "esp_private/esp_modem_clock.h"
 
@@ -28,7 +30,7 @@
 #endif // CONFIG_ESP_COEX_ENABLED
 
 #include "nimble/nimble_npl_os.h"
-#include "nimble/ble_hci_trans.h"
+#include "ble_hci_trans.h"
 #include "os/endian.h"
 
 #include "esp_bt.h"

components/bt/controller/esp32h2/bt.c

@@ -15,7 +15,9 @@
 
 #include "sdkconfig.h"
 
+#if CONFIG_BT_NIMBLE_ENABLED
 #include "nimble/nimble_port.h"
+#endif // CONFIG_BT_NIMBLE_ENABLED
 #include "nimble/nimble_port_freertos.h"
 #include "esp_private/esp_modem_clock.h"
 
@@ -28,7 +30,7 @@
 #endif // CONFIG_ESP_COEX_ENABLED
 
 #include "nimble/nimble_npl_os.h"
-#include "nimble/ble_hci_trans.h"
+#include "ble_hci_trans.h"
 #include "os/endian.h"
 
 #include "esp_bt.h"

components/bt/host/bluedroid/hci/hci_hal_h4.c

@@ -36,7 +36,7 @@
 #include "stack/hcimsgs.h"
 
 #if ((BT_CONTROLLER_INCLUDED == TRUE) && SOC_ESP_NIMBLE_CONTROLLER)
-#include "nimble/ble_hci_trans.h"
+#include "ble_hci_trans.h"
 #endif
 
 #if (C2H_FLOW_CONTROL_INCLUDED == TRUE)

…ng/nimble/include/nimble/ble_hci_trans.h …nents/bt/porting/include/ble_hci_trans.hcomponents/bt/porting/nimble/include/nimble/ble_hci_trans.h renamed to components/bt/porting/include/ble_hci_trans.h components/bt/porting/nimble/include/nimble/ble_hci_trans.h renamed to components/bt/porting/include/ble_hci_trans.h

@@ -1,20 +1,7 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #ifndef H_HCI_TRANSPORT_