summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-08-06 04:33:14 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-08-06 04:33:14 +0200
commite54f7d3c080bf7dcac82887203a8195968053bbc (patch)
tree7a2340b10b5fec43755ec7220dfcf9480a4d195e
parent00255d4391f5c87957cdde4c94d0eac64bb66588 (diff)
Remove unused HCI definitions
-rw-r--r--include/hci.h19
-rw-r--r--lib/hci.c1
-rw-r--r--src/security.c3
3 files changed, 0 insertions, 23 deletions
diff --git a/include/hci.h b/include/hci.h
index 499f1bdd..1fb24359 100644
--- a/include/hci.h
+++ b/include/hci.h
@@ -69,8 +69,6 @@ enum {
HCI_INQUIRY,
HCI_RAW,
-
- HCI_SECMGR
};
/* HCI ioctl defines */
@@ -95,8 +93,6 @@ enum {
#define HCISETACLMTU _IOW('H', 227, int)
#define HCISETSCOMTU _IOW('H', 228, int)
-#define HCISETSECMGR _IOW('H', 230, int)
-
#define HCIINQUIRY _IOR('H', 240, int)
#ifndef __NO_HCI_DEFS
@@ -1666,14 +1662,6 @@ typedef struct {
} __attribute__ ((packed)) evt_si_device;
#define EVT_SI_DEVICE_SIZE 4
-#define EVT_SI_SECURITY 0x02
-typedef struct {
- uint16_t event;
- uint16_t proto;
- uint16_t subproto;
- uint8_t incoming;
-} __attribute__ ((packed)) evt_si_security;
-
/* -------- HCI Packet structures -------- */
#define HCI_TYPE_LEN 1
@@ -1828,13 +1816,6 @@ struct hci_inquiry_req {
};
#define IREQ_CACHE_FLUSH 0x0001
-struct hci_remotename_req {
- uint16_t dev_id;
- uint16_t flags;
- bdaddr_t bdaddr;
- uint8_t name[248];
-};
-
#ifdef __cplusplus
}
#endif
diff --git a/lib/hci.c b/lib/hci.c
index 1b12d833..905969d4 100644
--- a/lib/hci.c
+++ b/lib/hci.c
@@ -171,7 +171,6 @@ static hci_map dev_flags_map[] = {
{ "INQUIRY", HCI_INQUIRY },
{ "AUTH", HCI_AUTH },
{ "ENCRYPT", HCI_ENCRYPT },
- { "SECMGR", HCI_SECMGR },
{ NULL }
};
diff --git a/src/security.c b/src/security.c
index 20739065..11655271 100644
--- a/src/security.c
+++ b/src/security.c
@@ -864,9 +864,6 @@ static gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer
/* Check for pending command request */
check_pending_hci_req(di->dev_id, eh->evt);
- if (hci_test_bit(HCI_SECMGR, &di->flags))
- return TRUE;
-
switch (eh->evt) {
case EVT_PIN_CODE_REQ:
pin_code_request(dev, &di->bdaddr, (bdaddr_t *) ptr);