mirror of
https://github.com/espressif/esp-idf.git
synced 2026-05-03 19:41:55 +02:00
refactor(linux): Unified libbsd handling
* Users can now use libbsd string.h and sys/cdefs.h functionality (e.g., strlcpy, containerof) on Linux by just including string.h or sys/cdefs.h. In other words, the includes are the same on the Linux target as well as on chips targets (ESP32, etc.). * libbsd linking is done by the linux component (belongs to common components) now instead of handling it separately in each component
This commit is contained in:
@@ -35,13 +35,3 @@ idf_component_register(SRCS ${srcs}
|
||||
PRIV_REQUIRES esp_driver_uart
|
||||
esp_driver_usb_serial_jtag
|
||||
)
|
||||
|
||||
if(${target} STREQUAL "linux")
|
||||
# link bsd library for strlcpy
|
||||
find_library(LIB_BSD bsd)
|
||||
if(LIB_BSD)
|
||||
target_link_libraries(${COMPONENT_LIB} PRIVATE ${LIB_BSD})
|
||||
elseif(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
|
||||
message(WARNING "Missing LIBBSD library. Install libbsd-dev package and/or check linker directories.")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -6,10 +6,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#if __has_include(<bsd/string.h>)
|
||||
// for strlcpy
|
||||
#include <bsd/string.h>
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <sys/param.h>
|
||||
#include "esp_heap_caps.h"
|
||||
|
||||
@@ -1,17 +1,15 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
|
||||
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include "sdkconfig.h"
|
||||
#include <sys/cdefs.h> // __containerof
|
||||
#include "esp_console.h"
|
||||
#include "console_private.h"
|
||||
#include "esp_log.h"
|
||||
#include "linenoise/linenoise.h"
|
||||
#if CONFIG_IDF_TARGET_LINUX
|
||||
#include "esp_linux_helper.h" // __containerof
|
||||
#endif
|
||||
|
||||
static const char *TAG = "console.common";
|
||||
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
#include <termios.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
#include "sdkconfig.h"
|
||||
#include "esp_log.h"
|
||||
#include "esp_linux_helper.h"
|
||||
#include "freertos/FreeRTOS.h"
|
||||
#include "freertos/task.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user