From beeb9c3f655296a3f15b0f0dc3030905014833b1 Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Sun, 30 Jun 2013 22:20:51 -0700
Subject: [PATCH] [Style] Do not declare new types if not really necessary.

---
 .../stm32/common/crypto_common_f24.h           | 18 +++++++++---------
 include/libopencm3/stm32/f4/crypto.h           |  6 +++---
 lib/stm32/common/crypto_common_f24.c           | 12 ++++++------
 lib/stm32/f4/crypto.c                          |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/include/libopencm3/stm32/common/crypto_common_f24.h b/include/libopencm3/stm32/common/crypto_common_f24.h
index 0c84bf7a..592edec2 100644
--- a/include/libopencm3/stm32/common/crypto_common_f24.h
+++ b/include/libopencm3/stm32/common/crypto_common_f24.h
@@ -242,7 +242,7 @@ specific memorymap.h header before including this header file.*/
  */
 /**@{*/
 
-typedef enum {
+enum crypto_mode {
 	ENCRYPT_TDES_ECB = CRYP_CR_ALGOMODE_TDES_ECB,
 	ENCRYPT_TDES_CBC = CRYP_CR_ALGOMODE_TDES_CBC,
 	ENCRYPT_DES_ECB = CRYP_CR_ALGOMODE_DES_ECB,
@@ -257,26 +257,26 @@ typedef enum {
 	DECRYPT_AES_ECB = CRYP_CR_ALGOMODE_AES_ECB | CRYP_CR_ALGODIR,
 	DECRYPT_AES_CBC = CRYP_CR_ALGOMODE_AES_CBC | CRYP_CR_ALGODIR,
 	DECRYPT_AES_CTR = CRYP_CR_ALGOMODE_AES_CTR,/* XOR is same ENC as DEC */
-} crypto_mode_t;
-typedef enum {
+};
+enum crypto_keysize {
 	CRYPTO_KEY_128BIT = 0,
 	CRYPTO_KEY_192BIT,
 	CRYPTO_KEY_256BIT,
-} crypto_keysize_t;
-typedef enum {
+};
+enum crypto_datatype {
 
 	CRYPTO_DATA_32BIT = 0,
 	CRYPTO_DATA_16BIT,
 	CRYPTO_DATA_8BIT,
 	CRYPTO_DATA_BIT,
-} crypto_datatype_t;
+};
 
 BEGIN_DECLS
 void crypto_wait_busy(void);
-void crypto_set_key(crypto_keysize_t keysize, uint64_t key[]);
+void crypto_set_key(enum crypto_keysize keysize, uint64_t key[]);
 void crypto_set_iv(uint64_t iv[]);
-void crypto_set_datatype(crypto_datatype_t datatype);
-void crypto_set_algorithm(crypto_mode_t mode);
+void crypto_set_datatype(enum crypto_datatype datatype);
+void crypto_set_algorithm(enum crypto_mode mode);
 void crypto_start(void);
 void crypto_stop(void);
 uint32_t crypto_process_block(uint32_t *inp, uint32_t *outp, uint32_t length);
diff --git a/include/libopencm3/stm32/f4/crypto.h b/include/libopencm3/stm32/f4/crypto.h
index 15554d14..3e758171 100644
--- a/include/libopencm3/stm32/f4/crypto.h
+++ b/include/libopencm3/stm32/f4/crypto.h
@@ -78,19 +78,19 @@
  */
 /**@{*/
 
-typedef enum {
+enum crypto_mode_mac {
 	ENCRYPT_GCM = CRYP_CR_ALGOMODE_TDES_ECB | CRYP_CR_ALGOMODE3,
 	ENCRYPT_CCM = CRYP_CR_ALGOMODE_TDES_CBC | CRYP_CR_ALGOMODE3,
 	DECRYPT_GCM = CRYP_CR_ALGOMODE_TDES_ECB | CRYP_CR_ALGOMODE3 |
 		      CRYP_CR_ALGODIR,
 	DECRYPT_CCM = CRYP_CR_ALGOMODE_TDES_CBC | CRYP_CR_ALGOMODE3 |
 		      CRYP_CR_ALGODIR,
-} crypto_mode_mac_t;
+};
 
 BEGIN_DECLS
 
 void crypto_context_swap(uint32_t *buf);
-void crypto_set_mac_algorithm(crypto_mode_mac_t mode);
+void crypto_set_mac_algorithm(enum crypto_mode_mac mode);
 
 END_DECLS
 /**@}*/
diff --git a/lib/stm32/common/crypto_common_f24.c b/lib/stm32/common/crypto_common_f24.c
index bfae72a6..46cef6bd 100644
--- a/lib/stm32/common/crypto_common_f24.c
+++ b/lib/stm32/common/crypto_common_f24.c
@@ -46,10 +46,10 @@ void crypto_wait_busy(void)
 
 /**
  * @brief Set key value to the controller
- * @param[in] keysize crypto_keysize_t Specified size of the key.
+ * @param[in] keysize enum crypto_keysize Specified size of the key.
  * @param[in] key uint64_t[] Key value (array of 4 items)
  */
-void crypto_set_key(crypto_keysize_t keysize, uint64_t key[])
+void crypto_set_key(enum crypto_keysize keysize, uint64_t key[])
 {
 	int i;
 
@@ -84,9 +84,9 @@ void crypto_set_iv(uint64_t iv[])
 /**
  * @brief Set the order of the data to be crypted
  *
- * @param[in] datatype crypto_datatype_t Specified datatype of the key.
+ * @param[in] datatype enum crypto_datatype Specified datatype of the key.
  */
-void crypto_set_datatype(crypto_datatype_t datatype)
+void crypto_set_datatype(enum crypto_datatype datatype)
 {
 	CRYP_CR = (CRYP_CR & ~CRYP_CR_DATATYPE) |
 		  (datatype << CRYP_CR_DATATYPE_SHIFT);
@@ -95,9 +95,9 @@ void crypto_set_datatype(crypto_datatype_t datatype)
 /**
  * @brief Set the algoritm for Encryption/decryption
  *
- *@param[in] mode crypto_mode_t Mode of execution
+ *@param[in] mode enum crypto_mode Mode of execution
  */
-void crypto_set_algorithm(crypto_mode_t mode)
+void crypto_set_algorithm(enum crypto_mode mode)
 {
 	mode &= ~CRYP_CR_ALGOMODE_MASK;
 
diff --git a/lib/stm32/f4/crypto.c b/lib/stm32/f4/crypto.c
index 6410e8fb..651f3659 100644
--- a/lib/stm32/f4/crypto.c
+++ b/lib/stm32/f4/crypto.c
@@ -36,9 +36,9 @@
 
 /** @brief Set the MAC algorithm
  */
-void crypto_set_mac_algorithm(crypto_mode_mac_t mode)
+void crypto_set_mac_algorithm(enum crypto_mode_mac mode)
 {
-	crypto_set_algorithm((crypto_mode_t) mode);
+	crypto_set_algorithm((enum crypto_mode) mode);
 }
 
 /**