3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ctr: Add support for multiple integers in DECL_CTR_INT 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-08-22 12:12:21 -04:00
parent 1b83fb72f5
commit 84fd89b8cf
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/command.h
View File

@ -16,17 +16,17 @@
#define HF_IN_SHUTDOWN 0x01 // Handler can run even when in emergency stop #define HF_IN_SHUTDOWN 0x01 // Handler can run even when in emergency stop
// Declare a constant exported to the host // Declare a constant exported to the host
#define DECL_CONSTANT(NAME, VALUE) \ #define DECL_CONSTANT(NAME, VALUE) \
DECL_CTR_INT("_DECL_CONSTANT " NAME, (VALUE)) DECL_CTR_INT("_DECL_CONSTANT " NAME, 1, CTR_INT(VALUE))
#define DECL_CONSTANT_STR(NAME, VALUE) \ #define DECL_CONSTANT_STR(NAME, VALUE) \
DECL_CTR("_DECL_CONSTANT_STR " NAME " " VALUE) DECL_CTR("_DECL_CONSTANT_STR " NAME " " VALUE)
// Declare an enumeration // Declare an enumeration
#define DECL_ENUMERATION(ENUM, NAME, VALUE) \ #define DECL_ENUMERATION(ENUM, NAME, VALUE) \
DECL_CTR_INT("_DECL_ENUMERATION " ENUM " " NAME, (VALUE)) DECL_CTR_INT("_DECL_ENUMERATION " ENUM " " NAME, 1, CTR_INT(VALUE))
#define DECL_ENUMERATION_RANGE(ENUM, NAME, VALUE, COUNT) \ #define DECL_ENUMERATION_RANGE(ENUM, NAME, VALUE, COUNT) \
DECL_CTR_INT("_DECL_ENUMERATION_RANGE " ENUM " " NAME \ DECL_CTR_INT("_DECL_ENUMERATION_RANGE " ENUM " " NAME \
" " __stringify(COUNT), (VALUE)) " " __stringify(COUNT), 1, CTR_INT(VALUE))
// Send an output message (and declare a static message type for it) // Send an output message (and declare a static message type for it)
#define output(FMT, args...) \ #define output(FMT, args...) \

30
src/ctr.h
View File

@ -14,20 +14,24 @@
static char __PASTE(_DECLS_, __LINE__)[] __attribute__((used)) \ static char __PASTE(_DECLS_, __LINE__)[] __attribute__((used)) \
__section(".compile_time_request") = (REQUEST) __section(".compile_time_request") = (REQUEST)
// Helper macros for encoding an integer // Macro to encode an integer for use with DECL_CTR_INT()
#define CTR_HEX(H) ((H) > 9 ? (H) - 10 + 'A' : (H) + '0') #define _CTR_HEX(H) ((H) > 9 ? (H) - 10 + 'A' : (H) + '0')
#define CTR_INT(V, S) CTR_HEX(((uint32_t)(V) >> (S)) & 0x0f) #define _CTR_INT(V, S) _CTR_HEX(((uint32_t)(V) >> (S)) & 0x0f)
#define CTR_INT(VALUE) { \
' ', (VALUE) < 0 ? '-' : '+', '0', 'x', \
_CTR_INT((VALUE),28), _CTR_INT((VALUE),24), \
_CTR_INT((VALUE),20), _CTR_INT((VALUE),16), \
_CTR_INT((VALUE),12), _CTR_INT((VALUE),8), \
_CTR_INT((VALUE),4), _CTR_INT((VALUE),0) }
// Declare a compile time request with an integer expression // Declare a compile time request with an integer expression
#define DECL_CTR_INT(REQUEST, VALUE) \ #define DECL_CTR_INT(REQUEST, PARAM_COUNT, args...) \
static struct { char _r[sizeof(REQUEST)]; char _v[12]; } \ static struct { \
__PASTE(_DECLI_, __LINE__) __attribute__((used)) \ char _request[sizeof(REQUEST)-1]; \
__section(".compile_time_request") = { \ char _values[(PARAM_COUNT)][12]; \
REQUEST " ", { \ char _end_of_line; \
(VALUE) < 0 ? '-' : '+', '0', 'x', \ } __PASTE(_DECLI_, __LINE__) __attribute__((used)) \
CTR_INT((VALUE),28), CTR_INT((VALUE),24), \ __section(".compile_time_request") = { \
CTR_INT((VALUE),20), CTR_INT((VALUE),16), \ (REQUEST), { args }, 0 }
CTR_INT((VALUE),12), CTR_INT((VALUE),8), \
CTR_INT((VALUE),4), CTR_INT((VALUE),0), 0 } }
#endif // ctr.h #endif // ctr.h

4
src/generic/armcm_boot.h
View File

@ -4,8 +4,8 @@
#include "ctr.h" // DECL_CTR_INT #include "ctr.h" // DECL_CTR_INT
// Declare an IRQ handler // Declare an IRQ handler
#define DECL_ARMCM_IRQ(FUNC, NUM) \ #define DECL_ARMCM_IRQ(FUNC, NUM) \
DECL_CTR_INT("DECL_ARMCM_IRQ " __stringify(FUNC), (NUM)) DECL_CTR_INT("DECL_ARMCM_IRQ " __stringify(FUNC), 1, CTR_INT(NUM))
// Statically declare an IRQ handler and run-time enable it // Statically declare an IRQ handler and run-time enable it
#define armcm_enable_irq(FUNC, NUM, PRIORITY) do { \ #define armcm_enable_irq(FUNC, NUM, PRIORITY) do { \