From b8d3b57a114d79a840080c282e2fda200fb58b5b Mon Sep 17 00:00:00 2001 From: David Rees Date: Mon, 16 Dec 2024 13:34:10 -0800 Subject: [PATCH] pw_bluetooth_proxy: Rename to l2cap_channel_common.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename l2cap_channel_event.h to l2cap_channel_common.h. Later CLs will put items beyond event in it. Bug: 369849508 Change-Id: I0eeb30f834b187669ef53a60a37a4ad5c80f1784 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/254519 Presubmit-Verified: CQ Bot Account Reviewed-by: Ali Saeed Commit-Queue: David Rees Lint: Lint 🤖 Docs-Not-Needed: David Rees --- pw_bluetooth_proxy/BUILD.bazel | 2 +- pw_bluetooth_proxy/BUILD.gn | 2 +- pw_bluetooth_proxy/CMakeLists.txt | 2 +- pw_bluetooth_proxy/basic_l2cap_channel.cc | 2 +- pw_bluetooth_proxy/l2cap_channel.cc | 2 +- pw_bluetooth_proxy/l2cap_coc.cc | 2 +- pw_bluetooth_proxy/proxy_host.cc | 2 +- .../public/pw_bluetooth_proxy/basic_l2cap_channel.h | 2 +- .../public/pw_bluetooth_proxy/internal/l2cap_channel.h | 2 +- .../public/pw_bluetooth_proxy/internal/l2cap_coc_internal.h | 2 +- .../{l2cap_channel_event.h => l2cap_channel_common.h} | 0 pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h | 2 +- pw_bluetooth_proxy/public/pw_bluetooth_proxy/proxy_host.h | 6 +++--- pw_bluetooth_proxy/pw_bluetooth_proxy_private/test_utils.h | 2 +- pw_bluetooth_proxy/rfcomm_channel.cc | 2 +- pw_bluetooth_proxy/test_utils.cc | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) rename pw_bluetooth_proxy/public/pw_bluetooth_proxy/{l2cap_channel_event.h => l2cap_channel_common.h} (100%) diff --git a/pw_bluetooth_proxy/BUILD.bazel b/pw_bluetooth_proxy/BUILD.bazel index 63fdefe0d..351d82205 100644 --- a/pw_bluetooth_proxy/BUILD.bazel +++ b/pw_bluetooth_proxy/BUILD.bazel @@ -55,7 +55,7 @@ cc_library( "public/pw_bluetooth_proxy/internal/l2cap_status_tracker.h", "public/pw_bluetooth_proxy/internal/logical_transport.h", "public/pw_bluetooth_proxy/internal/rfcomm_fcs.h", - "public/pw_bluetooth_proxy/l2cap_channel_event.h", + "public/pw_bluetooth_proxy/l2cap_channel_common.h", "public/pw_bluetooth_proxy/l2cap_coc.h", "public/pw_bluetooth_proxy/l2cap_status_delegate.h", "public/pw_bluetooth_proxy/proxy_host.h", diff --git a/pw_bluetooth_proxy/BUILD.gn b/pw_bluetooth_proxy/BUILD.gn index 086897381..29749131f 100644 --- a/pw_bluetooth_proxy/BUILD.gn +++ b/pw_bluetooth_proxy/BUILD.gn @@ -56,7 +56,7 @@ pw_source_set("pw_bluetooth_proxy") { "public/pw_bluetooth_proxy/internal/l2cap_status_tracker.h", "public/pw_bluetooth_proxy/internal/logical_transport.h", "public/pw_bluetooth_proxy/internal/rfcomm_fcs.h", - "public/pw_bluetooth_proxy/l2cap_channel_event.h", + "public/pw_bluetooth_proxy/l2cap_channel_common.h", "public/pw_bluetooth_proxy/l2cap_coc.h", "public/pw_bluetooth_proxy/l2cap_status_delegate.h", "public/pw_bluetooth_proxy/proxy_host.h", diff --git a/pw_bluetooth_proxy/CMakeLists.txt b/pw_bluetooth_proxy/CMakeLists.txt index 1c1c26df0..27090e19c 100644 --- a/pw_bluetooth_proxy/CMakeLists.txt +++ b/pw_bluetooth_proxy/CMakeLists.txt @@ -41,7 +41,7 @@ pw_add_library(pw_bluetooth_proxy STATIC public/pw_bluetooth_proxy/internal/l2cap_leu_signaling_channel.h public/pw_bluetooth_proxy/internal/logical_transport.h public/pw_bluetooth_proxy/internal/rfcomm_fcs.h - public/pw_bluetooth_proxy/l2cap_channel_event.h + public/pw_bluetooth_proxy/l2cap_channel_common.h public/pw_bluetooth_proxy/l2cap_coc.h public/pw_bluetooth_proxy/l2cap_status_delegate.h public/pw_bluetooth_proxy/proxy_host.h diff --git a/pw_bluetooth_proxy/basic_l2cap_channel.cc b/pw_bluetooth_proxy/basic_l2cap_channel.cc index 0581c2ed0..6261784d1 100644 --- a/pw_bluetooth_proxy/basic_l2cap_channel.cc +++ b/pw_bluetooth_proxy/basic_l2cap_channel.cc @@ -17,7 +17,7 @@ #include "pw_bluetooth/emboss_util.h" #include "pw_bluetooth/hci_data.emb.h" #include "pw_bluetooth/l2cap_frames.emb.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_log/log.h" #include "pw_status/try.h" diff --git a/pw_bluetooth_proxy/l2cap_channel.cc b/pw_bluetooth_proxy/l2cap_channel.cc index 814eac550..c2c36e98d 100644 --- a/pw_bluetooth_proxy/l2cap_channel.cc +++ b/pw_bluetooth_proxy/l2cap_channel.cc @@ -21,7 +21,7 @@ #include "pw_bluetooth/hci_h4.emb.h" #include "pw_bluetooth/l2cap_frames.emb.h" #include "pw_bluetooth_proxy/internal/l2cap_channel_manager.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_log/log.h" #include "pw_status/status.h" #include "pw_status/try.h" diff --git a/pw_bluetooth_proxy/l2cap_coc.cc b/pw_bluetooth_proxy/l2cap_coc.cc index 72413beb7..e00c42966 100644 --- a/pw_bluetooth_proxy/l2cap_coc.cc +++ b/pw_bluetooth_proxy/l2cap_coc.cc @@ -21,7 +21,7 @@ #include "pw_bluetooth/hci_data.emb.h" #include "pw_bluetooth/l2cap_frames.emb.h" #include "pw_bluetooth_proxy/internal/l2cap_signaling_channel.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_log/log.h" #include "pw_status/try.h" diff --git a/pw_bluetooth_proxy/proxy_host.cc b/pw_bluetooth_proxy/proxy_host.cc index c3928b1ae..a20aa36e3 100644 --- a/pw_bluetooth_proxy/proxy_host.cc +++ b/pw_bluetooth_proxy/proxy_host.cc @@ -25,7 +25,7 @@ #include "pw_bluetooth_proxy/internal/gatt_notify_channel_internal.h" #include "pw_bluetooth_proxy/internal/l2cap_coc_internal.h" #include "pw_bluetooth_proxy/internal/logical_transport.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_log/log.h" namespace pw::bluetooth::proxy { diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/basic_l2cap_channel.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/basic_l2cap_channel.h index 8e80de375..9b189c67e 100644 --- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/basic_l2cap_channel.h +++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/basic_l2cap_channel.h @@ -15,7 +15,7 @@ #pragma once #include "pw_bluetooth_proxy/internal/l2cap_channel.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" namespace pw::bluetooth::proxy { diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_channel.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_channel.h index 24f2f7014..125796358 100644 --- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_channel.h +++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_channel.h @@ -16,7 +16,7 @@ #include "pw_bluetooth_proxy/h4_packet.h" #include "pw_bluetooth_proxy/internal/logical_transport.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_containers/inline_queue.h" #include "pw_containers/intrusive_forward_list.h" #include "pw_result/result.h" diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_coc_internal.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_coc_internal.h index d71ffdf12..a579d2b44 100644 --- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_coc_internal.h +++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/internal/l2cap_coc_internal.h @@ -14,7 +14,7 @@ #pragma once -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_bluetooth_proxy/l2cap_coc.h" namespace pw::bluetooth::proxy { diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_channel_event.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_channel_common.h similarity index 100% rename from pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_channel_event.h rename to pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_channel_common.h diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h index 7d4587642..1d405c2e0 100644 --- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h +++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/l2cap_coc.h @@ -16,7 +16,7 @@ #include "pw_bluetooth_proxy/internal/l2cap_channel.h" #include "pw_bluetooth_proxy/internal/l2cap_signaling_channel.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_sync/mutex.h" namespace pw::bluetooth::proxy { diff --git a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/proxy_host.h b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/proxy_host.h index 1f24d0a1b..15f7c3bf6 100644 --- a/pw_bluetooth_proxy/public/pw_bluetooth_proxy/proxy_host.h +++ b/pw_bluetooth_proxy/public/pw_bluetooth_proxy/proxy_host.h @@ -18,7 +18,7 @@ #include "pw_bluetooth_proxy/internal/h4_storage.h" #include "pw_bluetooth_proxy/internal/hci_transport.h" #include "pw_bluetooth_proxy/internal/l2cap_channel_manager.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_bluetooth_proxy/l2cap_coc.h" #include "pw_bluetooth_proxy/l2cap_status_delegate.h" #include "pw_bluetooth_proxy/rfcomm_channel.h" @@ -184,7 +184,7 @@ class ProxyHost { /// /// @param[in] event_fn Handle asynchronous events such as /// errors encountered by the channel. - /// See `l2cap_channel_event.h`. + /// See `l2cap_channel_common.h`. /// /// @returns @rst /// @@ -248,7 +248,7 @@ class ProxyHost { /// /// @param[in] event_fn Handle asynchronous events such as errors /// encountered by the channel. See - /// `l2cap_channel_event.h`. + /// `l2cap_channel_common.h`. /// /// @returns @rst /// diff --git a/pw_bluetooth_proxy/pw_bluetooth_proxy_private/test_utils.h b/pw_bluetooth_proxy/pw_bluetooth_proxy_private/test_utils.h index 618a1e24c..8c632b893 100644 --- a/pw_bluetooth_proxy/pw_bluetooth_proxy_private/test_utils.h +++ b/pw_bluetooth_proxy/pw_bluetooth_proxy_private/test_utils.h @@ -26,7 +26,7 @@ #include "pw_bluetooth/l2cap_frames.emb.h" #include "pw_bluetooth_proxy/h4_packet.h" #include "pw_bluetooth_proxy/internal/logical_transport.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_bluetooth_proxy/l2cap_coc.h" #include "pw_bluetooth_proxy/l2cap_status_delegate.h" #include "pw_bluetooth_proxy/proxy_host.h" diff --git a/pw_bluetooth_proxy/rfcomm_channel.cc b/pw_bluetooth_proxy/rfcomm_channel.cc index 58bbab374..9667cc04d 100644 --- a/pw_bluetooth_proxy/rfcomm_channel.cc +++ b/pw_bluetooth_proxy/rfcomm_channel.cc @@ -23,7 +23,7 @@ #include "pw_bluetooth/rfcomm_frames.emb.h" #include "pw_bluetooth_proxy/internal/logical_transport.h" #include "pw_bluetooth_proxy/internal/rfcomm_fcs.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_log/log.h" #include "pw_status/try.h" diff --git a/pw_bluetooth_proxy/test_utils.cc b/pw_bluetooth_proxy/test_utils.cc index 4e6817199..3ee1e07d4 100644 --- a/pw_bluetooth_proxy/test_utils.cc +++ b/pw_bluetooth_proxy/test_utils.cc @@ -25,7 +25,7 @@ #include "pw_bluetooth_proxy/basic_l2cap_channel.h" #include "pw_bluetooth_proxy/h4_packet.h" #include "pw_bluetooth_proxy/internal/logical_transport.h" -#include "pw_bluetooth_proxy/l2cap_channel_event.h" +#include "pw_bluetooth_proxy/l2cap_channel_common.h" #include "pw_bluetooth_proxy/l2cap_status_delegate.h" #include "pw_bluetooth_proxy/proxy_host.h" #include "pw_function/function.h"