diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2017-10-17 21:55:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-17 21:55:04 +0000 |
| commit | 0a1fd44e1edde4c38253be749529883826f5f17a (patch) | |
| tree | 8676f39060ae0ec4875bc2b747f77ccc7690d31b | |
| parent | 6ac9ba500b246a49ba78cf2a1caf0a16876abbc5 (diff) | |
| parent | 3bc4556b2359257a26d551888c9f0d89d9e0d794 (diff) | |
| download | libhardware-0a1fd44e1edde4c38253be749529883826f5f17a.tar.gz | |
Merge "Remove hw_module_t dependency in Bluetooth (2/3)" am: 481f65c913 am: a516b63f87
am: 3bc4556b23
Change-Id: I78faddefdbb04985a9561e9332435aafcf13fca5
| -rw-r--r-- | include/hardware/bluetooth.h | 22 | ||||
| -rw-r--r-- | include/hardware/hardware.h | 2 |
2 files changed, 1 insertions, 23 deletions
diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h index d6f6e3e9..40ccc604 100644 --- a/include/hardware/bluetooth.h +++ b/include/hardware/bluetooth.h @@ -22,20 +22,12 @@ #include <sys/cdefs.h> #include <sys/types.h> -#include <hardware/hardware.h> - #include <bluetooth/uuid.h> #include <raw_address.h> __BEGIN_DECLS -/** - * The Bluetooth Hardware Module ID - */ - -#define BT_HARDWARE_MODULE_ID "bluetooth" -#define BT_STACK_MODULE_ID "bluetooth" - +#define BLUETOOTH_INTERFACE_STRING "bluetoothInterface" /** Bluetooth profile interface IDs */ @@ -592,18 +584,6 @@ typedef struct { void (*interop_database_add)(uint16_t feature, const RawAddress *addr, size_t len); } bt_interface_t; -/** TODO: Need to add APIs for Service Discovery, Service authorization and - * connection management. Also need to add APIs for configuring - * properties of remote bonded devices such as name, UUID etc. */ - -typedef struct { - struct hw_device_t common; - const bt_interface_t* (*get_bluetooth_interface)(); -} bluetooth_device_t; - -typedef bluetooth_device_t bluetooth_module_t; - - __END_DECLS #endif /* ANDROID_INCLUDE_BLUETOOTH_H */ diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h index 5ba37e92..bf076f6c 100644 --- a/include/hardware/hardware.h +++ b/include/hardware/hardware.h @@ -20,10 +20,8 @@ #include <stdint.h> #include <sys/cdefs.h> -#ifndef _HW_DONT_INCLUDE_CORE_ #include <cutils/native_handle.h> #include <system/graphics.h> -#endif // _HW_DONT_INCLUDE_CORE_ __BEGIN_DECLS |