Rename singleton to initialized_singleton
Use #pragma once instead of guard definitions in every header
This commit is contained in:
parent
61fce5992e
commit
8e9b69b87a
17 changed files with 151 additions and 175 deletions
|
@ -14,6 +14,10 @@ FixNamespaceComments: false
|
|||
PackConstructorInitializers: Never
|
||||
AlignAfterOpenBracket: AlwaysBreak
|
||||
InsertBraces: true
|
||||
SpaceBeforeParens: Custom
|
||||
SpaceBeforeParensOptions:
|
||||
AfterControlStatements: true
|
||||
AfterFunctionDefinitionName: false
|
||||
BraceWrapping:
|
||||
AfterClass: true # false
|
||||
AfterControlStatement: false
|
||||
|
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <f4ll/initialized_singleton.h>
|
||||
#include <f4ll/packet_usart.h>
|
||||
#include <f4ll/ringbuffer.h>
|
||||
#include <f4ll/singleton.h>
|
||||
|
||||
namespace f4ll {
|
||||
|
||||
class console_handler : public usart_core, public singleton<console_handler>
|
||||
class console_handler : public usart_core, public initialized_singleton<console_handler>
|
||||
{
|
||||
friend class singleton<console_handler>;
|
||||
friend class initialized_singleton<console_handler>;
|
||||
|
||||
public:
|
||||
void print(char const *s);
|
||||
|
|
|
@ -7,15 +7,15 @@
|
|||
#pragma once
|
||||
|
||||
#include <f4ll/dma_helper.h>
|
||||
#include <f4ll/singleton.h>
|
||||
#include <f4ll/initialized_singleton.h>
|
||||
#include <inttypes.h>
|
||||
#include <platform/dma_ll.h>
|
||||
|
||||
namespace f4ll {
|
||||
|
||||
class crc_handler : public singleton<crc_handler>
|
||||
class crc_handler : public initialized_singleton<crc_handler>
|
||||
{
|
||||
friend class singleton<crc_handler>;
|
||||
friend class initialized_singleton<crc_handler>;
|
||||
|
||||
public:
|
||||
struct icallback
|
||||
|
|
|
@ -5,8 +5,7 @@
|
|||
* Author: abody
|
||||
*/
|
||||
|
||||
#ifndef LL_DMAHELPER_H_
|
||||
#define LL_DMAHELPER_H_
|
||||
#pragma once
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <platform/dma_ll.h>
|
||||
|
@ -56,5 +55,3 @@ private:
|
|||
};
|
||||
|
||||
} /* namespace f4ll */
|
||||
|
||||
#endif /* LL_DMAHELPER_H_ */
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef __FAULT_H
|
||||
#define __FAULT_H
|
||||
#pragma once
|
||||
|
||||
#define FAULT_REASON_HARD_FAULT 1
|
||||
#define FAULT_REASON_MEMMANAGE_FAULT 2
|
||||
|
@ -43,5 +42,3 @@ __attribute__((noreturn)) void fault_handler(uint32_t type, fault_context_t *con
|
|||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __FAULT_H */
|
||||
|
|
27
components/f4ll/inc/f4ll/initialized_singleton.h
Normal file
27
components/f4ll/inc/f4ll/initialized_singleton.h
Normal file
|
@ -0,0 +1,27 @@
|
|||
#pragma once
|
||||
|
||||
#include <utility>
|
||||
|
||||
namespace f4ll {
|
||||
|
||||
template <typename T> class initialized_singleton
|
||||
{
|
||||
public:
|
||||
static T &instance() { return *m_instance; }
|
||||
template <typename... args_t> static T &init(args_t &&...args)
|
||||
{
|
||||
static T instance{std::forward<args_t>(args)...};
|
||||
m_instance = &instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
protected:
|
||||
initialized_singleton() = default;
|
||||
initialized_singleton(const initialized_singleton &) = delete;
|
||||
initialized_singleton &operator=(const initialized_singleton &) = delete;
|
||||
static T *m_instance;
|
||||
};
|
||||
|
||||
template <typename T> T *initialized_singleton<T>::m_instance = nullptr;
|
||||
|
||||
} // namespace f1ll {
|
|
@ -1,5 +1,4 @@
|
|||
#ifndef _IRQLOCK_H_INCLUDED
|
||||
#define _IRQLOCK_H_INCLUDED
|
||||
#pragma once
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <stm32f4xx.h>
|
||||
|
@ -22,5 +21,3 @@ private:
|
|||
uint32_t m_primask;
|
||||
};
|
||||
}
|
||||
|
||||
#endif // _IRQLOCK_H_INCLUDED
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
#pragma once
|
||||
|
||||
#include <f4ll/dma_helper.h>
|
||||
#include <f4ll/singleton.h>
|
||||
#include <f4ll/initialized_singleton.h>
|
||||
|
||||
namespace f4ll {
|
||||
|
||||
class memcpy_dma : public singleton<memcpy_dma>, private dma_helper
|
||||
class memcpy_dma : public initialized_singleton<memcpy_dma>, private dma_helper
|
||||
{
|
||||
friend class singleton<memcpy_dma>;
|
||||
friend class initialized_singleton<memcpy_dma>;
|
||||
|
||||
public:
|
||||
void *copy(void *dst, void const *src, uint16_t length);
|
||||
|
@ -24,4 +24,4 @@ private:
|
|||
bool volatile m_busy = false;
|
||||
};
|
||||
|
||||
} /* namespace f4ll */
|
||||
} // namespace f4ll
|
||||
|
|
|
@ -5,11 +5,12 @@
|
|||
* Author: abody
|
||||
*/
|
||||
|
||||
#ifndef LL_HSUSART_H_
|
||||
#define LL_HSUSART_H_
|
||||
#pragma once
|
||||
|
||||
#include <platform/usart_ll.h>
|
||||
|
||||
#include <f4ll/crc_handler.h>
|
||||
#include <f4ll/usart_core.h>
|
||||
#include <platform/usart_ll.h>
|
||||
|
||||
namespace f4ll {
|
||||
|
||||
|
@ -119,4 +120,3 @@ private:
|
|||
};
|
||||
|
||||
}
|
||||
#endif /* LL_HSUSART_H_ */
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
#ifndef SINGLETON_H_
|
||||
#define SINGLETON_H_
|
||||
|
||||
#include <utility>
|
||||
|
||||
namespace f4ll {
|
||||
|
||||
template <typename T> class singleton
|
||||
{
|
||||
public:
|
||||
static T &instance()
|
||||
{
|
||||
return *m_instance;
|
||||
}
|
||||
template <typename... args_t> static T &init(args_t &&...args)
|
||||
{
|
||||
static T instance{std::forward<args_t>(args)...};
|
||||
m_instance = &instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
protected:
|
||||
singleton() = default;
|
||||
singleton(const singleton &) = delete;
|
||||
singleton &operator=(const singleton &) = delete;
|
||||
static T *m_instance;
|
||||
};
|
||||
|
||||
template <typename T> T *singleton<T>::m_instance = nullptr;
|
||||
|
||||
} // namespace f1ll {
|
||||
|
||||
#endif /* SINGLETON_H_ */
|
|
@ -5,8 +5,7 @@
|
|||
* Author: compi
|
||||
*/
|
||||
|
||||
#ifndef _STM32PLUS_STRUTIL_H_
|
||||
#define _STM32PLUS_STRUTIL_H_
|
||||
#pragma once
|
||||
|
||||
#include <stddef.h>
|
||||
#include <inttypes.h>
|
||||
|
@ -27,5 +26,3 @@ char tochr(const uint8_t in, const uint8_t upper);
|
|||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _STM32PLUS_STRUTIL_H_ */
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
* Author: abody
|
||||
*/
|
||||
|
||||
#ifndef LL_USARTCORE_H_
|
||||
#define LL_USARTCORE_H_
|
||||
#pragma once
|
||||
|
||||
#include <platform/usart_ll.h>
|
||||
|
||||
#include <f4ll/dma_helper.h>
|
||||
|
@ -44,11 +44,10 @@ private:
|
|||
virtual void tx_dma_half_transfer(void) = 0;
|
||||
virtual void tx_dma_error(dma_helper::dma_error_type reason) = 0;
|
||||
|
||||
public:
|
||||
void usart_isr();
|
||||
void rx_dma_isr();
|
||||
void tx_dma_isr();
|
||||
};
|
||||
|
||||
} /* namespace f4ll */
|
||||
|
||||
#endif /* LL_USARTCORE_H_ */
|
||||
|
|
|
@ -71,19 +71,15 @@ size_t console_handler::append(char const *s)
|
|||
|
||||
void console_handler::flush()
|
||||
{
|
||||
bool busy;
|
||||
|
||||
if (!m_tx_buffer.uncommited()) {
|
||||
return;
|
||||
}
|
||||
m_tx_buffer.commit();
|
||||
{
|
||||
irq_lock l;
|
||||
busy = m_in_flight_size != 0;
|
||||
}
|
||||
if (busy) {
|
||||
|
||||
if (m_in_flight_size) {
|
||||
return;
|
||||
}
|
||||
|
||||
uint8_t const *chunk;
|
||||
m_tx_buffer.get_chunk(m_tx_buffer.size(), chunk, m_in_flight_size);
|
||||
if (m_in_flight_size) {
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
* Created on: Oct 26, 2019
|
||||
* Author: compi
|
||||
*/
|
||||
|
||||
#include <f4ll/crc_handler.h>
|
||||
|
||||
namespace f4ll {
|
||||
|
|
|
@ -45,10 +45,11 @@ void swo_send_str(char const *str, uint8_t len, uint8_t port)
|
|||
++str;
|
||||
--len;
|
||||
}
|
||||
} else
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void fault_print_str(char const *fmtstr, uint32_t *values)
|
||||
{
|
||||
|
@ -72,16 +73,8 @@ void fault_print_str(char const *fmtstr, uint32_t *values)
|
|||
void fault_handler(uint32_t type, fault_context_t *context)
|
||||
{
|
||||
uint32_t FSR[9] = {
|
||||
SCB->HFSR,
|
||||
0xff & SCB->CFSR,
|
||||
(0xff00 & SCB->CFSR) >> 8,
|
||||
(0xffff0000 & SCB->CFSR) >> 16,
|
||||
SCB->DFSR,
|
||||
SCB->AFSR,
|
||||
SCB->SHCSR,
|
||||
SCB->MMFAR,
|
||||
SCB->BFAR
|
||||
};
|
||||
SCB->HFSR, 0xff & SCB->CFSR, (0xff00 & SCB->CFSR) >> 8, (0xffff0000 & SCB->CFSR) >> 16, SCB->DFSR, SCB->AFSR, SCB->SHCSR,
|
||||
SCB->MMFAR, SCB->BFAR};
|
||||
|
||||
while (1) {
|
||||
fault_print_str("\n++ Fault Handler ++\n\nFaultType: ", NULL);
|
||||
|
@ -147,4 +140,3 @@ void fault_handler(uint32_t type, fault_context_t *context)
|
|||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
* Author: abody
|
||||
*/
|
||||
#include <f4ll/packet_usart.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <cstring>
|
||||
|
||||
namespace f4ll {
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#include <f4ll/str_util.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
size_t strcpy_ex(char *dst, char const *src)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue