From f5cbba5b3b5c684ff86c7f9083aac79738e7103f Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Wed, 26 Feb 2020 13:58:46 -0500 Subject: Remove init checks from hal_io_[write|read], since initialization is done in stm_init, and the checks add unneccesary delays to critical code paths. --- hal_io_fmc.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/hal_io_fmc.c b/hal_io_fmc.c index c8d92ec..25decd6 100644 --- a/hal_io_fmc.c +++ b/hal_io_fmc.c @@ -5,6 +5,8 @@ * * Author: Paul Selkirk * Copyright (c) 2014-2016, NORDUnet A/S All rights reserved. + * Copyright: 2020, The Commons Conservancy Cryptech Project + * SPDX-License-Identifier: BSD-3-Clause * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -16,9 +18,9 @@ * 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. + * - Neither the name of the copyright holder 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 @@ -53,8 +55,6 @@ #define HAL_IO_FMC_DEBUG 0 #endif -static int inited = 0; - #if HAL_IO_FMC_DEBUG static int debug = 0; @@ -115,11 +115,6 @@ hal_error_t hal_io_write(const hal_core_t *core, hal_addr_t offset, const uint8_ if (len % 4 != 0) return HAL_ERROR_IO_BAD_COUNT; - if (!inited) { - fmc_init(); - inited = 1; - } - dump("write ", offset + hal_core_base(core), buf, len); offset = fmc_offset(offset + hal_core_base(core)); @@ -136,11 +131,6 @@ hal_error_t hal_io_read(const hal_core_t *core, hal_addr_t offset, uint8_t *buf, if (len % 4 != 0) return HAL_ERROR_IO_BAD_COUNT; - if (!inited) { - fmc_init(); - inited = 1; - } - dump("read ", offset + hal_core_base(core), buf, len); offset = fmc_offset(offset + hal_core_base(core)); -- cgit v1.2.3