diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2024-11-15 11:58:59 -0700 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2024-11-19 20:15:16 -0700 |
| commit | 936fd0145896acbf55de496f036af55a01b80e82 (patch) | |
| tree | a81cfff1fe552a184d614e7a0639583f0a8f8252 | |
| parent | 573b0f7d4d4a7e84ae8d1e4a7c0611dd9f513fa2 (diff) | |
libhw_generic: Split into a separate library
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libhw/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | libhw_generic/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | libhw_generic/alarmclock.c (renamed from libhw/common_alarmclock.c) | 2 | ||||
| -rw-r--r-- | libhw_generic/include/libhw/generic/alarmclock.h (renamed from libhw/common_include/libhw/generic/alarmclock.h) | 0 | ||||
| -rw-r--r-- | libhw_generic/include/libhw/generic/net.h (renamed from libhw/common_include/libhw/generic/net.h) | 0 | ||||
| -rw-r--r-- | libhw_generic/include/libhw/generic/spi.h (renamed from libhw/common_include/libhw/generic/spi.h) | 0 |
7 files changed, 22 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e42490..eef2617 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,7 @@ endfunction() add_subdirectory(libmisc) add_subdirectory(libcr) add_subdirectory(libcr_ipc) +add_subdirectory(libhw_generic) add_subdirectory(libhw) add_subdirectory(libdhcp) add_subdirectory(libusb) diff --git a/libhw/CMakeLists.txt b/libhw/CMakeLists.txt index 3627641..d1767da 100644 --- a/libhw/CMakeLists.txt +++ b/libhw/CMakeLists.txt @@ -1,22 +1,18 @@ -# libhw/CMakeLists.txt - TODO +# libhw/CMakeLists.txt - Device drivers # # Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> # SPDX-License-Identifier: AGPL-3.0-or-later add_library(libhw INTERFACE) -target_include_directories(libhw SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/common_include) target_link_libraries(libhw INTERFACE - libcr - libcr_ipc - libmisc -) - -target_sources(libhw INTERFACE - common_alarmclock.c + libhw_generic ) if (PICO_PLATFORM STREQUAL "rp2040") target_include_directories(libhw SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/rp2040_include) + target_link_libraries(libhw INTERFACE + libcr_ipc + ) target_sources(libhw INTERFACE rp2040_hwtimer.c rp2040_hwspi.c diff --git a/libhw_generic/CMakeLists.txt b/libhw_generic/CMakeLists.txt new file mode 100644 index 0000000..9c88937 --- /dev/null +++ b/libhw_generic/CMakeLists.txt @@ -0,0 +1,15 @@ +# libhw_generic/CMakeLists.txt - UAPI device interfaces +# +# Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> +# SPDX-License-Identifier: AGPL-3.0-or-later + +add_library(libhw_generic INTERFACE) +target_include_directories(libhw_generic SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include) +target_link_libraries(libhw_generic INTERFACE + libmisc + libcr +) + +target_sources(libhw_generic INTERFACE + alarmclock.c +) diff --git a/libhw/common_alarmclock.c b/libhw_generic/alarmclock.c index 9812d44..d539496 100644 --- a/libhw/common_alarmclock.c +++ b/libhw_generic/alarmclock.c @@ -1,4 +1,4 @@ -/* libhw/common_alarmclock.c - Device-independent <libhw/generic/alarmclock.h> utilities +/* libhw_generic/alarmclock.c - Device-independent <libhw/generic/alarmclock.h> utilities * * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> * SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/libhw/common_include/libhw/generic/alarmclock.h b/libhw_generic/include/libhw/generic/alarmclock.h index a9d816b..a9d816b 100644 --- a/libhw/common_include/libhw/generic/alarmclock.h +++ b/libhw_generic/include/libhw/generic/alarmclock.h diff --git a/libhw/common_include/libhw/generic/net.h b/libhw_generic/include/libhw/generic/net.h index def533c..def533c 100644 --- a/libhw/common_include/libhw/generic/net.h +++ b/libhw_generic/include/libhw/generic/net.h diff --git a/libhw/common_include/libhw/generic/spi.h b/libhw_generic/include/libhw/generic/spi.h index 2207a2c..2207a2c 100644 --- a/libhw/common_include/libhw/generic/spi.h +++ b/libhw_generic/include/libhw/generic/spi.h |