fix most compilation issues with msvc

svn path=/trunk/; revision=30557
This commit is contained in:
Christoph von Wittich 2007-11-18 19:00:17 +00:00
parent 8d6220cb32
commit 73b55e61c8
3 changed files with 8 additions and 8 deletions

View file

@ -246,7 +246,7 @@ acpi_aml_digits_needed (
} }
else { 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); return (num_digits);

View file

@ -108,7 +108,7 @@ AcpiCreateInstanceIDString(PUNICODE_STRING InstanceID,
swprintf(Buffer, L"%S", Node->device.id.uid); swprintf(Buffer, L"%S", Node->device.id.uid);
else else
/* FIXME: Generate unique id! */ /* FIXME: Generate unique id! */
swprintf(Buffer, L"0000"); swprintf(Buffer, L"%S", L"0000");
return AcpiCreateUnicodeString(InstanceID, Buffer, PagedPool); return AcpiCreateUnicodeString(InstanceID, Buffer, PagedPool);
} }

View file

@ -302,38 +302,38 @@ acpi_os_out32(ACPI_IO_ADDRESS port, u32 val)
WRITE_PORT_ULONG((PULONG)port, val); WRITE_PORT_ULONG((PULONG)port, val);
} }
UINT8 u8
acpi_os_mem_in8 (ACPI_PHYSICAL_ADDRESS phys_addr) acpi_os_mem_in8 (ACPI_PHYSICAL_ADDRESS phys_addr)
{ {
return (*(PUCHAR)(ULONG)phys_addr); return (*(PUCHAR)(ULONG)phys_addr);
} }
UINT16 u16
acpi_os_mem_in16 (ACPI_PHYSICAL_ADDRESS phys_addr) acpi_os_mem_in16 (ACPI_PHYSICAL_ADDRESS phys_addr)
{ {
return (*(PUSHORT)(ULONG)phys_addr); return (*(PUSHORT)(ULONG)phys_addr);
} }
UINT32 u32
acpi_os_mem_in32 (ACPI_PHYSICAL_ADDRESS phys_addr) acpi_os_mem_in32 (ACPI_PHYSICAL_ADDRESS phys_addr)
{ {
return (*(PULONG)(ULONG)phys_addr); return (*(PULONG)(ULONG)phys_addr);
} }
void 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; *(PUCHAR)(ULONG)phys_addr = value;
} }
void 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; *(PUSHORT)(ULONG)phys_addr = value;
} }
void 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; *(PULONG)(ULONG)phys_addr = value;
} }