From patchwork Mon Nov 30 20:03:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonny Sasaka X-Patchwork-Id: 335207 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0E6CC64E7B for ; Mon, 30 Nov 2020 20:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 766E8206C1 for ; Mon, 30 Nov 2020 20:04:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="iW/DhWZ4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388322AbgK3UER (ORCPT ); Mon, 30 Nov 2020 15:04:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726400AbgK3UER (ORCPT ); Mon, 30 Nov 2020 15:04:17 -0500 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00B7AC061A04 for ; Mon, 30 Nov 2020 12:03:31 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id w202so11116584pff.10 for ; Mon, 30 Nov 2020 12:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Osr2t5lC/rtahR1ayaZEYydm7foHMd951I0Pg1nz0qM=; b=iW/DhWZ47eo8QPMYbW1mU+bhKdB6vsNEkVUh8iSJpIwUKSItYX1lX/Dl9X2JynAE8T /19cOsuqPavOTMlyVBDkioNyq6aNNMjQZ4ENn1nXzT36iTHwNaXJDLCbXqef1S9Yextk metu5ERLMR3pcKoGG3UHfLQj+B/Yiu3FG7MdU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Osr2t5lC/rtahR1ayaZEYydm7foHMd951I0Pg1nz0qM=; b=Wi6JzMSO3ugBoToiTgC825w/Wk1BbvTcCe6+OtZ+DU59UzAF2+2oy5rfPgwYKDjvxt jjEFVxwrrkQ3ZAQW0otp1jfyA7GQ+VQcE1oOlvFIVF7+JF46bDk8yOY9ESaT4/PVyhWf DsYv4oHaYktshgmLzkin1I6r5UjmteJRELVlu/EUaOoh1VhAaa4Ggbw25lAPgLSJHh6/ KrLNNLF6hPpwoEDNYIRF6rqBrDvq/Di7JIKtadkUA98mmq467DzD6/JaXN7uSwdbwUV1 +nyXlj/juq1NVe9UxCOLrlZAJ6XJyaeF5etpqDs+4USszPu6x8Wcpo960drW7gfVPEKS ndgg== X-Gm-Message-State: AOAM5316NoIkLaxFSiNrgfONqIO/tfvqrjtiEZPqoZ9HhAH0GSap8wI0 cbdufjWyzNoLybxwhNOq05kxeXVr5wxVnA== X-Google-Smtp-Source: ABdhPJwESw0IpGDiRVqvO5GBtCy41upiKjPoJ+CJAwB6qHkEvIjLhA4Bs2cvQZ5D1IyH2Ym8m8AYrQ== X-Received: by 2002:a63:5418:: with SMTP id i24mr19168570pgb.165.1606766609656; Mon, 30 Nov 2020 12:03:29 -0800 (PST) Received: from sonnysasaka-chrome.mtv.corp.google.com ([2620:15c:202:201:4a0f:cfff:fe66:e60c]) by smtp.gmail.com with ESMTPSA id y24sm17117184pfn.176.2020.11.30.12.03.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Nov 2020 12:03:28 -0800 (PST) From: Sonny Sasaka To: linux-bluetooth@vger.kernel.org Cc: Sonny Sasaka , Miao-chen Chou Subject: [PATCH BlueZ v4 6/7] adapter: Add a public function to find a device by path Date: Mon, 30 Nov 2020 12:03:06 -0800 Message-Id: <20201130200307.386410-6-sonnysasaka@chromium.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201130200307.386410-1-sonnysasaka@chromium.org> References: <20201130200307.386410-1-sonnysasaka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org The public function is motivated by the Battery Provider API code which needs to probe whether a device exists. Reviewed-by: Miao-chen Chou --- src/adapter.c | 33 ++++++++++++++++++++++++--------- src/adapter.h | 2 ++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 56d0c6eaa..03d9d29e9 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -872,6 +872,30 @@ struct btd_device *btd_adapter_find_device(struct btd_adapter *adapter, return device; } +static int device_path_cmp(gconstpointer a, gconstpointer b) +{ + const struct btd_device *device = a; + const char *path = b; + const char *dev_path = device_get_path(device); + + return strcasecmp(dev_path, path); +} + +struct btd_device *btd_adapter_find_device_by_path(struct btd_adapter *adapter, + const char *path) +{ + GSList *list; + + if (!adapter) + return NULL; + + list = g_slist_find_custom(adapter->devices, path, device_path_cmp); + if (!list) + return NULL; + + return list->data; +} + static void uuid_to_uuid128(uuid_t *uuid128, const uuid_t *uuid) { if (uuid->type == SDP_UUID16) @@ -3192,15 +3216,6 @@ static gboolean property_get_roles(const GDBusPropertyTable *property, return TRUE; } -static int device_path_cmp(gconstpointer a, gconstpointer b) -{ - const struct btd_device *device = a; - const char *path = b; - const char *dev_path = device_get_path(device); - - return strcasecmp(dev_path, path); -} - static DBusMessage *remove_device(DBusConnection *conn, DBusMessage *msg, void *user_data) { diff --git a/src/adapter.h b/src/adapter.h index e5750a37b..60b5e3bcc 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -83,6 +83,8 @@ sdp_list_t *btd_adapter_get_services(struct btd_adapter *adapter); struct btd_device *btd_adapter_find_device(struct btd_adapter *adapter, const bdaddr_t *dst, uint8_t dst_type); +struct btd_device *btd_adapter_find_device_by_path(struct btd_adapter *adapter, + const char *path); const char *adapter_get_path(struct btd_adapter *adapter); const bdaddr_t *btd_adapter_get_address(struct btd_adapter *adapter);