external/bluez_bluetooth/inc/bluetooth/hci.h | 106 +++++++++++------------
external/bluez_bluetooth/inc/bluetooth/hci_lib.h | 5 -
external/bluez_bluetooth/inc/bluetooth/rfcomm.h | 6 -
external/bluez_bluetooth/inc/bluetooth/sco.h | 6 -
solenv/clang-format/excludelist | 4
5 files changed, 61 insertions(+), 66 deletions(-)
New commits:
commit c19cc6ad7676a987475fc718488007af3672a025
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 12:56:54 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Nov 19 14:46:43 2020 +0100
tdf#123936 Formatting files in module external with clang-format
Change-Id: If304aa6be018442a72e284f62d7745b3cdaef536
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105668
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/external/bluez_bluetooth/inc/bluetooth/hci.h
b/external/bluez_bluetooth/inc/bluetooth/hci.h
index 3b78f4b5f7d0..7a5b6ab0a23a 100644
--- a/external/bluez_bluetooth/inc/bluetooth/hci.h
+++ b/external/bluez_bluetooth/inc/bluetooth/hci.h
@@ -96,7 +96,7 @@
#define ESCO_3EV5 0x0200
#define SCO_ESCO_MASK (ESCO_HV1 | ESCO_HV2 | ESCO_HV3)
#define EDR_ESCO_MASK (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5)
-#define ALL_ESCO_MASK (SCO_ESCO_MASK | ESCO_EV3 | ESCO_EV4 | ESCO_EV5 |
EDR_ESCO_MASK)
+#define ALL_ESCO_MASK (SCO_ESCO_MASK | ESCO_EV3 | ESCO_EV4 | ESCO_EV5 |
EDR_ESCO_MASK)
#define HCI_UNKNOWN_COMMAND 0x01
#define HCI_NO_CONNECTION 0x02
#define HCI_HARDWARE_FAILURE 0x03
@@ -414,9 +414,9 @@
#define OCF_READ_NUM_SUPPORTED_IAC 0x0038
#define MAX_IAC_LAP 0x40
#define OCF_READ_CURRENT_IAC_LAP 0x0039
-#define READ_CURRENT_IAC_LAP_RP_SIZE 2+3*MAX_IAC_LAP
+#define READ_CURRENT_IAC_LAP_RP_SIZE 2 + 3 * MAX_IAC_LAP
#define OCF_WRITE_CURRENT_IAC_LAP 0x003A
-#define WRITE_CURRENT_IAC_LAP_CP_SIZE 1+3*MAX_IAC_LAP
+#define WRITE_CURRENT_IAC_LAP_CP_SIZE 1 + 3 * MAX_IAC_LAP
#define OCF_READ_PAGE_SCAN_PERIOD_MODE 0x003B
#define OCF_WRITE_PAGE_SCAN_PERIOD_MODE 0x003C
#define OCF_READ_PAGE_SCAN_MODE 0x003D
@@ -620,10 +620,10 @@
#define HCI_ACL_HDR_SIZE 4
#define HCI_SCO_HDR_SIZE 3
#define HCI_MSG_HDR_SIZE 6
-#define cmd_opcode_pack(ogf, ocf) (uint16_t)((ocf & 0x03ff)|(ogf << 10))
+#define cmd_opcode_pack(ogf, ocf) (uint16_t)((ocf & 0x03ff) | (ogf << 10))
#define cmd_opcode_ogf(op) (op >> 10)
#define cmd_opcode_ocf(op) (op & 0x03ff)
-#define acl_handle_pack(h, f) (uint16_t)((h & 0x0fff)|(f << 12))
+#define acl_handle_pack(h, f) (uint16_t)((h & 0x0fff) | (f << 12))
#define acl_handle(h) (h & 0x0fff)
#define acl_flags(h) (h >> 12)
#endif
@@ -642,77 +642,77 @@
#endif
struct hci_dev_stats
{
- uint32_t err_rx;
- uint32_t err_tx;
- uint32_t cmd_tx;
- uint32_t evt_rx;
- uint32_t acl_tx;
- uint32_t acl_rx;
- uint32_t sco_tx;
- uint32_t sco_rx;
- uint32_t byte_rx;
- uint32_t byte_tx;
+ uint32_t err_rx;
+ uint32_t err_tx;
+ uint32_t cmd_tx;
+ uint32_t evt_rx;
+ uint32_t acl_tx;
+ uint32_t acl_rx;
+ uint32_t sco_tx;
+ uint32_t sco_rx;
+ uint32_t byte_rx;
+ uint32_t byte_tx;
};
struct hci_dev_info
{
- uint16_t dev_id;
- char name[8];
+ uint16_t dev_id;
+ char name[8];
- bdaddr_t bdaddr;
+ bdaddr_t bdaddr;
- uint32_t flags;
- uint8_t type;
+ uint32_t flags;
+ uint8_t type;
- uint8_t features[8];
+ uint8_t features[8];
- uint32_t pkt_type;
- uint32_t link_policy;
- uint32_t link_mode;
+ uint32_t pkt_type;
+ uint32_t link_policy;
+ uint32_t link_mode;
- uint16_t acl_mtu;
- uint16_t acl_pkts;
- uint16_t sco_mtu;
- uint16_t sco_pkts;
+ uint16_t acl_mtu;
+ uint16_t acl_pkts;
+ uint16_t sco_mtu;
+ uint16_t sco_pkts;
- struct hci_dev_stats stat;
+ struct hci_dev_stats stat;
};
enum
{
- HCI_UP,
- HCI_INIT,
- HCI_RUNNING,
+ HCI_UP,
+ HCI_INIT,
+ HCI_RUNNING,
- HCI_PSCAN,
- HCI_ISCAN,
- HCI_AUTH,
- HCI_ENCRYPT,
- HCI_INQUIRY,
+ HCI_PSCAN,
+ HCI_ISCAN,
+ HCI_AUTH,
+ HCI_ENCRYPT,
+ HCI_INQUIRY,
- HCI_RAW,
+ HCI_RAW,
- HCI_SECMGR
+ HCI_SECMGR
};
struct sockaddr_hci
{
- sa_family_t hci_family;
- unsigned short hci_dev;
+ sa_family_t hci_family;
+ unsigned short hci_dev;
};
struct hci_conn_info
{
- uint16_t handle;
- bdaddr_t bdaddr;
- uint8_t type;
- uint8_t out;
- uint16_t state;
- uint32_t link_mode;
- uint32_t mtu;
- uint32_t cnt;
- uint32_t pkts;
+ uint16_t handle;
+ bdaddr_t bdaddr;
+ uint8_t type;
+ uint8_t out;
+ uint16_t state;
+ uint32_t link_mode;
+ uint32_t mtu;
+ uint32_t cnt;
+ uint32_t pkts;
};
struct hci_conn_list_req
{
- uint16_t dev_id;
- uint16_t conn_num;
- struct hci_conn_info conn_info[0];
+ uint16_t dev_id;
+ uint16_t conn_num;
+ struct hci_conn_info conn_info[0];
};
#endif
diff --git a/external/bluez_bluetooth/inc/bluetooth/hci_lib.h
b/external/bluez_bluetooth/inc/bluetooth/hci_lib.h
index ef290bc45464..d6886c146d6f 100644
--- a/external/bluez_bluetooth/inc/bluetooth/hci_lib.h
+++ b/external/bluez_bluetooth/inc/bluetooth/hci_lib.h
@@ -16,9 +16,8 @@
#endif
#ifdef __cplusplus
#endif
-static inline int
-hci_test_bit (int nr, void *addr)
+static inline int hci_test_bit(int nr, void* addr)
{
- return *((uint32_t *) addr + (nr >> 5)) & (1 << (nr & 31));
+ return *((uint32_t*)addr + (nr >> 5)) & (1 << (nr & 31));
}
#endif
diff --git a/external/bluez_bluetooth/inc/bluetooth/rfcomm.h
b/external/bluez_bluetooth/inc/bluetooth/rfcomm.h
index 3610088a3591..b179717b79dd 100644
--- a/external/bluez_bluetooth/inc/bluetooth/rfcomm.h
+++ b/external/bluez_bluetooth/inc/bluetooth/rfcomm.h
@@ -40,8 +40,8 @@
#endif
struct sockaddr_rc
{
- sa_family_t rc_family;
- bdaddr_t rc_bdaddr;
- uint8_t rc_channel;
+ sa_family_t rc_family;
+ bdaddr_t rc_bdaddr;
+ uint8_t rc_channel;
};
#endif
diff --git a/external/bluez_bluetooth/inc/bluetooth/sco.h
b/external/bluez_bluetooth/inc/bluetooth/sco.h
index 96b8a0a4f7cc..56fe3710a0c1 100644
--- a/external/bluez_bluetooth/inc/bluetooth/sco.h
+++ b/external/bluez_bluetooth/inc/bluetooth/sco.h
@@ -25,8 +25,8 @@
#endif
struct sockaddr_sco
{
- sa_family_t sco_family;
- bdaddr_t sco_bdaddr;
- uint16_t sco_pkt_type;
+ sa_family_t sco_family;
+ bdaddr_t sco_bdaddr;
+ uint16_t sco_pkt_type;
};
#endif
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 6a43df5e136e..602463bac622 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -4030,10 +4030,6 @@ extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h
extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp
extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h
external/bluez_bluetooth/inc/bluetooth/bluetooth.h
-external/bluez_bluetooth/inc/bluetooth/hci.h
-external/bluez_bluetooth/inc/bluetooth/hci_lib.h
-external/bluez_bluetooth/inc/bluetooth/rfcomm.h
-external/bluez_bluetooth/inc/bluetooth/sco.h
external/clew/source/clew.c
external/clew/source/include/clew/clew.h
external/clucene/configs/_clucene-config-LINUX.h
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
