Module Name: src
Committed By: cegger
Date: Mon May 11 20:53:47 UTC 2009
Modified Files:
src/sys/dev/pci/n8: n8_memory_bsd.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/n8/n8_memory_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/n8/n8_memory_bsd.c
diff -u src/sys/dev/pci/n8/n8_memory_bsd.c:1.2 src/sys/dev/pci/n8/n8_memory_bsd.c:1.3
--- src/sys/dev/pci/n8/n8_memory_bsd.c:1.2 Wed Mar 18 16:00:20 2009
+++ src/sys/dev/pci/n8/n8_memory_bsd.c Mon May 11 20:53:47 2009
@@ -61,7 +61,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: n8_memory_bsd.c,v 1.2 2009/03/18 16:00:20 cegger Exp $";
+static char const n8_id[] = "$Id: n8_memory_bsd.c,v 1.3 2009/05/11 20:53:47 cegger Exp $";
/*****************************************************************************/
/** @file n8_memory_bsd.c
* @brief NetOctaveMemory Services - FreeBSD-specific support routines.
@@ -287,26 +287,27 @@
#endif
if (bus_dmamem_alloc(sc->dma_tag, size, PAGE_SIZE, 0,
&seg, 1, &rseg, BUS_DMA_NOWAIT)) {
- printf("%s: can't alloc DMA buffer\n", sc->device.dv_xname);
+ printf("%s: can't alloc DMA buffer\n",
+ device_xname(&sc->device));
return 0;
}
if (bus_dmamem_map(sc->dma_tag, &seg, rseg, size, &kva,
BUS_DMA_NOWAIT)) {
- printf("%s: can't map DMA buffers (%lu bytes)\n", sc->device.dv_xname,
- size);
+ printf("%s: can't map DMA buffers (%lu bytes)\n",
+ device_xname(&sc->device), size);
bus_dmamem_free(sc->dma_tag, &seg, rseg);
return 0;
}
if (bus_dmamap_create(sc->dma_tag, size, 1,
size, 0, BUS_DMA_NOWAIT, &DmaMap_g[bankIndex])) {
- printf("%s: can't create DMA map\n", sc->device.dv_xname);
+ printf("%s: can't create DMA map\n", device_xname(&sc->device));
bus_dmamem_unmap(sc->dma_tag, kva, size);
bus_dmamem_free(sc->dma_tag, &seg, rseg);
return 0;
}
if (bus_dmamap_load(sc->dma_tag, DmaMap_g[bankIndex], kva, size,
NULL, BUS_DMA_NOWAIT)) {
- printf("%s: can't load DMA map\n", sc->device.dv_xname);
+ printf("%s: can't load DMA map\n", device_xname(&sc->device));
bus_dmamap_destroy(sc->dma_tag, DmaMap_g[bankIndex]);
bus_dmamem_unmap(sc->dma_tag, kva, size);
bus_dmamem_free(sc->dma_tag, &seg, rseg);