From nobody Tue Jul 25 04:26:31 2023 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 4R93rS1M4Vz4p3yy; Tue, 25 Jul 2023 04:26:32 +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 4R93rR6W4Gz4PQx; Tue, 25 Jul 2023 04:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690259192; 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=eAwfBhlWbxaV7G92hkYJpQpzcgYdSIfMmX30UtYCxtk=; b=Fjiao9P1/m2hyl8y3FeY08SuS6fv/+aKe6iUpXLE3RMXssY7vVKNH0qFbPjA8xu1kxsM57 4hmJvmGVAg6F872Ejq+xaWX4yAPtcU1J+yeLftSvD9RG+37CdFZaeU87NwALwEdth2ASmD LI3WjCYMEfc9agSbVhfZAmUyoCO7sxFAGpM4tQmJ6ow5NwpqCQtrb+poJUzCmu3LbBhfcD +THOgNqM5WCGbMgeXgCCLBFljv6LyHWwaBsZoRfe3TfxRlem6fMVR1nFP0Z0+qZ2d402rH MaGis8fWXtkcYKvGpWh4QrQdj1sEA5ZpNwQ5GbVN2aACSRUDYHSbuyBHoAiO7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690259192; 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=eAwfBhlWbxaV7G92hkYJpQpzcgYdSIfMmX30UtYCxtk=; b=GnZzjTl/ePAkg76ntJAAsKBAuP/jciWOm9r0oMLxy1eHJiiau/vXjKRZ5skDHvH75PFWOz yPKZhFGpT8hknXcro5s+1o6kvR7xiLiOHi/VbU3XrjSJ5m15C2lHEpa73B2+O4LPzC8IGn KHHiddBggF08BshncuQU2JWELdb7y19AwGnaDg0KVswCjjFiZkQJv4iBmWLL8WbslREdZI rRePmS+xGtePSoc8/jgJIdxzxQY96tiybPlemfXLVwGvLPgCR8aFaZKuwSbTFWQzIxPomk fF69X0gOGr6kumuOA0AV1AiP2An8kxgBloa6EXQ67gwPdt5+9ZBGhPm/fRi3+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690259192; a=rsa-sha256; cv=none; b=Fz5EhLTt4+WKUOYTrtydcFN0Tz/CSrFc2uLIOhN577mG7iJwEyYOvNch34HrexnH5lCf2I GB3kSPjzmIUROKeMN1YoZrjAvhP8BpNkR0f2WtZf37d7n6UIaBFwESbi02e6LLxwic1ypb IlRe29+UKLKmLt7qhm+OkOXxOJ+vkSxSgo3Bxqf2x3nO/bya7fPq/A1N7aHuXyVnt26S8b 16FDNnvrc8ix2DtWSWtDTdOqOeZGMGcB8Dn+ncqL8u6aCegOSbu3wh9i8wa9O8iS5LEteE f7eN4N2BUu/i1Jaxk0/njgrqHdRQCZhFVtN+36piJxxJp+Uxqg3/tGP45+tamg== 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 4R93rR46HpzlTs; Tue, 25 Jul 2023 04:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36P4QVot039402; Tue, 25 Jul 2023 04:26:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36P4QVXC039401; Tue, 25 Jul 2023 04:26:31 GMT (envelope-from git) Date: Tue, 25 Jul 2023 04:26:31 GMT Message-Id: <202307250426.36P4QVXC039401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a74530d9e2db - main - cam/ctl: Migrate to modern uintXX_t from u_intXX_t 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a74530d9e2dbdae63eec79e6b0f238c10ef0345b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a74530d9e2dbdae63eec79e6b0f238c10ef0345b commit a74530d9e2dbdae63eec79e6b0f238c10ef0345b Author: Warner Losh AuthorDate: 2023-07-25 03:17:41 +0000 Commit: Warner Losh CommitDate: 2023-07-25 03:32:56 +0000 cam/ctl: Migrate to modern uintXX_t from u_intXX_t As per https://lists.freebsd.org/archives/freebsd-scsi/2023-July/000257.html move to the modern uintXX_t. MFC After: 3 days Sponsored by: Netflix --- sys/cam/ctl/ctl.c | 2 +- sys/cam/ctl/scsi_ctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index a365d5726d93..7507c4c3f18a 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -8272,7 +8272,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio) struct ctl_softc *softc = CTL_SOFTC(ctsio); struct ctl_lun *lun = CTL_LUN(ctsio); int retval; - u_int32_t param_len; + uint32_t param_len; struct scsi_per_res_out *cdb; struct scsi_per_res_out_parms* param; uint32_t residx; diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c index cd521e66ebe0..e7fd66c33580 100644 --- a/sys/cam/ctl/scsi_ctl.c +++ b/sys/cam/ctl/scsi_ctl.c @@ -669,7 +669,7 @@ ctlfecleanup(struct cam_periph *periph) static void ctlfedata(struct ctlfe_lun_softc *softc, union ctl_io *io, ccb_flags *flags, uint8_t **data_ptr, uint32_t *dxfer_len, - u_int16_t *sglist_cnt) + uint16_t *sglist_cnt) { struct ctlfe_softc *bus_softc; struct ctlfe_cmd_info *cmd_info;