From 0f9aa9c24516433bd249ba5ef59548148d335f8d Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Thu, 31 Jul 2008 19:55:13 +0000 Subject: [PATCH] Patch by Fredrik Ekdahl. Fix tabs and whitespaces, this set of files were conflicting git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26702 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/bluetooth/HCI/btHCI.h | 1 - headers/os/bluetooth/HCI/btHCI_event.h | 16 ---------------- headers/os/bluetooth/HCI/btHCI_transport.h | 10 ---------- 3 files changed, 27 deletions(-) diff --git a/headers/os/bluetooth/HCI/btHCI.h b/headers/os/bluetooth/HCI/btHCI.h index 244e80ed5b..e68738bf8e 100644 --- a/headers/os/bluetooth/HCI/btHCI.h +++ b/headers/os/bluetooth/HCI/btHCI.h @@ -38,4 +38,3 @@ typedef enum { BT_COMMAND = 0, #define HCI_DEVICE_NAME_SIZE 248 /* unit name size */ #endif - diff --git a/headers/os/bluetooth/HCI/btHCI_event.h b/headers/os/bluetooth/HCI/btHCI_event.h index 64d8cf7969..fbbbbd9087 100644 --- a/headers/os/bluetooth/HCI/btHCI_event.h +++ b/headers/os/bluetooth/HCI/btHCI_event.h @@ -48,19 +48,11 @@ struct hci_ev_conn_request { uint8 link_type; } __attribute__ ((packed)); -<<<<<<< .mine #define HCI_EVENT_DISCONNECTION_COMPLETE 0x05 struct hci_ev_disconnection_complete_reply { uint8 status; uint16 handle; uint8 reason; -======= -#define HCI_EVENT_DISCONNECTION_COMPLETE 0x05 -struct hci_ev_disconnection_complete_reply { - uint8 status; - uint16 handle; - uint8 reason; ->>>>>>> .r26700 } __attribute__ ((packed)); #define HCI_EVENT_AUTH_COMPLETE 0x06 @@ -69,19 +61,11 @@ struct hci_ev_auth_complete { uint16 handle; } __attribute__ ((packed)); -<<<<<<< .mine #define HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE 0x07 struct hci_ev_remote_name_request_complete_reply { uint8 status; bdaddr_t bdaddr; char remote_name[248]; -======= -#define HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE 0x07 -struct hci_ev_remote_name_request_complete_reply { - uint8 status; - bdaddr_t bdaddr; - char remote_name[248]; ->>>>>>> .r26700 } __attribute__ ((packed)); #define HCI_EVENT_ENCRYPT_CHANGE 0x08 diff --git a/headers/os/bluetooth/HCI/btHCI_transport.h b/headers/os/bluetooth/HCI/btHCI_transport.h index db31ef7fd5..a1f1a7f3f8 100644 --- a/headers/os/bluetooth/HCI/btHCI_transport.h +++ b/headers/os/bluetooth/HCI/btHCI_transport.h @@ -13,21 +13,12 @@ #include #include -<<<<<<< .mine typedef enum { ANCILLYANT = (1<<0), RUNNING = (1<<1), LEAVING = (1<<2), SENDING = (1<<3), PROCESSING = (1<<4) } bt_transport_status_t; -======= -typedef enum { ANCILLYANT = (1<<0), - RUNNING = (1<<1), - LEAVING = (1<<2), - SENDING = (1<<3), - PROCESSING = (1<<4) - } bt_transport_status_t; ->>>>>>> .r26700 typedef uint8 bt_stat_t; typedef struct bt_hci_statistics { @@ -93,7 +84,6 @@ typedef struct bt_hci_device { enum { ISSUE_BT_COMMAND = B_DEVICE_OP_CODES_END + BT_IOCTLS_OFFSET, - BT_UP, GET_STATICS, GET_NOTIFICATION_PORT, GET_HCI_ID,