diff options
author | jhb <jhb@FreeBSD.org> | 2002-11-07 22:23:46 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2002-11-07 22:23:46 +0000 |
commit | ddccbcba683e7f6493c953ba72d9ec8c8bfd21cf (patch) | |
tree | 0a4ddeaa5f8accbf6ce3cd29836eb2ff2da22dfd /sys/dev | |
parent | 4f451155dc58cc4953dbe3034d950a4e7f6500e1 (diff) | |
download | FreeBSD-src-ddccbcba683e7f6493c953ba72d9ec8c8bfd21cf.zip FreeBSD-src-ddccbcba683e7f6493c953ba72d9ec8c8bfd21cf.tar.gz |
Use [u]intmax_t and %j instead of long long and %ll to better fix warnings
I fixed earlier.
Requested by: mux, jake
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ata/ata-all.c | 5 | ||||
-rw-r--r-- | sys/dev/ata/atapi-tape.c | 5 | ||||
-rw-r--r-- | sys/dev/ida/ida.c | 3 | ||||
-rw-r--r-- | sys/dev/iir/iir_pci.c | 5 |
4 files changed, 11 insertions, 7 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index ffd16fb..c7cc11f 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -40,6 +40,7 @@ #include <sys/bio.h> #include <sys/malloc.h> #include <sys/devicestat.h> +#include <sys/stdint.h> #include <sys/sysctl.h> #include <machine/stdarg.h> #include <machine/resource.h> @@ -1007,9 +1008,9 @@ ata_command(struct ata_device *atadev, u_int8_t command, int error = 0; #ifdef ATA_DEBUG ata_prtdev(atadev, "ata_command: addr=%04lx, cmd=%02x, " - "lba=%lld, count=%d, feature=%d, flags=%02x\n", + "lba=%jd, count=%d, feature=%d, flags=%02x\n", rman_get_start(atadev->channel->r_io), - command, (long long)lba, count, feature, flags); + command, (intmax_t)lba, count, feature, flags); #endif /* select device */ diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index 360ff0a..a0fdc2e 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -40,6 +40,7 @@ #include <sys/mtio.h> #include <sys/disklabel.h> #include <sys/devicestat.h> +#include <sys/stdint.h> #include <machine/bus.h> #include <dev/ata/ata-all.h> #include <dev/ata/atapi-all.h> @@ -291,8 +292,8 @@ astclose(dev_t dev, int flags, int fmt, struct thread *td) stp->flags &= F_CTL_WARN; #ifdef AST_DEBUG - ata_prtdev(stp->device, "%llu total bytes transferred\n", - (unsigned long long)ast_total); + ata_prtdev(stp->device, "%ju total bytes transferred\n", + (uintmax_t)ast_total); #endif return 0; } diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c index a60c516..39369ea 100644 --- a/sys/dev/ida/ida.c +++ b/sys/dev/ida/ida.c @@ -40,6 +40,7 @@ #include <sys/param.h> #include <sys/kernel.h> +#include <sys/stdint.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -480,7 +481,7 @@ ida_intr(void *data) if (qcb == NULL || qcb->state != QCB_ACTIVE) { device_printf(ida->dev, - "ignoring completion %llx\n", (long long)completed); + "ignoring completion %jx\n", (intmax_t)completed); continue; } ida_done(ida, qcb); diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c index 85f5eb8..d22077a 100644 --- a/sys/dev/iir/iir_pci.c +++ b/sys/dev/iir/iir_pci.c @@ -48,6 +48,7 @@ #include <sys/kernel.h> #include <sys/module.h> #include <sys/bus.h> +#include <sys/stdint.h> #include <machine/bus_memio.h> #include <machine/bus_pio.h> @@ -227,8 +228,8 @@ iir_pci_attach(device_t dev) htole32(GDT_MPR_MAGIC)); if (bus_space_read_4(gdt->sc_dpmemt, gdt->sc_dpmemh, GDT_MPR_IC) != htole32(GDT_MPR_MAGIC)) { - printf("cannot access DPMEM at 0x%llx (shadowed?)\n", - (long long)gdt->sc_dpmembase); + printf("cannot access DPMEM at 0x%jx (shadowed?)\n", + (uintmax_t)gdt->sc_dpmembase); error = ENXIO; goto err; } |