mirror of
https://github.com/pine64/blisp.git
synced 2024-12-22 06:20:12 +00:00
Compare commits
6 Commits
92572c9811
...
07f8e92f6e
Author | SHA1 | Date | |
---|---|---|---|
|
07f8e92f6e | ||
|
bfe472e71c | ||
|
2268e535d4 | ||
|
cb32800728 | ||
|
da463d79fd | ||
|
67bd1bd468 |
@ -1,5 +1,6 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||||
|
# set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
|
||||||
project(blisp C)
|
project(blisp C)
|
||||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||||
set(CMAKE_C_STANDARD 11)
|
set(CMAKE_C_STANDARD 11)
|
||||||
@ -42,11 +43,10 @@ set_target_properties(libblisp_static PROPERTIES
|
|||||||
OUTPUT_NAME "blisp")
|
OUTPUT_NAME "blisp")
|
||||||
|
|
||||||
if(BLISP_USE_SYSTEM_LIBRARIES)
|
if(BLISP_USE_SYSTEM_LIBRARIES)
|
||||||
find_package(PkgConfig)
|
find_package(Libserialport REQUIRED)
|
||||||
pkg_search_module(LIBSERIALPORT REQUIRED libserialport)
|
target_link_libraries(libblisp PUBLIC Libserialport::Libserialport)
|
||||||
target_link_libraries(libblisp PUBLIC ${LIBSERIALPORT_LIBRARIES})
|
target_link_libraries(libblisp_static PUBLIC Libserialport::Libserialport)
|
||||||
target_link_libraries(libblisp_static PUBLIC ${LIBSERIALPORT_LIBRARIES})
|
target_include_directories(libblisp_obj PUBLIC ${Libserialport_INCLUDE_DIRS})
|
||||||
target_include_directories(libblisp_obj PUBLIC ${LIBSERIALPORT_INCLUDE_DIRS})
|
|
||||||
else()
|
else()
|
||||||
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||||
target_sources(libblisp_obj PRIVATE
|
target_sources(libblisp_obj PRIVATE
|
||||||
|
79
cmake/FindLibserialport.cmake
Normal file
79
cmake/FindLibserialport.cmake
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
#[=======================================================================[.rst:
|
||||||
|
FindLibserialport
|
||||||
|
-------
|
||||||
|
|
||||||
|
Finds the sigrok serial port library (``libserialport``)
|
||||||
|
|
||||||
|
Imported Targets
|
||||||
|
^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
This module defines the following imported targets, if found:
|
||||||
|
|
||||||
|
``Libserialport::Libserialport``
|
||||||
|
The serialport library
|
||||||
|
|
||||||
|
Result Variables
|
||||||
|
^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
This module will define the following variables:
|
||||||
|
|
||||||
|
``Libserialport_FOUND``
|
||||||
|
True if the system has the serialport library.
|
||||||
|
``Libserialport_VERSION``
|
||||||
|
The version of the serialport library which was found.
|
||||||
|
``Libserialport_INCLUDE_DIRS``
|
||||||
|
Include directories needed to use ``libserialport``.
|
||||||
|
``Libserialport_LIBRARIES``
|
||||||
|
Libraries needed to link to ``libserialport``.
|
||||||
|
|
||||||
|
Cache Variables
|
||||||
|
^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
The following cache variables may also be set:
|
||||||
|
|
||||||
|
``Libserialport_INCLUDE_DIR``
|
||||||
|
The directory containing ``libserialport.h``.
|
||||||
|
``Libserialport_LIBRARY``
|
||||||
|
The path to the ``libserialport`` library.
|
||||||
|
|
||||||
|
#]=======================================================================]
|
||||||
|
|
||||||
|
find_package(PkgConfig)
|
||||||
|
pkg_check_modules(PC_Libserialport QUIET libserialport)
|
||||||
|
|
||||||
|
find_path(Libserialport_INCLUDE_DIR
|
||||||
|
NAMES libserialport.h
|
||||||
|
PATHS "${PC_Libserialport_INCLUDE_DIRS}"
|
||||||
|
)
|
||||||
|
find_library(Libserialport_LIBRARY
|
||||||
|
NAMES serialport
|
||||||
|
HINTS "${PC_Libserialport_LIBRARY_DIRS}"
|
||||||
|
)
|
||||||
|
|
||||||
|
set(Foo_VERSION ${PC_Foo_VERSION})
|
||||||
|
|
||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
find_package_handle_standard_args(Libserialport
|
||||||
|
FOUND_VAR Libserialport_FOUND
|
||||||
|
REQUIRED_VARS
|
||||||
|
Libserialport_LIBRARY
|
||||||
|
Libserialport_INCLUDE_DIR
|
||||||
|
VERSION_VAR Libserialport_VERSION
|
||||||
|
)
|
||||||
|
|
||||||
|
if(Libserialport_FOUND)
|
||||||
|
set(Libserialport_LIBRARIES ${Libserialport_LIBRARY})
|
||||||
|
set(Libserialport_INCLUDE_DIRS ${Libserialport_INCLUDE_DIR})
|
||||||
|
set(Libserialport_DEFINITIONS ${PC_Liberialport_CFLAGS_OTHER})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(Libserialport_FOUND AND NOT TARGET Libserialport::Libserialport)
|
||||||
|
add_library(Libserialport::Libserialport UNKNOWN IMPORTED)
|
||||||
|
set_target_properties(Libserialport::Libserialport PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${Libserialport_LIBRARY}"
|
||||||
|
INTERFACE_COMPILE_OPTIONS "${PC_Libserialport_CFLAGS_OTHER}"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${Libserialport_INCLUDE_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
@ -360,13 +360,13 @@ blisp_return_t blisp_device_flash_erase(struct blisp_device* device,
|
|||||||
*(uint32_t*)(payload + 4) = end_address;
|
*(uint32_t*)(payload + 4) = end_address;
|
||||||
|
|
||||||
blisp_return_t ret = blisp_send_command(device, 0x30, payload, 8, true);
|
blisp_return_t ret = blisp_send_command(device, 0x30, payload, 8, true);
|
||||||
if (ret < 0)
|
if (ret != BLISP_OK)
|
||||||
return ret;
|
return ret;
|
||||||
do {
|
do {
|
||||||
ret = blisp_receive_response(device, false);
|
ret = blisp_receive_response(device, false);
|
||||||
} while (ret == BLISP_ERR_PENDING);
|
} while (ret == BLISP_ERR_PENDING);
|
||||||
|
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
blisp_return_t blisp_device_flash_write(struct blisp_device* device,
|
blisp_return_t blisp_device_flash_write(struct blisp_device* device,
|
||||||
@ -414,4 +414,4 @@ blisp_return_t blisp_device_reset(struct blisp_device* device) {
|
|||||||
void blisp_device_close(struct blisp_device* device) {
|
void blisp_device_close(struct blisp_device* device) {
|
||||||
struct sp_port* serial_port = device->serial_port;
|
struct sp_port* serial_port = device->serial_port;
|
||||||
sp_close(serial_port);
|
sp_close(serial_port);
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,7 @@ target_include_directories(blisp PRIVATE
|
|||||||
"${CMAKE_SOURCE_DIR}/include")
|
"${CMAKE_SOURCE_DIR}/include")
|
||||||
|
|
||||||
target_link_libraries(blisp PRIVATE
|
target_link_libraries(blisp PRIVATE
|
||||||
argtable3
|
argtable3::argtable3
|
||||||
libblisp_static file_parsers)
|
libblisp_static file_parsers)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
|
Loading…
Reference in New Issue
Block a user