Changeset 18085 in vbox for trunk/src

Timestamp:

Mar 19, 2009 10:32:58 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/DRM: bits.

Location:

trunk/src/VBox/Additions/solaris

Files:

• DRM/vboxvideo_drm.c (modified) (3 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c

@@ -24 +24 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <sys/conf.h>
-#include <sys/modctl.h>
-#include <sys/mutex.h>
-#include <sys/pci.h>
-#include <sys/stat.h>
-#include <sys/ddi.h>
-#include <sys/ddi_intr.h>
-#include <sys/sunddi.h>
-#include <sys/open.h>
+#undef offsetof     /* This gets redefined in drmP.h */
+#include "include/drmP.h"
+#include "include/drm.h"
+
+#undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 
 #include <VBox/log.h>
 #include <VBox/version.h>
-
-#include "include/drmP.h"
-#include "include/drm.h"
-
-#undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 
 
@@ -367 +358 @@
 
 
-static int vboxVideoSolarisLoad(drm_driver_t *pDriver, unsigned long fFlag)
+static int vboxVideoSolarisLoad(drm_device_t *pDevice, unsigned long fFlag)
 {
     return 0;
 }
 
-static int vboxVideoSolarisUnload(drm_driver_t *pDriver)
+static int vboxVideoSolarisUnload(drm_device_t *pDevice)
 {
     return 0;
 }
 
-static int vboxVideoSolarisPreClose(drm_driver_t *pDriver, drm_file_t *pFile)
-{
-    return 0;
+static void vboxVideoSolarisLastClose(drm_device_t *pDevice)
+{
+}
+
+static void vboxVideoSolarisPreClose(drm_device_t *pDevice, drm_file_t *pFile)
+{
 }
 
@@ -392 +386 @@
     pDriver->unload             = vboxVideoSolarisUnload;
     pDriver->preclose           = vboxVideoSolarisPreClose;
-    pDriver->lastclose          = vboxVideoSolarisUnload;
+    pDriver->lastclose          = vboxVideoSolarisLastClose;
     pDriver->device_is_agp      = drm_device_is_agp;
 #if 0

trunk/src/VBox/Additions/solaris/Makefile.kmk

@@ -29 +29 @@
 ifeq ($(KBUILD_HOST),solaris)
  include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/DRM/Makefile.kmk
 endif