commit b2959a49be9674513793fbf39a6255a473482728
author Kenny Root <kroot@google.com> Tue Mar 13 13:11:09 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 13 13:11:09 2012 -0700
tree d848da456f1937732c8f8472ab9ce59537913ce5
parent a776bb2e81e5c3a36394867fcb30c141d2a3ac0e
parent 9271d04d888c5676ccd9707378d18cad0f06d607

Merge "Update keymaster API to final signing spec"

include/hardware/audio.h

diff --git a/include/hardware/audio.h b/include/hardware/audio.h
index 1e68cd1..af4df04 100644
--- a/include/hardware/audio.h
+++ b/include/hardware/audio.h
@@ -63,6 +63,9 @@
 #define AUDIO_PARAMETER_VALUE_TTY_HCO "tty_hco"
 #define AUDIO_PARAMETER_VALUE_TTY_FULL "tty_full"
 
+/* A2DP sink address set by framework */
+#define AUDIO_PARAMETER_A2DP_SINK_ADDRESS "a2dp_sink_address"
+
 /**
  *  audio stream parameters
  */

include/hardware/audio_policy.h

diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h
index f31bea8..43d9e83 100644
--- a/include/hardware/audio_policy.h
+++ b/include/hardware/audio_policy.h
@@ -210,7 +210,7 @@
                                         audio_stream_type_t stream);
 
     /* return the enabled output devices for the given stream type */
-    uint32_t (*get_devices_for_stream)(const struct audio_policy *pol,
+    audio_devices_t (*get_devices_for_stream)(const struct audio_policy *pol,
                                        audio_stream_type_t stream);
 
     /* Audio effect management */

include/hardware/nfc.h

diff --git a/include/hardware/nfc.h b/include/hardware/nfc.h
index ca3683b..74b3cfb 100644
--- a/include/hardware/nfc.h
+++ b/include/hardware/nfc.h
@@ -76,6 +76,11 @@
      * Set to 0 to disable the workaround, 1 to enable it.
      */
     uint8_t enable_i2c_workaround;
+    /* I2C slave address. Multiple I2C addresses are
+     * possible for PN544 module. Configure address according to
+     * board design.
+     */
+    uint8_t i2c_device_address;
 } nfc_pn544_device_t;
 
 static inline int nfc_pn544_open(const struct hw_module_t* module,

modules/audio/audio_policy.c

diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c
index 5fb6095..8d7e5c3 100644
--- a/modules/audio/audio_policy.c
+++ b/modules/audio/audio_policy.c
@@ -186,7 +186,7 @@
     return 0;
 }
 
-static uint32_t ap_get_devices_for_stream(const struct audio_policy *pol,
+static audio_devices_t ap_get_devices_for_stream(const struct audio_policy *pol,
                                           audio_stream_type_t stream)
 {
     return 0;

modules/nfc/nfc_hw_example.c

diff --git a/modules/nfc/nfc_hw_example.c b/modules/nfc/nfc_hw_example.c
index 9769282..54c9c56 100644
--- a/modules/nfc/nfc_hw_example.c
+++ b/modules/nfc/nfc_hw_example.c
@@ -44,6 +44,7 @@
         dev->linktype = PN544_LINK_TYPE_INVALID;
         dev->device_node = NULL;
         dev->enable_i2c_workaround = 0;
+        dev->i2c_device_address = 0;
 
         *device = (hw_device_t*) dev;
         return 0;