diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-08-27 11:45:28 +0200 | 
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-08-27 11:45:28 +0200 | 
| commit | 85586b684b630334778a41c942fe8290ca07ca93 (patch) | |
| tree | 9666f7afc6adbb58192e31f8c03b4f58f4c5db57 /src/adapter.h | |
| parent | e94d033441ea79a820c018bc04f49b3ab08ac2f3 (diff) | |
| parent | fda18fb2d24cedaaf823cdafecbe8ba69495947c (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/cktakahasis-clone
Diffstat (limited to 'src/adapter.h')
| -rw-r--r-- | src/adapter.h | 6 | 
1 files changed, 0 insertions, 6 deletions
| diff --git a/src/adapter.h b/src/adapter.h index 4e2366ba..7d6ca9cb 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -24,12 +24,6 @@  #define ADAPTER_INTERFACE	"org.bluez.Adapter" -#define INVALID_DEV_ID		0xFFFF - -#define BONDING_TIMEOUT         45000 /* 45 sec */ - -#define DC_PENDING_TIMEOUT      2000  /* 2 secs */ -  /* Discover types */  #define DISCOVER_TYPE_NONE	0x00  #define STD_INQUIRY		0x01 | 
