nvme-print-stdout: Use NVME_PMRMSC register definitions to print

ikegami-t · igaw · commit 2af32187e98c · 2024-03-12T18:16:15.000+01:00
Change it instead of hardcoded register mask and shift values.

Signed-off-by: Tokunori Ikegami &lt;ikegami.t@gmail.com&gt;
diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
@@ -1411,9 +1411,8 @@ static void stdout_registers_pmrswtp(__u32 pmrswtp)
 static void stdout_registers_pmrmscl(uint32_t pmrmscl)
 {
 	printf("\tController Base Address         (CBA): %#x\n",
-		(pmrmscl & 0xfffff000) >> 12);
-	printf("\tController Memory Space Enable (CMSE): %#x\n\n",
-		(pmrmscl & 0x00000002) >> 1);
+	       (uint32_t)NVME_PMRMSC_CBA(pmrmscl));
+	printf("\tController Memory Space Enable (CMSE): %#x\n\n", NVME_PMRMSC_CMSE(pmrmscl));
 }
 
 static void stdout_registers_pmrmscu(uint32_t pmrmscu)

Original file line number	Diff line number	Diff line change
`@@ -1411,9 +1411,8 @@ static void stdout_registers_pmrswtp(__u32 pmrswtp)`
`1411`	`1411`	`static void stdout_registers_pmrmscl(uint32_t pmrmscl)`
`1412`	`1412`	`{`
`1413`	`1413`	`printf("\tController Base Address (CBA): %#x\n",`
`1414`		`- (pmrmscl & 0xfffff000) >> 12);`
`1415`		`- printf("\tController Memory Space Enable (CMSE): %#x\n\n",`
`1416`		`- (pmrmscl & 0x00000002) >> 1);`
	`1414`	`+ (uint32_t)NVME_PMRMSC_CBA(pmrmscl));`
	`1415`	`+ printf("\tController Memory Space Enable (CMSE): %#x\n\n", NVME_PMRMSC_CMSE(pmrmscl));`
`1417`	`1416`	`}`
`1418`	`1417`
`1419`	`1418`	`static void stdout_registers_pmrmscu(uint32_t pmrmscu)`