From nobody Tue Jul 25 04:26:32 2023 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 4R93rT0Cfzz4p4Dl; Tue, 25 Jul 2023 04:26:33 +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 4R93rS6Bjbz4PR6; Tue, 25 Jul 2023 04:26:32 +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=9Mz6eco6Z+K0zFAxeZD1f7mooTI+rLjiH8r6pktTRzk=; b=W/wcwwWvYrEBOelnDjtMebUyInJ8pSxRSPStFhXBBeIimFaqkTvxVf1gJ45N3F9uWoHVCj rPt24P9GHQw2tiFvvJYjbknJfoi/XxKqalBxptsEWv64DBJQ34iqE9oKrAFBjzPLbIeP9s 9XXQKOpEhJYAp+1uRPSPC2FGfi2p8/pX1ilzVuDDF/ijy1N6yKkDdzrlDbimQAVGeYI/jL m0GuxTXLcwV5YQzyLz8+5kA3UIryjgc/0aXLf6ryKtJQmMCVA1Nu3wI4b/ZT/kWgHOGVso /CWnp5lSCw61e6wrLbQYGDfjhi3cf7gn0mcdj7CZHOEZcYt4KMV9LL1KWiVMMQ== 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=9Mz6eco6Z+K0zFAxeZD1f7mooTI+rLjiH8r6pktTRzk=; b=rw1C7oLrH3gWADDQXHYrMzbIqBhPbs5YmGcX2wTeMDHzm5PTc5TIBnctrDN9VTz0M8r/wL APr9DRmIS0N6n/YtODSqzxqnWVlZbKjDq8QIRJOJhCzIsUFcds85+N3IJ3KfMz4oW/mMeh WagJ60es4z3Z+S7dVZUOkjZEDYZHi5Tkv+byQxuRQZ2xqALzcpzoAUCCTmgdMYOIetYyGL m++Ky191s0XVl/pKj3MUTnWMmyIAZUBP9RkN3eG/K7obhavyXeUycgr+myxehp7xk00swi 8Qzm2fh7D9BFozya60vu8DECeVfujsXYHAq0dZbG3bev5ifDezYMbYXXTKxN3A== 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=VWnJVJg9kiL7jz8+nDwrTxlN8iKXi4uerKy0g9vREaEEx35GCn8vTxeAhrEM2/OXipEVU1 rADGTZeKz7T0hIWPsKtxNDWycmZHZiCMyYUgCfHuV4j09dvS3aeY4yPn+cp+hHEkFBcpcN IqgN65q5qGGI5Q6rrMHwjkAgkS6Bn/vVmYbrG7YlcjmwOloArMwcsA1Tuunr+uE4QwNtPO L2rNqNGaKJA46gDRCo36nreDHn9PDtIsS17NSajcXBPxWegfcDk2e/+BHvVS9aQN2nDZZB B3x9EE4/hIDrT5kBTkOxZOJY5g2Ku3LlYIvACnu45PQgfTHGe9za9cKU+GzVkw== 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 4R93rS4zpszlqX; Tue, 25 Jul 2023 04:26:32 +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 36P4QWlc039421; Tue, 25 Jul 2023 04:26:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36P4QWSO039420; Tue, 25 Jul 2023 04:26:32 GMT (envelope-from git) Date: Tue, 25 Jul 2023 04:26:32 GMT Message-Id: <202307250426.36P4QWSO039420@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: 7f85b11c57eb - main - cam/nvme: Migrate to modern uintXX_t from u_intXX_t 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f85b11c57eb0d27f6d604b7b6e66fcdaff5f483 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7f85b11c57eb0d27f6d604b7b6e66fcdaff5f483 commit 7f85b11c57eb0d27f6d604b7b6e66fcdaff5f483 Author: Warner Losh AuthorDate: 2023-07-25 03:17:41 +0000 Commit: Warner Losh CommitDate: 2023-07-25 03:32:56 +0000 cam/nvme: 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/nvme/nvme_da.c | 10 +++++----- sys/cam/nvme/nvme_xpt.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 9beef786f320..82b6893fdecb 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -149,7 +149,7 @@ static disk_ioctl_t ndaioctl; static disk_strategy_t ndastrategy; static dumper_t ndadump; static periph_init_t ndainit; -static void ndaasync(void *callback_arg, u_int32_t code, +static void ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg); static void ndasysctlinit(void *context, int pending); static int ndaflagssysctl(SYSCTL_HANDLER_ARGS); @@ -159,8 +159,8 @@ static periph_start_t ndastart; static periph_oninv_t ndaoninvalidate; static void ndadone(struct cam_periph *periph, union ccb *done_ccb); -static int ndaerror(union ccb *ccb, u_int32_t cam_flags, - u_int32_t sense_flags); +static int ndaerror(union ccb *ccb, uint32_t cam_flags, + uint32_t sense_flags); static void ndashutdown(void *arg, int howto); static void ndasuspend(void *arg); @@ -646,7 +646,7 @@ ndacleanup(struct cam_periph *periph) } static void -ndaasync(void *callback_arg, u_int32_t code, +ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg) { struct cam_periph *periph; @@ -1268,7 +1268,7 @@ ndadone(struct cam_periph *periph, union ccb *done_ccb) } static int -ndaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) +ndaerror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags) { #ifdef CAM_IO_STATS struct nda_softc *softc; diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index f1bcd581a096..3222ec1e9dc3 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -150,7 +150,7 @@ static struct cam_ed * nvme_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id); static void nvme_device_transport(struct cam_path *path); -static void nvme_dev_async(u_int32_t async_code, +static void nvme_dev_async(uint32_t async_code, struct cam_eb *bus, struct cam_et *target, struct cam_ed *device, @@ -310,7 +310,7 @@ nvme_probe_done(struct cam_periph *periph, union ccb *done_ccb) struct cam_path *path; struct scsi_vpd_device_id *did; struct scsi_vpd_id_descriptor *idd; - u_int32_t priority; + uint32_t priority; int found = 1, e, g, len; CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("nvme_probe_done\n")); @@ -373,7 +373,7 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) path->device->serial_num = NULL; path->device->serial_num_len = 0; } - path->device->serial_num = (u_int8_t *) + path->device->serial_num = (uint8_t *) malloc(NVME_SERIAL_NUMBER_LENGTH + 1, M_CAMXPT, M_NOWAIT); if (path->device->serial_num != NULL) { cam_strvis_flag(path->device->serial_num, @@ -430,7 +430,7 @@ device_fail: if ((path->device->flags & CAM_DEV_UNCONFIGURED) == 0) if (e < sizeof(nvme_data->eui64)) len += sizeof(struct scsi_vpd_id_descriptor) + 8; if (len > 0) { - path->device->device_id = (u_int8_t *) + path->device->device_id = (uint8_t *) malloc(SVPD_DEVICE_ID_HDR_LEN + len, M_CAMXPT, M_NOWAIT); } @@ -764,7 +764,7 @@ nvme_action(union ccb *start_ccb) * Handle any per-device event notifications that require action by the XPT. */ static void -nvme_dev_async(u_int32_t async_code, struct cam_eb *bus, struct cam_et *target, +nvme_dev_async(uint32_t async_code, struct cam_eb *bus, struct cam_et *target, struct cam_ed *device, void *async_arg) {