acpica: remove debug version

The debug version comes with an unwelcome libc dependency, which is
solely needed for the formatted output of error messages. Since the
distinction between the regular and the debug versions remained unused
in practice, this patch removes the debug version.
This commit is contained in:
Norman Feske 2017-11-10 11:13:00 +01:00 committed by Christian Helmuth
parent cda71e198f
commit b7eb5d94f2
6 changed files with 5 additions and 46 deletions

View File

@ -201,7 +201,7 @@ install_config $config
set boot_modules {
core init
ld.lib.so libc.lib.so
ld.lib.so
timer
ps2_drv
input_merger
@ -209,7 +209,6 @@ set boot_modules {
dynamic_rom
acpica
acpi_input
debug-acpica
test-input
}

View File

@ -1,25 +0,0 @@
/*
* Copyright (C) 2016-2017 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
*/
#include <stdarg.h>
#include <stdio.h>
extern "C"
void AcpiOsPrintf (const char *fmt, ...)
{
va_list va;
va_start(va, fmt);
vprintf(fmt, va);
va_end(va);
}
extern "C"
void AcpiOsVprintf (const char *fmt, va_list va)
{
vprintf(fmt, va);
}

View File

@ -1,7 +0,0 @@
TARGET = debug-acpica
LIBS = libc
SRC_CC = os.cc printf.cc
include $(PRG_DIR)/../target.inc
vpath os.cc $(PRG_DIR)/..

View File

@ -12,7 +12,6 @@
#include <base/allocator_avl.h>
#include <base/component.h>
#include <libc/component.h>
#include <base/log.h>
#include <base/signal.h>
#include <base/heap.h>
@ -303,7 +302,6 @@ ACPI_STATUS AcpiOsInstallInterruptHandler(UINT32 irq, ACPI_OSD_HANDLER handler,
}
/* used by normal (no-printf-debug) target */
void Component::construct(Genode::Env &env)
{
/* XXX execute constructors of global statics */
@ -311,6 +309,3 @@ void Component::construct(Genode::Env &env)
static Acpica::Main main(env);
}
/* used by debug target (using printf of libc) */
void Libc::Component::construct(Libc::Env &env) { static Acpica::Main main(env); }

View File

@ -1,3 +0,0 @@
REQUIRES := x86
LIBS += base acpica

View File

@ -1,4 +1,4 @@
TARGET = acpica
SRC_CC = os.cc printf.cc
include $(PRG_DIR)/target.inc
TARGET := acpica
SRC_CC := os.cc printf.cc
REQUIRES := x86
LIBS += base acpica