Changeset 4800 in vbox for trunk/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp

Timestamp:

Sep 14, 2007 2:59:15 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

24502

Message:

Redid the supdrv interface. works on windows and linux while the other OSes still needs some adjusting/testing. internal networking is temporarily broken as the SUPCallVMMR0Ex interface is being reworked (this is what all this is really about).

File:

• trunk/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp

@@ -96 +96 @@
 
 
-/**
- * Installs anything required by the support library.
- *
- * @returns 0 on success.
- * @returns error code on failure.
- */
 int suplibOsInstall(void)
 {
-//    int rc = mknod(DEVICE_NAME, S_IFCHR, );
-
     return VERR_NOT_IMPLEMENTED;
 }
 
 
-/**
- * Installs anything required by the support library.
- *
- * @returns 0 on success.
- * @returns error code on failure.
- */
 int suplibOsUninstall(void)
 {
-//    int rc = unlink(DEVICE_NAME);
-
     return VERR_NOT_IMPLEMENTED;
 }
 
 
-/**
- * Send a I/O Control request to the device.
- *
- * @returns 0 on success.
- * @returns VBOX error code on failure.
- * @param   uFunction   IO Control function.
- * @param   pvIn        Input data buffer.
- * @param   cbIn        Size of input data.
- * @param   pvOut       Output data buffer.
- * @param   cbOut       Size of output data.
- */
-int suplibOsIOCtl(unsigned uFunction, void *pvIn, size_t cbIn, void *pvOut, size_t cbOut)
+int suplibOsIOCtl(uintptr_t uFunction, void *pvReq, size_t cbReq)
 {
     AssertMsg(g_hDevice != -1, ("SUPLIB not initiated successfully!\n"));
-    /*
-     * Issue device iocontrol.
-     */
-    SUPDRVIOCTLDATA Args;
-    Args.pvIn = pvIn;
-    Args.cbIn = cbIn;
-    Args.pvOut = pvOut;
-    Args.cbOut = cbOut;
 
-    if (ioctl(g_hDevice, uFunction, &Args) >= 0)
-        return 0;
-    /* This is the reverse operation of the one found in SUPDrv-linux.c */
-    switch (errno)
-    {
-        case EACCES: return VERR_GENERAL_FAILURE;
-        case EINVAL: return VERR_INVALID_PARAMETER;
-        case ENOSYS: return VERR_INVALID_MAGIC;
-        case ENXIO:  return VERR_INVALID_HANDLE;
-        case EFAULT: return VERR_INVALID_POINTER;
-        case ENOLCK: return VERR_LOCK_FAILED;
-        case EEXIST: return VERR_ALREADY_LOADED;
-    }
-
+    if (RT_LIKELY(ioctl((g_hDevice, uFunction, pvReq) >= 0))
+        return VINF_SUCCESS;
     return RTErrConvertFromErrno(errno);
 }
 
 #ifdef VBOX_WITHOUT_IDT_PATCHING
-int suplibOSIOCtlFast(unsigned uFunction)
+int suplibOSIOCtlFast(uintptr_t uFunction)
 {
     int rc = ioctl(g_hDevice, uFunction, NULL);
@@ -175 +128 @@
 
 
-/**
- * Allocate a number of zero-filled pages in user space.
- *
- * @returns VBox status code.
- * @param   cPages      Number of pages to allocate.
- * @param   ppvPages    Where to return the base pointer.
- */
 int suplibOsPageAlloc(size_t cPages, void **ppvPages)
 {
@@ -191 +137 @@
 
 
-/**
- * Frees pages allocated by suplibOsPageAlloc().
- *
- * @returns VBox status code.
- * @param   pvPages     Pointer to pages.
- */
 int suplibOsPageFree(void *pvPages, size_t /* cPages */)
 {