From 6eb71891e9b06b4ef78b97c139479d644f36455f Mon Sep 17 00:00:00 2001
From: "matthias.ringwald"
 <matthias.ringwald@1a0a8af8-31b5-11de-8e0c-53a27eea117e>
Date: Sun, 4 Apr 2010 17:28:38 +0000
Subject: [PATCH] fix state reporting of BTstackManager

---
 CocoaTouch/src/BTDevice.m       |  2 +-
 CocoaTouch/src/BTstackManager.m | 10 ++++++++--
 TODO.txt                        |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CocoaTouch/src/BTDevice.m b/CocoaTouch/src/BTDevice.m
index 7e98ec96e..e18b26c59 100644
--- a/CocoaTouch/src/BTDevice.m
+++ b/CocoaTouch/src/BTDevice.m
@@ -35,7 +35,7 @@
 //  Created by Matthias Ringwald on 3/30/09.
 //
 
-#import "BTDevice.h"
+#import "btstack/BTDevice.h"
 
 @implementation BTDevice
 
diff --git a/CocoaTouch/src/BTstackManager.m b/CocoaTouch/src/BTstackManager.m
index 00f4aa70b..bf9e1e972 100644
--- a/CocoaTouch/src/BTstackManager.m
+++ b/CocoaTouch/src/BTstackManager.m
@@ -205,7 +205,14 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 }
 
 -(BOOL) isActivating {
-	return state == kW4Activated;
+	switch (state){
+		case kW4SysBTState:
+		case kW4SysBTDisabled:
+		case kW4Activated:
+			return YES;
+		default:
+			return NO;
+	}
 }
 -(BOOL) isDiscoveryActive {
 	return state == kActivated && (discoveryState != kInactive);
@@ -223,7 +230,6 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 	if (state < kActivated) return BTSTACK_NOT_ACTIVATED;
 	switch (discoveryState){
 		case kInactive:
-			state = kDeactivated;
 			[self sendDiscoveryStoppedEvent];
 			break;
 		case kW4InquiryMode:
diff --git a/TODO.txt b/TODO.txt
index fecc0aa42..c77ad5cee 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,6 +3,10 @@
 2009-11-08: Release 0.1
 
 NEXT:
+- clean up control flow
+  - l2cap directly sends data over socket: good/bad?
+  - split daemon into stack parts
+  - should there be STACK API/interface?
 - BUG: bt_close crashes when used in CocoaTouch app
 - add extern "C" to bstack methods
   - see: http://stackoverflow.com/questions/376966/using-c-c-static-libraries-from-iphone-objectivec-apps