diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f0dc9df..dd05d07 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,3 +1,2 @@ add_subdirectory(glacier) -add_subdirectory(libc) add_subdirectory(mammoth) diff --git a/lib/libc/CMakeLists.txt b/lib/libc/CMakeLists.txt deleted file mode 100644 index 89e6c99..0000000 --- a/lib/libc/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ - -add_library(c STATIC - src/string.cpp - ) - -target_include_directories(c - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) - -target_link_libraries(c - zion_stub - ) - -set_target_properties(c PROPERTIES - COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${BASE_COMPILE_FLAGS}") diff --git a/lib/libc/include/stddef.h b/lib/libc/include/stddef.h deleted file mode 100644 index 92a84ac..0000000 --- a/lib/libc/include/stddef.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -typedef uint64_t size_t; diff --git a/lib/libc/include/string.h b/lib/libc/include/string.h deleted file mode 100644 index bb4f5bc..0000000 --- a/lib/libc/include/string.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "stddef.h" - -void* memcpy(void* dest, const void* src, size_t count); diff --git a/lib/libc/src/string.cpp b/lib/libc/src/string.cpp deleted file mode 100644 index da0261a..0000000 --- a/lib/libc/src/string.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "string.h" - -void* memcpy(void* dest, const void* src, size_t count) { - uint8_t* d = (uint8_t*)dest; - const uint8_t* s = (uint8_t*)src; - for (size_t i = 0; i < count; i++) { - d[i] = s[i]; - } - return dest; -} diff --git a/lib/mammoth/CMakeLists.txt b/lib/mammoth/CMakeLists.txt index 95754d5..47a4429 100644 --- a/lib/mammoth/CMakeLists.txt +++ b/lib/mammoth/CMakeLists.txt @@ -23,7 +23,6 @@ target_include_directories(mammoth target_link_libraries(mammoth glacier - c victoriafalls_yunq yellowstone_yunq zion_stub diff --git a/sys/denali/ahci/ahci_device.cpp b/sys/denali/ahci/ahci_device.cpp index 8b81427..994f4db 100644 --- a/sys/denali/ahci/ahci_device.cpp +++ b/sys/denali/ahci/ahci_device.cpp @@ -2,7 +2,6 @@ #include #include -#include #include AhciDevice::AhciDevice(AhciPort* port) : port_struct_(port) { diff --git a/sys/denali/ahci/command.cpp b/sys/denali/ahci/command.cpp index e55f274..eea4ad0 100644 --- a/sys/denali/ahci/command.cpp +++ b/sys/denali/ahci/command.cpp @@ -1,9 +1,20 @@ #include "ahci/command.h" -#include - #include "ahci/ahci.h" +namespace { + +void* memcpy(void* dest, const void* src, uint64_t count) { + uint8_t* d = (uint8_t*)dest; + const uint8_t* s = (uint8_t*)src; + for (uint64_t i = 0; i < count; i++) { + d[i] = s[i]; + } + return dest; +} + +} // namespace + Command::~Command() {} DmaReadCommand::DmaReadCommand(uint64_t lba, uint64_t sector_cnt,