aboutsummaryrefslogtreecommitdiff
path: root/utils
AgeCommit message (Expand)Author
2016-06-26Merge branch 'master' of https://git.cryptech.is/sw/libhal.git.Rob Austein
2016-06-26Update libhal makefiles to use new LIBxxx_SRC / LIBxxx_BLD scheme so libhal c...Rob Austein
2016-06-25Dial back the last-gasp iterations to something sane.Paul Selkirk
2016-06-25Rename GNUmakefile to Makefile for consistency.Paul Selkirk
2016-06-24Support VPATH builds.Rob Austein
2016-06-01Make the makefile hopefully a little more readable/maintainable.Paul Selkirk
2016-05-26correct BPKDF2 -> PBKDF2 ;)Fredrik Thulin
2016-05-25Doh, helps if one actually **uses** the argument one just parsed.Rob Austein
2016-05-25PBKDF2 works better if we generate the right number of output bytes.Rob Austein
2016-05-25Start cleaning up PIN code.Rob Austein
2016-05-14Trailing whitespace cleanup.Rob Austein
2015-12-13Merge Paul's copyright updates.Rob Austein
2015-12-13whack copyrightsPaul Selkirk
2015-12-12Silence platform-dependent compiler whining: in general, when printf()Rob Austein
2015-11-14Catch up with other branch merges.Paul Selkirk
2015-11-12fix printf warnings, fix time_check calculationPaul Selkirk
2015-10-31add core probe utilityPaul Selkirk
2015-07-17Debian Jessie hangs with bs=128, Kosagi forum tells us that the magicRob Austein
2015-07-05Add load_novena_fpga script.Rob Austein
2015-07-05Use C99 variadic macro as safety wrapper around variadic function.Rob Austein
2015-07-05NULL-terminate string list, doh.Rob Austein
2015-07-05Get rid of autoconf, as we don't really need it. Add eim_peek_pokeRob Austein
pre>adb5eef
533898d

8238b28
8a492ac
9915d1b
8a492ac

533898d


adb5eef
4c6b056

8a492ac
8238b28
8a492ac
db5b207




8a492ac


4c6b056
533898d
4c6b056
adb5eef
db5b207


8238b28
db5b207
9915d1b
db5b207


8238b28
db5b207
9915d1b
db5b207

9915d1b



db5b207
9915d1b
db5b207

4c6b056

9b73356
8238b28
9b73356








4c6b056


533898d
4c6b056
adb5eef
db5b207

8238b28
db5b207
4c6b056

























9915d1b
4c6b056
4c1eff0
8238b28
4c1eff0



















5e32bc5

4c1eff0
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194






































                                                                           




                                            
 
                                                    
 




                                                       
 
                                                            

                                
                           
                                       
                           




                
                             
                                            
 
                                             

 
                                                                   
 
                                         

 


                                             
                                                            

 
                                
                                                                                      
 




                                                      


                     
                   
                                           
 
                                              


                   
                                                                        
 
                                                           


                    
                                                                                 
 
                           

                                                 



                                                                                  
                                                                             
     

                     

 
                       
                                                                                                      








                                                                                


                                                                 
                                                                               
 
                                                               

 
                                                                                                      
 

























                                                                               
                                                            
 
 
                                                                             



















                                                                                         

                  
 
/*
 * stm-uart.c
 * ----------
 * Functions for sending strings and numbers over the uart.
 *
 * Copyright (c) 2015, NORDUnet A/S All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 * - Redistributions of source code must retain the above copyright notice,
 *   this list of conditions and the following disclaimer.
 *
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * - Neither the name of the NORDUnet nor the names of its contributors may
 *   be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "stm32f4xx_hal.h"
#include "stm-uart.h"

#include <string.h>

UART_HandleTypeDef huart_mgmt;  /* USART1 */
UART_HandleTypeDef huart_user;  /* USART2 */

DMA_HandleTypeDef hdma_usart_mgmt_rx;
DMA_HandleTypeDef hdma_usart_user_rx;

static stm_uart_port_t default_uart = STM_UART_USER;

void uart_set_default(stm_uart_port_t port)
{
    if (port == STM_UART_USER || port == STM_UART_MGMT)
        default_uart = port;
}

inline UART_HandleTypeDef *_which_uart(stm_uart_port_t port)
{
    if (port == STM_UART_USER) {
        return &huart_user;
    } else if (port == STM_UART_MGMT) {
        return &huart_mgmt;
    }

    return NULL;
}

/* send a single character */
HAL_StatusTypeDef uart_send_char(uint8_t ch)
{
    return uart_send_char2(default_uart, ch);
}

HAL_StatusTypeDef uart_send_char2(stm_uart_port_t port, uint8_t ch)
{
    return uart_send_bytes(port, &ch, 1);
}

/* receive a single character */
HAL_StatusTypeDef uart_recv_char(uint8_t *cp)
{
    return uart_recv_char2(default_uart, cp, HAL_MAX_DELAY);
}

/* receive a single character */
HAL_StatusTypeDef uart_recv_char2(stm_uart_port_t port, uint8_t *cp, uint32_t timeout)
{
    UART_HandleTypeDef *uart = _which_uart(port);

    if (uart)
        return HAL_UART_Receive(uart, cp, 1, timeout);

    return HAL_ERROR;
}

/* send a string */
HAL_StatusTypeDef uart_send_string(char *s)
{
    return uart_send_string2(default_uart, s);
}

/* send a string */
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(stm_uart_port_t port, uint8_t *buf, size_t len)
{
    uint32_t timeout = 100;
    UART_HandleTypeDef *uart = _which_uart(port);

    if (uart) {
	while (HAL_UART_GetState(uart) != HAL_UART_STATE_READY && timeout--) { ; }
	if (! timeout) return HAL_ERROR;

        return HAL_UART_Transmit(uart, (uint8_t *) buf, (uint32_t) len, 0x1);
    }

    return HAL_ERROR;
}

/* receive raw bytes */
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);

    if (uart)
        return HAL_UART_Receive(uart, (uint8_t *) buf, (uint32_t) len, timeout);

    return HAL_ERROR;
}

/* Generalized routine to send binary, decimal, and hex integers.
 * This code is adapted from Chris Giese's printf.c
 */
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(stm_uart_port_t port, uint32_t num, uint8_t digits, uint8_t radix)
{
    #define BUFSIZE 32
    char buf[BUFSIZE];
    char *where = buf + BUFSIZE;

    /* initialize buf so we can add leading 0 by adjusting the pointer */
    memset(buf, '0', BUFSIZE);

    /* build the string backwards, starting with the least significant digit */
    do {
	uint32_t temp;
	temp = num % radix;
	where--;
	if (temp < 10)
	    *where = temp + '0';
	else
	    *where = temp - 10 + 'A';
	num = num / radix;
    } while (num != 0);

    if (where > buf + BUFSIZE - digits)
	/* pad with leading 0 */
	where = buf + BUFSIZE - digits;
    else
	/* number is larger than the specified number of digits */
	digits = buf + BUFSIZE - where;

    return uart_send_bytes(port, (uint8_t *) where, digits);
}

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;

    uart_send_string2(port, "00 -- ");

    for (i = 0; i <= end_offset; i++) {
	if (i && (! (i % 16))) {
	    uart_send_string2(port, "\r\n");

	    if (i != end_offset) {
		/* Output new offset unless the last byte is reached */
		uart_send_number2(port, i, 2, 16);
		uart_send_string2(port, " -- ");
	    }
	}

	uart_send_number2(port, *(buf + i), 2, 16);
	uart_send_string2(port, " ");
    }

    return HAL_OK;
}