[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] CVS: bochs bochs.h, 1.198, 1.199 config.h.in, 1.190,
From:       Volker Ruppert <vruppert () users ! sourceforge ! net>
Date:       2006-09-24 16:58:16
Message-ID: E1GRXJ2-00012R-2k () sc8-pr-cvs3 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/bochs/bochs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3966

Modified Files:
	bochs.h config.h.in configure.in plugin.h 
Log Message:
- implementation of the PIIX4 ACPI controller started. The code is not yet
  enabled and the i/o handler only generate info messages.


Index: bochs.h
===================================================================
RCS file: /cvsroot/bochs/bochs/bochs.h,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- bochs.h	17 Sep 2006 18:09:33 -0000	1.198
+++ bochs.h	24 Sep 2006 16:58:13 -0000	1.199
@@ -294,7 +294,7 @@
   CPU10LOG, CPU11LOG, CPU12LOG, CPU13LOG, CPU14LOG, CPU15LOG, CTRLLOG,
   UNMAPLOG, SERRLOG, BIOSLOG, PIT81LOG, PIT82LOG, IODEBUGLOG, PCI2ISALOG,
   PLUGINLOG, EXTFPUIRQLOG , PCIVGALOG, PCIUSBLOG, VTIMERLOG, STIMERLOG,
-  PCIIDELOG, PCIDEVLOG, PCIPNICLOG, SPEAKERLOG, BUSMLOG, GAMELOG
+  PCIIDELOG, PCIDEVLOG, PCIPNICLOG, SPEAKERLOG, BUSMLOG, GAMELOG, ACPILOG
 };
 
 class BOCHSAPI iofunctions {

Index: config.h.in
===================================================================
RCS file: /cvsroot/bochs/bochs/config.h.in,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- config.h.in	20 Sep 2006 17:02:19 -0000	1.190
+++ config.h.in	24 Sep 2006 16:58:13 -0000	1.191
@@ -260,6 +260,7 @@
 #define BX_USE_GAMEPORT_SMF 1  // Gameport
 #define BX_USE_CIRRUS_SMF   1  // SVGA Cirrus
 #define BX_USE_BUSM_SMF     1  // Bus Mouse
+#define BX_USE_ACPI_SMF     1  // ACPI
 
 #define BX_PLUGINS  0
 #define BX_HAVE_DLFCN_H 0
@@ -271,7 +272,7 @@
    || !BX_USE_SER_SMF || !BX_USE_UM_SMF || !BX_USE_VGA_SMF \
    || !BX_USE_SB16_SMF || !BX_USE_DEV_SMF || !BX_USE_PCI_SMF \
    || !BX_USE_P2I_SMF || !BX_USE_PCIVGA_SMF || !BX_USE_PCIUSB_SMF \
-   || !BX_USE_PCIPNIC_SMF || !BX_USE_PIDE_SMF \
+   || !BX_USE_PCIPNIC_SMF || !BX_USE_PIDE_SMF || !BX_USE_ACPI_SMF \
    || !BX_USE_NE2K_SMF || !BX_USE_EFI_SMF || !BX_USE_GAMEPORT_SMF \
    || !BX_USE_PCIDEV_SMF || !BX_USE_CIRRUS_SMF)
 #error You must use SMF to have plugins
@@ -692,6 +693,13 @@
 #error To enable CL-GD54xx PCI support, you must also enable PCI
 #endif
 
+// ACPI controller
+#define BX_SUPPORT_ACPI 0
+
+#if (BX_SUPPORT_ACPI && !BX_SUPPORT_PCI)
+#error To enable ACPI support, you must also enable PCI
+#endif
+
 // Experimental VGA on PCI
 #define BX_SUPPORT_PCIVGA 0
 

Index: configure.in
===================================================================
RCS file: /cvsroot/bochs/bochs/configure.in,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- configure.in	27 Aug 2006 15:36:39 -0000	1.325
+++ configure.in	24 Sep 2006 16:58:13 -0000	1.326
@@ -679,7 +679,7 @@
     AC_MSG_RESULT(yes)
     AC_DEFINE(BX_SUPPORT_PCI, 1)
     pci=1
-    PCI_OBJ='pci.o pci2isa.o pci_ide.o pcivga.o'
+    PCI_OBJ='pci.o pci2isa.o pci_ide.o pcivga.o acpi.o'
    else
     AC_MSG_RESULT(no)
     AC_DEFINE(BX_SUPPORT_PCI, 0)

Index: plugin.h
===================================================================
RCS file: /cvsroot/bochs/bochs/plugin.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- plugin.h	23 Sep 2006 12:59:56 -0000	1.55
+++ plugin.h	24 Sep 2006 16:58:13 -0000	1.56
@@ -45,6 +45,7 @@
 #define BX_PLUGIN_PCIPNIC   "pcipnic"
 #define BX_PLUGIN_GAMEPORT  "gameport"
 #define BX_PLUGIN_SPEAKER   "speaker"
+#define BX_PLUGIN_ACPI      "acpi"
 
 
 #define BX_REGISTER_DEVICE_DEVMODEL(a,b,c,d) pluginRegisterDeviceDevmodel(a,b,c,d)
@@ -378,6 +379,7 @@
 DECLARE_PLUGIN_INIT_FINI_FOR_MODULE(extfpuirq)
 DECLARE_PLUGIN_INIT_FINI_FOR_MODULE(gameport)
 DECLARE_PLUGIN_INIT_FINI_FOR_MODULE(speaker)
+DECLARE_PLUGIN_INIT_FINI_FOR_MODULE(acpi)
 DECLARE_PLUGIN_INIT_FINI_FOR_MODULE(amigaos)
 DECLARE_PLUGIN_INIT_FINI_FOR_MODULE(beos)
 DECLARE_PLUGIN_INIT_FINI_FOR_MODULE(carbon)


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]