From e50cb6d58713cede76a80cf861edaa850383a8f2 Mon Sep 17 00:00:00 2001
From: Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl>
Date: Mon, 22 Aug 2022 13:33:03 +0200
Subject: [PATCH] nimble: Fix hci defs order

---
 nimble/include/nimble/hci_common.h | 85 +++++++++++++++---------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/nimble/include/nimble/hci_common.h b/nimble/include/nimble/hci_common.h
index 17fa76272..40602d7b3 100644
--- a/nimble/include/nimble/hci_common.h
+++ b/nimble/include/nimble/hci_common.h
@@ -1063,6 +1063,48 @@ struct ble_hci_le_set_host_feat_cp {
     uint8_t val;
 } __attribute__((packed));
 
+#define BLE_HCI_OCF_LE_ENH_READ_TRANSMIT_POWER_LEVEL     (0x0076)
+struct ble_hci_le_enh_read_transmit_power_level_cp {
+    uint16_t conn_handle;
+    uint8_t phy;
+} __attribute__((packed));
+struct ble_hci_le_enh_read_transmit_power_level_rp {
+    uint8_t status;
+    uint16_t conn_handle;
+    uint8_t phy;
+    uint8_t curr_tx_power_level;
+    uint8_t max_tx_power_level;
+} __attribute__((packed));
+
+#define BLE_HCI_OCF_LE_READ_REMOTE_TRANSMIT_POWER_LEVEL  (0x0077)
+struct ble_hci_le_read_remote_transmit_power_level_cp {
+    uint16_t conn_handle;
+    uint8_t phy;
+} __attribute__((packed));
+
+#define BLE_HCI_OCF_LE_SET_PATH_LOSS_REPORT_PARAM        (0x0078)
+struct ble_hci_le_set_path_loss_report_param_cp {
+    uint16_t conn_handle;
+    uint8_t high_threshold;
+    uint8_t high_hysteresis;
+    uint8_t low_threshold;
+    uint8_t low_hysteresis;
+    uint16_t min_time_spent;
+} __attribute__((packed));
+
+#define BLE_HCI_OCF_LE_SET_PATH_LOSS_REPORT_ENABLE       (0x0079)
+struct ble_hci_le_set_path_loss_report_enable_cp {
+    uint16_t conn_handle;
+    uint8_t enable;
+} __attribute__((packed));
+
+#define BLE_HCI_OCF_LE_SET_TRANS_PWR_REPORT_ENABLE       (0x007A)
+struct ble_hci_le_set_transmit_power_report_enable_cp {
+    uint16_t conn_handle;
+    uint8_t local_enable;
+    uint8_t remote_enable;
+} __attribute__((packed));
+
 #define BLE_HCI_OCF_LE_SET_DEFAULT_SUBRATE               (0x007D)
 struct ble_hci_le_set_default_subrate_cp {
     uint16_t subrate_min;
@@ -1127,49 +1169,6 @@ struct ble_hci_vs_css_set_conn_slot_cp {
     uint16_t slot_idx;
 } __attribute__((packed));
 
-#define BLE_HCI_OCF_LE_ENH_READ_TRANSMIT_POWER_LEVEL     (0x0076)
-struct ble_hci_le_enh_read_transmit_power_level_cp {
-    uint16_t conn_handle;
-    uint8_t phy;
-} __attribute__((packed));
-struct ble_hci_le_enh_read_transmit_power_level_rp {
-    uint8_t status;
-    uint16_t conn_handle;
-    uint8_t phy;
-    uint8_t curr_tx_power_level;
-    uint8_t max_tx_power_level;
-} __attribute__((packed));
-
-#define BLE_HCI_OCF_LE_READ_REMOTE_TRANSMIT_POWER_LEVEL  (0x0077)
-struct ble_hci_le_read_remote_transmit_power_level_cp {
-    uint16_t conn_handle;
-    uint8_t phy;
-} __attribute__((packed));
-
-#define BLE_HCI_OCF_LE_SET_PATH_LOSS_REPORT_PARAM        (0x0078)
-struct ble_hci_le_set_path_loss_report_param_cp {
-    uint16_t conn_handle;
-    uint8_t high_threshold;
-    uint8_t high_hysteresis;
-    uint8_t low_threshold;
-    uint8_t low_hysteresis;
-    uint16_t min_time_spent;
-} __attribute__((packed));
-
-#define BLE_HCI_OCF_LE_SET_PATH_LOSS_REPORT_ENABLE       (0x0079)
-struct ble_hci_le_set_path_loss_report_enable_cp {
-    uint16_t conn_handle;
-    uint8_t enable;
-} __attribute__((packed));
-
-#define BLE_HCI_OCF_LE_SET_TRANS_PWR_REPORT_ENABLE       (0x007A)
-struct ble_hci_le_set_transmit_power_report_enable_cp {
-    uint16_t conn_handle;
-    uint8_t local_enable;
-    uint8_t remote_enable;
-} __attribute__((packed));
-
-
 /* Command Specific Definitions */
 /* --- Set controller to host flow control (OGF 0x03, OCF 0x0031) --- */
 #define BLE_HCI_CTLR_TO_HOST_FC_OFF         (0)