Bluetooth: Log refactor (cont.) #51897
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
theob-pro
requested review from
LingaoM,
PavelVPV,
Thalley,
Vudentz,
alwa-nordic,
carlescufi,
cvinayak,
jhedberg,
kruithofa,
sjanc,
sylvioalves and
thoh-ot
as code owners
zephyrbot
added
area: Bluetooth Mesh
area: Bluetooth Audio
platform: STM32
LingaoM
reviewed
Nov 2, 2022
jhedberg
reviewed
Nov 2, 2022
theob-pro
force-pushed
the
log-refactor-3-up
branch
from
fe5f9d7 to
fc7af71
Compare
Thalley
previously requested changes
Nov 2, 2022
theob-pro
commented
Nov 3, 2022
theob-pro
force-pushed
the
log-refactor-3-up
branch
from
fc7af71 to
880e034
Compare
theob-pro
requested review from
galak,
nashif and
nordic-krch
as code owners
jori-nordic
previously approved these changes
Nov 25, 2022
alwa-nordic
previously approved these changes
Nov 25, 2022
jhedberg
previously approved these changes
Nov 25, 2022
tejlmand
requested changes
Nov 25, 2022
subsys/bluetooth/audio/Kconfig.aics
Outdated
| legacy-debug-sym = BT_DEBUG_AICS | ||
| module-str = "Audio Input Control Service" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
minor nit, ${ZEPHYR_BASE} can be omitted when using source.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Member
There was a problem hiding this comment.
This should’ve been caught by compliance I think. I will check why it wasn’t.
subsys/bluetooth/audio/Kconfig.aics
Outdated
| legacy-debug-sym = BT_DEBUG_AICS_CLIENT | ||
| module-str = "Audio Input Control Service client" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
subsys/bluetooth/audio/Kconfig.baps
Outdated
| legacy-debug-sym = BT_AUDIO_DEBUG_STREAM | ||
| module-str = "Bluetooth Audio Stream" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
subsys/bluetooth/audio/Kconfig.baps
Outdated
| legacy-debug-sym = BT_DEBUG_ASCS | ||
| module-str = "Audio Stream Control Service" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
subsys/bluetooth/audio/Kconfig.baps
Outdated
| legacy-debug-sym = BT_AUDIO_DEBUG_UNICAST_SERVER | ||
| module-str = "Bluetooth Audio Unicast Server" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
subsys/bluetooth/audio/Kconfig.csip
Outdated
| legacy-debug-sym = BT_DEBUG_CSIP_SET_MEMBER_CRYPTO | ||
| module-str = "Coordinated Set Identification Profile crypto functions" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
subsys/bluetooth/audio/Kconfig.has
Outdated
| legacy-debug-sym = BT_DEBUG_HAS | ||
| module-str = "Hearing Access Service" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
subsys/bluetooth/audio/Kconfig.has
Outdated
| legacy-debug-sym = BT_DEBUG_HAS_CLIENT | ||
| module-str = "Hearing Access Service Client" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
subsys/bluetooth/audio/Kconfig.mcs
Outdated
| legacy-debug-sym = BT_DEBUG_MCS | ||
| module-str = "Media Control Service" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
subsys/bluetooth/audio/Kconfig.mcs
Outdated
| legacy-debug-sym = BT_DEBUG_MCC | ||
| module-str = "Media Control Client" | ||
| source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config_inherit" | ||
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" |
Contributor
There was a problem hiding this comment.
Suggested change
| source "${ZEPHYR_BASE}/subsys/bluetooth/common/Kconfig.template.log_config_bt" | |
| source "subsys/bluetooth/common/Kconfig.template.log_config_bt" |
theob-pro
dismissed stale reviews from jhedberg, alwa-nordic, and jori-nordic
via
8aad629
carlescufi
previously approved these changes
Nov 25, 2022
Contributor
|
@theob-pro thanks for fixing, but please squash the fix with previous commit, there is no reason to have that particular review comment fix as a independent commit. |
jhedberg
previously approved these changes
Nov 25, 2022
…n/log` The `bluetooth/common/log.h` and `bluetooth/common/log.c` files have been removed. Files that were using them have been updated to use `zephyr/logging/log.h` instead. Those replacement have been done consequently: - `/BT_DBG/LOG_DBG/` - `/BT_ERR/LOG_ERR/` - `/BT_WARN/LOG_WRN/` - `/BT_INFO/LOG_INF/` - `/BT_HEXDUMP_DBG/LOG_HEXDUMP_DBG/` - `/BT_DBG_OBJ_ID/LOG_DBG_OBJ_ID/` Also, some files were relying on the `common/log.h` include to include `zephyr/bluetooth/hci.h`, in those cases the include of `hci.h` has been added. For files that were including `common/log.h` but not using any logs, the include has been removed and not replaced. Signed-off-by: Théo Battrel <[email protected]>
theob-pro
force-pushed
the
log-refactor-3-up
branch
from
8aad629 to
8390c60
Compare
carlescufi
requested review from
PavelVPV,
alwa-nordic,
carlescufi,
jhedberg and
jori-nordic
jhedberg
approved these changes
Nov 25, 2022
PavelVPV
approved these changes
Nov 25, 2022
This was referenced Nov 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Last part of the log refactor work.
The
common/loghas been removed and file that were using it for log has been updated.More details in the commit message.