From 365e7d7efac23072c6b30545aba1b965d4f700f3 Mon Sep 17 00:00:00 2001
From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com>
Date: Mon, 24 May 2021 13:35:50 -0400
Subject: [PATCH] IC:2021-05-25, Combine cfe and osal

Combines:

- cfe v6.8.0-rc1+dev593 (nasa/cfe#1568)
- osal v5.1.0-rc1+dev458 (nasa/osal#1050)

Includes:

- nasa/cfe#1524, add printf format casts
- nasa/cfe#1520, accept "NULL" as entry point
- nasa/cfe #1549, add capability to generate multiple tables
- nasa/cfe#1551, fixes discrepancies (return type, parameter names, etc) between function protoypes and implementation. Updates stubs accordingly

- nasa/osal#1026, Add count sem timeout test
- nasa/osal#1026, defer cancellation when BSP locked
---
 cfe  | 2 +-
 osal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfe b/cfe
index 8443a46db..176e3df03 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit 8443a46db34bc2a19cb6b601c117840d686932e3
+Subproject commit 176e3df03f54f7753cb34beb3e986202604d6cef
diff --git a/osal b/osal
index 1d183e9a0..677605094 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit 1d183e9a079036ff0c91f36eab9c1f29a69547f2
+Subproject commit 677605094498564928f1ce334a1571e30bc9171c