Rearrange command_generic_callback() position to avoid fast forward
declaration in next patch.
---
tools/mgmt-tester.c | 56 +++++++++++++++++++++++++--------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index d53f94e..64f18c1 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -2565,34 +2565,6 @@ done:
test_condition_complete(data);
}
-static void command_generic_event_alt(uint16_t index, uint16_t length,
- const void *param,
- void *user_data)
-{
- struct test_data *data = tester_get_data();
- const struct generic_data *test = data->test_data;
-
- if (length != test->expect_alt_ev_len) {
- tester_warn("Invalid length %s event",
- mgmt_evstr(test->expect_alt_ev));
- tester_test_failed();
- return;
- }
-
- tester_print("New %s event received", mgmt_evstr(test->expect_alt_ev));
-
- if (memcmp(param, test->expect_alt_ev_param,
- test->expect_alt_ev_len) != 0)
- return;
-
- tester_print("Unregistering %s notification",
- mgmt_evstr(test->expect_alt_ev));
-
- mgmt_unregister(data->mgmt_alt, data->mgmt_alt_ev_id);
-
- test_condition_complete(data);
-}
-
static void command_generic_callback(uint8_t status, uint16_t length,
const void *param, void *user_data)
{
@@ -2621,6 +2593,34 @@ static void command_generic_callback(uint8_t status, uint16_t length,
test_condition_complete(data);
}
+static void command_generic_event_alt(uint16_t index, uint16_t length,
+ const void *param,
+ void *user_data)
+{
+ struct test_data *data = tester_get_data();
+ const struct generic_data *test = data->test_data;
+
+ if (length != test->expect_alt_ev_len) {
+ tester_warn("Invalid length %s event",
+ mgmt_evstr(test->expect_alt_ev));
+ tester_test_failed();
+ return;
+ }
+
+ tester_print("New %s event received", mgmt_evstr(test->expect_alt_ev));
+
+ if (memcmp(param, test->expect_alt_ev_param,
+ test->expect_alt_ev_len) != 0)
+ return;
+
+ tester_print("Unregistering %s notification",
+ mgmt_evstr(test->expect_alt_ev));
+
+ mgmt_unregister(data->mgmt_alt, data->mgmt_alt_ev_id);
+
+ test_condition_complete(data);
+}
+
static bool command_hci_callback(uint16_t opcode, const void *param,
uint8_t length, void *user_data)
{
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
