[ros-diffs] [cwittich] 30557: fix most compilation issues with msvc

Author: cwittich
Date: Sun Nov 18 22:00:17 2007
New Revision: 30557

URL: http://svn.reactos.org/svn/reactos?rev=30557&view=rev
Log:
fix most compilation issues with msvc

Modified:
    trunk/reactos/drivers/bus/acpi/executer/amutils.c
    trunk/reactos/drivers/bus/acpi/ospm/fdo.c
    trunk/reactos/drivers/bus/acpi/ospm/osl.c

Modified: trunk/reactos/drivers/bus/acpi/executer/amutils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/executer/…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/executer/amutils.c (original)
+++ trunk/reactos/drivers/bus/acpi/executer/amutils.c Sun Nov 18 22:00:17 2007
@@ -246,7 +246,7 @@
 	}
 
 	else {
-		for (num_digits = 1 + (val < 0); (val = ACPI_DIVIDE (val,base)); ++num_digits) { ;
}
+		for (num_digits = 1; (val = ACPI_DIVIDE (val,base)); ++num_digits) { ; }
 	}
 
 	return (num_digits);

Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/fdo.…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/ospm/fdo.c (original)
+++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c Sun Nov 18 22:00:17 2007
@@ -108,7 +108,7 @@
     swprintf(Buffer, L"%S", Node->device.id.uid);
   else
     /* FIXME: Generate unique id! */
-    swprintf(Buffer, L"0000");
+    swprintf(Buffer, L"%S", L"0000");
 
   return AcpiCreateUnicodeString(InstanceID, Buffer, PagedPool);
 }

Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/osl.…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/ospm/osl.c (original)
+++ trunk/reactos/drivers/bus/acpi/ospm/osl.c Sun Nov 18 22:00:17 2007
@@ -302,38 +302,38 @@
   WRITE_PORT_ULONG((PULONG)port, val);
 }
 
-UINT8
+u8
 acpi_os_mem_in8 (ACPI_PHYSICAL_ADDRESS phys_addr)
 {
   return (*(PUCHAR)(ULONG)phys_addr);
 }
 
-UINT16
+u16
 acpi_os_mem_in16 (ACPI_PHYSICAL_ADDRESS phys_addr)
 {
   return (*(PUSHORT)(ULONG)phys_addr);
 }
 
-UINT32
+u32
 acpi_os_mem_in32 (ACPI_PHYSICAL_ADDRESS phys_addr)
 {
   return (*(PULONG)(ULONG)phys_addr);
 }
 
 void
-acpi_os_mem_out8 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT8 value)
+acpi_os_mem_out8 (ACPI_PHYSICAL_ADDRESS phys_addr, u8 value)
 {
   *(PUCHAR)(ULONG)phys_addr = value;
 }
 
 void
-acpi_os_mem_out16 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT16 value)
+acpi_os_mem_out16 (ACPI_PHYSICAL_ADDRESS phys_addr, u16 value)
 {
   *(PUSHORT)(ULONG)phys_addr = value;
 }
 
 void
-acpi_os_mem_out32 (ACPI_PHYSICAL_ADDRESS phys_addr, UINT32 value)
+acpi_os_mem_out32 (ACPI_PHYSICAL_ADDRESS phys_addr, u32 value)
 {
   *(PULONG)(ULONG)phys_addr = value;
 }