tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'f404dc42d6677a1aee88d1ce996a7e8e4afe55bb' into HEAD

Browse source
This commit is contained in:
Bill Yi 2014-04-29 11:34:21 -07:00
commit 08e9b2a43d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/hardware/bt_gatt_client.h
View file

@ -278,7 +278,9 @@ typedef struct {
/** Set the advertising data or scan response data */ /** Set the advertising data or scan response data */
bt_status_t (*set_adv_data)(int server_if, bool set_scan_rsp, bool include_name, bt_status_t (*set_adv_data)(int server_if, bool set_scan_rsp, bool include_name,
bool include_txpower, int min_interval, int max_interval, int appearance, bool include_txpower, int min_interval, int max_interval, int appearance,
uint16_t manufacturer_len, char* manufacturer_data); uint16_t manufacturer_len, char* manufacturer_data,
uint16_t service_data_len, char* service_data,
uint16_t service_uuid_len, char* service_uuid);
/** Test mode interface */ /** Test mode interface */
bt_status_t (*test_command)( int command, btgatt_test_params_t* params); bt_status_t (*test_command)( int command, btgatt_test_params_t* params);

2
modules/usbaudio/audio_hw.c
View file

@ -212,7 +212,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
err: err:
pthread_mutex_unlock(&out->lock); pthread_mutex_unlock(&out->lock);
pthread_mutex_unlock(&out->dev->lock);
if (ret != 0) { if (ret != 0) {
usleep(bytes * 1000000 / audio_stream_frame_size(&stream->common) / usleep(bytes * 1000000 / audio_stream_frame_size(&stream->common) /
out_get_sample_rate(&stream->common)); out_get_sample_rate(&stream->common));