minor ajustments

diff --git a/bcal/bcal-nessie.c b/bcal/bcal-nessie.c
index b013bf573541d348bf1baf3183e85c4e98228e4c..9b4cc25719da1f6902f472932e2155ab196a2ea2 100644 (file)
--- a/bcal/bcal-nessie.c
+++ b/bcal/bcal-nessie.c
@@ -1,6 +1,6 @@
 /* bcal-nessie.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/bcal/bcal-nessie.h b/bcal/bcal-nessie.h
index 5e4285f4e5eb6f95422f4908047f3d28f7f80cb6..23a0e759a1f4241658fda88fb04fa2873aedd790 100644 (file)
--- a/bcal/bcal-nessie.h
+++ b/bcal/bcal-nessie.h
@@ -1,6 +1,6 @@
 /* bcal-nessie.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/bcal/bcal_cscipher.c b/bcal/bcal_cscipher.c
index 4a65398b8bdddb93d1168c08e9c35549c35523ea..bd9404a2f1360028fae3f48c2f29544a01900018 100644 (file)
--- a/bcal/bcal_cscipher.c
+++ b/bcal/bcal_cscipher.c
@@ -1,6 +1,6 @@
 /* bcal_cscipher.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/bcal/bcal_cscipher.h b/bcal/bcal_cscipher.h
index 5d2697cfb54febe8b6f68e7b616bc4818096f479..9cd1f876a8c680098267b56074dece1c11ddd3ec 100644 (file)
--- a/bcal/bcal_cscipher.h
+++ b/bcal/bcal_cscipher.h
@@ -1,6 +1,6 @@
 /* bcal_cscipher.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/bcal/bcal_khazad.c b/bcal/bcal_khazad.c
index 7cc3708b5952c5415f2295e717a5b2108c997fe2..609050d9b2f67eceb170d6f737b11af2cf229068 100644 (file)
--- a/bcal/bcal_khazad.c
+++ b/bcal/bcal_khazad.c
@@ -1,6 +1,6 @@
 /* bcal_khazad.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/bcal/bcal_khazad.h b/bcal/bcal_khazad.h
index 74e3a4aa7a4e38235c5b221a97a1e847e908f099..283b0156444129e11d587196b29c5ff90add9801 100644 (file)
--- a/bcal/bcal_khazad.h
+++ b/bcal/bcal_khazad.h
@@ -1,6 +1,6 @@
 /* bcal_khazad.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/cscipher/cscipher.h b/cscipher/cscipher.h
index 717fc0593c67a2f9a281e6775324ef503aa13f08..5ca1a50495576f1ab5b79c9e175d38d11244397a 100644 (file)
--- a/cscipher/cscipher.h
+++ b/cscipher/cscipher.h
@@ -1,6 +1,6 @@
 /* cscipher.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/cscipher/cscipher_sbox.h b/cscipher/cscipher_sbox.h
index f48d9d7bbf87db80875f36c7164d48c160e4115d..5f3fda54d11e883ac5050444171048181cc930cc 100644 (file)
--- a/cscipher/cscipher_sbox.h
+++ b/cscipher/cscipher_sbox.h
@@ -1,6 +1,6 @@
 /* cscipher_sbox.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/keysize_descriptor.c b/keysize_descriptor.c
index b9a8d71f207a0b5d1cf26792cf442e17a694868f..579ef56d9f24bb2e183a8e064d40acf4fb8f45b5 100644 (file)
--- a/keysize_descriptor.c
+++ b/keysize_descriptor.c
@@ -1,6 +1,6 @@
 /* keysize_descriptor.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/keysize_descriptor.h b/keysize_descriptor.h
index e7139f3120ce2cb17e21d6d9c8dd85c19519c92c..2858e90ec4beb9f38690dfe651585fea26e5abd2 100644 (file)
--- a/keysize_descriptor.h
+++ b/keysize_descriptor.h
@@ -1,6 +1,6 @@
 /* keysize_descriptor.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/khazad/khazad.c b/khazad/khazad.c
index d2bb21c4f10be6c848ee0a7696afb2ca58a42722..e1c6fd8c11b60c7acdd1c58281e698081032419f 100644 (file)
--- a/khazad/khazad.c
+++ b/khazad/khazad.c
@@ -1,6 +1,6 @@
 /* khazad.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2006-2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/khazad/khazad.h b/khazad/khazad.h
index 1f1c3358581919bdfb8cd9d8ba4ee47b17ad09bd..76c639943c4de6da6d0f7147006712010cc7db9c 100644 (file)
--- a/khazad/khazad.h
+++ b/khazad/khazad.h
@@ -1,6 +1,6 @@
 /* khazad.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/test_src/circularbytebuffer.c b/test_src/circularbytebuffer.c
index 720da1407e095dfe35c4e26e25d1ad5396dc88f0..4b3f9017213fa1a33dba35fa36c1a94d8700c090 100644 (file)
--- a/test_src/circularbytebuffer.c
+++ b/test_src/circularbytebuffer.c
@@ -1,6 +1,6 @@
 /* circularbytebuffer.c */
 /*
-    This file is part of the AVR-circularbuffer.
+    This file is part of the ARM-circularbytebuffer.
     Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/test_src/circularbytebuffer.h b/test_src/circularbytebuffer.h
index 6d6864cc9bbd827a7ccc6496cf4890664155b811..35ee9ee8693b7b041c5e48497786e01992b26c00 100644 (file)
--- a/test_src/circularbytebuffer.h
+++ b/test_src/circularbytebuffer.h
@@ -1,6 +1,6 @@
 /* circularbytebuffer.h */
 /*
-    This file is part of the AVR-circularbytebuffer.
+    This file is part of the ARM-circularbytebuffer.
     Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/test_src/main-cscipher-test.c b/test_src/main-cscipher-test.c
index 1ea73c0a0eb0dc39e5aacc4341d22759cb1d0b8a..f9f3aad79c674c288c1a269d62d131aaa5edc7e0 100644 (file)
--- a/test_src/main-cscipher-test.c
+++ b/test_src/main-cscipher-test.c
@@ -1,6 +1,6 @@
 /* main-cscipher-test.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/test_src/main-khazad-test.c b/test_src/main-khazad-test.c
index 5e03fbf831d85fd57d3877bad583ec7778f9dcc5..b547ed4a39f32d44a4b476c44f01aef30a558eb7 100644 (file)
--- a/test_src/main-khazad-test.c
+++ b/test_src/main-khazad-test.c
@@ -1,6 +1,6 @@
 /* main-khazad-test.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify

diff --git a/test_src/setbaud_asm.inc b/test_src/setbaud_asm.inc
deleted file mode 100644 (file)
index b472a88..0000000
--- a/test_src/setbaud_asm.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    This file is part of the AVR-uart_ni.
-    Copyright (C) 2009 Daniel Otte (daniel.otte@rub.de)
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* #include <util/setbaud.h> */
-/* we use a modifyed version of util/setbaud where the UL suffix is removed
- * since the preprocessor can not handle that.
- */
-
-#ifndef F_CPU
-#  error "uart_i requires F_CPU to be defined"
-#endif
-
-#ifndef BAUD
-#  error "uart_i requires UART0_BAUD_RATE to be defined"
-#endif
-
-#if !(F_CPU)
-#  error "F_CPU must be a constant value"
-#endif
-
-#if !(BAUD)
-#  error "UART0_BAUD_RATE must be a constant value"
-#endif
-
-#undef USE_2X
-
-/* Baud rate tolerance is 2 % unless previously defined */
-#ifndef BAUD_TOL
-#  define BAUD_TOL 2
-#endif
-
-#define UBRR_VALUE (((F_CPU) + 8 * (BAUD)) / (16 * (BAUD)) -1)
-
-#if 100 * (F_CPU) > \
-  (16 * ((UBRR_VALUE) + 1)) * (100 * (BAUD) + (BAUD) * (BAUD_TOL))
-#  define USE_2X 1
-#elif 100 * (F_CPU) < \
-  (16 * ((UBRR_VALUE) + 1)) * (100 * (BAUD) - (BAUD) * (BAUD_TOL))
-#  define USE_2X 1
-#else
-#  define USE_2X 0
-#endif
-
-#if USE_2X
-/* U2X required, recalculate */
-#undef UBRR_VALUE
-#define UBRR_VALUE (((F_CPU) + 4 * (BAUD)) / (8 * (BAUD)) -1)
-
-#if 100 * (F_CPU) > \
-  (8 * ((UBRR_VALUE) + 1)) * (100 * (BAUD) + (BAUD) * (BAUD_TOL))
-#  warning "Baud rate achieved is higher than allowed"
-#endif
-
-#if 100 * (F_CPU) < \
-  (8 * ((UBRR_VALUE) + 1)) * (100 * (BAUD) - (BAUD) * (BAUD_TOL))
-#  warning "Baud rate achieved is lower than allowed"
-#endif
-
-#endif /* USE_U2X */
-
-#ifdef UBRR_VALUE
-#  define UBRRL_VALUE ((UBRR_VALUE) & 0xff)
-#  define UBRRH_VALUE ((UBRR_VALUE) >> 8)
-#endif
-

diff --git a/test_src/uart_i.h b/test_src/uart_i.h
deleted file mode 100644 (file)
index aff5f85..0000000
--- a/test_src/uart_i.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* uart_i.h */
-/*
-    This file is part of the AVR-uart_ni.
-    Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * \file     uart_i.h
- * \email    daniel.otte@rub.de
- * \author   Daniel Otte 
- * \date     2009-07-24
- * \license  GPLv3 or later
- * \ingroup  uart_i
- * \brief    declaration for non-interrupt uart
- */
-
-#ifndef UART_I_H_
-#define UART_I_H_
-
-#include "config.h"
-#include "circularbytebuffer.h"
-#include <stdint.h>
-
-typedef struct{
-       circularbytebuffer_t rxb;
-       circularbytebuffer_t txb;       
-#if UART0_HOOK
-       void(*hook)(uint8_t);
-       volatile uint8_t hook_running;
-#endif
-#if UART0_SWFLOWCTRL
-       volatile uint8_t txon;
-       volatile uint8_t rxon;
-#endif
-} uart0_ctx_t;
-
-
-typedef struct{
-       circularbytebuffer_t rxb;
-       circularbytebuffer_t txb;       
-#if UART1_HOOK
-       void(*hook)(uint8_t);
-       volatile uint8_t hook_running;
-#endif
-#if UART1_SWFLOWCTRL
-       volatile uint8_t txon;
-       volatile uint8_t rxon;
-#endif
-} uart1_ctx_t;
-
-#if UART0_I
-
-/** \fn uart0_init(void)
- * \brief initialize uart0.
- * This function initializes the first uart according to the parameter specifyed
- * in config.h .
- */
-void uart0_init(void);
-
-/** \fn uart0_putc(uint16_t)
- * \brief send data through uart0.
- * This function sends data through the first uart 
- * (the data size is debfined in config.h).
- * \param c data to send
- */
-void uart0_putc(uint16_t c);
-
-/** \fn uart0_getc(void)
- * \brief read data from uart0.
- * This function reads data from the first uart 
- * (the data size is debfined in config.h).
- * \return data recived by uart0
- */
-uint16_t uart0_getc(void);
-
-/** \fn uart0_dataavail(void)
- * \brief checks if data is available.
- * 
- * This function checks the state of the input buffer of uart0 and
- * returns if data is available or not.
- * \return zero if no data is available else a value different from zero is returned
- */
-uint8_t uart0_dataavail(void);
-
-#if    UART0_HOOK
-void uart0_sethook(void(*fpt)(uint8_t));
-#endif
-
-
-#endif /* UART0_I */
-
-#if UART1_I
-/** \fn uart1_init(void)
- * \brief initialize uart1.
- * This function initializes the second uart according to the parameter specifyed
- * in config.h .
- */
-void uart1_init(void);
-
-/** \fn uart1_putc(uint16_t)
- * \brief send data through uart1.
- * This function sends data through the second uart 
- * (the data size is debfined in config.h).
- * \param c data to send
- */
-void uart1_putc(uint16_t c);
-
-/** \fn uart1_getc(void)
- * \brief read data from uart1.
- * This function reads data from the second uart 
- * (the data size is debfined in config.h).
- * \return data recived by uart1
- */
-uint16_t uart1_getc(void);
-
-/** \fn uart1_dataavail(void)
- * \brief checks if data is available.
- * This function checks the state of the input buffer of uart1 and
- * returns if data is available or not.
- * \return zero if no data is available else a value different from zero is returned
- */
-uint8_t uart1_dataavail(void);
-
-void uart0_sethook(void(*fpt)(uint8_t));
-#endif
-
-#endif /* UART_I_H_ */