Changeset 70048 in vbox

Timestamp:

Dec 9, 2017 1:57:49 AM (7 years ago)

Author:

vboxsync

Message:

VBoxGuest-netbsd.c: give mem bus space members their usual names.
Retire otherwise unused pMMIOBase (the actuall address is obtained via
bus_space_vaddr).

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c

@@ -91 +91 @@
     bus_size_t sc_iosize;
 
-    bus_space_tag_t iVMMDevMemResId;
-    bus_space_handle_t VMMDevMemHandle;
+    bus_space_tag_t sc_memt;
+    bus_space_handle_t sc_memh;
 
     /** Size of the memory area. */
-    bus_size_t         VMMDevMemSize;
-    /** Mapping of the register space */
-    bus_addr_t         pMMIOBase;
+    bus_size_t         sc_memsize;
 
     /** IRQ resource handle. */
@@ -290 +288 @@
          */
         memh_valid = (pci_mapreg_map(pa, PCI_MAPREG_START+4, PCI_MAPREG_TYPE_MEM, BUS_SPACE_MAP_LINEAR,
-                                     &sc->iVMMDevMemResId, &sc->VMMDevMemHandle,
-                                     &sc->pMMIOBase, &sc->VMMDevMemSize) == 0);
+                                     &sc->sc_memt, &sc->sc_memh,
+                                     NULL, &sc->sc_memsize) == 0);
         if (memh_valid)
         {
@@ -298 +296 @@
              */
             rc = VGDrvCommonInitDevExt(&g_DevExt, sc->sc_iobase,
-                                       bus_space_vaddr(sc->iVMMDevMemResId,
-                                                       sc->VMMDevMemHandle),
-                                       sc->VMMDevMemSize,
+                                       bus_space_vaddr(sc->sc_memt, sc->sc_memh),
+                                       sc->sc_memsize,
 #if ARCH_BITS == 64
                                        VBOXOSTYPE_NetBSD_x64,
@@ -327 +324 @@
                 aprint_error_dev(sc->sc_dev, "init failed\n");
             }
-            bus_space_unmap(sc->iVMMDevMemResId, sc->VMMDevMemHandle, sc->VMMDevMemSize);
+            bus_space_unmap(sc->sc_memt, sc->sc_memh, sc->sc_memsize);
         }
         else
@@ -450 +447 @@
     VGDrvCommonDeleteDevExt(&g_DevExt);
 
-    bus_space_unmap(sc->iVMMDevMemResId, sc->VMMDevMemHandle, sc->VMMDevMemSize);
+    bus_space_unmap(sc->sc_memt, sc->sc_memh, sc->sc_memsize);
     bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);