The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7f85b11c57eb0d27f6d604b7b6e66fcdaff5f483
commit 7f85b11c57eb0d27f6d604b7b6e66fcdaff5f483 Author: Warner Losh <[email protected]> AuthorDate: 2023-07-25 03:17:41 +0000 Commit: Warner Losh <[email protected]> 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) {
