From f3c809e1be4d49e73c52255f1d54abce23370d30 Mon Sep 17 00:00:00 2001 From: LongHairedHacker Date: Fri, 4 Sep 2015 12:01:05 +0200 Subject: [PATCH] Remove portability wrappers for memset and memcopy The esp sdk seems to provide them already --- include/message.h | 6 +++--- include/util.h | 9 --------- twinkl.c | 9 ++++----- util.c | 11 ----------- 4 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 include/util.h delete mode 100644 util.c diff --git a/include/message.h b/include/message.h index 3df34bc..7300967 100644 --- a/include/message.h +++ b/include/message.h @@ -2,9 +2,9 @@ #define _MESSAGE_H_ #include +#include #include "config.h" -#include "util.h" struct twinkl_message { @@ -28,8 +28,8 @@ struct twinkl_message { * Static helper functions for messages */ static inline void twinkl_init_message(struct twinkl_message *msg) { - twinkl_memset(msg->values, 0, TWINKL_CHANNEL_COUNT); - twinkl_memset(msg->mask, 0, TWINKL_MASK_BYTES); + memset(msg->values, 0, TWINKL_CHANNEL_COUNT); + memset(msg->mask, 0, TWINKL_MASK_BYTES); msg->priority = 0; } diff --git a/include/util.h b/include/util.h deleted file mode 100644 index adfba60..0000000 --- a/include/util.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _UTIL_H_ -#define _UTIL_H_ - -#include - -void __attribute__((weak)) twinkl_memset(void *ptr, int value, size_t num); -void __attribute__((weak)) twinkl_memcpy(void *destination, const void *source, size_t num); - -#endif diff --git a/twinkl.c b/twinkl.c index 0114a0b..a9c58f4 100644 --- a/twinkl.c +++ b/twinkl.c @@ -1,7 +1,6 @@ #include #include "config.h" -#include "util.h" #include "twinkl.h" @@ -12,8 +11,8 @@ uint8_t twinkl_has_changed; void twinkl_init() { - twinkl_memset(twinkl_channels, 0, TWINKL_LEVEL_COUNT * TWINKL_CHANNEL_COUNT); - twinkl_memset(twinkl_masks, 0, TWINKL_LEVEL_COUNT * TWINKL_MASK_BYTES); + memset(twinkl_channels, 0, TWINKL_LEVEL_COUNT * TWINKL_CHANNEL_COUNT); + memset(twinkl_masks, 0, TWINKL_LEVEL_COUNT * TWINKL_MASK_BYTES); twinkl_has_changed = 0; } @@ -21,8 +20,8 @@ void twinkl_init() { void twinkl_process_message(struct twinkl_message *msg) { if(msg->priority < TWINKL_LEVEL_COUNT) { - twinkl_memcpy(twinkl_channels[msg->priority], msg->values, TWINKL_CHANNEL_COUNT); - twinkl_memcpy(twinkl_masks[msg->priority], msg->mask, TWINKL_MASK_BYTES); + memcpy(twinkl_channels[msg->priority], msg->values, TWINKL_CHANNEL_COUNT); + memcpy(twinkl_masks[msg->priority], msg->mask, TWINKL_MASK_BYTES); twinkl_has_changed = 1; } diff --git a/util.c b/util.c deleted file mode 100644 index 35c3d65..0000000 --- a/util.c +++ /dev/null @@ -1,11 +0,0 @@ -#include - -#include "util.h" - -void twinkl_memset(void *ptr, int value, size_t num) { - memset(ptr, value, num); -} - -void twinkl_memcpy(void *destination, const void *source, size_t num) { - memcpy(destination, source, num); -}