Commit the bits of nda that were missed. This should fix the build.

Approved by: re@

1 files changed, 5 insertions, 37 deletions

diff --git a/sys/dev/nvme/nvme_ns_cmd.c b/sys/dev/nvme/nvme_ns_cmd.c
index b5c45dc..303e03c 100644
--- a/sys/dev/nvme/nvme_ns_cmd.c
+++ b/sys/dev/nvme/nvme_ns_cmd.c
@@ -34,20 +34,14 @@ nvme_ns_cmd_read(struct nvme_namespace *ns, void *payload, uint64_t lba,
     uint32_t lba_count, nvme_cb_fn_t cb_fn, void *cb_arg)
 {
 	struct nvme_request	*req;
-	struct nvme_command	*cmd;
 
 	req = nvme_allocate_request_vaddr(payload,
 	    lba_count*nvme_ns_get_sector_size(ns), cb_fn, cb_arg);
 
 	if (req == NULL)
 		return (ENOMEM);
-	cmd = &req->cmd;
-	cmd->opc = NVME_OPC_READ;
-	cmd->nsid = ns->id;
 
-	/* TODO: create a read command data structure */
-	*(uint64_t *)&cmd->cdw10 = lba;
-	cmd->cdw12 = lba_count-1;
+	nvme_ns_read_cmd(&req->cmd, ns->id, lba, lba_count);
 
 	nvme_ctrlr_submit_io_request(ns->ctrlr, req);
 
@@ -59,7 +53,6 @@ nvme_ns_cmd_read_bio(struct nvme_namespace *ns, struct bio *bp,
     nvme_cb_fn_t cb_fn, void *cb_arg)
 {
 	struct nvme_request	*req;
-	struct nvme_command	*cmd;
 	uint64_t		lba;
 	uint64_t		lba_count;
 
@@ -67,16 +60,10 @@ nvme_ns_cmd_read_bio(struct nvme_namespace *ns, struct bio *bp,
 
 	if (req == NULL)
 		return (ENOMEM);
-	cmd = &req->cmd;
-	cmd->opc = NVME_OPC_READ;
-	cmd->nsid = ns->id;
 
 	lba = bp->bio_offset / nvme_ns_get_sector_size(ns);
 	lba_count = bp->bio_bcount / nvme_ns_get_sector_size(ns);
-
-	/* TODO: create a read command data structure */
-	*(uint64_t *)&cmd->cdw10 = lba;
-	cmd->cdw12 = lba_count-1;
+	nvme_ns_read_cmd(&req->cmd, ns->id, lba, lba_count);
 
 	nvme_ctrlr_submit_io_request(ns->ctrlr, req);
 
@@ -88,7 +75,6 @@ nvme_ns_cmd_write(struct nvme_namespace *ns, void *payload, uint64_t lba,
     uint32_t lba_count, nvme_cb_fn_t cb_fn, void *cb_arg)
 {
 	struct nvme_request	*req;
-	struct nvme_command	*cmd;
 
 	req = nvme_allocate_request_vaddr(payload,
 	    lba_count*nvme_ns_get_sector_size(ns), cb_fn, cb_arg);
@@ -96,13 +82,7 @@ nvme_ns_cmd_write(struct nvme_namespace *ns, void *payload, uint64_t lba,
 	if (req == NULL)
 		return (ENOMEM);
 
-	cmd = &req->cmd;
-	cmd->opc = NVME_OPC_WRITE;
-	cmd->nsid = ns->id;
-
-	/* TODO: create a write command data structure */
-	*(uint64_t *)&cmd->cdw10 = lba;
-	cmd->cdw12 = lba_count-1;
+	nvme_ns_write_cmd(&req->cmd, ns->id, lba, lba_count);
 
 	nvme_ctrlr_submit_io_request(ns->ctrlr, req);
 
@@ -114,7 +94,6 @@ nvme_ns_cmd_write_bio(struct nvme_namespace *ns, struct bio *bp,
     nvme_cb_fn_t cb_fn, void *cb_arg)
 {
 	struct nvme_request	*req;
-	struct nvme_command	*cmd;
 	uint64_t		lba;
 	uint64_t		lba_count;
 
@@ -122,16 +101,9 @@ nvme_ns_cmd_write_bio(struct nvme_namespace *ns, struct bio *bp,
 
 	if (req == NULL)
 		return (ENOMEM);
-	cmd = &req->cmd;
-	cmd->opc = NVME_OPC_WRITE;
-	cmd->nsid = ns->id;
-
 	lba = bp->bio_offset / nvme_ns_get_sector_size(ns);
 	lba_count = bp->bio_bcount / nvme_ns_get_sector_size(ns);
-
-	/* TODO: create a write command data structure */
-	*(uint64_t *)&cmd->cdw10 = lba;
-	cmd->cdw12 = lba_count-1;
+	nvme_ns_write_cmd(&req->cmd, ns->id, lba, lba_count);
 
 	nvme_ctrlr_submit_io_request(ns->ctrlr, req);
 
@@ -168,17 +140,13 @@ int
 nvme_ns_cmd_flush(struct nvme_namespace *ns, nvme_cb_fn_t cb_fn, void *cb_arg)
 {
 	struct nvme_request	*req;
-	struct nvme_command	*cmd;
 
 	req = nvme_allocate_request_null(cb_fn, cb_arg);
 
 	if (req == NULL)
 		return (ENOMEM);
 
-	cmd = &req->cmd;
-	cmd->opc = NVME_OPC_FLUSH;
-	cmd->nsid = ns->id;
-
+	nvme_ns_flush_cmd(&req->cmd, ns->id);
 	nvme_ctrlr_submit_io_request(ns->ctrlr, req);
 
 	return (0);