diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-24 13:40:29 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2015-04-24 13:40:29 -0700 |
| commit | bf11b573d6bef7428333db8a02689bd978d0c502 (patch) | |
| tree | cff19b027a6e8fb04548f6fd3ebfe361d7bb2332 | |
| parent | f4abadb8a1c7d99f23ebf6860bcce1cbece7c281 (diff) | |
| parent | 3aa51879ee8caf96e83d7a826a07f186b5ad9bbd (diff) | |
| download | bt-bf11b573d6bef7428333db8a02689bd978d0c502.tar.gz | |
Merge commit '3aa5187' into merge2
| -rw-r--r-- | audio_a2dp_hw/audio_a2dp_hw.c | 17 | ||||
| -rw-r--r-- | stack/include/bt_types.h | 6 |
2 files changed, 12 insertions, 11 deletions
diff --git a/audio_a2dp_hw/audio_a2dp_hw.c b/audio_a2dp_hw/audio_a2dp_hw.c index a3ff331e7..0d621165a 100644 --- a/audio_a2dp_hw/audio_a2dp_hw.c +++ b/audio_a2dp_hw/audio_a2dp_hw.c @@ -1003,13 +1003,14 @@ static int adev_open_output_stream(struct audio_hw_device *dev, audio_output_flags_t flags, struct audio_config *config, struct audio_stream_out **stream_out, - const char *address __unused) + const char *address) { struct a2dp_audio_device *a2dp_dev = (struct a2dp_audio_device *)dev; struct a2dp_stream_out *out; int ret = 0; int i; + UNUSED(address); UNUSED(handle); UNUSED(devices); UNUSED(flags); @@ -1202,16 +1203,19 @@ static int adev_open_input_stream(struct audio_hw_device *dev, audio_devices_t devices, struct audio_config *config, struct audio_stream_in **stream_in, - audio_input_flags_t flags __unused, - const char *address __unused, - audio_source_t source __unused) + audio_input_flags_t flags, + const char *address, + audio_source_t source) { struct a2dp_audio_device *a2dp_dev = (struct a2dp_audio_device *)dev; struct a2dp_stream_in *in; int ret; - UNUSED(handle); - UNUSED(devices); + UNUSED(address); UNUSED(config); + UNUSED(devices); + UNUSED(flags); + UNUSED(handle); + UNUSED(source); FNLOG(); @@ -1367,4 +1371,3 @@ struct audio_module HAL_MODULE_INFO_SYM = { .methods = &hal_module_methods, }, }; - diff --git a/stack/include/bt_types.h b/stack/include/bt_types.h index 8968af640..e16f53f07 100644 --- a/stack/include/bt_types.h +++ b/stack/include/bt_types.h @@ -735,7 +735,7 @@ static const BD_ADDR bd_addr_null= {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; ** Returns void ** *******************************************************************************/ -inline void bdcpy(BD_ADDR a, const BD_ADDR b) +static inline void bdcpy(BD_ADDR a, const BD_ADDR b) { int i; @@ -755,7 +755,7 @@ inline void bdcpy(BD_ADDR a, const BD_ADDR b) ** Returns Zero if b==a, nonzero otherwise (like memcmp). ** *******************************************************************************/ -inline int bdcmp(const BD_ADDR a, const BD_ADDR b) +static inline int bdcmp(const BD_ADDR a, const BD_ADDR b) { int i; @@ -799,5 +799,3 @@ static inline void bdsetany(BD_ADDR a) bdcpy(a, bd_addr_any); } #endif - - |