Add proper LE_ prefix to some HCI constants

diff --git a/lib/hci.c b/lib/hci.c
index 4b15be7..3b2baf9 100644 (file)
--- a/lib/hci.c
+++ b/lib/hci.c
@@ -2606,7 +2606,7 @@ int hci_le_set_scan_enable(int dd, uint8_t enable, uint8_t filter_dup)
        rq.ogf = OGF_LE_CTL;
        rq.ocf = OCF_LE_SET_SCAN_ENABLE;
        rq.cparam = &scan_cp;
-       rq.clen = SET_SCAN_ENABLE_CP_SIZE;
+       rq.clen = LE_SET_SCAN_ENABLE_CP_SIZE;
        rq.rparam = &status;
        rq.rlen = 1;
 
@@ -2640,7 +2640,7 @@ int hci_le_set_scan_parameters(int dd, uint8_t type,
        rq.ogf = OGF_LE_CTL;
        rq.ocf = OCF_LE_SET_SCAN_PARAMETERS;
        rq.cparam = &param_cp;
-       rq.clen = SET_SCAN_PARAMETERS_CP_SIZE;
+       rq.clen = LE_SET_SCAN_PARAMETERS_CP_SIZE;
        rq.rparam = &status;
        rq.rlen = 1;
 
@@ -2668,7 +2668,7 @@ int hci_le_set_advertise_enable(int dd, uint8_t enable)
        rq.ogf = OGF_LE_CTL;
        rq.ocf = OCF_LE_SET_ADVERTISE_ENABLE;
        rq.cparam = &adv_cp;
-       rq.clen = SET_ADVERTISE_ENABLE_CP_SIZE;
+       rq.clen = LE_SET_ADVERTISE_ENABLE_CP_SIZE;
        rq.rparam = &status;
        rq.rlen = 1;
 

diff --git a/lib/hci.h b/lib/hci.h
index 30249f6..aea423f 100644 (file)
--- a/lib/hci.h
+++ b/lib/hci.h
@@ -1300,34 +1300,34 @@ typedef struct {
        uint8_t         chan_map;
        uint8_t         filter;
 } __attribute__ ((packed)) le_set_advertising_parameters_cp;
-#define SET_ADVERTISING_PARAMETERS_CP_SIZE 15
+#define LE_SET_ADVERTISING_PARAMETERS_CP_SIZE 15
 
 #define OCF_LE_READ_ADVERTISING_CHANNEL_TX_POWER       0x0007
 typedef struct {
        uint8_t         status;
        uint8_t         level;
 } __attribute__ ((packed)) le_read_advertising_channel_tx_power_rp;
-#define READ_ADVERTISING_CHANNEL_TX_POWER_RP_SIZE 2
+#define LE_READ_ADVERTISING_CHANNEL_TX_POWER_RP_SIZE 2
 
 #define OCF_LE_SET_ADVERTISING_DATA            0x0008
 typedef struct {
        uint8_t         length;
        uint8_t         data[31];
 } __attribute__ ((packed)) le_set_advertising_data_cp;
-#define SET_ADVERTISING_DATA_CP_SIZE 32
+#define LE_SET_ADVERTISING_DATA_CP_SIZE 32
 
 #define OCF_LE_SET_SCAN_RESPONSE_DATA          0x0009
 typedef struct {
        uint8_t         length;
        uint8_t         data[31];
 } __attribute__ ((packed)) le_set_scan_response_data_cp;
-#define SET_SCAN_RESPONSE_DATA_CP_SIZE 32
+#define LE_SET_SCAN_RESPONSE_DATA_CP_SIZE 32
 
 #define OCF_LE_SET_ADVERTISE_ENABLE            0x000A
 typedef struct {
        uint8_t         enable;
 } __attribute__ ((packed)) le_set_advertise_enable_cp;
-#define SET_ADVERTISE_ENABLE_CP_SIZE 1
+#define LE_SET_ADVERTISE_ENABLE_CP_SIZE 1
 
 #define OCF_LE_SET_SCAN_PARAMETERS             0x000B
 typedef struct {
@@ -1337,14 +1337,14 @@ typedef struct {
        uint8_t         own_bdaddr_type;
        uint8_t         filter;
 } __attribute__ ((packed)) le_set_scan_parameters_cp;
-#define SET_SCAN_PARAMETERS_CP_SIZE 7
+#define LE_SET_SCAN_PARAMETERS_CP_SIZE 7
 
 #define OCF_LE_SET_SCAN_ENABLE                 0x000C
 typedef struct {
        uint8_t         enable;
        uint8_t         filter_dup;
 } __attribute__ ((packed)) le_set_scan_enable_cp;
-#define SET_SCAN_ENABLE_CP_SIZE 2
+#define LE_SET_SCAN_ENABLE_CP_SIZE 2
 
 #define OCF_LE_CREATE_CONN                     0x000D
 typedef struct {