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

File not yet ready, revert

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34025 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Ruiz Dorantes
2009-11-13 22:09:00 +00:00
parent 02d67528b5
commit b2ebb71755
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/bluetooth/btCoreData.h
+2 -9
View File
@@ -6,7 +6,6 @@
#define _BTCOREDATA_H #define _BTCOREDATA_H
#include <module.h> #include <module.h>
#include <lock.h>
#include <util/DoublyLinkedList.h> #include <util/DoublyLinkedList.h>
#include <util/DoublyLinkedQueue.h> #include <util/DoublyLinkedQueue.h>
@@ -31,9 +30,6 @@ typedef enum _connection_status {
#ifdef __cplusplus #ifdef __cplusplus
struct HciConnection : DoublyLinkedListLinkImpl<HciConnection> { struct HciConnection : DoublyLinkedListLinkImpl<HciConnection> {
HciConnection();
virtual ~HciConnection();
hci_id Hid; hci_id Hid;
struct net_device* ndevice; struct net_device* ndevice;
net_buffer* currentRxPacket; net_buffer* currentRxPacket;
@@ -48,8 +44,6 @@ struct HciConnection : DoublyLinkedListLinkImpl<HciConnection> {
DoublyLinkedList<L2capChannel> ChannelList; DoublyLinkedList<L2capChannel> ChannelList;
DoublyLinkedList<L2capFrame> ExpectedResponses; DoublyLinkedList<L2capFrame> ExpectedResponses;
DoublyLinkedList<L2capFrame> OutGoingFrames; DoublyLinkedList<L2capFrame> OutGoingFrames;
mutex fLock;
mutex fLockExpected;
}; };
#else #else
@@ -90,7 +84,7 @@ struct L2capChannel : DoublyLinkedListLinkImpl<L2capChannel> {
uint16 psm; uint16 psm;
uint8 ident; uint8 ident;
uint8 cfgState; uint8 cfgState;
channel_status state; channel_status state;
ChannelConfiguration* configuration; ChannelConfiguration* configuration;
L2capEndpoint* endpoint; L2capEndpoint* endpoint;
@@ -160,10 +154,9 @@ struct bluetooth_core_data_module_info {
struct L2capFrame* (*SignalByIdent)(struct HciConnection* conn, uint8 ident); struct L2capFrame* (*SignalByIdent)(struct HciConnection* conn, uint8 ident);
status_t (*TimeoutSignal)(struct L2capFrame* frame, uint32 timeo); status_t (*TimeoutSignal)(struct L2capFrame* frame, uint32 timeo);
status_t (*UnTimeoutSignal)(struct L2capFrame* frame); 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); struct L2capFrame* (*SpawnSignal)(struct HciConnection* conn, struct L2capChannel* channel, net_buffer* buffer, uint8 ident, uint8 code);
status_t (*AcknowledgeSignal)(struct L2capFrame* frame); status_t (*AcknowledgeSignal)(struct L2capFrame* frame);
status_t (*QueueSignal)(struct L2capFrame* frame);
}; };