From 8c9b08f347ebe50c12bfca5296cb0586735b4f95 Mon Sep 17 00:00:00 2001
From: "matthias.ringwald"
 <matthias.ringwald@1a0a8af8-31b5-11de-8e0c-53a27eea117e>
Date: Sun, 3 Jan 2010 18:38:25 +0000
Subject: [PATCH] fix endless remote name request

---
 CocoaTouch/include/BTstack/BTDevice.h    |   1 -
 CocoaTouch/src/BTInquiryViewController.m | 119 ++++++++++++++---------
 2 files changed, 73 insertions(+), 47 deletions(-)

diff --git a/CocoaTouch/include/BTstack/BTDevice.h b/CocoaTouch/include/BTstack/BTDevice.h
index 0fb1bbd9a..f48911f13 100644
--- a/CocoaTouch/include/BTstack/BTDevice.h
+++ b/CocoaTouch/include/BTstack/BTDevice.h
@@ -31,7 +31,6 @@
 
 //
 //  BTDevice.h
-//  BT-Keyboard
 //
 //  Created by Matthias Ringwald on 3/30/09.
 //
diff --git a/CocoaTouch/src/BTInquiryViewController.m b/CocoaTouch/src/BTInquiryViewController.m
index ee1582f5c..cc89cd002 100644
--- a/CocoaTouch/src/BTInquiryViewController.m
+++ b/CocoaTouch/src/BTInquiryViewController.m
@@ -42,6 +42,8 @@
 #include <dlfcn.h>
 #define INQUIRY_INTERVAL 3
 
+// #define LASER_KB
+
 // fix compare for 3.0
 #ifndef __IPHONE_3_0
 #define __IPHONE_3_0 30000
@@ -213,41 +215,6 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 					remoteNameIndex++;
 					[self getNextRemoteName];
 					break;
-										
-				case HCI_EVENT_COMMAND_COMPLETE:
-					if (COMMAND_COMPLETE_EVENT(packet, hci_inquiry_cancel)){
-						// inquiry canceled
-						// NSLog(@"Inquiry cancelled successfully");
-						inquiryState = kInquiryInactive;
-						[[self tableView] reloadData];
-						if (notifyDelegateOnInquiryStopped){
-							notifyDelegateOnInquiryStopped = false;
-							if (delegate) {
-								[delegate inquiryStopped];
-							}
-						}
-					}
-					if (COMMAND_COMPLETE_EVENT(packet, hci_remote_name_request_cancel)){
-						// inquiry canceled
-						// NSLog(@"Remote name request cancelled successfully");
-						inquiryState = kInquiryInactive;
-						[[self tableView] reloadData];
-						if (notifyDelegateOnInquiryStopped){
-							notifyDelegateOnInquiryStopped = false;
-							if (delegate) {
-								[delegate inquiryStopped];
-							}
-						}
-					}
-					
-					break;
-					
-				case HCI_EVENT_INQUIRY_COMPLETE:
-					// reset name check
-					remoteNameIndex = 0;
-					[self getNextRemoteName];
-					break;
-
 				case HCI_EVENT_LINK_KEY_NOTIFICATION:
 					if (deviceInfo) {
 						bt_flip_addr(event_addr, &packet[2]); 
@@ -285,6 +252,42 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 					break;
 				}
 					
+					
+				case HCI_EVENT_COMMAND_COMPLETE:
+					if (COMMAND_COMPLETE_EVENT(packet, hci_inquiry_cancel)){
+						// inquiry canceled
+						// NSLog(@"Inquiry cancelled successfully");
+						inquiryState = kInquiryInactive;
+						[[self tableView] reloadData];
+						if (notifyDelegateOnInquiryStopped){
+							notifyDelegateOnInquiryStopped = false;
+							if (delegate) {
+								[delegate inquiryStopped];
+							}
+						}
+					}
+					if (COMMAND_COMPLETE_EVENT(packet, hci_remote_name_request_cancel)){
+						// inquiry canceled
+						// NSLog(@"Remote name request cancelled successfully");
+						inquiryState = kInquiryInactive;
+						[[self tableView] reloadData];
+						if (notifyDelegateOnInquiryStopped){
+							notifyDelegateOnInquiryStopped = false;
+							if (delegate) {
+								[delegate inquiryStopped];
+							}
+						}
+					}
+					
+					break;
+					
+				case HCI_EVENT_INQUIRY_COMPLETE:
+					// reset name check
+					remoteNameIndex = 0;
+					[self getNextRemoteName];
+					break;
+
+
 				default:
 					break;
 			}
@@ -328,7 +331,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 	
 	remoteNameDevice = nil;
 		
-	for (remoteNameIndex = 0; remoteNameIndex < [devices count]; remoteNameIndex++){
+	for ( ; remoteNameIndex < [devices count]; remoteNameIndex++){
 		BTDevice *dev = [devices objectAtIndex:remoteNameIndex];
 		if (![dev name]){
 			remoteNameDevice = dev;
@@ -523,17 +526,41 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 		
 		// pick an icon for the devices
 		if (showIcons) {
-			int major = ([dev classOfDevice] & 0x1f00) >> 8;
-			if (major == 0x01) {
-				theImage = [UIImage imageNamed:@"computer.png"];
-			} else if (major == 0x02) {
-				theImage = [UIImage imageNamed:@"smartphone.png"];
-			} else if ( major == 0x05 && ([dev classOfDevice] & 0xff) == 0x40){ 
-				theImage = [UIImage imageNamed:@"keyboard.png"];
-			} else {
-				theImage = [UIImage imageNamed:@"bluetooth.png"];
+			NSString *imageName = @"bluetooth.png";
+			// check major device class
+			switch (([dev classOfDevice] & 0x1f00) >> 8) {
+				case 0x01:
+					imageName = @"computer.png";
+					break;
+				case 0x02:
+					imageName = @"smartphone.png";
+#ifdef LASER_KB	
+					// Celluon CL800BT has COD 0x400210
+					if ([dev name] && [[dev name] isEqualToString:@"CL800BT"]){
+						imageName = @"keyboard.png";
+					}
+#endif
+					break;
+				case 0x05:
+					switch ([dev classOfDevice] & 0xff){
+						case 0x40:
+							imageName = @"keyboard.png";
+							break;
+						case 0x80:
+							imageName = @"mouse.png";
+							break;
+						default:
+							imageName = @"HID.png";
+							break;
+					}
 			}
-			
+#ifdef LASER_KB			
+			// Celluon CL800BT has COD 0x400210
+			if ([dev name] && [[dev name] isEqualToString:@"VKB Keyboard"]){
+				imageName = @"keyboard.png";
+			}
+#endif
+			theImage = [UIImage imageNamed:imageName];
 		}
 		
 		// set accessory view