ARNik/Cpp-in-Embedded-Systems
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use span in uart interface

Browse Source
This commit is contained in:
Amar Mahmutbegovic
2024-10-27 01:24:37 +02:00
parent d497339a54
commit 4400c3532f
22 changed files with 41 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Chapter07/error_handling/cstdlib_support/retarget.cpp
View File

@@ -4,6 +4,8 @@
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <span>
namespace namespace
{ {
hal::uart *uart_stdio; hal::uart *uart_stdio;
@@ -26,7 +28,7 @@ extern "C" int _write(int fd, char * ptr, int len)
{ {
if(fd == STDOUT_FILENO || fd == STDERR_FILENO) if(fd == STDOUT_FILENO || fd == STDERR_FILENO)
{ {
uart_stdio->write_array(ptr, len); uart_stdio->write(std::span<const char>(ptr, len));
} }
return len; return len;

7
Chapter07/error_handling/hal/uart/inc/uart.hpp
View File

@@ -10,11 +10,6 @@ class uart
{ {
public: public:
virtual void init(std::uint32_t baudrate) = 0; virtual void init(std::uint32_t baudrate) = 0;
virtual void write_array(const char * ptr, std::size_t len) = 0; virtual void write(std::span<const char> data) = 0;
virtual void write(std::span<const char> data)
{
write_array(data.data(), data.size());
}
}; };
}; // namespace hal }; // namespace hal

2
Chapter07/error_handling/hal/uart/inc/uart_stm32.hpp
View File

@@ -18,7 +18,7 @@ class uart_stm32 : public uart
void init(std::uint32_t baudrate = c_baudrate_default) override; void init(std::uint32_t baudrate = c_baudrate_default) override;
void write_array(const char * ptr, std::size_t len) override; void write(std::span<const char> data) override;
private: private:
UART_HandleTypeDef huart_; UART_HandleTypeDef huart_;

6
Chapter07/error_handling/hal/uart/src/uart_stm32.cpp
View File

@@ -22,10 +22,10 @@ void hal::uart_stm32::init(std::uint32_t baudrate)
HAL_UART_Init(&huart_); HAL_UART_Init(&huart_);
} }
void hal::uart_stm32::write_array(const char * ptr, std::size_t len) void hal::uart_stm32::write(std::span<const char> data)
{ {
// we must cast away costness due to ST HAL's API // we must cast away costness due to ST HAL's API
char * data_ptr = const_cast<char *>(ptr); char * data_ptr = const_cast<char *>(data.data());
HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), len, HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), data.size(),
HAL_MAX_DELAY); HAL_MAX_DELAY);
} }

2
Chapter09/type_safety/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ set(CMAKE_SIZE "arm-none-eabi-size")
set(RENODE "renode" CACHE STRING "Path to Renode executable") set(RENODE "renode" CACHE STRING "Path to Renode executable")
set(MAIN_CPP_PATH "${CMAKE_SOURCE_DIR}/app/src/") set(MAIN_CPP_PATH "${CMAKE_SOURCE_DIR}/app/src/")
set(MAIN_CPP_FILE_NAME "main_integer_promotion.cpp" CACHE STRING "main file") set(MAIN_CPP_FILE_NAME "main_usual_arithmetic_conversion.cpp" CACHE STRING "main file")
list(APPEND LIB_SPECS "-specs=nosys.specs") list(APPEND LIB_SPECS "-specs=nosys.specs")
list(APPEND LIB_SPECS "-specs=nano.specs") list(APPEND LIB_SPECS "-specs=nano.specs")

4
Chapter09/type_safety/cstdlib_support/retarget.cpp
View File

@@ -4,6 +4,8 @@
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <span>
namespace namespace
{ {
hal::uart *uart_stdio; hal::uart *uart_stdio;
@@ -26,7 +28,7 @@ extern "C" int _write(int fd, char * ptr, int len)
{ {
if(fd == STDOUT_FILENO || fd == STDERR_FILENO) if(fd == STDOUT_FILENO || fd == STDERR_FILENO)
{ {
uart_stdio->write_array(ptr, len); uart_stdio->write(std::span<const char>(ptr, len));
} }
return len; return len;

7
Chapter09/type_safety/hal/uart/inc/uart.hpp
View File

@@ -10,11 +10,6 @@ class uart
{ {
public: public:
virtual void init(std::uint32_t baudrate) = 0; virtual void init(std::uint32_t baudrate) = 0;
virtual void write_array(const char * ptr, std::size_t len) = 0; virtual void write(std::span<const char> data) = 0;
virtual void write(std::span<const char> data)
{
write_array(data.data(), data.size());
}
}; };
}; // namespace hal }; // namespace hal

2
Chapter09/type_safety/hal/uart/inc/uart_stm32.hpp
View File

@@ -18,7 +18,7 @@ class uart_stm32 : public uart
void init(std::uint32_t baudrate = c_baudrate_default) override; void init(std::uint32_t baudrate = c_baudrate_default) override;
void write_array(const char * ptr, std::size_t len) override; void write(std::span<const char> data) override;
private: private:
UART_HandleTypeDef huart_; UART_HandleTypeDef huart_;

6
Chapter09/type_safety/hal/uart/src/uart_stm32.cpp
View File

@@ -22,10 +22,10 @@ void hal::uart_stm32::init(std::uint32_t baudrate)
HAL_UART_Init(&huart_); HAL_UART_Init(&huart_);
} }
void hal::uart_stm32::write_array(const char * ptr, std::size_t len) void hal::uart_stm32::write(std::span<const char> data)
{ {
// we must cast away costness due to ST HAL's API // we must cast away costness due to ST HAL's API
char * data_ptr = const_cast<char *>(ptr); char * data_ptr = const_cast<char *>(data.data());
HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), len, HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), data.size(),
HAL_MAX_DELAY); HAL_MAX_DELAY);
} }

4
Chapter10/lambdas/cstdlib_support/retarget.cpp
View File

@@ -4,6 +4,8 @@
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <span>
namespace namespace
{ {
hal::uart *uart_stdio; hal::uart *uart_stdio;
@@ -26,7 +28,7 @@ extern "C" int _write(int fd, char * ptr, int len)
{ {
if(fd == STDOUT_FILENO || fd == STDERR_FILENO) if(fd == STDOUT_FILENO || fd == STDERR_FILENO)
{ {
uart_stdio->write_array(ptr, len); uart_stdio->write(std::span<const char>(ptr, len));
} }
return len; return len;

7
Chapter10/lambdas/hal/uart/inc/uart.hpp
View File

@@ -10,11 +10,6 @@ class uart
{ {
public: public:
virtual void init(std::uint32_t baudrate) = 0; virtual void init(std::uint32_t baudrate) = 0;
virtual void write_array(const char * ptr, std::size_t len) = 0; virtual void write(std::span<const char> data) = 0;
virtual void write(std::span<const char> data)
{
write_array(data.data(), data.size());
}
}; };
}; // namespace hal }; // namespace hal

2
Chapter10/lambdas/hal/uart/inc/uart_stm32.hpp
View File

@@ -18,7 +18,7 @@ class uart_stm32 : public uart
void init(std::uint32_t baudrate = c_baudrate_default) override; void init(std::uint32_t baudrate = c_baudrate_default) override;
void write_array(const char * ptr, std::size_t len) override; void write(std::span<const char> data) override;
private: private:
UART_HandleTypeDef huart_; UART_HandleTypeDef huart_;

6
Chapter10/lambdas/hal/uart/src/uart_stm32.cpp
View File

@@ -22,10 +22,10 @@ void hal::uart_stm32::init(std::uint32_t baudrate)
HAL_UART_Init(&huart_); HAL_UART_Init(&huart_);
} }
void hal::uart_stm32::write_array(const char * ptr, std::size_t len) void hal::uart_stm32::write(std::span<const char> data)
{ {
// we must cast away costness due to ST HAL's API // we must cast away costness due to ST HAL's API
char * data_ptr = const_cast<char *>(ptr); char * data_ptr = const_cast<char *>(data.data());
HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), len, HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), data.size(),
HAL_MAX_DELAY); HAL_MAX_DELAY);
} }

4
Chapter11/compile_time/cstdlib_support/retarget.cpp
View File

@@ -4,6 +4,8 @@
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <span>
namespace namespace
{ {
hal::uart *uart_stdio; hal::uart *uart_stdio;
@@ -26,7 +28,7 @@ extern "C" int _write(int fd, char * ptr, int len)
{ {
if(fd == STDOUT_FILENO || fd == STDERR_FILENO) if(fd == STDOUT_FILENO || fd == STDERR_FILENO)
{ {
uart_stdio->write_array(ptr, len); uart_stdio->write(std::span<const char>(ptr, len));
} }
return len; return len;

7
Chapter11/compile_time/hal/uart/inc/uart.hpp
View File

@@ -10,11 +10,6 @@ class uart
{ {
public: public:
virtual void init(std::uint32_t baudrate) = 0; virtual void init(std::uint32_t baudrate) = 0;
virtual void write_array(const char * ptr, std::size_t len) = 0; virtual void write(std::span<const char> data) = 0;
virtual void write(std::span<const char> data)
{
write_array(data.data(), data.size());
}
}; };
}; // namespace hal }; // namespace hal

2
Chapter11/compile_time/hal/uart/inc/uart_stm32.hpp
View File

@@ -18,7 +18,7 @@ class uart_stm32 : public uart
void init(std::uint32_t baudrate = c_baudrate_default) override; void init(std::uint32_t baudrate = c_baudrate_default) override;
void write_array(const char * ptr, std::size_t len) override; void write(std::span<const char> data) override;
private: private:
UART_HandleTypeDef huart_; UART_HandleTypeDef huart_;

6
Chapter11/compile_time/hal/uart/src/uart_stm32.cpp
View File

@@ -22,10 +22,10 @@ void hal::uart_stm32::init(std::uint32_t baudrate)
HAL_UART_Init(&huart_); HAL_UART_Init(&huart_);
} }
void hal::uart_stm32::write_array(const char * ptr, std::size_t len) void hal::uart_stm32::write(std::span<const char> data)
{ {
// we must cast away costness due to ST HAL's API // we must cast away costness due to ST HAL's API
char * data_ptr = const_cast<char *>(ptr); char * data_ptr = const_cast<char *>(data.data());
HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), len, HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), data.size(),
HAL_MAX_DELAY); HAL_MAX_DELAY);
} }

2
Chapter12/cpp_hal/app/src/main_basic_reg.cpp
View File

@@ -51,8 +51,6 @@ int main()
// RCC->CR = 0xDEADBEEF; // RCC->CR = 0xDEADBEEF;
rcc::write(0xDEADBEEF); rcc::write(0xDEADBEEF);
auto val = rcc::read();
printf("val = %ld\r\n", val);
print_reg(&(RCC->CR)); print_reg(&(RCC->CR));

4
Chapter12/cpp_hal/cstdlib_support/retarget.cpp
View File

@@ -4,6 +4,8 @@
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <span>
namespace namespace
{ {
hal::uart *uart_stdio; hal::uart *uart_stdio;
@@ -26,7 +28,7 @@ extern "C" int _write(int fd, char * ptr, int len)
{ {
if(fd == STDOUT_FILENO || fd == STDERR_FILENO) if(fd == STDOUT_FILENO || fd == STDERR_FILENO)
{ {
uart_stdio->write_array(ptr, len); uart_stdio->write(std::span<const char>(ptr, len));
} }
return len; return len;

7
Chapter12/cpp_hal/hal/uart/inc/uart.hpp
View File

@@ -10,11 +10,6 @@ class uart
{ {
public: public:
virtual void init(std::uint32_t baudrate) = 0; virtual void init(std::uint32_t baudrate) = 0;
virtual void write_array(const char * ptr, std::size_t len) = 0; virtual void write(std::span<const char> data) = 0;
virtual void write(std::span<const char> data)
{
write_array(data.data(), data.size());
}
}; };
}; // namespace hal }; // namespace hal

2
Chapter12/cpp_hal/hal/uart/inc/uart_stm32.hpp
View File

@@ -18,7 +18,7 @@ class uart_stm32 : public uart
void init(std::uint32_t baudrate = c_baudrate_default) override; void init(std::uint32_t baudrate = c_baudrate_default) override;
void write_array(const char * ptr, std::size_t len) override; void write(std::span<const char> data) override;
private: private:
UART_HandleTypeDef huart_; UART_HandleTypeDef huart_;

6
Chapter12/cpp_hal/hal/uart/src/uart_stm32.cpp
View File

@@ -22,10 +22,10 @@ void hal::uart_stm32::init(std::uint32_t baudrate)
HAL_UART_Init(&huart_); HAL_UART_Init(&huart_);
} }
void hal::uart_stm32::write_array(const char * ptr, std::size_t len) void hal::uart_stm32::write(std::span<const char> data)
{ {
// we must cast away costness due to ST HAL's API // we must cast away costness due to ST HAL's API
char * data_ptr = const_cast<char *>(ptr); char * data_ptr = const_cast<char *>(data.data());
HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), len, HAL_UART_Transmit(&huart_, reinterpret_cast<uint8_t *>(data_ptr), data.size(),
HAL_MAX_DELAY); HAL_MAX_DELAY);
} }