[PATCH BlueZ 1/3] android/tester: Fix duplicate const

[PATCH BlueZ 1/3] android/tester: Fix duplicate const

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

---
 android/tester-main.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/tester-main.h b/android/tester-main.h
index 5a5cba4..3f0d46e 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -358,7 +358,7 @@ struct test_case {
 	const uint8_t emu_type;
 	const char *title;
 	const uint16_t step_num;
-	const struct step const *step;
+	const struct step *step;
 };
 
 /* Get, remove test cases API */
-- 
1.9.3

[PATCH BlueZ 2/3] android/tester-pan: Make cid_data static

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

---
 android/tester-pan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/tester-pan.c b/android/tester-pan.c
index da5b771..c293022 100644
--- a/android/tester-pan.c
+++ b/android/tester-pan.c
@@ -28,7 +28,7 @@ struct emu_cid_data {
 	uint16_t nap_cid;
 };
 
-struct emu_cid_data cid_data;
+static struct emu_cid_data cid_data;
 static uint8_t pan_conn_req_pdu[] = { 0x01, 0x01, 0x02, 0x11, 0x16,
 								0x11, 0x15 };
 static uint8_t pan_conn_rsp_pdu[] = { 0x01, 0x02, 0x00, 0x00 };
-- 
1.9.3

[PATCH BlueZ 3/3] android/tester: Fix mixing different enum types

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

---
 android/tester-main.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/tester-main.h b/android/tester-main.h
index 3f0d46e..54c53f0 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -318,8 +318,8 @@ struct emu_set_l2cap_data {
  * matching with expected step data.
  */
 struct bt_callback_data {
-	bt_state_t state;
-	bt_status_t status;
+	int state;
+	int status;
 	int num_properties;
 	bt_property_t *properties;
 
-- 
1.9.3

Re: [PATCH BlueZ 1/3] android/tester: Fix duplicate const

[Luiz Augusto von Dentz]

Hi,

On Thu, Aug 7, 2014 at 5:13 PM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> ---
>  android/tester-main.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/android/tester-main.h b/android/tester-main.h
> index 5a5cba4..3f0d46e 100644
> --- a/android/tester-main.h
> +++ b/android/tester-main.h
> @@ -358,7 +358,7 @@ struct test_case {
>         const uint8_t emu_type;
>         const char *title;
>         const uint16_t step_num;
> -       const struct step const *step;
> +       const struct step *step;
>  };
>
>  /* Get, remove test cases API */
> --
> 1.9.3

Patches 1 and 2 pushed, patch 3 will be redesigned.


-- 
Luiz Augusto von Dentz