From: Gregor Riepl <onitake@gmail.com>
Date: Thu, 11 Dec 2014 17:26:14 +0000 (+0100)
Subject: aes: replace deprecated prog_uint* types
X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=commitdiff_plain;h=01cf1ccda59340b1d0e65ed61a302692cf7f2ff5;hp=6a4d2778a2e0ead8754eb8b2ae1b8a57d94de4d6;ds=sidebyside

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 <onitake@gmail.com>
Signed-off-by: Olivier Matz <zer0@droids-corp.org>
---

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 <assert.h>
+#include <stdint.h>
 
 #include <aversive.h>
 #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