[ros-diffs] [cgutman] 46242: - Set the resource pointer back to the start of the list before looping a second time - Remove the duplicate OSL - Disable more debug prints - ROS with ACPI has been booted successfully on VirtualBox (with additions), QEMU, and VMware

[cgutman at svn.reactos.org]

Author: cgutman
Date: Wed Mar 17 10:25:07 2010
New Revision: 46242

URL: http://svn.reactos.org/svn/reactos?rev=46242&view=rev
Log:
 - Set the resource pointer back to the start of the list before looping a second time
 - Remove the duplicate OSL
 - Disable more debug prints
 - ROS with ACPI has been booted successfully on VirtualBox (with additions), QEMU, and VMware

Removed:
    trunk/reactos/drivers/bus/acpi/acpica/osl/
Modified:
    trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild
    trunk/reactos/drivers/bus/acpi/buspdo.c
    trunk/reactos/drivers/bus/acpi/osl.c

Modified: trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild?rev=46242&r1=46241&r2=46242&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/acpica/acpica.rbuild [iso-8859-1] Wed Mar 17 10:25:07 2010
@@ -83,9 +83,6 @@
 		<file>nsxfname.c</file>
 		<file>nsxfobj.c</file>
 	</directory>
-	<!--directory name="osl">
-		<file>osl.c</file>
-	</directory-->
 	<directory name="parser">
 		<file>psargs.c</file>
 		<file>psloop.c</file>

Modified: trunk/reactos/drivers/bus/acpi/buspdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?rev=46242&r1=46241&r2=46242&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Wed Mar 17 10:25:07 2010
@@ -679,6 +679,7 @@
 	ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors;
 
 	/* Fill resources list structure */
+        resource = Buffer.Pointer;
 	while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG)
 	{
 		switch (resource->Type)
@@ -1093,6 +1094,7 @@
 	RequirementDescriptor = RequirementsList->List[0].Descriptors;
 
 	/* Fill resources list structure */
+        resource = Buffer.Pointer;
 	while (resource->Type != ACPI_RESOURCE_TYPE_END_TAG)
 	{
 		switch (resource->Type)

Modified: trunk/reactos/drivers/bus/acpi/osl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev=46242&r1=46241&r2=46242&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Wed Mar 17 10:25:07 2010
@@ -117,7 +117,9 @@
     const char              *Fmt,
     va_list                 Args)
 {
+#ifndef NDEBUG
     vDbgPrintEx (-1, DPFLTR_ERROR_LEVEL, Fmt, Args);
+#endif
     return;
 }