diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-12-19 09:01:51 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-12-19 09:01:51 +0000 |
| commit | 5aa3aeb10e0552d44d3905bbbb46eb704d6c68c6 (patch) | |
| tree | ea0a9e7d972eae0e8883a8fe048e263f8cf46c18 /sys | |
| parent | 11877e3dd365d3b630f8fb362287477ef2420c68 (diff) | |
Use bus_size_t as the type for the base address.
ok deraadt@, dlg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ipmi.c | 6 | ||||
| -rw-r--r-- | sys/dev/ipmivar.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ipmi.c b/sys/dev/ipmi.c index 8d2be074cbf..f112a75575c 100644 --- a/sys/dev/ipmi.c +++ b/sys/dev/ipmi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipmi.c,v 1.105 2019/08/19 18:31:02 kettenis Exp $ */ +/* $OpenBSD: ipmi.c,v 1.106 2019/12/19 09:01:50 kettenis Exp $ */ /* * Copyright (c) 2015 Masao Uebayashi @@ -1450,7 +1450,7 @@ ipmi_map_regs(struct ipmi_softc *sc, struct ipmi_attach_args *ia) if (bus_space_map(sc->sc_iot, ia->iaa_if_iobase, sc->sc_if->nregs * sc->sc_if_iospacing, 0, &sc->sc_ioh)) { - printf("%s: bus_space_map(%lx %x %x 0 %p) failed\n", + printf("%s: bus_space_map(%lx %lx %x 0 %p) failed\n", DEVNAME(sc), (unsigned long)sc->sc_iot, ia->iaa_if_iobase, sc->sc_if->nregs * sc->sc_if_iospacing, &sc->sc_ioh); @@ -1540,7 +1540,7 @@ ipmi_attach_common(struct ipmi_softc *sc, struct ipmi_attach_args *ia) printf(": version %d.%d interface %s", ia->iaa_if_rev >> 4, ia->iaa_if_rev & 0xF, sc->sc_if->name); if (sc->sc_if->nregs > 0) - printf(" %sbase 0x%x/%x spacing %d", + printf(" %sbase 0x%lx/%x spacing %d", ia->iaa_if_iotype == 'i' ? "io" : "mem", ia->iaa_if_iobase, ia->iaa_if_iospacing * sc->sc_if->nregs, ia->iaa_if_iospacing); diff --git a/sys/dev/ipmivar.h b/sys/dev/ipmivar.h index d2eb268ef35..535e3fd7d09 100644 --- a/sys/dev/ipmivar.h +++ b/sys/dev/ipmivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ipmivar.h,v 1.31 2019/08/19 18:31:02 kettenis Exp $ */ +/* $OpenBSD: ipmivar.h,v 1.32 2019/12/19 09:01:50 kettenis Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave @@ -65,7 +65,7 @@ struct ipmi_attach_args { int iaa_if_type; int iaa_if_rev; int iaa_if_iotype; - int iaa_if_iobase; + bus_addr_t iaa_if_iobase; int iaa_if_iospacing; int iaa_if_irq; int iaa_if_irqlvl; |