 @@ -1,14 +1,14 @@
-/*	$NetBSD: hci_event.c,v 1.19 2009/08/20 21:40:59 plunky Exp $	*/
+/*	$NetBSD: hci_event.c,v 1.20 2009/08/24 20:37:36 plunky Exp $	*/
 /*-
  * Copyright (c) 2005 Iain Hibbert.
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -21,41 +21,42 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hci_event.c,v 1.19 2009/08/20 21:40:59 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hci_event.c,v 1.20 2009/08/24 20:37:36 plunky Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <netbt/bluetooth.h>
 #include <netbt/hci.h>
 #include <netbt/sco.h>
 static void hci_event_inquiry_result(struct hci_unit *, struct mbuf *);
 static void hci_event_rssi_result(struct hci_unit *, struct mbuf *);
 static void hci_event_extended_result(struct hci_unit *, struct mbuf *);
 static void hci_event_command_status(struct hci_unit *, struct mbuf *);
 static void hci_event_command_compl(struct hci_unit *, struct mbuf *);
 static void hci_event_con_compl(struct hci_unit *, struct mbuf *);
 static void hci_event_discon_compl(struct hci_unit *, struct mbuf *);
 static void hci_event_con_req(struct hci_unit *, struct mbuf *);
 static void hci_event_num_compl_pkts(struct hci_unit *, struct mbuf *);
 static void hci_event_auth_compl(struct hci_unit *, struct mbuf *);
 static void hci_event_encryption_change(struct hci_unit *, struct mbuf *);
 static void hci_event_change_con_link_key_compl(struct hci_unit *, struct mbuf *);
 static void hci_event_read_clock_offset_compl(struct hci_unit *, struct mbuf *);
 static void hci_cmd_read_bdaddr(struct hci_unit *, struct mbuf *);
 static void hci_cmd_read_buffer_size(struct hci_unit *, struct mbuf *);
 static void hci_cmd_read_local_features(struct hci_unit *, struct mbuf *);
 @@ -185,26 +186,30 @@ hci_event(struct mbuf *m, struct hci_uni
 	case HCI_EVENT_NUM_COMPL_PKTS:
 		hci_event_num_compl_pkts(unit, m);
 		break;
 	case HCI_EVENT_INQUIRY_RESULT:
 		hci_event_inquiry_result(unit, m);
 		break;
 	case HCI_EVENT_RSSI_RESULT:
 		hci_event_rssi_result(unit, m);
 		break;
 	case HCI_EVENT_EXTENDED_RESULT:
 		hci_event_extended_result(unit, m);
 		break;
 	case HCI_EVENT_CON_COMPL:
 		hci_event_con_compl(unit, m);
 		break;
 	case HCI_EVENT_DISCON_COMPL:
 		hci_event_discon_compl(unit, m);
 		break;
 	case HCI_EVENT_CON_REQ:
 		hci_event_con_req(unit, m);
 		break;
 	case HCI_EVENT_AUTH_COMPL:
 @@ -482,26 +487,56 @@ hci_event_rssi_result(struct hci_unit *u
 			rr.bdaddr.b[5], rr.bdaddr.b[4], rr.bdaddr.b[3],
 			rr.bdaddr.b[2], rr.bdaddr.b[1], rr.bdaddr.b[0]);
 		memo = hci_memo_new(unit, &rr.bdaddr);
 		if (memo != NULL) {
 			memo->page_scan_rep_mode = rr.page_scan_rep_mode;
 			memo->page_scan_mode = 0;
 			memo->clock_offset = rr.clock_offset;
+		}
+	}
+}
 /*
  * Extended Inquiry Result
+ *
  * as above but provides only one response and extended service info
  */
 static void
 hci_event_extended_result(struct hci_unit *unit, struct mbuf *m)
+{
 	hci_extended_result_ep ep;
 	struct hci_memo *memo;
 	KASSERT(m->m_pkthdr.len >= sizeof(ep));
 	m_copydata(m, 0, sizeof(ep), &ep);
 	m_adj(m, sizeof(ep));
 	if (ep.num_responses != 1)
 		return;
 	DPRINTFN(1, "bdaddr %02x:%02x:%02x:%02x:%02x:%02x\n",
 		ep.bdaddr.b[5], ep.bdaddr.b[4], ep.bdaddr.b[3],
 		ep.bdaddr.b[2], ep.bdaddr.b[1], ep.bdaddr.b[0]);
 	memo = hci_memo_new(unit, &ep.bdaddr);
 	if (memo != NULL) {
 		memo->page_scan_rep_mode = ep.page_scan_rep_mode;
 		memo->page_scan_mode = 0;
 		memo->clock_offset = ep.clock_offset;
+	}
+}
 /*
  * Connection Complete
+ *
  * Sent to us when a connection is made. If there is no link
  * structure already allocated for this, we must have changed
  * our mind, so just disconnect.
  */
 static void
 hci_event_con_compl(struct hci_unit *unit, struct mbuf *m)
+{
 	hci_con_compl_ep ep;
 	hci_write_link_policy_settings_cp cp;
 	struct hci_link *link;
 	int err;