judsonupchurch/nanoMODBUS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from jonathangjertsen/macros-to-funcs

Browse Source 
Convert `get_` and `put_` to functions
This commit is contained in:
Valerio De Benedetto 2022-07-29 12:36:16 +02:00 committed by GitHub
commit b4172c8fef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
nanomodbus.c
View File

@ -50,29 +50,48 @@
#endif #endif
#endif #endif
#define get_1(m) \ static uint8_t get_1(nmbs_t *m) {
(m)->msg.buf[(m)->msg.buf_idx]; \ uint8_t result = m->msg.buf[m->msg.buf_idx];
(m)->msg.buf_idx++ m->msg.buf_idx++;
#define put_1(m, b) \ return result;
(m)->msg.buf[(m)->msg.buf_idx] = (b); \ }
(m)->msg.buf_idx++
#define discard_1(m) (m)->msg.buf_idx++ static void put_1(nmbs_t *m, uint8_t b) {
m->msg.buf[(m)->msg.buf_idx] = b;
m->msg.buf_idx++;
}
static void discard_1(nmbs_t *m) {
m->msg.buf_idx++;
}
#ifdef NMBS_BIG_ENDIAN #ifdef NMBS_BIG_ENDIAN
#define get_2(m) \
(*(uint16_t*) ((m)->msg.buf + (m)->msg.buf_idx)); \ static uint16_t get_2(nmbs_t *m) {
(m)->msg.buf_idx += 2 uint16_t result = (*(uint16_t*) (m->msg.buf + m->msg.buf_idx));
#define put_2(m, w) \ m->msg.buf_idx += 2;
(*(uint16_t*) ((m)->msg.buf + (m)->msg.buf_idx)) = (w); \ return result;
(m)->msg.buf_idx += 2 }
static void put_2(nmbs_t *m, uint16_t w) {
(*(uint16_t*) (m->msg.buf + m->msg.buf_idx)) = w;
m->msg.buf_idx += 2;
}
#else #else
#define get_2(m) \
((uint16_t) ((m)->msg.buf[(m)->msg.buf_idx + 1])) | (((uint16_t) (m)->msg.buf[(m)->msg.buf_idx] << 8)); \ static uint16_t get_2(nmbs_t *m) {
(m)->msg.buf_idx += 2 uint16_t result = ((uint16_t) (m->msg.buf[m->msg.buf_idx + 1])) | (((uint16_t) m->msg.buf[m->msg.buf_idx] << 8));
#define put_2(m, w) \ m->msg.buf_idx += 2;
(m)->msg.buf[(m)->msg.buf_idx] = ((uint8_t) ((((uint16_t) (w)) & 0xFF00) >> 8)); \ return result;
(m)->msg.buf[(m)->msg.buf_idx + 1] = ((uint8_t) (((uint16_t) (w)) & 0x00FF)); \ }
(m)->msg.buf_idx += 2
static void put_2(nmbs_t *m, uint16_t w) {
m->msg.buf[m->msg.buf_idx] = ((uint8_t) ((((uint16_t) (w)) & 0xFF00) >> 8));
m->msg.buf[m->msg.buf_idx + 1] = ((uint8_t) (((uint16_t) (w)) & 0x00FF));
m->msg.buf_idx += 2;
}
#endif #endif