Skip to content
Snippets Groups Projects
Commit c9dadf2d authored by Pekka Enberg's avatar Pekka Enberg
Browse files

acpi: Use console for AcpiOsPrintf()


Switch to console::write_ll() in AcpiOsPrintf() and AcpiOsvPrintf() to
make ACPI boot-time output readable:

  [penberg@localhost osv]$ ./scripts/run.py
  ACPI: RSDP 0xfd8d0 00014 (v00 BOCHS )
  ACPI: RSDT 0x3fffe380 00034 (v01 BOCHS  BXPCRSDT 00000001 BXPC 00000001)
  ACPI: FACP 0x3fffff80 00074 (v01 BOCHS  BXPCFACP 00000001 BXPC 00000001)
  ACPI: DSDT 0x3fffe3c0 011A9 (v01   BXPC   BXDSDT 00000001 INTL 20100528)
  ACPI: FACS 0x3fffff40 00040
  ACPI: SSDT 0x3ffff6e0 00858 (v01 BOCHS  BXPCSSDT 00000001 BXPC 00000001)
  ACPI: APIC 0x3ffff5b0 00090 (v01 BOCHS  BXPCAPIC 00000001 BXPC 00000001)
  ACPI: HPET 0x3ffff570 00038 (v01 BOCHS  BXPCHPET 00000001 BXPC 00000001)
  acpi 0 apic 0
  acpi 1 apic 1
  acpi 2 apic 2
  acpi 3 apic 3
  APIC base fee00000
  OSv v0.02-64-ga556eab Copyright 2013 Cloudius Systems
  locale works
  ACPI: RSDP 0xfd8d0 00014 (v00 BOCHS )
  ACPI: RSDT 0x3fffe380 00034 (v01 BOCHS  BXPCRSDT 00000001 BXPC 00000001)
  ACPI: FACP 0x3fffff80 00074 (v01 BOCHS  BXPCFACP 00000001 BXPC 00000001)
  ACPI: DSDT 0x3fffe3c0 011A9 (v01   BXPC   BXDSDT 00000001 INTL 20100528)
  ACPI: FACS 0x3fffff40 00040
  ACPI: SSDT 0x3ffff6e0 00858 (v01 BOCHS  BXPCSSDT 00000001 BXPC 00000001)
  ACPI: APIC 0x3ffff5b0 00090 (v01 BOCHS  BXPCAPIC 00000001 BXPC 00000001)
  ACPI: HPET 0x3ffff570 00038 (v01 BOCHS  BXPCHPET 00000001 BXPC 00000001)
  ACPI: All ACPI Tables successfully acquired

Signed-off-by: default avatarPekka Enberg <penberg@cloudius-systems.com>
parent d1c5a723
No related branches found
No related tags found
No related merge requests found
...@@ -25,6 +25,7 @@ extern "C" { ...@@ -25,6 +25,7 @@ extern "C" {
#include <osv/mutex.h> #include <osv/mutex.h>
#include <osv/semaphore.hh> #include <osv/semaphore.hh>
#include "drivers/console.hh"
#include "drivers/pci.hh" #include "drivers/pci.hh"
#include "interrupt.hh" #include "interrupt.hh"
...@@ -472,13 +473,17 @@ void ACPI_INTERNAL_VAR_XFACE AcpiOsPrintf(const char *Format, ...) ...@@ -472,13 +473,17 @@ void ACPI_INTERNAL_VAR_XFACE AcpiOsPrintf(const char *Format, ...)
{ {
va_list va; va_list va;
va_start(va, Format); va_start(va, Format);
vprintf(Format, va); AcpiOsVprintf(Format, va);
va_end(va); va_end(va);
} }
void AcpiOsVprintf(const char *Format, va_list Args) void AcpiOsVprintf(const char *Format, va_list Args)
{ {
vprintf(Format, Args); static char msg[1024];
vsnprintf(msg, sizeof(msg), Format, Args);
console::write_ll(msg, strlen(msg));
} }
void __attribute__((constructor(ACPI_INIT_PRIO))) acpi_init_early() void __attribute__((constructor(ACPI_INIT_PRIO))) acpi_init_early()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment