[Cryptech-Commits] [sw/libhal] 01/01: Merge branch 'ksng' into no-rtos

[git at cryptech.is]

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

sra at hactrn.net pushed a commit to branch no-rtos
in repository sw/libhal.

commit a76a684fbd33c2b90a33e9c12e7536149630d6b5
Merge: 18c297c 018b238
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Sun Apr 30 10:21:09 2017 -0400

    Merge branch 'ksng' into no-rtos

 cryptech_muxd               |  6 +++++-
 hal_internal.h              |  8 +++++++-
 ks_flash.c                  | 18 +++++++++++-------
 last_gasp_pin_internal.h    |  6 +++---
 mkm.c                       | 10 +++++++++-
 rpc_misc.c                  | 16 +++++++++++++---
 rpc_pkey.c                  | 21 ++++++++++++++++++---
 unit-tests.py               | 32 +++++++++++++++++++++++++-------
 utils/last_gasp_default_pin |  2 +-
 9 files changed, 92 insertions(+), 27 deletions(-)

diff --cc hal_internal.h
index 659cd27,36f24d4..3aadb48
--- a/hal_internal.h
+++ b/hal_internal.h
@@@ -97,12 -97,16 +97,17 @@@ extern void hal_critical_section_start(
  extern void hal_critical_section_end(void);
  extern void hal_ks_lock(void);
  extern void hal_ks_unlock(void);
 +extern void hal_task_yield(void);
  
  /*
-  * Logging.
+  * Thread sleep.  Currently used only for bad-PIN delays.
   */
  
+ extern void hal_sleep(const unsigned seconds);
+ 
+ /*
+  * Logging.
+  */
  
  typedef enum {
    HAL_LOG_DEBUG, HAL_LOG_INFO, HAL_LOG_WARN, HAL_LOG_ERROR, HAL_LOG_SILENT