From nobody Thu Apr 03 07:07:25 2025 X-Original-To: dev-commits-src-main@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 4ZSt8t0Q2Xz5sdbt; Thu, 03 Apr 2025 07:07:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSt8s6vsmz3K9S; Thu, 03 Apr 2025 07:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743664046; 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=PIFPwYQHt4P1QYtT59TAeM9SQ/FuoNCJsOExUEj+1zc=; b=f7cWHR7IkDV0Bo+Os2HpLFqwqvCv2aXrfj/B53OfaBLhnZUxkyIHmbkR4m7y4BH7LtlN/S fPKZsw4ZSEoqq2uH2cgMgal4erE2c1IxY4LbPXb8VGVdeMpVnankKgMajHR+L9J+TUFqLp Lktdb9xqhiH4d8kaT9MkxYEcTX2QC1hWrQiurHQjZDQ7umgIJpMMJgN9vmt6xCUYJP02fP 0aemnQnraMlhpw0+gtfLx47gW98Qg3jsmBCv/k4dsBObaJ8YLsCraNsW4xkLDXQ8UPoyZA IKiAUzwoJ6dnpLmtUgkUiTKLb5ZMGaZkk3cag2TinDN+XxGVjSObsKMYYuIrmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743664046; a=rsa-sha256; cv=none; b=PqqbkYshPUEY8QeP+wWfTZCcm/hYGTcQGssd/je4nmIedYOJIMkWLytWLk6NQwjkTzMjv1 LYs6IrZfMv7cMj4rbAw/1+u/LU6KtRJlAJNrm3fp+V2NJge6HkPmbf0C8v6Cg3rM7ZYDht 3BJ/iyVbekUEIrBii/PDCWjsXoHQTfu6DZvafmkTYjv/CnPSn5wcXOcBFyGP7MjBxIPGbx F869Qz8hx/vaU8qEYOFFWl3f94KCIQYEa3JhVSDKDZmxMFHNmZXQGPBT7bZz9gmGzBVINg S0a5u82KcflWuhGVhFXW9n5bczHQ5rlyh0pOrtO5Uu74t3JTKEDZNym/oY10EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743664046; 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=PIFPwYQHt4P1QYtT59TAeM9SQ/FuoNCJsOExUEj+1zc=; b=OgOC5mCXdJeBApxsMlkdGlbFOYHSD2sFBttF+IeNOPTEXE5gQNw484OqS/cR3RRWpGySXh y6bxNuGI+kBrFR1CxeLIJKwLIA8zn+G5HIp1+X8KmbKTZUB0huFyhTlIZlNba1S6BjCMqH BB3EQt1fDhgyOXgR4fPsRK/tPj6wVJSaHBW0CFGiP7ScJA0wCPPgNwfJodEX3NjY4Vt4sd /NLd49cVKosrHuSrTvQSbTvAYBB9KDcEuS/E+Sn2c80LQi3Atn8cQwWv6Chl/lFwczcmxP oGJ/HvNXbjLztpDd86142Eb6i0e2LZJ2vTu1VVbXxCM6RrmngrmlT8TSOQTXBg== 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 4ZSt8s6Qmwzrq6; Thu, 03 Apr 2025 07:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53377Ph9040793; Thu, 3 Apr 2025 07:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53377PCW040790; Thu, 3 Apr 2025 07:07:25 GMT (envelope-from git) Date: Thu, 3 Apr 2025 07:07:25 GMT Message-Id: <202504030707.53377PCW040790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 74a6f2a76b32 - main - iwx: Shorten log code field List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74a6f2a76b32e01d05c4ad71897bd3a6831e703e Auto-Submitted: auto-generated The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=74a6f2a76b32e01d05c4ad71897bd3a6831e703e commit 74a6f2a76b32e01d05c4ad71897bd3a6831e703e Author: Tom Jones AuthorDate: 2025-04-03 07:06:40 +0000 Commit: Tom Jones CommitDate: 2025-04-03 07:06:40 +0000 iwx: Shorten log code field The widest value used with code is 32 bits, other values are smaller. Reduce this down. Update printfs. This fixes the build on i386. Reviewed by: bapt, emast, kevans, adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49634 --- sys/dev/iwx/if_iwx_debug.c | 10 +++++----- sys/dev/iwx/if_iwx_debug.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/iwx/if_iwx_debug.c b/sys/dev/iwx/if_iwx_debug.c index 7ce1ea8abe43..6a2bf32ad738 100644 --- a/sys/dev/iwx/if_iwx_debug.c +++ b/sys/dev/iwx/if_iwx_debug.c @@ -126,7 +126,7 @@ iwx_dump_cmd(uint32_t id, void *data, uint16_t len, const char *str, int type) } void -iwx_bbl_add_entry(uint64_t code, int type, int ticks) +iwx_bbl_add_entry(uint32_t code, int type, int ticks) { /* * Compress together repeated notifications, but increment the sequence @@ -162,22 +162,22 @@ iwx_bbl_print_entry(struct iwx_bbl_entry *e) switch(e->type) { case IWX_BBL_PKT_TX: printf("pkt "); - printf("seq %08d\t pkt len %ld", + printf("seq %08d\t pkt len %u", e->seq, e->code); break; printf("pkt dup "); - printf("seq %08d\t dup count %ld", + printf("seq %08d\t dup count %u", e->seq, e->code); break; case IWX_BBL_CMD_TX: printf("tx -> "); - printf("seq %08d\tcode 0x%08lx (%s:%s)", + printf("seq %08d\tcode 0x%08x (%s:%s)", e->seq, e->code, get_label(command_group, group), get_label(get_table(group), opcode)); break; case IWX_BBL_CMD_RX: printf("rx "); - printf("seq %08d\tcode 0x%08lx (%s:%s)", + printf("seq %08d\tcode 0x%08x (%s:%s)", e->seq, e->code, get_label(command_group, group), get_label(get_table(group), opcode)); break; diff --git a/sys/dev/iwx/if_iwx_debug.h b/sys/dev/iwx/if_iwx_debug.h index 7875338ef6b6..80fd3ffa6eed 100644 --- a/sys/dev/iwx/if_iwx_debug.h +++ b/sys/dev/iwx/if_iwx_debug.h @@ -56,7 +56,7 @@ enum { void print_opcode(const char *, int, int, uint32_t); void print_ratenflags(const char *, int , uint32_t , int ); void iwx_dump_cmd(uint32_t , void *, uint16_t, const char *, int); -void iwx_bbl_add_entry(uint64_t, int, int); +void iwx_bbl_add_entry(uint32_t, int, int); void iwx_bbl_print_log(void); #define IWX_BBL_NONE 0x00 @@ -254,7 +254,7 @@ static struct opcode_label phyops_opcodes[] = { struct iwx_bbl_entry { uint8_t type; - uint64_t code; + uint32_t code; uint32_t seq; uint32_t ticks; uint32_t count;