From b2ebb717553db0b922405656e52607de0b6bfff2 Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Fri, 13 Nov 2009 22:09:00 +0000 Subject: [PATCH] File not yet ready, revert git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34025 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/bluetooth/btCoreData.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/headers/private/bluetooth/btCoreData.h b/headers/private/bluetooth/btCoreData.h index 8885807667..55a2226f0c 100644 --- a/headers/private/bluetooth/btCoreData.h +++ b/headers/private/bluetooth/btCoreData.h @@ -6,7 +6,6 @@ #define _BTCOREDATA_H #include -#include #include #include @@ -31,9 +30,6 @@ typedef enum _connection_status { #ifdef __cplusplus struct HciConnection : DoublyLinkedListLinkImpl { - HciConnection(); - virtual ~HciConnection(); - hci_id Hid; struct net_device* ndevice; net_buffer* currentRxPacket; @@ -48,8 +44,6 @@ struct HciConnection : DoublyLinkedListLinkImpl { DoublyLinkedList ChannelList; DoublyLinkedList ExpectedResponses; DoublyLinkedList OutGoingFrames; - mutex fLock; - mutex fLockExpected; }; #else @@ -90,7 +84,7 @@ struct L2capChannel : DoublyLinkedListLinkImpl { uint16 psm; uint8 ident; uint8 cfgState; - + channel_status state; ChannelConfiguration* configuration; L2capEndpoint* endpoint; @@ -160,10 +154,9 @@ struct bluetooth_core_data_module_info { struct L2capFrame* (*SignalByIdent)(struct HciConnection* conn, uint8 ident); status_t (*TimeoutSignal)(struct L2capFrame* frame, uint32 timeo); status_t (*UnTimeoutSignal)(struct L2capFrame* frame); - struct L2capFrame* (*SpawnFrame)(struct HciConnection* conn, struct L2capChannel* channel, net_buffer* buffer, frame_type frame); + struct L2capFrame* (*SpawnFrame)(struct HciConnection* conn, net_buffer* buffer, frame_type frame); struct L2capFrame* (*SpawnSignal)(struct HciConnection* conn, struct L2capChannel* channel, net_buffer* buffer, uint8 ident, uint8 code); status_t (*AcknowledgeSignal)(struct L2capFrame* frame); - status_t (*QueueSignal)(struct L2capFrame* frame); };