Skip to content

Commit fbb4056

Browse files
committed
Fixed incorrect merge issues and Cmake arguments
1 parent 30f16f6 commit fbb4056

2 files changed

Lines changed: 1 addition & 15 deletions

File tree

src/example_machine/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set_target_properties(example_machine
99
target_link_libraries(example_machine PRIVATE Debug)
1010
target_compile_definitions(example_machine PRIVATE __DEBUG__)
1111

12-
target_link_libraries(example_machine PRIVATE Drivers)
12+
target_link_libraries(example_machine PRIVATE drivers)
1313

1414
COMPILE_BINARY(example_machine)
1515
ADD_QEMU_TARGET(example_machine BIOS_IMAGE)

src/lib/debug/debug_stdio.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@ static char* uart_output_handler(const char* buf, void* user, int len) {
1717
return (char*)user;
1818
}
1919

20-
// by u i mean "uart"
21-
void uprintf(const char* fmt, ...) {
22-
va_list va;
23-
va_start(va, fmt);
24-
char buf[STB_SPRINTF_MIN];
25-
vsprintfcb(handler, buf, buf, fmt, va);
26-
va_end(va);
27-
}
28-
29-
static char* uart_output_handler(const char* buf, void* user, int len) {
30-
while (len--) putc_uart(*buf++);
31-
return (char*)user;
32-
}
33-
3420
// by u i mean "uart"
3521
void uprintf(const char* fmt, ...) {
3622
va_list va;

0 commit comments

Comments
 (0)