From b3256174a6047003e2a5bde7c369319a2bddf50c Mon Sep 17 00:00:00 2001 From: Oliver Ruiz Dorantes Date: Tue, 25 Nov 2008 18:22:25 +0000 Subject: [PATCH] Change module name git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28727 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../bluetooth/{BTCoreData.h => btCoreData.h} | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) rename headers/private/bluetooth/{BTCoreData.h => btCoreData.h} (93%) diff --git a/headers/private/bluetooth/BTCoreData.h b/headers/private/bluetooth/btCoreData.h similarity index 93% rename from headers/private/bluetooth/BTCoreData.h rename to headers/private/bluetooth/btCoreData.h index f6b1b9c211..55a2226f0c 100644 --- a/headers/private/bluetooth/BTCoreData.h +++ b/headers/private/bluetooth/btCoreData.h @@ -16,7 +16,7 @@ #include #include -#define BT_CORE_DATA_MODULE_NAME "generic/btCoreData/v1" +#define BT_CORE_DATA_MODULE_NAME "bluetooth/btCoreData/v1" struct L2capChannel; struct L2capFrame; @@ -40,6 +40,7 @@ struct HciConnection : DoublyLinkedListLinkImpl { uint16 mtu; connection_status status; /* ACL connection state */ uint16 lastCid; + uint8 lastIdent; DoublyLinkedList ChannelList; DoublyLinkedList ExpectedResponses; DoublyLinkedList OutGoingFrames; @@ -82,19 +83,13 @@ struct L2capChannel : DoublyLinkedListLinkImpl { uint16 dcid; uint16 psm; uint8 ident; - + uint8 cfgState; + channel_status state; - ChannelConfiguration* configuration; - - int cfgState; L2capEndpoint* endpoint; }; -#else - -struct L2capChannel; - #endif @@ -127,10 +122,6 @@ struct L2capFrame : DoublyLinkedListLinkImpl { //TODO :struct callout timo; /* RTX/ERTX timeout */ }; -#else - -struct L2capFrame; - #endif