From 92b6ca84953749669e0b7a9745a1c721b733d86a Mon Sep 17 00:00:00 2001 From: Stefano Calabretti Date: Thu, 3 Feb 2022 19:35:39 +0100 Subject: [PATCH] Fix compile error --- Inc/mmr_can_scs_dict.h | 4 ++-- Src/mmr_can_scs_dict.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Inc/mmr_can_scs_dict.h b/Inc/mmr_can_scs_dict.h index c9fde57..9999226 100644 --- a/Inc/mmr_can_scs_dict.h +++ b/Inc/mmr_can_scs_dict.h @@ -14,11 +14,11 @@ typedef struct { uint32_t delayStart; } MmrCanScsDictEntry; -typedef MmrCanScsDictEntry MmrCanScsDictionary[MMR_SCS_DICTIONARY_SIZE]; +typedef MmrCanScsDictEntry MmrCanScsDictionary[MMR_CAN_SCS_DICTIONARY_SIZE]; typedef void(*MmrCanScsDictAction)(MmrCanScsDictEntry *entry); -uint32_t MMR_CAN_ScsDictPut(MmrCanScsDictEntry entry); +void MMR_CAN_ScsDictPut(MmrCanScsDictEntry entry); void MMR_CAN_ScsDictRemove(uint32_t key); void MMR_CAN_ScsDictForeach(MmrCanScsDictAction action); diff --git a/Src/mmr_can_scs_dict.c b/Src/mmr_can_scs_dict.c index e40ad36..e22a605 100644 --- a/Src/mmr_can_scs_dict.c +++ b/Src/mmr_can_scs_dict.c @@ -1,14 +1,14 @@ -#include "mmr_can_scs.h" +#include "mmr_can_scs_dict.h" static MmrCanScsDictionary _dictionary; -uint32_t MMR_CAN_ScsDictPut(MmrCanScsDictEntry entry) { - _dictionary[entry.key % MMR_CAN_SCS_DICTIONARY_SIZE] = entry.delayStart; +void MMR_CAN_ScsDictPut(MmrCanScsDictEntry entry) { + _dictionary[entry.key % MMR_CAN_SCS_DICTIONARY_SIZE] = entry; } void MMR_CAN_ScsDictRemove(uint32_t key) { - _dictionary[key] = {}; + _dictionary[key] = (MmrCanScsDictEntry){}; } void MMR_CAN_ScsDictForeach(MmrCanScsDictAction action) { @@ -27,4 +27,4 @@ uint32_t MMR_CAN_ScsMessageAsKey(MmrCanMessage *message) { uint16_t lowerHalf = message->header.messageType; return (upperHalf << 16) | lowerHalf; -} \ No newline at end of file +}