[Cryptech-Commits] [sw/stm32] 06/11: Change enum stm_uart_port port to a typedef.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

paul at psgd.org pushed a commit to branch master
in repository sw/stm32.

commit 8238b28a1267330f2046e82244a8721e746c21a7
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Mon Jun 6 11:51:14 2016 -0400

    Change enum stm_uart_port port to a typedef.
---
 stm-uart.c | 16 ++++++++--------
 stm-uart.h | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/stm-uart.c b/stm-uart.c
index 59bbbe6..7911d44 100644
--- a/stm-uart.c
+++ b/stm-uart.c
@@ -46,7 +46,7 @@ DMA_HandleTypeDef hdma_usart_user_rx;
 #define DEFAULT_UART STM_UART_USER
 
 
-inline UART_HandleTypeDef *_which_uart(enum stm_uart_port port)
+inline UART_HandleTypeDef *_which_uart(stm_uart_port_t port)
 {
     if (port == STM_UART_USER) {
         return &huart_user;
@@ -63,7 +63,7 @@ HAL_StatusTypeDef uart_send_char(uint8_t ch)
     return uart_send_char2(DEFAULT_UART, ch);
 }
 
-HAL_StatusTypeDef uart_send_char2(enum stm_uart_port port, uint8_t ch)
+HAL_StatusTypeDef uart_send_char2(stm_uart_port_t port, uint8_t ch)
 {
     return uart_send_bytes(port, &ch, 1);
 }
@@ -75,7 +75,7 @@ HAL_StatusTypeDef uart_recv_char(uint8_t *cp)
 }
 
 /* receive a single character */
-HAL_StatusTypeDef uart_recv_char2(enum stm_uart_port port, uint8_t *cp, uint32_t timeout)
+HAL_StatusTypeDef uart_recv_char2(stm_uart_port_t port, uint8_t *cp, uint32_t timeout)
 {
     UART_HandleTypeDef *uart = _which_uart(port);
 
@@ -92,13 +92,13 @@ HAL_StatusTypeDef uart_send_string(char *s)
 }
 
 /* send a string */
-HAL_StatusTypeDef uart_send_string2(enum stm_uart_port port, const char *s)
+HAL_StatusTypeDef uart_send_string2(stm_uart_port_t port, const char *s)
 {
     return uart_send_bytes(port, (uint8_t *) s, strlen(s));
 }
 
 /* send raw bytes */
-HAL_StatusTypeDef uart_send_bytes(enum stm_uart_port port, uint8_t *buf, size_t len)
+HAL_StatusTypeDef uart_send_bytes(stm_uart_port_t port, uint8_t *buf, size_t len)
 {
     uint32_t timeout = 100;
     UART_HandleTypeDef *uart = _which_uart(port);
@@ -114,7 +114,7 @@ HAL_StatusTypeDef uart_send_bytes(enum stm_uart_port port, uint8_t *buf, size_t
 }
 
 /* receive raw bytes */
-HAL_StatusTypeDef uart_receive_bytes(enum stm_uart_port port, uint8_t *buf, size_t len, uint32_t timeout)
+HAL_StatusTypeDef uart_receive_bytes(stm_uart_port_t port, uint8_t *buf, size_t len, uint32_t timeout)
 {
     UART_HandleTypeDef *uart = _which_uart(port);
 
@@ -132,7 +132,7 @@ HAL_StatusTypeDef uart_send_number(uint32_t num, uint8_t digits, uint8_t radix)
     return uart_send_number2(DEFAULT_UART, num, digits, radix);
 }
 
-HAL_StatusTypeDef uart_send_number2(enum stm_uart_port port, uint32_t num, uint8_t digits, uint8_t radix)
+HAL_StatusTypeDef uart_send_number2(stm_uart_port_t port, uint32_t num, uint8_t digits, uint8_t radix)
 {
     #define BUFSIZE 32
     char buf[BUFSIZE];
@@ -163,7 +163,7 @@ HAL_StatusTypeDef uart_send_number2(enum stm_uart_port port, uint32_t num, uint8
     return uart_send_bytes(port, (uint8_t *) where, digits);
 }
 
-HAL_StatusTypeDef uart_send_hexdump(enum stm_uart_port port, const uint8_t *buf,
+HAL_StatusTypeDef uart_send_hexdump(stm_uart_port_t port, const uint8_t *buf,
 				    const uint8_t start_offset, const uint8_t end_offset)
 {
     uint32_t i;
diff --git a/stm-uart.h b/stm-uart.h
index db3a045..6133093 100644
--- a/stm-uart.h
+++ b/stm-uart.h
@@ -40,10 +40,10 @@
 #define USART_MGMT_BAUD_RATE	921600
 #define USART_USER_BAUD_RATE	921600
 
-enum stm_uart_port {
+typedef enum {
   STM_UART_USER,
   STM_UART_MGMT
-};
+} stm_uart_port_t;
 
 extern UART_HandleTypeDef huart_mgmt;
 extern UART_HandleTypeDef huart_user;
@@ -57,16 +57,16 @@ extern HAL_StatusTypeDef uart_recv_char(uint8_t *cp);
 extern HAL_StatusTypeDef uart_send_string(char *s);
 extern HAL_StatusTypeDef uart_send_number(uint32_t num, uint8_t digits, uint8_t radix);
 
-extern HAL_StatusTypeDef uart_send_char2(enum stm_uart_port port, uint8_t ch);
-extern HAL_StatusTypeDef uart_recv_char2(enum stm_uart_port port, uint8_t *cp, uint32_t timeout);
+extern HAL_StatusTypeDef uart_send_char2(stm_uart_port_t port, uint8_t ch);
+extern HAL_StatusTypeDef uart_recv_char2(stm_uart_port_t port, uint8_t *cp, uint32_t timeout);
 
-extern HAL_StatusTypeDef uart_send_string2(enum stm_uart_port port, const char *s);
-extern HAL_StatusTypeDef uart_send_number2(enum stm_uart_port port, uint32_t num, uint8_t digits, uint8_t radix);
+extern HAL_StatusTypeDef uart_send_string2(stm_uart_port_t port, const char *s);
+extern HAL_StatusTypeDef uart_send_number2(stm_uart_port_t port, uint32_t num, uint8_t digits, uint8_t radix);
 
-extern HAL_StatusTypeDef uart_send_bytes(enum stm_uart_port port, uint8_t *buf, size_t len);
-extern HAL_StatusTypeDef uart_receive_bytes(enum stm_uart_port port, uint8_t *buf, size_t len, uint32_t timeout);
+extern HAL_StatusTypeDef uart_send_bytes(stm_uart_port_t port, uint8_t *buf, size_t len);
+extern HAL_StatusTypeDef uart_receive_bytes(stm_uart_port_t port, uint8_t *buf, size_t len, uint32_t timeout);
 
-extern HAL_StatusTypeDef uart_send_hexdump(enum stm_uart_port port, const uint8_t *buf,
+extern HAL_StatusTypeDef uart_send_hexdump(stm_uart_port_t port, const uint8_t *buf,
 					   const uint8_t start_offset, const uint8_t end_offset);
 
 #define uart_send_binary(num, bits)    uart_send_number(num, bits, 2)