Changeset 48444 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 12, 2013 9:54:33 AM (11 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: make the new driver build but not yet load.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• Makefile.kmk (modified) (1 diff)
• Makefile.module.kms (modified) (2 diffs)
• files_vboxvideo_drv (modified) (2 diffs)

trunk/src/VBox/Additions/linux/drm/Makefile.kmk

@@ -77 +77 @@
  vboxvideo_drm_SOURCES         = vboxvideo_drm.c
 else
- vboxvideo_drm_INCS           += ../../../Runtime/r0drv/linux
+ vboxvideo_drm_INCS           += \
+   ../../../Runtime/include \
+   ../../../Runtime/r0drv/linux
  vboxvideo_drm_SOURCES         = \
    ../../common/VBoxVideo/HGSMIBase.cpp \
    ../../common/VBoxVideo/Modesetting.cpp \
    ../../common/VBoxVideo/VBVABase.cpp \
+   ../../../GuestHost/HGSMI/HGSMICommon.cpp \
+   ../../../Runtime/common/alloc/heapoffset.cpp \
         vbox_drv.c \
         vbox_fb.c \

trunk/src/VBox/Additions/linux/drm/Makefile.module.kms

@@ -21 +21 @@
 MOD_NAME   = vboxvideo
 
-MOD_OBJS   = HGSMIBase.o Modesetting.o VBVABase.o vbox_drv.o vbox_fb.o \
-             vbox_main.o vbox_mode.o vbox_ttm.o 
+MOD_OBJS   = HGSMIBase.o HGSMICommon.o heapoffset.o Modesetting.o vbox_drv.o \
+             vbox_fb.o vbox_main.o vbox_mode.o vbox_ttm.o VBVABase.o
 
 ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxvideo),)
@@ -30 +30 @@
 endif
 MOD_CFLAGS = -fshort-wchar -include $(MANGLING)
-MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
 # What on earth is this?
-MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include /r0drv/linux)
+MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
+MOD_INCL  += -Iinclude/drm
 MOD_DEFS  := -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
              -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \

trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

@@ -25 +25 @@
     ${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \
     ${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \
+    ${PATH_ROOT}/include/iprt/heap.h=>include/iprt/heap.h \
     ${PATH_ROOT}/include/iprt/log.h=>include/iprt/log.h \
     ${PATH_ROOT}/include/iprt/param.h=>include/iprt/param.h \
     ${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \
     ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
+    ${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \
     ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
     ${PATH_ROOT}/include/iprt/mangling.h=>include/iprt/mangling.h \
     ${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \
     ${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \
+    ${PATH_ROOT}/include/VBox/log.h=>include/VBox/log.h \
     ${PATH_ROOT}/include/VBox/ostypes.h=>include/VBox/ostypes.h \
     ${PATH_ROOT}/include/VBox/param.h=>include/VBox/param.h \
@@ -56 +59 @@
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_mode.c=>vbox_mode.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_ttm.c=>vbox_ttm.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
+    ${PATH_ROOT}/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp=>HGSMICommon.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/alloc/heapoffset.cpp=>heapoffset.c \
+    ${PATH_ROOT}/src/VBox/Runtime/include/internal/iprt.h=>include/internal/iprt.h \
+    ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>include/the-linux-kernel.h \
     ${PATH_ROOT}/src/VBox/Installer/linux/Makefile.include.header=>Makefile.include.header \
     ${PATH_ROOT}/src/VBox/Installer/linux/Makefile.include.footer=>Makefile.include.footer \