Upgrade bluez5_37 :Merge the code from private

[platform/upstream/bluez.git] / monitor / packet.h

diff --git a/monitor/packet.h b/monitor/packet.h
index c39816b..322f101 100644 (file)
--- a/monitor/packet.h
+++ b/monitor/packet.h
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/time.h>
+#include <sys/socket.h>
 
 #define PACKET_FILTER_SHOW_INDEX       (1 << 0)
 #define PACKET_FILTER_SHOW_DATE                (1 << 1)
@@ -37,6 +38,7 @@ void packet_set_filter(unsigned long filter);
 void packet_add_filter(unsigned long filter);
 void packet_del_filter(unsigned long filter);
 
+void packet_set_priority(const char *priority);
 void packet_select_index(uint16_t index);
 
 void packet_hexdump(const unsigned char *buf, uint16_t len);
@@ -53,9 +55,11 @@ void packet_print_channel_map_ll(const uint8_t *map);
 void packet_print_io_capability(uint8_t capability);
 void packet_print_io_authentication(uint8_t authentication);
 
-void packet_control(struct timeval *tv, uint16_t index, uint16_t opcode,
+void packet_control(struct timeval *tv, struct ucred *cred,
+                                       uint16_t index, uint16_t opcode,
                                        const void *data, uint16_t size);
-void packet_monitor(struct timeval *tv, uint16_t index, uint16_t opcode,
+void packet_monitor(struct timeval *tv, struct ucred *cred,
+                                       uint16_t index, uint16_t opcode,
                                        const void *data, uint16_t size);
 void packet_simulator(struct timeval *tv, uint16_t frequency,
                                        const void *data, uint16_t size);
@@ -63,14 +67,26 @@ void packet_simulator(struct timeval *tv, uint16_t frequency,
 void packet_new_index(struct timeval *tv, uint16_t index, const char *label,
                                uint8_t type, uint8_t bus, const char *name);
 void packet_del_index(struct timeval *tv, uint16_t index, const char *label);
-
-void packet_hci_command(struct timeval *tv, uint16_t index,
-                                       const void *data, uint16_t size);
-void packet_hci_event(struct timeval *tv, uint16_t index,
+void packet_open_index(struct timeval *tv, uint16_t index, const char *label);
+void packet_close_index(struct timeval *tv, uint16_t index, const char *label);
+void packet_index_info(struct timeval *tv, uint16_t index, const char *label,
+                                                       uint16_t manufacturer);
+void packet_vendor_diag(struct timeval *tv, uint16_t index,
+                                       uint16_t manufacturer,
                                        const void *data, uint16_t size);
-void packet_hci_acldata(struct timeval *tv, uint16_t index, bool in,
+void packet_system_note(struct timeval *tv, struct ucred *cred,
+                                       uint16_t index, const void *message);
+void packet_user_logging(struct timeval *tv, struct ucred *cred,
+                                       uint16_t index, uint8_t priority,
+                                       const char *ident, const char *message);
+
+void packet_hci_command(struct timeval *tv, struct ucred *cred, uint16_t index,
                                        const void *data, uint16_t size);
-void packet_hci_scodata(struct timeval *tv, uint16_t index, bool in,
+void packet_hci_event(struct timeval *tv, struct ucred *cred, uint16_t index,
                                        const void *data, uint16_t size);
+void packet_hci_acldata(struct timeval *tv, struct ucred *cred, uint16_t index,
+                               bool in, const void *data, uint16_t size);
+void packet_hci_scodata(struct timeval *tv, struct ucred *cred, uint16_t index,
+                               bool in, const void *data, uint16_t size);
 
 void packet_todo(void);