From 01cf1ccda59340b1d0e65ed61a302692cf7f2ff5 Mon Sep 17 00:00:00 2001 From: Gregor Riepl Date: Thu, 11 Dec 2014 18:26:14 +0100 Subject: [PATCH] aes: replace deprecated prog_uint* types avr/pgmspace.h does not use prog_uint* types any more. Changed AES module to use standard types from stdint.h. Signed-off-by: Gregor Riepl Signed-off-by: Olivier Matz --- modules/crypto/aes/aes_core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/crypto/aes/aes_core.c b/modules/crypto/aes/aes_core.c index d121814..c2d3b77 100644 --- a/modules/crypto/aes/aes_core.c +++ b/modules/crypto/aes/aes_core.c @@ -42,6 +42,7 @@ # endif #endif #include +#include #include #include "aes_locl.h" @@ -70,7 +71,7 @@ Td4[x] = Si[x].[01, 01, 01, 01]; #ifdef USE_PGMMEM -prog_uint32_t Te0_[256] = { +__attribute__((progmem)) const uint32_t Te0_[256] = { #else static const uint32_t Te0_[256] = { #endif @@ -152,7 +153,7 @@ static inline uint32_t Te0(int i) #endif #ifdef USE_PGMMEM -prog_uint8_t Te4_[256] = { +__attribute__((progmem)) const uint8_t Te4_[256] = { #else static const u8 Te4_[256] = { #endif @@ -234,7 +235,7 @@ static inline u8 Te4(int i) #ifdef USE_PGMMEM -prog_uint32_t Td0_[256] = { +__attribute__((progmem)) const uint32_t Td0_[256] = { #else static const uint32_t Td0_[256] = { #endif @@ -315,7 +316,7 @@ static inline uint32_t Td0(int i) #endif #ifdef USE_PGMMEM -prog_uint8_t Td4_[256] = { +__attribute__((progmem)) const uint8_t Td4_[256] = { #else static const u8 Td4_[256] = { #endif -- 2.20.1