summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2014-09-12 06:34:15 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2014-09-12 06:34:15 +0000
commit2e72522db32189cc09ef83a10f53b6b868812eac (patch)
tree17afd306ded352b8ca09b7c0bb3f95d22cd33229
parent2cb7ce110e22298c69e03cd5f561f1ea661a6b67 (diff)
fix some format string issues
-rw-r--r--sys/dev/ic/nvme.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c
index 6b852d88e70..6fb2a8ef6af 100644
--- a/sys/dev/ic/nvme.c
+++ b/sys/dev/ic/nvme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nvme.c,v 1.6 2014/07/13 23:10:23 deraadt Exp $ */
+/* $OpenBSD: nvme.c,v 1.7 2014/09/12 06:34:14 dlg Exp $ */
/*
* Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -150,16 +150,16 @@ nvme_dumpregs(struct nvme_softc *sc)
(u_int)NVME_CAP_MPSMIN(r8), (1 << NVME_CAP_MPSMIN(r8)));
printf("%s: css %llu\n", DEVNAME(sc), NVME_CAP_CSS(r8));
printf("%s: nssrs %llu\n", DEVNAME(sc), NVME_CAP_NSSRS(r8));
- printf("%s: dstrd %llu\n", DEVNAME(sc), NVME_CAP_DSTRD(r8));
+ printf("%s: dstrd %u\n", DEVNAME(sc), NVME_CAP_DSTRD(r8));
printf("%s: to %llu msec\n", DEVNAME(sc), NVME_CAP_TO(r8));
printf("%s: ams %llu\n", DEVNAME(sc), NVME_CAP_AMS(r8));
printf("%s: cqr %llu\n", DEVNAME(sc), NVME_CAP_CQR(r8));
printf("%s: mqes %llu\n", DEVNAME(sc), NVME_CAP_MQES(r8));
- printf("%s: vs 0x%08lx\n", DEVNAME(sc), nvme_read4(sc, NVME_VS));
+ printf("%s: vs 0x%04x\n", DEVNAME(sc), nvme_read4(sc, NVME_VS));
r4 = nvme_read4(sc, NVME_CC);
- printf("%s: cc 0x%08lx\n", DEVNAME(sc), r4);
+ printf("%s: cc 0x%04x\n", DEVNAME(sc), r4);
printf("%s: iocqes %u\n", DEVNAME(sc), NVME_CC_IOCQES_R(r4));
printf("%s: iosqes %u\n", DEVNAME(sc), NVME_CC_IOSQES_R(r4));
printf("%s: shn %u\n", DEVNAME(sc), NVME_CC_SHN_R(r4));
@@ -168,8 +168,8 @@ nvme_dumpregs(struct nvme_softc *sc)
printf("%s: css %u\n", DEVNAME(sc), NVME_CC_CSS_R(r4));
printf("%s: en %u\n", DEVNAME(sc), ISSET(r4, NVME_CC_EN));
- printf("%s: csts 0x%08lx\n", DEVNAME(sc), nvme_read4(sc, NVME_CSTS));
- printf("%s: aqa 0x%08lx\n", DEVNAME(sc), nvme_read4(sc, NVME_AQA));
+ printf("%s: csts 0x%08x\n", DEVNAME(sc), nvme_read4(sc, NVME_CSTS));
+ printf("%s: aqa 0x%08x\n", DEVNAME(sc), nvme_read4(sc, NVME_AQA));
printf("%s: asq 0x%016llx\n", DEVNAME(sc), nvme_read8(sc, NVME_ASQ));
printf("%s: acq 0x%016llx\n", DEVNAME(sc), nvme_read8(sc, NVME_ACQ));
}