From nobody Tue Dec 28 17:51:12 2021 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 09948190F891; Tue, 28 Dec 2021 17:51:15 +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 4JNhss0Bmqz3F1F; Tue, 28 Dec 2021 17:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 28D78160C1; Tue, 28 Dec 2021 17:51:12 +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 1BSHpCEZ053619; Tue, 28 Dec 2021 17:51:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BSHpCGf053618; Tue, 28 Dec 2021 17:51:12 GMT (envelope-from git) Date: Tue, 28 Dec 2021 17:51:12 GMT Message-Id: <202112281751.1BSHpCGf053618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f2b1ec3aebf1 - main - sys/isa: Use C99 fixed-width integer types. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2b1ec3aebf12e77118688a85bf0ede428f72251 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640713873; 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=i/PYC+r/P4FreZSe/xVJENoXwXj/F667LxGkwK+c4n0=; b=o16+q4tjVjfmfW/HAhGj3FssI55Pv/9heEZIXKhyte4/d9cICWDOZkjPTZQPzzhhh7lns1 ThtG1SJXTzypgW0wpw7/kNh31SGJ8/j6FO7U3ecuo924plq4tepdBq8Rwenw25yQelZ+EW e8qmqNKN1wmmBor81kG3MgCi9Ff65Zep4QVTrJqrHkHxVXoxqCbpxAYd0NCXkKDSXjHDoU lboS9F7ooK+lpgJpR3OxDl6vahMoMOGCRzZiyKNj1D8trfXP4CO0Hu0pIaFw2g8PoS20cA tLhsDmi1IT75QEd4QF6KPBDgyTFjS9gY325GJuPt8zudUmTDixYAKVS+pS/lfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640713873; a=rsa-sha256; cv=none; b=r2PY61DYZD+U5AvR+jwlLZM0FxrYiCUGYBkuhhccoZhNDkIe2ke+/cCDqWk9B+HcgSaiSY BT8Md9uGfzym8y6ro+NDiGXv59tY7NTEgysv0U5g1WmWIdg13i9jsUarp3PQvHR9z3JKYx nxmN6DhJEW+K/Qzi7LqcumrZaTfxLmp+G1ztOz5ku3+8SHSIor7OJ3aEX6wzV8sqYdVXDn 2PpfvI6pYjkV/qG5GwfcfQf2PMXe8uDEbqASpLklNuEpARHRfi87xTBWNhtf5NfjcXgG/s WzLQEJymtT07dkzmzdzxGBGzHv03YYgf3bnYA3gHnLFJ3eePZrXuyjUfTAUFZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f2b1ec3aebf12e77118688a85bf0ede428f72251 commit f2b1ec3aebf12e77118688a85bf0ede428f72251 Author: John Baldwin AuthorDate: 2021-12-28 17:41:57 +0000 Commit: John Baldwin CommitDate: 2021-12-28 17:41:57 +0000 sys/isa: Use C99 fixed-width integer types. No functional change. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D33636 --- sys/isa/isavar.h | 14 +++++++------- sys/isa/pnpparse.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h index 81ba280da457..c4ac81297e29 100644 --- a/sys/isa/isavar.h +++ b/sys/isa/isavar.h @@ -79,17 +79,17 @@ typedef void isa_config_cb(void *arg, struct isa_config *config, int enable); * ISA_ADD_CONFIG(). */ struct isa_range { - u_int32_t ir_start; - u_int32_t ir_end; - u_int32_t ir_size; - u_int32_t ir_align; + uint32_t ir_start; + uint32_t ir_end; + uint32_t ir_size; + uint32_t ir_align; }; struct isa_config { struct isa_range ic_mem[ISA_NMEM]; struct isa_range ic_port[ISA_NPORT]; - u_int32_t ic_irqmask[ISA_NIRQ]; - u_int32_t ic_drqmask[ISA_NDRQ]; + uint32_t ic_irqmask[ISA_NIRQ]; + uint32_t ic_drqmask[ISA_NDRQ]; int ic_nmem; int ic_nport; int ic_nirq; @@ -100,7 +100,7 @@ struct isa_config { * Used to build lists of IDs and description strings for PnP drivers. */ struct isa_pnp_id { - u_int32_t ip_id; + uint32_t ip_id; const char *ip_desc; }; diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c index 979389f59808..a2716f513d52 100644 --- a/sys/isa/pnpparse.c +++ b/sys/isa/pnpparse.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #define I32(p) (I16(p) + (I16((p)+2) << 16)) void -pnp_printf(u_int32_t id, char *fmt, ...) +pnp_printf(uint32_t id, char *fmt, ...) { va_list ap; @@ -64,8 +64,8 @@ pnp_parse_desc(device_t dev, u_char tag, u_char *res, int len, struct isa_config *config, int ldn) { char buf[100]; - u_int32_t id; - u_int32_t compat_id; + uint32_t id; + uint32_t compat_id; int temp; id = isa_get_logicalid(dev); @@ -414,7 +414,7 @@ pnp_parse_resources(device_t dev, u_char *resources, int len, int ldn) u_char *start; u_char *p; u_char tag; - u_int32_t id; + uint32_t id; int ncfgs; int l; int i;