CVS commit: src/sys/rump/dev/lib/libpci

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Fri Apr 11 01:03:08 UTC 2014

Modified Files:
        src/sys/rump/dev/lib/libpci: rumpdev_bus_dma.c

Log Message:
remove obfuscation macros


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.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/rump/dev/lib/libpci/rumpdev_bus_dma.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.1 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.2
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.1	Fri Apr  4 12:53:59 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c	Fri Apr 11 01:03:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpdev_bus_dma.c,v 1.1 2014/04/04 12:53:59 pooka Exp $	*/
+/*	$NetBSD: rumpdev_bus_dma.c,v 1.2 2014/04/11 01:03:08 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2013 Antti Kantee
@@ -86,11 +86,6 @@
 int	_bus_dmamap_load_buffer (bus_dma_tag_t, bus_dmamap_t, void *,
 	    bus_size_t, struct vmspace *, int, paddr_t *, int *, int);
 
-#undef PHYS_TO_BUS_MEM
-#define PHYS_TO_BUS_MEM(_t_, _a_) rumpcomp_pci_virt_to_mach((void *)_a_)
-#undef BUS_MEM_TO_PHYS
-#define BUS_MEM_TO_PHYS(_t_, _a_) rumpcomp_pci_mach_to_virt(_a_)
-
 /*
  * Common function for DMA map creation.  May be called by bus-specific
  * DMA map creation functions.
@@ -212,7 +207,8 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
 		 * the previous segment if possible.
 		 */
 		if (first) {
-			map->dm_segs[seg].ds_addr = PHYS_TO_BUS_MEM(t, curaddr);
+			map->dm_segs[seg].ds_addr
+			    = rumpcomp_pci_virt_to_mach((void *)curaddr);
 			map->dm_segs[seg].ds_len = sgsize;
 			first = 0;
 		} else {
@@ -221,13 +217,13 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
 			     map->dm_maxsegsz &&
 			    (map->_dm_boundary == 0 ||
 			     (map->dm_segs[seg].ds_addr & bmask) ==
-			     (PHYS_TO_BUS_MEM(t, curaddr) & bmask)))
+			     (rumpcomp_pci_virt_to_mach((void*)curaddr)&bmask)))
 				map->dm_segs[seg].ds_len += sgsize;
 			else {
 				if (++seg >= map->_dm_segcnt)
 					break;
 				map->dm_segs[seg].ds_addr =
-					PHYS_TO_BUS_MEM(t, curaddr);
+				    rumpcomp_pci_virt_to_mach((void *)curaddr);
 				map->dm_segs[seg].ds_len = sgsize;
 			}
 		}
@@ -334,7 +330,7 @@ bus_dmamap_load_mbuf(bus_dma_tag_t t, bu
 				continue;
 			}
 			map->dm_segs[seg].ds_addr =
-			    PHYS_TO_BUS_MEM(t, lastaddr);
+			    rumpcomp_pci_virt_to_mach((void *)lastaddr);
 			map->dm_segs[seg].ds_len = m->m_len;
 			lastaddr += m->m_len;
 			continue;