From fe798a54dfc1a491a04316019bc35c6fff92a35c Mon Sep 17 00:00:00 2001
From: "matthias.ringwald"
 <matthias.ringwald@1a0a8af8-31b5-11de-8e0c-53a27eea117e>
Date: Sun, 11 Oct 2009 23:09:31 +0000
Subject: [PATCH] don't omit 3 when counting to 6

---
 CocoaTouch/src/BTDevice.m         | 2 +-
 TODO.txt                          | 8 ++++----
 project.xcodeproj/project.pbxproj | 2 ++
 src/daemon.c                      | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CocoaTouch/src/BTDevice.m b/CocoaTouch/src/BTDevice.m
index 97ebc9c72..e4851cddf 100644
--- a/CocoaTouch/src/BTDevice.m
+++ b/CocoaTouch/src/BTDevice.m
@@ -33,7 +33,7 @@
 + (NSString *) stringForAddress:(bd_addr_t *) address {
 	uint8_t * addr = (uint8_t*) address;
 	return [NSString stringWithFormat:@"%02x:%02x:%02x:%02x:%02x:%02x", addr[0], addr[1], addr[2],
-			addr[4], addr[5], addr[6]];
+			addr[3], addr[4], addr[5]];
 }
 
 - (NSString *) nameOrAddress{
diff --git a/TODO.txt b/TODO.txt
index c1ed33a01..041183b51 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,12 +1,13 @@
 /* new todo file for BTstack */
 
 Last milestone reached: create script to build APT package for BTdeamon, Resources, and BTstack client library
-Last change: use single packet handler on client side
-
+Last change: added Cocoa CFRunLoop support
 
 NEXT:
+- CocoaTouch User Interface Components
+  - Inquiry
+  - Alerts
 - prepare WiiMoteDemo for release
-  - update to current stack version
   - add inquiry code
 - provide test version by setting up APT repository within BTstack SVN
   - instructions: http://www.saurik.com/id/7
@@ -22,7 +23,6 @@ NEXT:
   - can we get willGoToSleep event, should we should down?
   - would be nice, if we could get woken up by Bluetooth data
 - CocoaTouch User Interface Components
-  - Inquiry
   - Alerts and shutdown of Apple's stack
 - create new GPG key for gmail account and sign APT package
 - non-reproducible bug: hci_state gets confused.
diff --git a/project.xcodeproj/project.pbxproj b/project.xcodeproj/project.pbxproj
index 30344bba4..e21a3942c 100644
--- a/project.xcodeproj/project.pbxproj
+++ b/project.xcodeproj/project.pbxproj
@@ -55,6 +55,7 @@
 		9C00F87210191130008DAB17 /* l2cap_signaling.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = l2cap_signaling.c; path = src/l2cap_signaling.c; sourceTree = "<group>"; };
 		9C04B825107D1CED002A63D0 /* run_loop.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = run_loop.c; path = src/run_loop.c; sourceTree = "<group>"; };
 		9C04B879107D2BA7002A63D0 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+		9C04BD3110826575002A63D0 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = logo.png; path = resources/logo.png; sourceTree = "<group>"; };
 		9C1813F71042FCCA00C68F09 /* mitm.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = mitm.c; path = example/mitm.c; sourceTree = "<group>"; };
 		9C2071F210014D3200A07EA4 /* hci_transport_usb.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = hci_transport_usb.c; path = src/hci_transport_usb.c; sourceTree = "<group>"; };
 		9C46FC340FA906F700ABEF05 /* hci.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = hci.c; path = src/hci.c; sourceTree = "<group>"; };
@@ -215,6 +216,7 @@
 		9C78A049103C671D003B2950 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				9C04BD3110826575002A63D0 /* logo.png */,
 				9C78A0BB103C9DEE003B2950 /* ch.ringwald.BTstack.plist */,
 				9C78A04A103C6734003B2950 /* Default_BTstack.png */,
 				9C78A04B103C6734003B2950 /* Default_BTstackActive.png */,
diff --git a/src/daemon.c b/src/daemon.c
index 2200a7c81..17504a0db 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -216,7 +216,7 @@ int main (int argc, const char * argv[]){
     // @TODO: allow configuration per HCI CMD
     
     // use logger: format HCI_DUMP_PACKETLOGGER, HCI_DUMP_BLUEZ or HCI_DUMP_STDOUT
-    // hci_dump_open("/tmp/hci_dump.pklg", HCI_DUMP_PACKETLOGGER);
+    hci_dump_open("/tmp/hci_dump.pklg", HCI_DUMP_PACKETLOGGER);
     // hci_dump_open(NULL, HCI_DUMP_STDOUT);
                   
     // init HCI