Added uart_recv_char() to support RPC.

Moved hal_io_fmc.c to libhal repo.

4 files changed, 19 insertions, 219 deletions

diff --git a/Makefile b/Makefile
index bfd8a02..3324969 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ SELF-TESTS = fmc-test led-test short-test uart-test fmc-perf
 vpath %.c self-test
 
 # apps originally written for unix-like environment
-LIBHAL-TESTS = cores test-bus test-trng test-hash test-aes-key-wrap test-pbkdf2 test-ecdsa test-rsa
+LIBHAL-TESTS = cores test-bus test-trng test-hash test-aes-key-wrap test-pbkdf2 test-ecdsa test-rsa test-rpc_server
 vpath %.c libhal/tests libhal/utils
 
 # absolute path, because we're going to be passing -I cflags to sub-makes
@@ -90,8 +90,8 @@ $(STD_PERIPH_LIB)/libstmf4.a:
 thirdparty/libtfm/libtfm.a:
 	$(MAKE) -C thirdparty/libtfm PREFIX=$(PREFIX)
 
-libhal/libhal.a: hal_io_fmc.o thirdparty/libtfm/libtfm.a
-	$(MAKE) -C libhal IO_OBJ=../hal_io_fmc.o libhal.a
+libhal/libhal.a: thirdparty/libtfm/libtfm.a
+	$(MAKE) -C libhal IO_BUS=fmc RPC_SERVER=yes RPC_TRANSPORT=serial KS=volatile libhal.a
 
 self-test: $(SELF-TESTS:=.elf)
 
diff --git a/hal_io_fmc.c b/hal_io_fmc.c
deleted file mode 100644
index fde8775..0000000
--- a/hal_io_fmc.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * hal_io_fmc.c
- * ------------
- * This module contains common code to talk to the FPGA over the FMC bus.
- *
- * Author: Paul Selkirk
- * Copyright (c) 2014-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 <stdio.h>
-#include <stdint.h>
-
-#include "stm-fmc.h"
-#include "libhal/hal.h"
-#include "libhal/verilog_constants.h"
-
-static int debug = 0;
-static int inited = 0;
-
-#ifndef FMC_IO_TIMEOUT
-#define FMC_IO_TIMEOUT  100000000
-#endif
-
-/* not available in arm-none-eabi libc */
-#ifndef __ARMEB__   // Little endian
-static inline uint32_t htonl(uint32_t w)
-{
-  return
-    ((w & 0x000000ff) << 24) +
-    ((w & 0x0000ff00) << 8) +
-    ((w & 0x00ff0000) >> 8) +
-    ((w & 0xff000000) >> 24);
-}
-#else               // Big endian
-#define htonl(x) (x)
-#endif
-#define ntohl htonl
-
-static hal_error_t init(void)
-{
-  if (!inited) {
-    fmc_init();
-    inited = 1;
-  }
-  return HAL_OK;
-}
-
-/* Translate cryptech register number to FMC address.
- *
- * register number format:
- * 3 bits segment selector
- * 5 bits core selector (6 bits in native eim)
- * 8 bits register selector
- *
- * sss ccccc rrrrrrrr => sss 0 ccccc rrrrrrrr 00
- */
-static hal_addr_t fmc_offset(hal_addr_t offset)
-{
-  return ((offset & ~0x1fff) << 3) + ((offset & 0x1fff) << 2);
-}
-
-void hal_io_set_debug(int onoff)
-{
-  debug = onoff;
-}
-
-static void dump(char *label, const uint8_t *buf, size_t len)
-{
-  if (debug) {
-    size_t i;
-    printf("%s [", label);
-    for (i = 0; i < len; ++i)
-      printf(" %02x", buf[i]);
-    printf(" ]\n");
-  }
-}
-
-hal_error_t hal_io_write(const hal_core_t *core, hal_addr_t offset, const uint8_t *buf, size_t len)
-{
-  hal_error_t err;
-
-  if (core == NULL)
-    return HAL_ERROR_CORE_NOT_FOUND;
-
-  if (len % 4 != 0)
-    return HAL_ERROR_IO_BAD_COUNT;
-
-  if ((err = init()) != HAL_OK)
-    return err;
-
-  dump("write ", buf, len);
-
-  offset = fmc_offset(offset + hal_core_base(core));
-  for (; len > 0; offset += 4, buf += 4, len -= 4) {
-    uint32_t val;
-    val = htonl(*(uint32_t *)buf);
-    fmc_write_32(offset, &val);
-  }
-
-  return HAL_OK;
-}
-
-hal_error_t hal_io_read(const hal_core_t *core, hal_addr_t offset, uint8_t *buf, size_t len)
-{
-  uint8_t *rbuf = buf;
-  int rlen = len;
-  hal_error_t err;
-
-  if (core == NULL)
-    return HAL_ERROR_CORE_NOT_FOUND;
-
-  if (len % 4 != 0)
-    return HAL_ERROR_IO_BAD_COUNT;
-
-  if ((err = init()) != HAL_OK)
-    return err;
-
-  offset = fmc_offset(offset + hal_core_base(core));
-  for (; rlen > 0; offset += 4, rbuf += 4, rlen -= 4) {
-    uint32_t val;
-    fmc_read_32(offset, &val);
-    *(uint32_t *)rbuf = ntohl(val);
-  }
-
-  dump("read  ", buf, len);
-
-  return HAL_OK;
-}
-
-hal_error_t hal_io_init(const hal_core_t *core)
-{
-  uint8_t buf[4] = { 0, 0, 0, CTRL_INIT };
-  return hal_io_write(core, ADDR_CTRL, buf, sizeof(buf));
-}
-
-hal_error_t hal_io_next(const hal_core_t *core)
-{
-  uint8_t buf[4] = { 0, 0, 0, CTRL_NEXT };
-  return hal_io_write(core, ADDR_CTRL, buf, sizeof(buf));
-}
-
-hal_error_t hal_io_wait(const hal_core_t *core, uint8_t status, int *count)
-{
-  hal_error_t err;
-  uint8_t buf[4];
-  int i;
-
-  for (i = 1; ; ++i) {
-
-    if (count && (*count > 0) && (i >= *count))
-      return HAL_ERROR_IO_TIMEOUT;
-
-    if ((err = hal_io_read(core, ADDR_STATUS, buf, sizeof(buf))) != HAL_OK)
-      return err;
-
-    if ((buf[3] & status) != 0) {
-      if (count)
-        *count = i;
-      return HAL_OK;
-    }
-  }
-}
-
-hal_error_t hal_io_wait_ready(const hal_core_t *core)
-{
-  int limit = FMC_IO_TIMEOUT;
-  return hal_io_wait(core, STATUS_READY, &limit);
-}
-
-hal_error_t hal_io_wait_valid(const hal_core_t *core)
-{
-  int limit = FMC_IO_TIMEOUT;
-  return hal_io_wait(core, STATUS_VALID, &limit);
-}
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * c-basic-offset: 2
- * End:
- */
diff --git a/stm-uart.c b/stm-uart.c
index 602a59c..9934870 100644
--- a/stm-uart.c
+++ b/stm-uart.c
@@ -41,21 +41,27 @@
 UART_HandleTypeDef huart2;
 
 /* send a single character */
-void uart_send_char(uint8_t ch)
+HAL_StatusTypeDef uart_send_char(uint8_t ch)
 {
-  HAL_UART_Transmit(&huart2, &ch, 1, 0x1);
+    return HAL_UART_Transmit(&huart2, &ch, 1, 0x1);
+}
+
+/* receive a single character */
+HAL_StatusTypeDef uart_recv_char(uint8_t *cp)
+{
+    return HAL_UART_Receive(&huart2, cp, 1, 0x0);
 }
 
 /* send a string */
-void uart_send_string(char *s)
+HAL_StatusTypeDef uart_send_string(char *s)
 {
-  HAL_UART_Transmit(&huart2, (uint8_t *) s, strlen(s), 0x1);
+    return HAL_UART_Transmit(&huart2, (uint8_t *) s, strlen(s), 0x1);
 }
 
 /* Generalized routine to send binary, decimal, and hex integers.
  * This code is adapted from Chris Giese's printf.c
  */
-void uart_send_number(uint32_t num, uint8_t digits, uint8_t radix)
+HAL_StatusTypeDef uart_send_number(uint32_t num, uint8_t digits, uint8_t radix)
 {
     #define BUFSIZE 32
     char buf[BUFSIZE];
@@ -83,5 +89,5 @@ void uart_send_number(uint32_t num, uint8_t digits, uint8_t radix)
 	/* number is larger than the specified number of digits */
 	digits = buf + BUFSIZE - where;
 
-    HAL_UART_Transmit(&huart2, (uint8_t *) where, digits, 0x1);
+    return HAL_UART_Transmit(&huart2, (uint8_t *) where, digits, 0x1);
 }
diff --git a/stm-uart.h b/stm-uart.h
index 7019a48..67e9d75 100644
--- a/stm-uart.h
+++ b/stm-uart.h
@@ -39,9 +39,10 @@
 
 #define USART2_BAUD_RATE	115200
 
-extern void uart_send_char(uint8_t ch);
-extern void uart_send_string(char *s);
-extern void uart_send_number(uint32_t num, uint8_t digits, uint8_t radix);
+extern HAL_StatusTypeDef uart_send_char(uint8_t ch);
+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);
 #define uart_send_binary(num, bits)    uart_send_number(num, bits, 2)
 #define uart_send_integer(num, digits) uart_send_number(num, digits, 10)
 #define uart_send_hex(num, digits)     uart_send_number(num, digits, 16)