diff options
author | Brad Smith <brad@cvs.openbsd.org> | 2006-08-04 02:44:51 +0000 |
---|---|---|
committer | Brad Smith <brad@cvs.openbsd.org> | 2006-08-04 02:44:51 +0000 |
commit | 6b2031e5974c3f8df452c41c43d2f6ebf0c33e41 (patch) | |
tree | 37b137450d752e5f3eee2c1ca0bbcb5f74f5694f | |
parent | c6d72c00b0c2aed7eea140abc50018cc44d2e1ea (diff) |
fix up error messages in em/ixgb_allocate_pci_resources().
-rw-r--r-- | sys/dev/pci/if_em.c | 12 | ||||
-rw-r--r-- | sys/dev/pci/if_ixgb.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 5db364b6c25..58a675ab87a 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.139 2006/08/01 23:50:14 brad Exp $ */ +/* $OpenBSD: if_em.c,v 1.140 2006/08/04 02:44:50 brad Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -1381,13 +1381,13 @@ em_allocate_pci_resources(struct em_softc *sc) val = pci_conf_read(pa->pa_pc, pa->pa_tag, EM_MMBA); if (PCI_MAPREG_TYPE(val) != PCI_MAPREG_TYPE_MEM) { - printf(": mmba isn't memory"); + printf(": mmba is not mem space\n"); return (ENXIO); } if (pci_mapreg_map(pa, EM_MMBA, PCI_MAPREG_MEM_TYPE(val), 0, &sc->osdep.mem_bus_space_tag, &sc->osdep.mem_bus_space_handle, &sc->osdep.em_membase, &sc->osdep.em_memsize, 0)) { - printf(": can't find mem space\n"); + printf(": cannot find mem space\n"); return (ENXIO); } @@ -1408,7 +1408,7 @@ em_allocate_pci_resources(struct em_softc *sc) if (pci_mapreg_map(pa, rid, PCI_MAPREG_TYPE_IO, 0, &sc->osdep.io_bus_space_tag, &sc->osdep.io_bus_space_handle, &sc->osdep.em_iobase, &sc->osdep.em_iosize, 0)) { - printf(": can't find io space\n"); + printf(": cannot find i/o space\n"); return (ENXIO); } @@ -1419,14 +1419,14 @@ em_allocate_pci_resources(struct em_softc *sc) if (sc->hw.mac_type == em_ich8lan) { val = pci_conf_read(pa->pa_pc, pa->pa_tag, EM_FLASH); if (PCI_MAPREG_TYPE(val) != PCI_MAPREG_TYPE_MEM) { - printf(": flash isn't memory"); + printf(": flash is not mem space\n"); return (ENXIO); } if (pci_mapreg_map(pa, EM_FLASH, PCI_MAPREG_MEM_TYPE(val), 0, &sc->osdep.flash_bus_space_tag, &sc->osdep.flash_bus_space_handle, &sc->osdep.em_flashbase, &sc->osdep.em_flashsize, 0)) { - printf(": can't find mem space\n"); + printf(": cannot find mem space\n"); return (ENXIO); } } diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c index 1e463027c27..448668c052e 100644 --- a/sys/dev/pci/if_ixgb.c +++ b/sys/dev/pci/if_ixgb.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_ixgb.c,v 1.22 2006/08/01 23:50:14 brad Exp $ */ +/* $OpenBSD: if_ixgb.c,v 1.23 2006/08/04 02:44:50 brad Exp $ */ #include <dev/pci/if_ixgb.h> @@ -941,13 +941,13 @@ ixgb_allocate_pci_resources(struct ixgb_softc *sc) val = pci_conf_read(pa->pa_pc, pa->pa_tag, IXGB_MMBA); if (PCI_MAPREG_TYPE(val) != PCI_MAPREG_TYPE_MEM) { - printf(": mmba isn't memory"); + printf(": mmba is not mem space\n"); return (ENXIO); } if (pci_mapreg_map(pa, IXGB_MMBA, PCI_MAPREG_MEM_TYPE(val), 0, &sc->osdep.mem_bus_space_tag, &sc->osdep.mem_bus_space_handle, &sc->osdep.ixgb_membase, &sc->osdep.ixgb_memsize, 0)) { - printf(": can't find mem space\n"); + printf(": cannot find mem space\n"); return (ENXIO); } @@ -970,7 +970,7 @@ ixgb_allocate_pci_resources(struct ixgb_softc *sc) } printf(": %s", intrstr); - return(0); + return (0); } void |