From c2555c31491191be0e860e9726555eb2bd881104 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 18 Feb 2013 11:38:51 +0200 Subject: [PATCH] tools: btmgmt: Convert controller error event monitoring to new API --- tools/btmgmt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/btmgmt.c b/tools/btmgmt.c index 55cf9adcd..e24dcf8a3 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -196,20 +196,19 @@ static int mgmt_cmd_status(int mgmt_sk, uint16_t index, return 0; } -static int mgmt_controller_error(uint16_t index, - struct mgmt_ev_controller_error *ev, - uint16_t len) +static void controller_error(uint16_t index, uint16_t len, + const void *param, void *user_data) { + const struct mgmt_ev_controller_error *ev = param; + if (len < sizeof(*ev)) { fprintf(stderr, "Too short (%u bytes) controller error event\n", len); - return -EINVAL; + return; } if (monitor) printf("hci%u error 0x%02x\n", index, ev->error_code); - - return 0; } static int mgmt_index_added(int mgmt_sk, uint16_t index) @@ -715,8 +714,6 @@ static int mgmt_handle_event(int mgmt_sk, uint16_t ev, uint16_t index, return mgmt_cmd_complete(mgmt_sk, index, data, len); case MGMT_EV_CMD_STATUS: return mgmt_cmd_status(mgmt_sk, index, data, len); - case MGMT_EV_CONTROLLER_ERROR: - return mgmt_controller_error(index, data, len); case MGMT_EV_INDEX_ADDED: return mgmt_index_added(mgmt_sk, index); case MGMT_EV_INDEX_REMOVED: @@ -2033,6 +2030,9 @@ int main(int argc, char *argv[]) return -1; } + mgmt_register(mgmt, MGMT_EV_CONTROLLER_ERROR, index, controller_error, + NULL, NULL); + pollfd.fd = mgmt_sk; pollfd.events = POLLIN; pollfd.revents = 0; -- 2.47.3