Changeset 15963 in vbox for trunk/src/VBox

Timestamp:

Jan 15, 2009 12:47:03 PM (16 years ago)

Author:

vboxsync

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

41611

Message:

initial HPET device support (not yet functional)

Location:

trunk/src/VBox/Devices

Files:

• Builtins.cpp (modified) (1 diff)
• Builtins.h (modified) (1 diff)
• Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -79 +79 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_HPET
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceHPET);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceMC146818);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/Builtins.h

@@ -38 +38 @@
 extern const PDMDEVREG g_DeviceI8254;
 extern const PDMDEVREG g_DeviceI8259;
+#ifdef VBOX_WITH_HPET
+extern const PDMDEVREG g_DeviceHPET;
+#endif
 extern const PDMDEVREG g_DeviceMC146818;
 extern const PDMDEVREG g_DevicePIIX3IDE;

trunk/src/VBox/Devices/Makefile.kmk

@@ -328 +328 @@
 endif
 
+ifdef VBOX_WITH_HPET
+DevicesR3_DEFS          += VBOX_WITH_HPET
+DevicesR3_SOURCES       += PC/DevHPET.cpp 
+endif
+
 ifdef VBOX_WITH_USB
 DevicesR3_DEFS         += VBOX_WITH_USB IN_USB_R3
@@ -425 +430 @@
 endif
 
+ifdef VBOX_WITH_HPET
+VBoxDDGC_DEFS          += VBOX_WITH_HPET
+VBoxDDGC_SOURCES       += PC/DevHPET.cpp 
+endif
+
 ifeq ($(VBOX_LDR_FMT32),pe)
 VBoxDDGC_LDFLAGS        = -Entry:vgaMMIOWrite
@@ -495 +505 @@
 endif
 
+ifdef VBOX_WITH_HPET
+VBoxDDR0_DEFS          += VBOX_WITH_HPET
+VBoxDDR0_SOURCES       += PC/DevHPET.cpp 
+endif
+
 ifeq ($(VBOX_LDR_FMT32),pe)
 VBoxDDR0_LDFLAGS        = -Entry:vgaMMIOWrite
@@ -501 +516 @@
 VBoxDDR0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
 endif
-
 
 #