i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by Fredrik Ekdahl. Fix tabs and whitespaces, this set of files were conflicting

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26702 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes
2008-07-31 19:55:13 +00:00
parent ded3259257
commit 0f9aa9c245
3 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/bluetooth/HCI/btHCI.h
-1
View File
@@ -38,4 +38,3 @@ typedef enum { BT_COMMAND = 0,
#define HCI_DEVICE_NAME_SIZE 248 /* unit name size */ #define HCI_DEVICE_NAME_SIZE 248 /* unit name size */
#endif #endif
headers/os/bluetooth/HCI/btHCI_event.h
-16
View File
@@ -48,19 +48,11 @@ struct hci_ev_conn_request {
uint8 link_type; uint8 link_type;
} __attribute__ ((packed)); } __attribute__ ((packed));
<<<<<<< .mine
#define HCI_EVENT_DISCONNECTION_COMPLETE 0x05 #define HCI_EVENT_DISCONNECTION_COMPLETE 0x05
struct hci_ev_disconnection_complete_reply { struct hci_ev_disconnection_complete_reply {
uint8 status; uint8 status;
uint16 handle; uint16 handle;
uint8 reason; uint8 reason;
=======
#define HCI_EVENT_DISCONNECTION_COMPLETE 0x05
struct hci_ev_disconnection_complete_reply {
uint8 status;
uint16 handle;
uint8 reason;
>>>>>>> .r26700
} __attribute__ ((packed)); } __attribute__ ((packed));
#define HCI_EVENT_AUTH_COMPLETE 0x06 #define HCI_EVENT_AUTH_COMPLETE 0x06
@@ -69,19 +61,11 @@ struct hci_ev_auth_complete {
uint16 handle; uint16 handle;
} __attribute__ ((packed)); } __attribute__ ((packed));
<<<<<<< .mine
#define HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE 0x07 #define HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE 0x07
struct hci_ev_remote_name_request_complete_reply { struct hci_ev_remote_name_request_complete_reply {
uint8 status; uint8 status;
bdaddr_t bdaddr; bdaddr_t bdaddr;
char remote_name[248]; 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)); } __attribute__ ((packed));
#define HCI_EVENT_ENCRYPT_CHANGE 0x08 #define HCI_EVENT_ENCRYPT_CHANGE 0x08
headers/os/bluetooth/HCI/btHCI_transport.h
-10
View File
@@ -13,21 +13,12 @@
#include <net_buffer.h> #include <net_buffer.h>
#include <Drivers.h> #include <Drivers.h>
<<<<<<< .mine
typedef enum { ANCILLYANT = (1<<0), typedef enum { ANCILLYANT = (1<<0),
RUNNING = (1<<1), RUNNING = (1<<1),
LEAVING = (1<<2), LEAVING = (1<<2),
SENDING = (1<<3), SENDING = (1<<3),
PROCESSING = (1<<4) PROCESSING = (1<<4)
} bt_transport_status_t; } 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 uint8 bt_stat_t;
typedef struct bt_hci_statistics { typedef struct bt_hci_statistics {
@@ -93,7 +84,6 @@ typedef struct bt_hci_device {
enum { enum {
ISSUE_BT_COMMAND = B_DEVICE_OP_CODES_END + BT_IOCTLS_OFFSET, ISSUE_BT_COMMAND = B_DEVICE_OP_CODES_END + BT_IOCTLS_OFFSET,
BT_UP,
GET_STATICS, GET_STATICS,
GET_NOTIFICATION_PORT, GET_NOTIFICATION_PORT,
GET_HCI_ID, GET_HCI_ID,