Remove portability wrappers for memset and memcopy

The esp sdk seems to provide them already
This commit is contained in:
Sebastian 2015-09-04 12:01:05 +02:00
parent 39aa340f82
commit f3c809e1be
4 changed files with 7 additions and 28 deletions

View File

@ -2,9 +2,9 @@
#define _MESSAGE_H_
#include <stdint.h>
#include <string.h>
#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;
}

View File

@ -1,9 +0,0 @@
#ifndef _UTIL_H_
#define _UTIL_H_
#include <stdlib.h>
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

View File

@ -1,7 +1,6 @@
#include <stdint.h>
#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;
}

11
util.c
View File

@ -1,11 +0,0 @@
#include <string.h>
#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);
}