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

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26701 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes
2008-07-31 19:51:16 +00:00
parent 9a0fc9a874
commit ded3259257
6 changed files with 523 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/bluetooth/HCI/btHCI.h
+3 -3
View File
@@ -18,11 +18,10 @@ typedef enum { BT_COMMAND = 0,
BT_ACL, BT_ACL,
BT_SCO, BT_SCO,
BT_ESCO, BT_ESCO,
// more packet types // more packets here
HCI_NUM_PACKET_TYPES //max HCI_NUM_PACKET_TYPES
} bt_packet_t; } bt_packet_t;
/* packets sizes */ /* packets sizes */
#define HCI_MAX_ACL_SIZE 1024 #define HCI_MAX_ACL_SIZE 1024
#define HCI_MAX_SCO_SIZE 255 #define HCI_MAX_SCO_SIZE 255
@@ -39,3 +38,4 @@ 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,11 +48,19 @@ 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
@@ -61,11 +69,19 @@ 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_module.h
-1
View File
@@ -19,7 +19,6 @@
/* TODO: Possible definition of a bus manager of whatever is gonna be on the top */ /* TODO: Possible definition of a bus manager of whatever is gonna be on the top */
typedef struct bt_hci_module_info { typedef struct bt_hci_module_info {
/* registration */ /* registration */
status_t (*RegisterDriver)(bt_hci_transport* desc, hci_id *id /*out*/, status_t (*RegisterDriver)(bt_hci_transport* desc, hci_id *id /*out*/,
bt_hci_device* cookie /*out*/ ); bt_hci_device* cookie /*out*/ );
headers/os/bluetooth/HCI/btHCI_transport.h
+11 -1
View File
@@ -13,12 +13,21 @@
#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 {
@@ -87,7 +96,8 @@ enum {
BT_UP, BT_UP,
GET_STATICS, GET_STATICS,
GET_NOTIFICATION_PORT, GET_NOTIFICATION_PORT,
GET_HCI_ID GET_HCI_ID,
BT_UP
}; };
#define PACK_PORTCODE(type,hid,data) ((type&0xFF)<<24|(hid&0xFF)<<16|(data&0xFFFF)) #define PACK_PORTCODE(type,hid,data) ((type&0xFF)<<24|(hid&0xFF)<<16|(data&0xFFFF))