From nobody Sat Oct 22 19:52:06 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MvsRq13hHz4fw0x; Sat, 22 Oct 2022 19:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MvsRq0SkXz4LM4; Sat, 22 Oct 2022 19:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666468327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSd8bH6auRHINNAt/PRrAIT2MqwawDdga6rHnbKIGJE=; b=KpLtA6N8g78uITA4OuCII5WHFhx7Bj5B4230nvqmUSTP874T4pSmORfaTW5llWZbHykM86 IQ9tw+EVFS77kU0TvryI9voOmBBJRnoPD9ELKB7lP3vgMUF1U+lDL//kLNKceq424RFYVC unsp2rpklUOx5oYlN+R1EsU5z0zVNloA9tP2hV/xetq2V3aYfV6wTx7bWUOegPbQeohZON 7w/EgpF5YPDpeOZr4pO0lCbCbFvFtEfrUBAVyud78l6l29Rhqryn1bBQyLG3K2Q+dda1RR JcxtS62WeX12Mq566zgaH2dafoopmstDwxFaAC6oMYnaguOtqJ6uaC+5gWx8Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MvsRp6f5Gzfnb; Sat, 22 Oct 2022 19:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29MJq6MX032859; Sat, 22 Oct 2022 19:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29MJq6PB032858; Sat, 22 Oct 2022 19:52:06 GMT (envelope-from git) Date: Sat, 22 Oct 2022 19:52:06 GMT Message-Id: <202210221952.29MJq6PB032858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 71ebd2d00b96 - main - iwlwifi: constify another argument of iwl_print_hex_dump() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71ebd2d00b9618325ef6d0bb8c224d3d5f32160a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666468327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XSd8bH6auRHINNAt/PRrAIT2MqwawDdga6rHnbKIGJE=; b=s5zfVan08p5DZd/HueYAPSuUtG3CZwJtWxM9TiOW++AKTtkCcFMWzFP/fAWwmSeBXObszP uuU8A1QsfNWlGMWbxRCCzjV0BDYXIllmKPW+eZBefi3csoyi2mhGCMyLxEQSEaDB7S80kj utCjl6rM/KWYnsECMNTgRY54OQCoX5e2gCkammE2u9g/a3KVEAaT9ssMdHdlrjv0c3/aFa K++QYjinyWwUNM6Qvgtqxu9aijf0Ojh7L5lUZ9VyR/uHr3reYRjfqixTF8iPaJI6+QD5u3 8gpN9i2Xc9nUBcgyGfQWZwlp3V3YuwZO/f7FOn1u1f/WTKYmB/x2kpPTAqv6Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666468327; a=rsa-sha256; cv=none; b=eCO2MS/MGcX+FdgZHWg4vQzr9dD3wfo8JZvTiZMYf1Qt6VTQ8vjU4D+Oc3xbMQUSaYM6bB dugEQm5rcmb64LQtEqtEgEWesrHWbuNP28/sFqRzzw16xd23KstNE2d6NJNuTguQoQ6bFQ L1SD3hGBHk4IPvcgetouVU4o6cvzeCYRJCagBA8TuNPIbdVCKkJwQ0m5Th6S5dJxB0k8iz YqwwbNeSf01DKve79477jBiJWot7Zu20V3AiEWxVCBA3ClSCxnfui4hPFnSOJSO69m7VAf WQpNjISxYkeLu9k9q4h1TjnvZtWg+T9qD8Q9WcAO4T8J+uYdVZ57W5JIPlnu3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=71ebd2d00b9618325ef6d0bb8c224d3d5f32160a commit 71ebd2d00b9618325ef6d0bb8c224d3d5f32160a Author: Bjoern A. Zeeb AuthorDate: 2022-10-22 17:33:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-10-22 17:33:18 +0000 iwlwifi: constify another argument of iwl_print_hex_dump() This is needed when enabling debugfs as it passes a const in which would otherwise be dropped. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/iwl-debug.c | 4 ++++ sys/contrib/dev/iwlwifi/iwl-debug.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.c b/sys/contrib/dev/iwlwifi/iwl-debug.c index 5bb61151b93b..5a9c8bc70168 100644 --- a/sys/contrib/dev/iwlwifi/iwl-debug.c +++ b/sys/contrib/dev/iwlwifi/iwl-debug.c @@ -115,7 +115,11 @@ iwl_have_debug_level(enum iwl_dl level) /* Passing the iwl_drv * in seems pointless. */ void iwl_print_hex_dump(void *drv __unused, enum iwl_dl level, +#if defined(__linux__) const char *prefix, uint8_t *data, size_t len) +#elif defined(__FreeBSD__) + const char *prefix, const uint8_t *data, size_t len) +#endif { /* Given we have a level, check for it. */ diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.h b/sys/contrib/dev/iwlwifi/iwl-debug.h index dac2c6b31562..43288a5a8d74 100644 --- a/sys/contrib/dev/iwlwifi/iwl-debug.h +++ b/sys/contrib/dev/iwlwifi/iwl-debug.h @@ -109,7 +109,11 @@ void __iwl_err(struct device *, enum iwl_err_mode, const char *, ...); #ifdef CONFIG_IWLWIFI_DEBUG bool iwl_have_debug_level(enum iwl_dl); +#if defined(__linux__) void iwl_print_hex_dump(void *, enum iwl_dl, const char *, uint8_t *, size_t); +#elif defined(__FreeBSD__) +void iwl_print_hex_dump(void *, enum iwl_dl, const char *, const uint8_t *, size_t); +#endif void __iwl_dbg(struct device *, u32, bool, const char *, const char *fmt, ...); #define IWL_DPRINTF_DEV_PREFIX(_dev, _e, _prefix, _fmt, ...) \