diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-02 02:28:33 +0200 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-02 02:28:33 +0200 |
commit | 0c05dd3dc5a18d64734a9f091d5285612e41107b (patch) | |
tree | 57de979b0fdef6c07329d0aae06235730a2fb4cb /src/hcid.h | |
parent | 4f946e36897fc67a28a56fb3102994da6857a038 (diff) | |
parent | 3f498e694e39756890db475f1f1edb528b378ee2 (diff) |
Merge branch 'for-upstream' of git://gitorious.org/bluez/cktakahasis-clone
Diffstat (limited to 'src/hcid.h')
-rw-r--r-- | src/hcid.h | 59 |
1 files changed, 20 insertions, 39 deletions
@@ -23,8 +23,6 @@ * */ -#define HCID_DEFAULT_DISCOVERABLE_TIMEOUT 180 /* 3 minutes */ - /* When all services should trust a remote device */ #define GLOBAL_TRUST "[all]" @@ -44,49 +42,32 @@ #define MODE_LIMITED 0x03 #define MODE_UNKNOWN 0xff -struct device_opts { - unsigned long flags; - char *name; - uint32_t class; - uint16_t voice; - uint8_t inqmode; - uint16_t pageto; - uint16_t pkt_type; - uint16_t link_mode; - uint16_t link_policy; - uint8_t scan; - uint8_t mode; - uint32_t discovto; -}; - -extern struct device_opts default_device; - -struct device_list { - char *ref; /* HCI device or Bluetooth address */ - struct device_list *next; - struct device_opts opts; -}; - -struct hcid_opts { - char host_name[40]; - int auto_init; - int offmode; - char deviceid[15]; +#define HCID_OFFMODE_DEVDOWN 0 +#define HCID_OFFMODE_NOSCAN 1 - int sock; +struct main_opts { + char host_name[40]; + unsigned long flags; + char *name; + uint32_t class; + uint16_t pageto; + uint32_t discovto; + uint16_t link_mode; + uint16_t link_policy; + + int offmode; + uint8_t scan; + uint8_t mode; + uint8_t inqmode; + char deviceid[15]; /* FIXME: */ + + int sock; }; -extern struct hcid_opts hcid; +extern struct main_opts main_opts; void hci_req_queue_remove(int dev_id, bdaddr_t *dba); -#define HCID_OFFMODE_DEVDOWN 0 -#define HCID_OFFMODE_NOSCAN 1 - -uint8_t get_startup_scan(int hdev); -uint8_t get_startup_mode(int hdev); -int get_discoverable_timeout(int dev_id); - void start_security_manager(int hdev); void stop_security_manager(int hdev); |