17c79a9e23
Besides adapting the components to the use of base/log.h, the patch cleans up a few base headers, i.e., it removes unused includes from root/component.h, specifically base/heap.h and ram_session/ram_session.h. Hence, components that relied on the implicit inclusion of those headers have to manually include those headers now. While adjusting the log messages, I repeatedly stumbled over the problem that printing char * arguments is ambiguous. It is unclear whether to print the argument as pointer or null-terminated string. To overcome this problem, the patch introduces a new type 'Cstring' that allows the caller to express that the argument should be handled as null-terminated string. As a nice side effect, with this type in place, the optional len argument of the 'String' class could be removed. Instead of supplying a pair of (char const *, size_t), the constructor accepts a 'Cstring'. This, in turn, clears the way let the 'String' constructor use the new output mechanism to assemble a string from multiple arguments (and thereby getting rid of snprintf within Genode in the near future). To enforce the explicit resolution of the char * ambiguity, the 'char *' overload of the 'print' function is marked as deleted. Issue #1987
28 lines
844 B
Makefile
28 lines
844 B
Makefile
include $(REP_DIR)/lib/mk/virtualbox-common.inc
|
|
|
|
#
|
|
# Prevent inclusion of the Genode::Log definition after the vbox #define
|
|
# of 'Log'. Otherwise, the attemt to compile base/log.h will fail.
|
|
#
|
|
VBOX_CC_OPT += -include base/log.h
|
|
|
|
SRC_CC += Devices/Input/DrvKeyboardQueue.cpp
|
|
SRC_CC += Devices/Input/DrvMouseQueue.cpp
|
|
SRC_CC += Devices/USB/DrvVUSBRootHub.cpp
|
|
SRC_CC += Devices/Storage/DrvBlock.cpp
|
|
SRC_CC += Devices/Storage/DrvMediaISO.cpp
|
|
SRC_CC += Devices/Storage/DrvVD.cpp
|
|
SRC_CC += Devices/Storage/DrvRawImage.cpp
|
|
SRC_CC += Devices/PC/DrvACPI.cpp
|
|
SRC_CC += Devices/Serial/DrvChar.cpp
|
|
SRC_CC += Devices/Serial/DrvRawFile.cpp
|
|
SRC_CC += Devices/Serial/DrvHostSerial.cpp
|
|
|
|
SRC_CC += audiodrv.cpp
|
|
SRC_CC += network.cpp
|
|
|
|
INC_DIR += $(VBOX_DIR)/Devices/Audio
|
|
|
|
vpath audiodrv.cpp $(REP_DIR)/src/virtualbox
|
|
vpath network.cpp $(REP_DIR)/src/virtualbox
|