message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
os/svcall: Fix TZ context handling issue
TZ context is freed but not updated in the task tcb. This will lead
to reuse of old freed context. So, we set the tz_context in tcb to
NULL. | @@ -568,6 +568,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg)
case SYS_free_securecontext: {
/* Free the secure context. */
TZ_FreeModuleContext_S(rtcb->tz_context);
+ rtcb->tz_context = NULL;
}
break;
#endif
|
chat-js: fix unread indicators on small screens
fixes | @@ -302,7 +302,7 @@ export class ChatScreen extends Component {
<>
{messageElem}
<div key={'unreads'+ msg.uid} ref={this.setUnreadMarker} className="mv2 green2 flex items-center f9">
- <hr className="ma0 w2 b--green2 bt-0" />
+ <hr className="dn-s ma0 w2 b--green2 bt-0" />
<p className="mh4">
New messages below
</p>
|
Fix atomic_win32.h for VS2015
VS2015 issues this:
atomic_win32.h(32): error: expected a ")"
atomic_win32.h(32): error: expected an identifier
atomic_win32.h(32): error: expected a ";" | @@ -29,7 +29,7 @@ namespace __atomic {
template <typename _Tp> _Tp __create();
template <typename _Tp, typename _Td>
-enable_if_t<sizeof(_Tp() = __create<_Td>()), char>
+enable_if_t<sizeof(__create<_Tp>() = __create<_Td>()), char>
__test_atomic_assignable(int);
template <typename _Tp, typename _Up>
__two __test_atomic_assignable(...);
|
HW: Fixing direct access mode | @@ -1180,7 +1180,7 @@ BEGIN
mmj_c_o.exploration_done <= exploration_done_q;
mmj_c_o.max_sat <= to_integer(unsigned(snap_regs_q(SNAP_STATUS_REG)(SNAP_STAT_MAX_SAT_L DOWNTO SNAP_STAT_MAX_SAT_R)));
mmj_c_o.last_seqno <= '1' WHEN context_seqno_hw_dout(CTX_SEQNO_CURRENT_INT_L DOWNTO CTX_SEQNO_CURRENT_INT_R) = context_seqno_hw_dout(CTX_SEQNO_LAST_INT_L DOWNTO CTX_SEQNO_LAST_INT_R)
- ELSE '0';
+ ELSE context_config_hw_dout(CTX_CFG_DIRECT_MODE_INT);
mmj_c_o.action_reset_vector <= action_reset_vector_q;
mmj_c_o.action_ack <= xmm_d_i.ack AND NOT xmm_mmio_ack_q;
|
admin/lmod: test explicitly calling out lua variant for Leap 15 | @@ -42,8 +42,9 @@ BuildRequires: procps-ng
Requires: lua-filesystem
Requires: lua-posix
%else
-BuildRequires: lua-luafilesystem
-BuildRequires: lua-luaposix
+# SUSE Leap
+BuildRequires: lua53-luafilesystem
+BuildRequires: lua53-luaposix
%endif
BuildRequires: rsync
|
[platone][tests]changed tcase_platone.h file | #include "check.h"
#include "boatlog.h"
#include "boatiotsdk.h"
-#include "boatiotsdk.h"
+#include "protocolapi/api_platone.h"
+
+extern char g_platone_private_key_buf[1024];
+extern BoatKeypairPriKeyCtx_config g_keypair_config;
+extern BoatPlatoneNetworkConfig g_platone_network_config;
+extern BUINT8 g_binFormatKey[32];
-extern BOAT_RESULT platone_createKeypair(BCHAR * keypairName, BBOOL is_onetime, BUINT8* keypairIndex_ptr);
-extern BOAT_RESULT platone_createNetwork(BBOOL is_onetime, BUINT8* networkIndex);
-extern BoatPlatoneWallet *platone_get_wallet_ptr();
+Suite *make_keypair_suite(void);
+Suite *make_network_suite(void);
+Suite *make_wallet_suite(void);
+Suite *make_parameters_suite(void);
+Suite *make_chainAndContract_suite(void);
#endif
\ No newline at end of file
|
[OpenGL] custom font file | #include "cpu.h"
#include "mesa/util/macros.h"
#include "mesa/util/os_time.h"
+#include "file_utils.h"
#include <chrono>
#include <iomanip>
@@ -104,12 +105,17 @@ void imgui_create(void *ctx)
if (!font_size)
font_size = 24;
+ if (!params.font_file.empty() && file_exists(params.font_file)) {
+ state.font = io.Fonts->AddFontFromFileTTF(params.font_file.c_str(), font_size);
+ state.font1 = io.Fonts->AddFontFromFileTTF(params.font_file.c_str(), font_size * 0.55f);
+ } else {
ImFontConfig font_cfg = ImFontConfig();
const char* ttf_compressed_base85 = GetDefaultCompressedFontDataTTFBase85();
const ImWchar* glyph_ranges = io.Fonts->GetGlyphRangesDefault();
state.font = io.Fonts->AddFontFromMemoryCompressedBase85TTF(ttf_compressed_base85, font_size, &font_cfg, glyph_ranges);
state.font1 = io.Fonts->AddFontFromMemoryCompressedBase85TTF(ttf_compressed_base85, font_size * 0.55, &font_cfg, glyph_ranges);
+ }
sw_stats.font1 = state.font1;
engineName = "OpenGL";
}
|
put title and id in collections updates | ^- {tar/name:hall msg/cord}
::TODO
::
+ :: put post id and title in post message
+ =/ lin %- crip
+ ;: weld
+ (scow %da top)
+ "|"
+ %- trip
+ =< tit.info
+ %- need
+ (ta-get-topic col top)
+ ==
:: this can't be the best way to switch on top v com?
?~ com
- [(circle-for col) 'TODO']
- [(circle-for-topic col top) 'TODO']
+ [(circle-for col) lin]
+ [(circle-for-topic col top) lin]
--
::
++ hall-permit
|
[mod_webdav] clean up resources after do{}while(0) | @@ -4949,12 +4949,12 @@ mod_webdav_lock (connection * const con, const plugin_config * const pconf)
}
}
+ do { /*(resources are cleaned up after code block)*/
+
if (NULL == lockdata.lockscope || NULL == lockdata.locktype) {
/*(missing lockscope and locktype in lock request)*/
http_status_set_error(con, 422); /* Unprocessable Entity */
- xmlFree(lockdata.ownerinfo.ptr);
- xmlFreeDoc(xml);
- return HANDLER_FINISHED;
+ break; /* clean up resources and return HANDLER_FINISHED */
}
/* check lock prior to potentially creating new resource,
@@ -4969,9 +4969,7 @@ mod_webdav_lock (connection * const con, const plugin_config * const pconf)
/* 423 Locked */
webdav_xml_doc_error_no_conflicting_lock(con, cbdata.b);
buffer_free(cbdata.b);
- xmlFree(lockdata.ownerinfo.ptr);
- xmlFreeDoc(xml);
- return HANDLER_FINISHED;
+ break; /* clean up resources and return HANDLER_FINISHED */
}
buffer_free(cbdata.b);
@@ -5014,18 +5012,15 @@ mod_webdav_lock (connection * const con, const plugin_config * const pconf)
}
else if (errno != EEXIST) {
http_status_set_error(con, 403); /* Forbidden */
- xmlFree(lockdata.ownerinfo.ptr);
- xmlFreeDoc(xml);
- return HANDLER_FINISHED;
+ break; /* clean up resources and return HANDLER_FINISHED */
}
lockdata.depth = 0; /* force Depth: 0 on non-collections */
}
else if (S_ISDIR(st.st_mode)) {
if (con->physical.path->ptr[con->physical.path->used - 2] != '/') {
+ /* 308 Permanent Redirect */
http_response_redirect_to_directory(pconf->srv, con, 308);
- xmlFree(lockdata.ownerinfo.ptr); /* 308 Permanent Redirect */
- xmlFreeDoc(xml);
- return HANDLER_FINISHED;
+ break; /* clean up resources and return HANDLER_FINISHED */
/* Alternatively, could append '/' to con->physical.path
* and con->physical.rel_path, set Content-Location in
* response headers, and continue to serve the request */
@@ -5033,9 +5028,7 @@ mod_webdav_lock (connection * const con, const plugin_config * const pconf)
}
else if (con->physical.path->ptr[con->physical.path->used - 2] == '/') {
http_status_set_error(con, 403); /* Forbidden */
- xmlFree(lockdata.ownerinfo.ptr);
- xmlFreeDoc(xml);
- return HANDLER_FINISHED;
+ break; /* clean up resources and return HANDLER_FINISHED */
}
else if (0 != lockdata.depth)
lockdata.depth = 0; /* force Depth: 0 on non-collections */
@@ -5064,6 +5057,8 @@ mod_webdav_lock (connection * const con, const plugin_config * const pconf)
else /*(database error obtaining lock)*/
http_status_set_error(con, 500); /* Internal Server Error */
+ } while (0); /*(resources are cleaned up after code block)*/
+
xmlFree(lockdata.ownerinfo.ptr);
xmlFreeDoc(xml);
return HANDLER_FINISHED;
|
Reset the module to the function on import end | @@ -1101,6 +1101,9 @@ static InterpretResult run(VM *vm) {
} else {
setcurrentFile(vm, "", 0);
}
+
+ vm->lastModule = frame->closure->function->module;
+
DISPATCH();
}
|
Provide 'config.rfconnected' and 'config.fwversion' for easier debugging. | @@ -591,7 +591,6 @@ void DeRestPluginPrivate::configToMap(const ApiRequest &req, QVariantMap &map)
if (req.apiVersion() == ApiVersion_1_DDEL)
{
- map["rfconnected"] = gwRfConnected;
map["permitjoin"] = (double)gwPermitJoinDuration;
map["permitjoinfull"] = (double)gwPermitJoinResend;
map["otauactive"] = isOtauActive();
@@ -599,7 +598,6 @@ void DeRestPluginPrivate::configToMap(const ApiRequest &req, QVariantMap &map)
map["groupdelay"] = (double)gwGroupSendDelay;
map["discovery"] = (gwAnnounceInterval > 0);
map["updatechannel"] = gwUpdateChannel;
- map["fwversion"] = gwFirmwareVersion;
map["fwneedupdate"] = gwFirmwareNeedUpdate;
if (gwFirmwareNeedUpdate)
{
@@ -706,6 +704,8 @@ void DeRestPluginPrivate::configToMap(const ApiRequest &req, QVariantMap &map)
swupdate2["lastinstall"] = "";
map["swupdate2"] = swupdate2;
+ map["fwversion"] = gwFirmwareVersion;
+ map["rfconnected"] = gwRfConnected;
map["name"] = gwName;
map["uuid"] = gwUuid;
if (apsCtrl)
|
Fix bug with wrong read after write in STM32 I2C | @@ -302,6 +302,11 @@ HRESULT Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice::NativeTransmit
// get the size of the buffer by reading the number of elements in the CLR_RT_HeapBlock_Array
palI2c->WriteSize = writeBuffer->m_numOfElements;
}
+ else
+ {
+ // nothing to write, have to zero this
+ palI2c->WriteSize = 0;
+ }
readBuffer = stack.Arg2().DereferenceArray();
if (readBuffer != NULL)
@@ -309,6 +314,11 @@ HRESULT Library_win_dev_i2c_native_Windows_Devices_I2c_I2cDevice::NativeTransmit
// get the size of the buffer by reading the number of elements in the CLR_RT_HeapBlock_Array
palI2c->ReadSize = readBuffer->m_numOfElements;
}
+ else
+ {
+ // nothing to read, have to zero this
+ palI2c->ReadSize = 0;
+ }
// check if this is a long running operation
isLongRunningOperation = IsLongRunningOperation(palI2c->WriteSize, palI2c->ReadSize, palI2c->ByteTime, (int&)estimatedDurationMiliseconds);
|
[core] fix regex condition subst w/ mod_extforward (fixes
x-ref:
"1.4.40 regression: regexp subst vars mangled by config-glue condition caching" | @@ -603,8 +603,17 @@ static void config_cond_clear_node(server *srv, connection *con, data_config *dc
if (con->cond_cache[dc->context_ndx].result != COND_RESULT_UNSET) {
size_t i;
+ #if 0
+ /* (redundant; matches not relevant unless COND_RESULT_TRUE) */
+ switch (con->cond_cache[dc->context_ndx].local_result) {
+ case COND_RESULT_TRUE:
+ case COND_RESULT_FALSE:
+ break;
+ default:
con->cond_cache[dc->context_ndx].patterncount = 0;
con->cond_cache[dc->context_ndx].comp_value = NULL;
+ }
+ #endif
con->cond_cache[dc->context_ndx].result = COND_RESULT_UNSET;
for (i = 0; i < dc->children.used; ++i) {
|
Add dummy versions of new SSL functions for non-SSL builds
This rectifies an oversight in commit which caused certain
builds to fail, especially on Windows. | @@ -432,6 +432,24 @@ PQsslAttributeNames(PGconn *conn)
return result;
}
+
+PQsslKeyPassHook_type
+PQgetSSLKeyPassHook(void)
+{
+ return NULL;
+}
+
+void
+PQsetSSLKeyPassHook(PQsslKeyPassHook_type hook)
+{
+ return;
+}
+
+int
+PQdefaultSSLKeyPassHook(char *buf, int size, PGconn *conn)
+{
+ return 0;
+}
#endif /* USE_SSL */
/* Dummy version of GSSAPI information functions, when built without GSS support */
|
extmod/Matrix: return 1x1 matrix as scalar | @@ -515,6 +515,11 @@ STATIC mp_obj_t robotics_Matrix__mul(mp_obj_t lhs_obj, mp_obj_t rhs_obj) {
}
}
+ // If the result is a 1x1, return as scalar.
+ if (ret->m == 1 && ret->n == 1) {
+ return mp_obj_new_float_from_f(ret->data[0] * ret->scale);
+ }
+
return MP_OBJ_FROM_PTR(ret);
}
|
[fabric][tests]add walletDeInit tests | @@ -522,6 +522,9 @@ START_TEST(test_003CreateWallet_0001CreateOneTimeWalletSuccess)
ck_assert_int_eq(memcmp(g_fabric_wallet_ptr->account_info.prikeyCtx.pubkey_content, pubkey256R1, sizeof(pubkey256R1)), 0);
rtnVal = fabric_checkNetworkData(g_fabric_wallet_ptr->network_info, networkConfig, 0);
+
+ BoatHlfabricWalletDeInit(g_fabric_wallet_ptr);
+ ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
/* free configuration struct */
fabricWalletConfigFree(networkConfig);
/* check result */
@@ -545,6 +548,9 @@ START_TEST(test_003CreateWallet_0002CreateOneTimeWalletFailureWithoutKeypair)
g_fabric_wallet_ptr = BoatHlfabricWalletInit(keypairIndex, networkIndex);
ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+ BoatHlfabricWalletDeInit(g_fabric_wallet_ptr);
+ ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+
/* free configuration struct */
fabricWalletConfigFree(networkConfig);
BoatIotSdkDeInit();
@@ -564,6 +570,10 @@ START_TEST(test_003CreateWallet_0003CreateOneTimeWalletFailureWithoutNetwork)
g_fabric_wallet_ptr = BoatHlfabricWalletInit(keypairIndex, networkIndex);
ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+
+ BoatHlfabricWalletDeInit(g_fabric_wallet_ptr);
+ ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+
BoatIotSdkDeInit();
}
END_TEST
@@ -602,6 +612,13 @@ START_TEST(test_003CreateWallet_0004CreatePersistWalletSuccess)
fabricWalletConfigFree(networkConfig);
/* check result */
ck_assert_int_eq(rtnVal, BOAT_SUCCESS);
+
+ BoatHlfabricWalletDeInit(g_fabric_wallet_ptr);
+ ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+
+ BoatHlfabricWalletDeInit(g_fabric_wallet_ptr);
+ ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+
/* delete this network*/
BoATHlfabricNetworkDelete(1);
BoATIotKeypairDelete(1);
@@ -624,6 +641,9 @@ START_TEST(test_003CreateWallet_0005CreatePersistWalletFailureWithoutKeypair)
g_fabric_wallet_ptr = BoatHlfabricWalletInit(keypairIndex, networkIndex);
ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+ BoatHlfabricWalletDeInit(g_fabric_wallet_ptr);
+ ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+
/* free configuration struct */
fabricWalletConfigFree(networkConfig);
BoATHlfabricNetworkDelete(1);
@@ -644,6 +664,9 @@ START_TEST(test_003CreateWallet_0006CreatePersistWalletFailureWithoutNetwork)
g_fabric_wallet_ptr = BoatHlfabricWalletInit(keypairIndex, networkIndex);
ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+ BoatHlfabricWalletDeInit(g_fabric_wallet_ptr);
+ ck_assert_ptr_eq(g_fabric_wallet_ptr, NULL);
+
BoATIotKeypairDelete(1);
BoatIotSdkDeInit();
}
|
Don't run if DAG root. | @@ -134,6 +134,11 @@ void cjoin_task_cb() {
// don't run if not synch
if (ieee154e_isSynch() == FALSE) return;
+ // don't run if DAG root
+ if (idmanager_getIsDAGroot() == TRUE) {
+ return;
+ }
+
// don't run if no route to DAG root
if (icmpv6rpl_getPreferredParentIndex(&temp) == FALSE) {
return;
@@ -144,16 +149,9 @@ void cjoin_task_cb() {
}
*/
- // don't run on dagroot
- if (idmanager_getIsDAGroot()) {
- opentimers_stop(cjoin_vars.timerId);
- return;
- }
+ opentimers_stop(cjoin_vars.startupTimerId);
cjoin_sendPut(NUMBER_OF_EXCHANGES-1);
- openserial_printError(COMPONENT_IEEE802154E,ERR_MAXRXACKPREPARE_OVERFLOWS,
- (errorparameter_t)ieee154e_vars.state,
- (errorparameter_t)NUMBER_OF_EXCHANGES-1);
return;
}
|
Replace printf with print | @@ -42,7 +42,7 @@ try:
if git_branch.index('develop') >= 0:
version = "latest-develop"
except Exception:
- printf("Exception for index check")
+ print("Exception for index check")
# For debugging purpose
print("GIT BRANCH: " + git_branch)
|
examples: encoder_ctrl comment update | * Create a simple GUI to demonstrate how to control it with an encoder
* using 'lv_group'.
*
+ * Be sure in lv_conf.h:
+ * - LV_OBJ_GROUP 1 to enable groups
+ * - LV_APP_ENABLE 0 to disable applications because they might bother now
+ *
* lv_group:
* - you can create groups and add object to them
* - it can be a focused object within a group
@@ -265,7 +269,7 @@ static lv_action_res_t mbox_no_action(lv_obj_t * btn, lv_dispi_t * dispi)
}
/**
- * Called when the Encoder emulator Next button is released
+ * Called when the Encoder emulator's Next button is released
* @param btn pointer to the button
* @param dispi pointer to the caller display input
* @return LV_ACTION_RES_OK: because the button is not deleted
@@ -279,7 +283,7 @@ static lv_action_res_t enc_next(lv_obj_t * btn, lv_dispi_t * dispi)
}
/**
- * Called when the Encoder emulator Increment button is released
+ * Called when the Encoder emulator's Increment button is released
* @param btn pointer to the button
* @param dispi pointer to the caller display input
* @return LV_ACTION_RES_OK: because the button is not deleted
@@ -293,7 +297,7 @@ static lv_action_res_t enc_inc(lv_obj_t * btn, lv_dispi_t * dispi)
}
/**
- * Called when the Encoder emulator Increment button is released
+ * Called when the Encoder emulator's Increment button is released
* @param btn pointer to the button
* @param dispi pointer to the caller display input
* @return LV_ACTION_RES_OK: because the button is not deleted
@@ -307,7 +311,7 @@ static lv_action_res_t enc_dec(lv_obj_t * btn, lv_dispi_t * dispi)
return LV_ACTION_RES_OK;
}
/**
- * Called when the Encoder emulator Send button is released
+ * Called when the Encoder emulator's Send button is released
* @param btn pointer to the button
* @param dispi pointer to the caller display input
* @return LV_ACTION_RES_OK: because the button is not deleted
|
MPLS: cannot delete a path from the CLI | @@ -428,7 +428,7 @@ vnet_mpls_local_label (vlib_main_t * vm,
}
else
{
- fib_node_index_t lfe, fib_index;
+ fib_node_index_t fib_index;
u32 fi;
if (NULL == rpaths)
@@ -469,6 +469,17 @@ vnet_mpls_local_label (vlib_main_t * vm,
goto done;
}
+ if (is_del)
+ {
+ fib_table_entry_path_remove2(fib_index,
+ &pfx,
+ FIB_SOURCE_CLI,
+ rpaths);
+ }
+ else
+ {
+ fib_node_index_t lfe;
+
lfe = fib_table_entry_path_add2(fib_index,
&pfx,
FIB_SOURCE_CLI,
@@ -484,6 +495,7 @@ vnet_mpls_local_label (vlib_main_t * vm,
goto done;
}
}
+ }
done:
unformat_free (line_input);
|
QLOGvis relative time support has been fixed so we can use it now | @@ -594,7 +594,6 @@ int qlog_connection_start(uint64_t time, const picoquic_connection_id_t * cid, i
svg_context_t * ctx = (svg_context_t*)ptr;
FILE * f = ctx->f_txtlog;
- ctx->start_time = 0; // appctx->log_time;
ctx->packet_count = 0;
fprintf(f, "{ \"qlog_version\": \"draft-00\", \"title\": \"picoquic\", \"traces\": [\n");
@@ -635,7 +634,7 @@ int convert_qlog(const picoquic_connection_id_t* cid, void* ptr)
qlog.f_txtlog = open_outfile(cid_name, appctx->binlog_name, appctx->out_dir, "qlog");
qlog.f_template = appctx->f_template;
qlog.cid_name = cid_name;
- qlog.start_time = 0; // appctx->log_time;
+ qlog.start_time = appctx->log_time;
qlog.packet_count = 0;
qlog.state = 0;
|
For provided ciphers, EVP_CIPHER_CTX_ctrl() with EVP_CTRL_INIT always returns 1
This control command should never be used with provided methods, but
since this is publically available, someone might still make the
mistake. We make sure it returns 1 so as not to be overly
disruptive. | @@ -1089,8 +1089,16 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
ptr, sz);
break;
+ case EVP_CTRL_INIT:
+ /*
+ * TODO(3.0) EVP_CTRL_INIT is purely legacy, no provider counterpart
+ * As a matter of fact, this should be dead code, but some caller
+ * might still do a direct control call with this command, so...
+ * Legacy methods return 1 except for exceptional circumstances, so
+ * we do the same here to not be disruptive.
+ */
+ return 1;
case EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS: /* Used by DASYNC */
- case EVP_CTRL_INIT: /* TODO(3.0) Purely legacy, no provider counterpart */
default:
goto end;
case EVP_CTRL_GET_IV:
|
Hexcolor Plugin: Implement rgb -> rgba expansion | *
*/
-#include <stdlib.h>
#include "hexcolor.h"
#include <kdberrors.h>
#include <kdbhelper.h>
#include <kdbtypes.h>
#include <regex.h>
+#include <stdlib.h>
typedef enum
{
@@ -44,7 +44,8 @@ static HexVariant is_valid_key (Key * key, Key * parentKey)
}
int len = strlen (value);
- switch(len) {
+ switch (len)
+ {
case 4:
return HEX_THREE;
case 5:
@@ -64,18 +65,33 @@ static void elektraColorSetInteger (Key * key, kdb_unsigned_long_t c)
keySetBinary (key, colorBytes, 4);
}
-static char * elektraColorExpandShortVariants(const char * str, HexVariant hexVar) {
- int strLength = strlen(str);
- int expandedLength = (hexVar == HEX_THREE) ? 8 : 10;
- char * expandedStr = (char*) elektraMalloc(expandedLength);
+static char * elektraColorExpand (const char * str, HexVariant hexVar)
+{
+ // Expand #abcd to #aabbccdd or #abc to #aabbccff
+ char * expandedStr = (char *) elektraMalloc (10);
+
+ if (hexVar == HEX_THREE || hexVar == HEX_FOUR)
+ {
expandedStr[0] = '#';
- for(int i = 1; i < strLength; i++) {
+ for (size_t i = 1; i < strlen (str); i++)
+ {
expandedStr[2 * i - 1] = str[i];
expandedStr[2 * i] = str[i];
}
+ }
+ else
+ {
+ strcpy (expandedStr, str);
+ }
+
+ if (hexVar == HEX_THREE || hexVar == HEX_SIX)
+ {
+ expandedStr[7] = 'f';
+ expandedStr[8] = 'f';
+ }
- expandedStr[expandedLength - 1] = '\0';
+ expandedStr[9] = '\0';
return expandedStr;
}
@@ -86,12 +102,15 @@ static void elektraColorNormalizeHexString (Key * key, HexVariant hexVar)
keySetMeta (key, "origvalue", str);
kdb_unsigned_long_t color;
- if(hexVar == HEX_THREE || hexVar == HEX_FOUR) {
- char * expandedStr = elektraColorExpandShortVariants(str, hexVar);
+ if (hexVar != HEX_EIGHT)
+ {
+ char * expandedStr = elektraColorExpand (str, hexVar);
ELEKTRA_LOG_DEBUG ("Expanded %s to %s", str, expandedStr);
color = ELEKTRA_UNSIGNED_LONG_LONG_S (expandedStr + 1, NULL, 16);
elektraFree (expandedStr);
- } else {
+ }
+ else
+ {
color = ELEKTRA_UNSIGNED_LONG_LONG_S (str + 1, NULL, 16);
}
elektraColorSetInteger (key, color);
@@ -134,7 +153,8 @@ int elektraHexcolorGet (Plugin * handle ELEKTRA_UNUSED, KeySet * returned, Key *
elektraColorNormalizeHexString (cur, hexVar);
}
- return ELEKTRA_PLUGIN_STATUS_SUCCESS;;
+ return ELEKTRA_PLUGIN_STATUS_SUCCESS;
+ ;
}
int elektraHexcolorSet (Plugin * handle ELEKTRA_UNUSED, KeySet * returned ELEKTRA_UNUSED, Key * parentKey ELEKTRA_UNUSED)
|
Bump version for 16.0-2 dev. | @@ -19,7 +19,7 @@ ROCM_VERSION=${ROCM_VERSION:-5.0.0}
# Set the AOMP VERSION STRING
AOMP_VERSION=${AOMP_VERSION:-"16.0"}
-AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"1"}
+AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"2"}
AOMP_VERSION_STRING=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"}
export AOMP_VERSION_STRING AOMP_VERSION AOMP_VERSION_MOD ROCM_VERSION
|
Put entire bucket_agg hashtable in executor-level memory context | @@ -314,12 +314,13 @@ bucket_agg_startup(FunctionCallInfo fcinfo)
Oid type = AggGetInitialArgType(fcinfo);
HASHCTL hctl;
+ old = MemoryContextSwitchTo(fcinfo->flinfo->fn_mcxt);
+
MemSet(&hctl, 0, sizeof(hctl));
hctl.hcxt = CurrentMemoryContext;
hctl.keysize = sizeof(uint64);
hctl.entrysize = sizeof(SetElement);
- old = MemoryContextSwitchTo(fcinfo->flinfo->fn_mcxt);
state = palloc0(sizeof(BucketAggState));
state->num_buckets = 0;
|
Apparently there isn't a default CLA | @@ -101,6 +101,6 @@ These are the features that have been requested so far. Even if any of them are
## License
-The project requires that all the code is licensed under the MIT license. Please refrain from using or offering code that required a change to the licensing scheme.
+The project requires that all the code is licensed under the MIT license. Please refrain from using or offering code that requires a change to the licensing scheme.
-I have no idea what Github's terms of service dictate in regards to PRs, but I'm sure it's reasonable and that it should apply.
+I understand GitHub doesn't offer a default CLA (Copyright and Licensing Agreement), so I should clarify: the resulting code uses the MIT license, listing me (and only me) as the author. I will list contributors in the CHANGELOG and special contributions will be listed in the README and/or here.
|
board/delbin/board.c: Format with clang-format
BRANCH=none
TEST=none | @@ -314,23 +314,22 @@ static void ps8815_reset(int port)
}
gpio_set_level(ps8xxx_rst_odl, 0);
- msleep(GENERIC_MAX(PS8XXX_RESET_DELAY_MS,
- PS8815_PWR_H_RST_H_DELAY_MS));
+ msleep(GENERIC_MAX(PS8XXX_RESET_DELAY_MS, PS8815_PWR_H_RST_H_DELAY_MS));
gpio_set_level(ps8xxx_rst_odl, 1);
msleep(PS8815_FW_INIT_DELAY_MS);
CPRINTS("[C%d] %s: patching ps8815 registers", port, __func__);
- if (i2c_read8(i2c_port,
- PS8XXX_I2C_ADDR1_P2_FLAGS, 0x0f, &val) == EC_SUCCESS)
+ if (i2c_read8(i2c_port, PS8XXX_I2C_ADDR1_P2_FLAGS, 0x0f, &val) ==
+ EC_SUCCESS)
CPRINTS("ps8815: reg 0x0f was %02x", val);
- if (i2c_write8(i2c_port,
- PS8XXX_I2C_ADDR1_P2_FLAGS, 0x0f, 0x31) == EC_SUCCESS)
+ if (i2c_write8(i2c_port, PS8XXX_I2C_ADDR1_P2_FLAGS, 0x0f, 0x31) ==
+ EC_SUCCESS)
CPRINTS("ps8815: reg 0x0f set to 0x31");
- if (i2c_read8(i2c_port,
- PS8XXX_I2C_ADDR1_P2_FLAGS, 0x0f, &val) == EC_SUCCESS)
+ if (i2c_read8(i2c_port, PS8XXX_I2C_ADDR1_P2_FLAGS, 0x0f, &val) ==
+ EC_SUCCESS)
CPRINTS("ps8815: reg 0x0f now %02x", val);
}
@@ -393,8 +392,8 @@ static const struct ec_response_keybd_config delbin_kb = {
.capabilities = KEYBD_CAP_SCRNLOCK_KEY | KEYBD_CAP_NUMERIC_KEYPAD,
};
-__override const struct ec_response_keybd_config
-*board_vivaldi_keybd_config(void)
+__override const struct ec_response_keybd_config *
+board_vivaldi_keybd_config(void)
{
return &delbin_kb;
}
|
parser xml BUGFIX minor fixes | @@ -1033,12 +1033,13 @@ lydxml_env_netconf_eventtime_validate(const struct lyd_node *node)
const struct lys_module *mod;
LY_ARRAY_COUNT_TYPE u;
struct ly_err_item *err = NULL;
- struct lysp_type *type_p;
+ struct lysp_type *type_p = NULL;
struct lysc_pattern **patterns = NULL;
const char *value;
/* get date-and-time parsed type */
mod = ly_ctx_get_module_latest(ctx, "ietf-yang-types");
+ assert(mod);
LY_ARRAY_FOR(mod->parsed->typedefs, u) {
if (!strcmp(mod->parsed->typedefs[u].name, "date-and-time")) {
type_p = &mod->parsed->typedefs[u].type;
|
Enable fused core mode support in OPAL
Previous commit
added check for fused core mode and bailed out.
The check can be removed since fused core mode
is now supported in OPAL. | @@ -1284,10 +1284,6 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt)
/* Install the OPAL Console handlers */
init_opal_console();
- if(is_fused_core(mfspr(SPR_PVR))) {
- prerror("CPU: Detected unsupported fused core mode\n");
- abort();
- }
/*
* Some platforms set a flag to wait for SBE validation to be
* performed by the BMC. If this occurs it leaves the SBE in a
|
Add variance penalty to late observations | @@ -498,23 +498,32 @@ void survive_kalman_tracker_integrate_observation(PoserData *pd, SurviveKalmanTr
tracker->model.t = time;
}
+ FLT R[] = {tracker->obs_pos_var, tracker->obs_pos_var, tracker->obs_pos_var, tracker->obs_rot_var,
+ tracker->obs_rot_var, tracker->obs_rot_var, tracker->obs_rot_var};
+ if (oR) {
+ addnd(R, R, oR, 7);
+ }
+
if (time - tracker->model.t < 0) {
if (time - tracker->model.t > -.1) {
- // time = tracker->model.t;
+ FLT tdiff = tracker->model.t - time;
+
+ // Scale up the covariance
+ FLT pS = 10, rS = 1;
+ FLT Raug[] = {pS * tdiff, pS * tdiff, pS * tdiff, rS * tdiff, rS * tdiff, rS * tdiff, rS * tdiff};
+ addnd(R, R, Raug, 7);
+
+ time = tracker->model.t;
} else {
// SV_WARN("Processing light data from the past %fs", time - tracker->model.t );
tracker->stats.late_light_dropped++;
return;
}
}
+
tracker->last_light_time = time;
if (tracker->obs_pos_var >= 0 && tracker->obs_rot_var >= 0) {
- FLT R[] = {tracker->obs_pos_var, tracker->obs_pos_var, tracker->obs_pos_var, tracker->obs_rot_var,
- tracker->obs_rot_var, tracker->obs_rot_var, tracker->obs_rot_var};
- if (oR) {
- addnd(R, R, oR, 7);
- }
tracker->stats.obs_total_error += integrate_pose(tracker, time, pose, tracker->adaptive_obs ? 0 : R);
tracker->stats.obs_count++;
|
Extend build.yml with cache layer for libunwind | @@ -275,6 +275,15 @@ jobs:
key: ${{ runner.os }}-${{ steps.env.outputs.arch }}-musl-${{ hashFiles('contrib/Makefile', 'contrib/musl/**') }}
upload-chunk-size: 1000000
+ # Cache the libunwind build. Use a key based on a hash of all the files
+ # used in the build.
+ - name: Setup libunwind Cache
+ uses: actions/[email protected]
+ with:
+ path: contrib/build/libunwind
+ key: ${{ runner.os }}-${{ steps.env.outputs.arch }}-libunwind-${{ hashFiles('contrib/Makefile', 'contrib/libunwind/**') }}
+ upload-chunk-size: 1000000
+
- name: Login to Dockerhub
uses: docker/login-action@v2
with:
|
nvhw/xf: Fix LT rcp function. | @@ -877,8 +877,8 @@ uint32_t pgraph_celsius_lt_rcp(uint32_t x) {
abort();
fx += 0x800000;
fx >>= 10;
- uint64_t s0 = pgraph_celsius_xf_rcp_lut[x >> 7 & 0x3f];
- uint64_t s1 = ((1u << 21) - s0 * x) * s0 >> 14;
+ uint64_t s0 = pgraph_celsius_xf_rcp_lut[fx >> 7 & 0x3f];
+ uint64_t s1 = ((1u << 21) - s0 * fx) * s0 >> 14;
s1 <<= 11;
s1 -= 0x800000;
if (s1 >= 0x800000)
|
jna: error code test fix | @@ -13,15 +13,10 @@ public class ErrorCodeTest {
private Key parentKey = Key.create("user/tests/javabinding");
private final String errorMeta = "trigger/error";
private final String warningMeta = "trigger/warnings";
- private NativeElektraPlugin errorPlugin;
-
- @Before
- public void setup(){
- errorPlugin = new NativeElektraPlugin("error", parentKey);
- }
@Test(expected = OutOfMemoryException.class)
public void kdbSetWithError_shouldMapOutOfMemoryError() throws Exception {
+ NativeElektraPlugin errorPlugin = new NativeElektraPlugin("error", parentKey);
Key errorKey = Key.create("user/tests/myError");
errorKey.setMeta(errorMeta, OutOfMemoryException.errorCode());
final KeySet ks = KeySet.create(10, KeySet.KS_END);
@@ -31,6 +26,7 @@ public class ErrorCodeTest {
@Test
public void kdbSetWithWarning_shouldNotTriggerException() throws Exception {
+ NativeElektraPlugin errorPlugin = new NativeElektraPlugin("error", parentKey);
Key warningKey = Key.create("user/tests/myError");
warningKey.setMeta(warningMeta, ResourceException.errorCode());
final KeySet ks = KeySet.create(10, KeySet.KS_END);
@@ -40,6 +36,7 @@ public class ErrorCodeTest {
@Test
public void kdbSetWithWarningAndError_shouldHaveWarnings() {
+ NativeElektraPlugin errorPlugin = new NativeElektraPlugin("error", parentKey);
Key warningKey = Key.create("user/tests/myError");
warningKey.setMeta(warningMeta, SemanticValidationException.errorCode());
Key errorKey = Key.create("user/tests/myError2");
|
story: |story-set: better error message on missing desk | ::
=/ our p.bec
=? desk =(*^desk desk) q.bec :: use current desk if user didn't provide
+?: !(~(has in .^((set ^desk) %cd /(scot %p our)/$/(scot %da now))) desk)
+ ~& >> "Error: desk {<desk>} does not exist."
+ helm-pass+[%d %noop ~]
=? cas =(*case cas) da+now :: use current commit if cas not provided
+
=/ tak .^(tako:clay %cs /(scot %p our)/[desk]/(scot cas)/tako/~)
=/ tale=story .^(story %cx /(scot %p our)/[desk]/(scot %da now)/story)
=. tale (~(put ju tale) tak prose)
|
Return OE_BUFFER_TOO_SMALL after initializing collateral as much as possible | @@ -158,6 +158,11 @@ oe_result_t oe_get_quote_verification_collateral_ocall(
oe_get_sgx_quote_verification_collateral_args_t args = {0};
bool buffer_too_small = false;
+ /* The value of any_buffer_too_small will be true if any buffer_too_small
+ * value becomes true. It is used to prevent terminating the collateral
+ * initialization process early. */
+ bool any_buffer_too_small = false;
+
/* fmspc */
memcpy(args.fmspc, fmspc, sizeof(args.fmspc));
@@ -175,8 +180,7 @@ oe_result_t oe_get_quote_verification_collateral_ocall(
args.tcb_info_size,
&buffer_too_small));
- if (buffer_too_small)
- OE_RAISE_NO_TRACE(OE_BUFFER_TOO_SMALL);
+ any_buffer_too_small |= buffer_too_small;
OE_CHECK(_copy_output_buffer(
tcb_info_issuer_chain,
@@ -186,8 +190,7 @@ oe_result_t oe_get_quote_verification_collateral_ocall(
args.tcb_info_issuer_chain_size,
&buffer_too_small));
- if (buffer_too_small)
- OE_RAISE_NO_TRACE(OE_BUFFER_TOO_SMALL);
+ any_buffer_too_small |= buffer_too_small;
OE_CHECK(_copy_output_buffer(
pck_crl,
@@ -197,8 +200,7 @@ oe_result_t oe_get_quote_verification_collateral_ocall(
args.pck_crl_size,
&buffer_too_small));
- if (buffer_too_small)
- OE_RAISE_NO_TRACE(OE_BUFFER_TOO_SMALL);
+ any_buffer_too_small |= buffer_too_small;
OE_CHECK(_copy_output_buffer(
root_ca_crl,
@@ -208,8 +210,7 @@ oe_result_t oe_get_quote_verification_collateral_ocall(
args.root_ca_crl_size,
&buffer_too_small));
- if (buffer_too_small)
- OE_RAISE_NO_TRACE(OE_BUFFER_TOO_SMALL);
+ any_buffer_too_small |= buffer_too_small;
OE_CHECK(_copy_output_buffer(
pck_crl_issuer_chain,
@@ -219,8 +220,7 @@ oe_result_t oe_get_quote_verification_collateral_ocall(
args.pck_crl_issuer_chain_size,
&buffer_too_small));
- if (buffer_too_small)
- OE_RAISE_NO_TRACE(OE_BUFFER_TOO_SMALL);
+ any_buffer_too_small |= buffer_too_small;
OE_CHECK(_copy_output_buffer(
qe_identity,
@@ -230,8 +230,7 @@ oe_result_t oe_get_quote_verification_collateral_ocall(
args.qe_identity_size,
&buffer_too_small));
- if (buffer_too_small)
- OE_RAISE_NO_TRACE(OE_BUFFER_TOO_SMALL);
+ any_buffer_too_small |= buffer_too_small;
OE_CHECK(_copy_output_buffer(
qe_identity_issuer_chain,
@@ -241,7 +240,9 @@ oe_result_t oe_get_quote_verification_collateral_ocall(
args.qe_identity_issuer_chain_size,
&buffer_too_small));
- if (buffer_too_small)
+ any_buffer_too_small |= buffer_too_small;
+
+ if (any_buffer_too_small)
OE_RAISE_NO_TRACE(OE_BUFFER_TOO_SMALL);
result = OE_OK;
|
try blas lib finder | @@ -166,10 +166,8 @@ cd src
--with-lapack-libs="mkl_core mkl_intel_lp64 mkl_sequential" \
--with-lapack-lib-dirs=$MKLROOT/intel64/lib \
%else
- --with-blas-libs=openblas \
- --with-blas-lib-dirs=$OPENBLAS_LIB \
- --with-lapack-libs=openblas \
- --with-lapack-lib-dirs=$OPENBLAS_LIB \
+ --with-blas \
+ --with-lapack \
%endif
--with-mli \
--with-fei \
|
Fix ALIGNED keyword and grow alignment to 64B | @@ -375,8 +375,8 @@ void kvz_quant_flat_avx2(const encoder_state_t * const state, coeff_t *coef, coe
if (!encoder->cfg.signhide_enable || ac_sum < 2)
return;
- coeff_t coef_reord[LCU_WIDTH * LCU_WIDTH >> 2] ALIGNED(32);
- coeff_t q_coef_reord[LCU_WIDTH * LCU_WIDTH >> 2] ALIGNED(32);
+ ALIGNED(64) coeff_t coef_reord[LCU_WIDTH * LCU_WIDTH >> 2];
+ ALIGNED(64) coeff_t q_coef_reord[LCU_WIDTH * LCU_WIDTH >> 2];
// Reorder coef and q_coef for sequential access
for (int32_t n = 0; n < width * height; n++) {
|
mapkit sdk 4 ios | @@ -54,7 +54,13 @@ ELSEIF (OS_DARWIN)
)
ELSEIF (OS_IOS)
# protobuf 2.6.1
+ IF (HOST_OS_LINUX)
DECLARE_EXTERNAL_RESOURCE(MAPKIT_SDK sbr:666724415)
+ ELSEIF (HOST_OS_DARWIN)
+ DECLARE_EXTERNAL_RESOURCE(MAPKIT_SDK sbr:731932280)
+ ELSE()
+ MESSAGE(FATAL_ERROR Unsupported platform)
+ ENDIF()
CFLAGS(
GLOBAL "-I$MAPKIT_SDK_RESOURCE_GLOBAL/mapkit_sdk/include"
)
|
examples/nxhello/nxhello_main.c: Fix trivial typo in printf statement. | @@ -228,7 +228,7 @@ int nxhello_main(int argc, char *argv[])
ret = nx_requestbkgd(g_nxhello.hnx, &g_nxhellocb, NULL);
if (ret < 0)
{
- printf("nxhello_main: nx_setbgcolor failed: %d\n", errno);
+ printf("nxhello_main: nx_requestbkgd() failed: %d\n", errno);
g_nxhello.code = NXEXIT_NXREQUESTBKGD;
goto errout_with_nx;
}
|
arch/Kconfig: Remove unused configuration, CONFIG_FLASH_VSTART
Remove unused configuration, CONFIG_FLASH_VSTART because we don't support MMU now. | @@ -848,18 +848,6 @@ config RAM_DDR_SIZE
If the board uses external DDR RAM memory, you need to define
the size of DDR RAM
-
-if BOOT_RUNFROMFLASH && ARCH_USE_MMU
-
-config FLASH_VSTART
- hex "Boot FLASH start address (virtual)"
- default 0x0
- ---help---
- The virtual start address of installed boot FLASH. "Boot" FLASH
- refers to the FLASH that you link program code into.
-
-endif # BOOT_RUNFROMFLASH && ARCH_USE_MMU
-
config ARCH_HAVE_SDRAM
bool
default n
|
Fix udp multicast test when no exernal interfaces are available
Fixes | @@ -179,7 +179,7 @@ return require('lib/tap')(function (test)
assert(uv.udp_bind(server, bind_addr, TEST_PORT))
local _, err, errname = uv.udp_set_membership(server, multicast_addr, interface_addr, "join")
if errname == "ENODEV" then
- print("no ipv6 multicast route, skipping")
+ print("no multicast route, skipping")
server:close()
return
elseif errname == "EADDRNOTAVAIL" and multicast_addr == "ff02::1" then
@@ -240,14 +240,18 @@ return require('lib/tap')(function (test)
end
end
- test("udp multicast join ipv4", multicast_join_test("0.0.0.0", "239.255.0.1", nil))
-
- test("udp multicast join ipv6", function(print, p, expect, uv)
- local function can_ipv6_external()
+ -- TODO This might be overkill, but the multicast
+ -- tests seem to rely on external interfaces being
+ -- available on some platforms. So, we use this to skip
+ -- the tests when there are no relevant exernal interfaces
+ -- available. Note: The Libuv multicast join test does use this
+ -- same check for skipping the ipv6 test; we just expanded it to
+ -- the ipv4 test as well.
+ local function has_external_interface(uv, family)
local addresses = assert(uv.interface_addresses())
for _, vals in pairs(addresses) do
for _, info in ipairs(vals) do
- if info.family == "inet6" and not info.internal then
+ if (not family or info.family == family) and not info.internal then
return true
end
end
@@ -255,11 +259,20 @@ return require('lib/tap')(function (test)
return false
end
- if not can_ipv6_external() then
- print("no ipv6 support, skipping")
+ test("udp multicast join ipv4", function(print, p, expect, uv)
+ if not has_external_interface(uv, "inet") then
+ print("no external ipv4 interface, skipping")
return
end
+ local testfn = multicast_join_test("0.0.0.0", "239.255.0.1", nil)
+ return testfn(print, p, expect, uv)
+ end)
+ test("udp multicast join ipv6", function(print, p, expect, uv)
+ if not has_external_interface(uv, "inet6") then
+ print("no external ipv6 interface, skipping")
+ return
+ end
local testfn = multicast_join_test("::", "ff02::1", nil)
return testfn(print, p, expect, uv)
end)
|
BugID:16851775: Add a new interface declaration - hal_flash_addr2offset | @@ -153,5 +153,15 @@ int32_t hal_flash_enable_secure(hal_partition_t partition, uint32_t off_set, uin
*/
int32_t hal_flash_dis_secure(hal_partition_t partition, uint32_t off_set, uint32_t size);
+/**
+ * Convert physical address to logic partition id and offset in partition
+ *
+ * @param[out] in_partition Point to the logic partition id
+ * @param[out] off_set Point to the offset in logic partition
+ * @param[in] addr The physical address
+ *
+ * @return 0 : On success, EIO : If an error occurred with any step
+ */
+int32_t hal_flash_addr2offset(hal_partition_t *in_partition, uint32_t *off_set, uint32_t addr);
#endif /* HAL_FLASH_H */
|
ci: If there is no sdkconfig, we have to generate one | @@ -121,12 +121,15 @@ build_template_app:
- $BOT_LABEL_BUILD
- $BOT_LABEL_REGULAR_TEST
script:
- - git clone https://github.com/espressif/esp-idf-template.git
+ # Set the variable for 'esp-idf-template' testing
+ - ESP_IDF_TEMPLATE_GIT=${ESP_IDF_TEMPLATE_GIT:-"https://github.com/espressif/esp-idf-template.git"}
+ - git clone ${ESP_IDF_TEMPLATE_GIT}
- cd esp-idf-template
# Try to use the same branch name for esp-idf-template that we're
# using on esp-idf. If it doesn't exist then just stick to the default
# branch
- python $CHECKOUT_REF_SCRIPT esp-idf-template
+ - make defconfig
# Test debug build (default)
- make all V=1
# Now test release build
|
test: Add flash_write_protect to default tests
BRANCH=none
TEST=make BOARD=krane -j tests | # found in the LICENSE file.
# Device test binaries
-test-list-y ?= pingpong timer_calib timer_dos timer_jump mutex utils utils_str
+test-list-y ?= flash_write_protect pingpong timer_calib timer_dos timer_jump mutex utils utils_str
#disable: powerdemo
# Emulator tests
|
fix(keys): Replace GUI with Application / Context Menu
This was a misrepresentation in the standardized keys that originated in earlier code. | /* Keyboard Pipe */
#define PIPE2 (LS(HID_USAGE_KEY_KEYBOARD_NON_US_BACKSLASH_AND_PIPE))
-/* Keyboard GUI (Windows / Command / Meta) */
-#define GUI (HID_USAGE_KEY_KEYBOARD_APPLICATION)
-#define WIN (GUI)
-#define COMMAND (GUI)
-#define CMD (GUI)
-#define META (GUI)
+/* Keyboard Application (Context Menu) */
+#define K_APPLICATION (HID_USAGE_KEY_KEYBOARD_APPLICATION)
+#define K_APP (K_APPLICATION)
+#define K_CONTEXT_MENU (K_APPLICATION)
+#define K_CMENU (K_APPLICATION)
+#define GUI (K_APPLICATION) // WARNING: DEPRECATED (DO NOT USE)
/* Keyboard Power */
#define K_POWER (HID_USAGE_KEY_KEYBOARD_POWER)
|
Specify ismin/ismax assembly kernels for POWER8 directly
to fix utest failure in new ismin test - Makefile.L1 defaults look wrong | @@ -88,7 +88,10 @@ ZTRSMKERNEL_RT = ../generic/trsm_kernel_RT.c
#
#SMINKERNEL = ../arm/min.c
#DMINKERNEL = ../arm/min.c
-#
+
+ISMINKERNEL = imin.S
+ISMAXKERNEL = imax.S
+
ifneq ($(__BYTE_ORDER__),"__ORDER_BIG_ENDIAN__")
ifneq ($(GCCVERSIONGTEQ9),1)
ISAMAXKERNEL = isamax_power8.S
|
xml parser BUGFIX skip elements for non-strict parsing | @@ -487,12 +487,19 @@ lydxml_data_r(struct lyd_xml_ctx *lydctx, struct lyd_node_inner *parent, struct
goto cleanup;
}
mod = ly_ctx_get_module_implemented_ns(ctx, ns->uri);
- if (!mod && (lydctx->options & LYD_OPT_STRICT)) {
- LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_REFERENCE, "No module with namespace \"%s\" in the context.", ns->uri);
+ if (!mod) {
+ if (lydctx->options & LYD_OPT_STRICT) {
+ LOGVAL(ctx, LY_VLOG_LINE, &xmlctx->line, LYVE_REFERENCE, "No module with namespace \"%s\" in the context.",
+ ns->uri);
ret = LY_EVALID;
goto cleanup;
}
+ /* skip element with children */
+ LY_CHECK_GOTO(ret = lydxml_data_skip(xmlctx), cleanup);
+ continue;
+ }
+
/* parser next */
LY_CHECK_GOTO(ret = lyxml_ctx_next(xmlctx), cleanup);
|
Add missing if clause
to not build float16 code if the datatype is disabled | @@ -119,6 +119,7 @@ target_sources(CMSISDSPTransform PRIVATE arm_rfft_fast_f64.c)
target_sources(CMSISDSPTransform PRIVATE arm_rfft_fast_init_f64.c)
endif()
+if ((NOT DISABLEFLOAT16))
if (NOT CONFIGTABLE OR ALLFFT OR RFFT_FAST_F16_32 OR RFFT_FAST_F16_64 OR RFFT_FAST_F16_128
OR RFFT_FAST_F16_256 OR RFFT_FAST_F16_512 OR RFFT_FAST_F16_1024 OR RFFT_FAST_F16_2048
OR RFFT_FAST_F16_4096 )
@@ -128,6 +129,7 @@ target_sources(CMSISDSPTransform PRIVATE arm_cfft_f16.c)
target_sources(CMSISDSPTransform PRIVATE arm_cfft_init_f16.c)
target_sources(CMSISDSPTransform PRIVATE arm_cfft_radix8_f16.c)
endif()
+endif()
if (NOT CONFIGTABLE OR ALLFFT OR RFFT_F32_128 OR RFFT_F32_512 OR RFFT_F32_2048 OR RFFT_F32_8192)
target_sources(CMSISDSPTransform PRIVATE arm_rfft_init_f32.c)
|
experiment with using non-c++ atomics on msvc | @@ -17,7 +17,7 @@ terms of the MIT license. A copy of the license can be found in the file
// instead of passing the memory order as a parameter.
// -----------------------------------------------------------------------------------------------
-#if defined(__cplusplus)
+#if defined(__cplusplus) && !defined(_MSC_VER)
// Use C++ atomics
#include <atomic>
#define _Atomic(tp) std::atomic<tp>
@@ -71,7 +71,7 @@ static inline intptr_t mi_atomic_addi(_Atomic(intptr_t)* p, intptr_t add);
static inline intptr_t mi_atomic_subi(_Atomic(intptr_t)* p, intptr_t sub);
-#if defined(__cplusplus) || !defined(_MSC_VER)
+#if (!defined(_MSC_VER)) // defined(__cplusplus) || !defined(_MSC_VER)
// In C++/C11 atomics we have polymorphic atomics so can use the typed `ptr` variants (where `tp` is the type of atomic value)
// We use these macros so we can provide a typed wrapper in MSVC in C compilation mode as well
@@ -193,7 +193,7 @@ static inline void mi_atomic_store_explicit(_Atomic(uintptr_t)* p, uintptr_t x,
// These are used by the statistics
static inline int64_t mi_atomic_addi64_relaxed(volatile _Atomic(int64_t)* p, int64_t add) {
#ifdef _WIN64
- return (int64_t)mi_atomic_addi((int64_t*)p,add);
+ return (int64_t)mi_atomic_addi((_Atomic(intptr_t)*)p,add);
#else
int64_t current;
int64_t sum;
@@ -208,7 +208,7 @@ static inline void mi_atomic_maxi64_relaxed(volatile _Atomic(int64_t)*p, int64_t
int64_t current;
do {
current = *p;
- } while (current < x && _InterlockedCompareExchange64(p, x, current) != current);
+ } while (current < x && _InterlockedCompareExchange64((int64_t*)p, x, current) != current);
}
// The pointer macros cast to `uintptr_t`.
@@ -222,6 +222,8 @@ static inline void mi_atomic_maxi64_relaxed(volatile _Atomic(int64_t)*p, int64_t
#define mi_atomic_exchange_ptr_release(tp,p,x) (tp*)mi_atomic_exchange_release((_Atomic(uintptr_t)*)(p),(uintptr_t)x)
#define mi_atomic_exchange_ptr_acq_rel(tp,p,x) (tp*)mi_atomic_exchange_acq_rel((_Atomic(uintptr_t)*)(p),(uintptr_t)x)
+#else
+#pragma message("define atomics for this platform (not C11, C++, msvc)")
#endif
|
mesh: Fix build error when LPN is not enabled
Some versions of gcc do not seem to compile out the inaccessible code
in this case and instead give the following error:
subsys/bluetooth/host/mesh/transport.c:419: undefined reference to
`bt_mesh_lpn_poll'
This happens at least when building samples/bluetooth/mesh for
native_posix on Fedora 28. | @@ -403,7 +403,8 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct os_mbuf *sdu,
}
}
- if (bt_mesh_lpn_established()) {
+ if (IS_ENABLED(CONFIG_BT_MESH_LOW_POWER) &&
+ bt_mesh_lpn_established()) {
bt_mesh_lpn_poll();
}
|
Modify FindOSMesa.cmake to install glapi and GLU libraries. | @@ -90,13 +90,10 @@ if (VISIT_OSMESA_DIR)
set(OSMESA_INCLUDE_DIR ${VISIT_OSMESA_DIR}/include CACHE PATH "OSMesa include path")
- find_library(GLAPI_LIBRARY glapi
- PATH ${VISIT_OSMESA_DIR}/lib
+ find_library(GLAPI_LIBRARY glapi PATH ${VISIT_OSMESA_DIR}/lib
NO_DEFAULT_PATH)
-
+ if (GLAPI_LIBRARY)
get_filename_component(GLAPI_LIB ${GLAPI_LIBRARY} NAME)
-
- # find the SOName
execute_process(COMMAND objdump -p ${GLAPI_LIBRARY}
COMMAND grep SONAME
RESULT_VARIABLE GLAPI_SONAME_RESULT
@@ -108,7 +105,36 @@ if (VISIT_OSMESA_DIR)
string(STRIP ${GLAPI_SONAME} GLAPI_SONAME)
set(GLAPI_LIBRARY ${VISIT_OSMESA_DIR}/lib/${GLAPI_SONAME})
endif()
+
+ execute_process(COMMAND ${CMAKE_COMMAND} -E copy
+ ${GLAPI_LIBRARY}
+ ${VISIT_BINARY_DIR}/lib/osmesa/)
+
list(APPEND OSMESA_LIBRARIES ${GLAPI_LIBRARY})
+ endif()
+
+ find_library(GLU_LIBRARY GLU PATH ${VISIT_OSMESA_DIR}/lib
+ NO_DEFAULT_PATH)
+ if (GLU_LIBRARY)
+ get_filename_component(GLU_LIB ${GLU_LIBRARY} NAME)
+ execute_process(COMMAND objdump -p ${GLU_LIBRARY}
+ COMMAND grep SONAME
+ RESULT_VARIABLE GLU_SONAME_RESULT
+ OUTPUT_VARIABLE GLU_SONAME
+ ERROR_VARIABLE GLU_SONAME_ERROR)
+
+ if(GLU_SONAME)
+ string(REPLACE "SONAME" "" GLU_SONAME ${GLU_SONAME})
+ string(STRIP ${GLU_SONAME} GLU_SONAME)
+ set(GLU_LIBRARY ${VISIT_OSMESA_DIR}/lib/${GLU_SONAME})
+ endif()
+
+ execute_process(COMMAND ${CMAKE_COMMAND} -E copy
+ ${GLU_LIBRARY}
+ ${VISIT_BINARY_DIR}/lib/osmesa/)
+
+ list(APPEND OSMESA_LIBRARIES ${GLU_LIBRARY})
+ endif()
# Check for OSMesa size limit --- IS THIS STILL NECESSARY?
set(MY_LIBS ${OSMESA_LIBRARIES})
|
fix typo in oidc_auth_checker | @@ -4138,7 +4138,7 @@ int oidc_auth_checker(request_rec *r) {
r->user = NULL;
if (oidc_dir_cfg_unauth_action(r) == OIDC_UNAUTH_PASS)
return OK;
- if if (oidc_request_state_get(r, OIDC_REQUEST_STATE_KEY_DISCOVERY) != NULL)
+ if (oidc_request_state_get(r, OIDC_REQUEST_STATE_KEY_DISCOVERY) != NULL)
return OK;
}
|
include/audio_codec.h: Format with clang-format
BRANCH=none
TEST=none | @@ -41,8 +41,8 @@ int audio_codec_capable(uint8_t cap);
* EC_ERROR_INVAL if invalid cap.
* EC_ERROR_BUSY if the shm_id has been registered.
*/
-int audio_codec_register_shm(uint8_t shm_id, uint8_t cap,
- uintptr_t *addr, uint32_t len, uint8_t type);
+int audio_codec_register_shm(uint8_t shm_id, uint8_t cap, uintptr_t *addr,
+ uint32_t len, uint8_t type);
/*
* Translates the physical address from AP to EC's memory space. Required if
@@ -63,7 +63,6 @@ int audio_codec_memmap_ap_to_ec(uintptr_t ap_addr, uintptr_t *ec_addr);
*/
int16_t audio_codec_s16_scale_and_clip(int16_t orig, uint8_t scalar);
-
/*
* DMIC abstract layer
*/
@@ -120,7 +119,6 @@ int audio_codec_dmic_set_gain_idx(uint8_t channel, uint8_t gain);
*/
int audio_codec_dmic_get_gain_idx(uint8_t channel, uint8_t *gain);
-
/*
* I2S RX abstract layer
*/
@@ -181,7 +179,6 @@ int audio_codec_i2s_rx_set_daifmt(uint8_t daifmt);
*/
int audio_codec_i2s_rx_set_bclk(uint32_t bclk);
-
/*
* WoV abstract layer
*/
|
Add SceDebugForDriver functions | @@ -129,6 +129,69 @@ int ksceKernelGetMinimumAssertionLevel(void);
*/
int ksceKernelSetMinimumAssertionLevel(int level);
+// process
+typedef struct SceKernelDebugEventLog1 { // size is 0x1C
+ int data_0x40;
+ SceUID pid;
+ int budget_type;
+ int data_0x4C; //!< 0xA
+ char titleid[0xC];
+} __attribute__((packed)) SceKernelDebugEventLog1;
+
+// Related to network
+typedef struct SceKernelDebugEventLog2 { // size is 0x4
+ int data_0x40; //!< 0 or 0x80412118?
+} __attribute__((packed)) SceKernelDebugEventLog2;
+
+// Related to network
+typedef struct SceKernelDebugEventLog3 { // size is 0x54
+ int data_0x40; //!< 0?
+ char ip1[0x10];
+ char ip2[0x10];
+ char ip3[0x10];
+ char ip4[0x10];
+ char ip5[0x10];
+} __attribute__((packed)) SceKernelDebugEventLog3;
+
+typedef struct SceKernelDebugEventLog {
+ SceSize size; //!< struct size(variable size)
+ int data_0x04; //!< 0xA, maybe titleid size
+ char titleid[0xC]; //!< Title id of the process where the event occurred
+ int flags; //!< Event flags
+ SceUID ppid; //!< Parent process id
+ SceUID data_0x1C; //!< Thread id?
+ int rsvd[4];
+ SceUInt64 time; //!< Time of the event occurred
+ int data_0x38;
+ SceSize item_size; //!< Event data size
+ union {
+ SceKernelDebugEventLog1 type1;
+ SceKernelDebugEventLog2 type2;
+ SceKernelDebugEventLog3 type3;
+ };
+} __attribute__((packed)) SceKernelDebugEventLog;
+
+/**
+ * @brief Get event log info
+ *
+ * @param[out] buf - The SceKernelDebugEventLog buffer list
+ * @param[in] buf_size - The buf size
+ * @param[out] read_blocks - The read event log number
+ *
+ * @return < 0 on error.
+ */
+int ksceEventLogGetInfo(void *buf, SceSize buf_size, SceSize *read_blocks);
+
+/**
+ * @brief Get tty log info
+ *
+ * @param[out] buf - The tty log buffer
+ * @param[in] buf_size - The buf size
+ *
+ * @return log length on success, < 0 on error.
+ */
+int ksceKernelGetTtyInfo(char *buf, SceSize buf_size);
+
#ifdef __cplusplus
}
#endif
|
out_azure_blob: fix missing initialization (CID 316380) | @@ -171,7 +171,7 @@ flb_sds_t azb_http_canonical_request(struct flb_azure_blob *ctx,
flb_sds_t tmp = NULL;
char *b64 = NULL;
char *encoding;
- char *ctype;
+ char *ctype = "";
unsigned char signature[32];
size = strlen(c->uri) + (mk_list_size(&c->headers) * 64) + 256;
|
netkvm: improve printout on packet receiption
Instead of 3 printouts in 3 different RX cases make
one printout with all the relevant information. | @@ -956,8 +956,6 @@ tPacketIndicationType ParaNdis_PrepareReceivedPacket(
{
*pnCoalescedSegmentsCount = PktGetTCPCoalescedSegmentsCount(pContext, pPacketInfo, pHeader->hdr.gso_size);
NBLSetRSCInfo(pContext, pNBL, pPacketInfo, *pnCoalescedSegmentsCount, 0);
- DPrintf(1, "RSC host packet, datalen %d, GSO type %d, mss %d, %d segments\n",
- pPacketInfo->dataLength, pHeader->hdr.gso_type, pHeader->hdr.gso_size, *pnCoalescedSegmentsCount);
pContext->extraStatistics.framesCoalescedHost++;
// according to the spec the device does not calculate TCP checksum
qCSInfo.Receive.IpChecksumValueInvalid = true;
@@ -967,7 +965,6 @@ tPacketIndicationType ParaNdis_PrepareReceivedPacket(
{
*pnCoalescedSegmentsCount = pHeader->rsc_pkts;
NBLSetRSCInfo(pContext, pNBL, pPacketInfo, *pnCoalescedSegmentsCount, pHeader->rsc_dup_acks);
- DPrintf(1, "RSC win packet, datalen %d, GSO type %d\n", pPacketInfo->dataLength, pHeader->hdr.gso_type);
pContext->extraStatistics.framesCoalescedWindows++;
// QEMU implementation of RSC does not populate the checksum for TCPv6
if ((pHeader->hdr.flags & VIRTIO_NET_HDR_F_DATA_VALID) == 0)
@@ -996,7 +993,9 @@ tPacketIndicationType ParaNdis_PrepareReceivedPacket(
qCSInfo.Receive.UdpChecksumSucceeded = csRes.flags.UdpOK;
}
NET_BUFFER_LIST_INFO(pNBL, TcpIpChecksumNetBufferListInfo) = qCSInfo.Value;
- DPrintf(1, "Reporting CS %X->%X\n", csRes.value, (ULONG)(ULONG_PTR)qCSInfo.Value);
+ DPrintf(1, "datalen %d, GSO type/flags %d:%d, mss %d, %d segments, CS %X->%X\n",
+ pPacketInfo->dataLength, pHeader->hdr.gso_type, pHeader->hdr.flags, pHeader->hdr.gso_size,
+ *pnCoalescedSegmentsCount, csRes.value, (ULONG)(ULONG_PTR)qCSInfo.Value);
pNBL->Status = NDIS_STATUS_SUCCESS;
#if defined(ENABLE_HISTORY_LOG)
|
arm/rtl8720c: Remove up_trigger_irq since it is implemented in arm_trigger_irq.c | @@ -259,45 +259,6 @@ void up_enable_irq(int irq)
}
}
-/****************************************************************************
- * Name: up_trigger_irq
- *
- * Description:
- * Trigger an IRQ by software.
- *
- ****************************************************************************/
-
-void up_trigger_irq(int irq)
-{
- uint32_t pend_bit = 0;
- DEBUGASSERT(irq >= NVIC_IRQ_NMI && irq < NR_IRQS);
- if (irq >= NVIC_IRQ_FIRST)
- {
- putreg32(irq - NVIC_IRQ_FIRST, NVIC_STIR);
- }
-
- else
- {
- switch (irq)
- {
- case NVIC_IRQ_PENDSV:
- pend_bit = NVIC_INTCTRL_PENDSVSET;
- break;
- case NVIC_IRQ_NMI:
- pend_bit = NVIC_INTCTRL_NMIPENDSET;
- break;
- case NVIC_IRQ_SYSTICK:
- pend_bit = NVIC_INTCTRL_PENDSTSET;
- break;
- }
-
- if (pend_bit)
- {
- modifyreg32(NVIC_INTCTRL, 0, pend_bit);
- }
- }
-}
-
/****************************************************************************
* Name: up_prioritize_irq
*
|
Update gpconfig help doc | @@ -12,7 +12,7 @@ gpconfig -c <param_name> -v <value> [-m <master_value> | --masteronly]
| -l
[--skipvalidation] [--verbose] [--debug]
-gpconfig -s <param_name> [--verbose] [--debug]
+gpconfig -s <param_name> [--flag] [--verbose] [--debug]
gpconfig --help
@@ -121,6 +121,21 @@ files (gpstop -u) or restart the system (gpstop -r) for changes
to take effect.
+--file
+
+For a configuration parameter, shows the value from the postgresql.conf
+file on all instances (master and segments) in the Greenplum Database
+system. If there is a discrepancy in a parameter value between segment
+instances, the gpconfig utility displays a warning message. Must be
+specified with the -s option.
+
+For example, a configuration parameter statement_mem is set to
+64MB for a user with the ALTER ROLE command, and the value in the
+postgresql.conf file is 128MB. Running the command
+gpconfig -s statement_mem --file displays 128MB. The command
+gpconfig -s statement_mem run by the user displays 64MB.
+
+
--skipvalidation
Overrides the system validation checks of gpconfig and allows you
|
Change MQTT description and name | @@ -43,8 +43,8 @@ extern "C" {
/**
* \ingroup ESP_APPS
- * \defgroup ESP_APP_MQTT_CLIENT_API Sequential, single thread MQTT client API
- * \brief MQTT client API
+ * \defgroup ESP_APP_MQTT_CLIENT_API MQTT client API
+ * \brief Sequential, single thread MQTT client API
* \{
*/
|
Remove schwa's plugins on his request from the readme | - [Fundamental extensions](#fundamental-extensions)
- [Support extensions](#support-extensions)
- [Extra extensions](#extra-extensions)
+ - [Third-party extensions](#third-party-extensions)
- [Adapters](#adapters)
- [Resources](#resources)
- [Examples](#examples)
@@ -120,7 +121,6 @@ and use to get a basic plugin experience:
- [clap-host](https://github.com/free-audio/clap-host), very simple host
- [clap-plugins](https://github.com/free-audio/clap-plugins), very simple plugins
-- [schwaaa's plugin](https://github.com/schwaaa/clap-plugin), basic example for prototyping CLAP audio plugins using Dear ImGui as the user interface
## Community related projects
|
ci: temporarily disable s3 assign test | @@ -312,11 +312,21 @@ class AssignTest(object):
console_log('\t{}'.format(job['name']), 'O')
# failures
+ real_failure_group = []
if failed_to_assign:
+ for group in failed_to_assign:
+ if ('ESP32S3_IDF' in group.filters.values() # for example_test and custom_test
+ or ['ESP32S3_IDF'] in group.filters.values()): # for unit_test
+ console_log('Bypassing Tag "ESP32S3_IDF" missing jobs for now!!!', 'O') # FIXME
+ continue
+
+ real_failure_group.append(group)
+
+ if real_failure_group:
console_log('Too many test cases vs jobs to run. '
'Please increase parallel count in .gitlab/ci/target-test.yml '
'for jobs with specific tags:', 'R')
- failed_group_count = self._count_groups_by_keys(failed_to_assign)
+ failed_group_count = self._count_groups_by_keys(real_failure_group)
for tags in failed_group_count:
console_log('\t{}: {}'.format(tags, failed_group_count[tags]), 'R')
raise RuntimeError('Failed to assign test case to CI jobs')
|
[SH2] Added camera bounce fix
Added code to PS2CameraSpeed that solves an issue with the PC version that caused the camera to bounce and move too quickly. | @@ -497,6 +497,20 @@ void Init()
pattern = hook::pattern("74 ? D9 05 ? ? ? ? E8 ? ? ? ? 50 E8");
injector::WriteMemory<uint8_t>(pattern.count(1).get(0).get<uint32_t>(0), (uint8_t)0xEBi8, true); //0058C0E3 flesh lips cutscene fix
+
+ //camera bounce fix
+ pattern = hook::pattern("E8 ? ? ? ? D8 4C 24 60 83 C4 04");
+ static float CameraEaseMultiplier = 3.0f;
+ struct CameraEaseHook
+ {
+ void operator() (injector::reg_pack& regs)
+ {
+ float esp00 = *(float*)(regs.esp);
+ _asm fld dword ptr [esp00]
+ _asm fabs
+ _asm fmul dword ptr [CameraEaseMultiplier]
+ }
+ }; injector::MakeInline<CameraEaseHook>(pattern.get_first(0), pattern.get_first(9)); //0051C760
}
if (bGamepadControlsFix)
|
panic() reports the error message | #include "assert.h"
void _panic(const char* msg, const char* file, int line) {
- printf("Kernel assertion in %s line %d", file, line);
+ printf("Kernel assertion in %s line %d: %s", file, line, msg);
//enter infinite loop
asm("cli");
do {} while (1);
|
Use statically allocated buffer for logging.
This allows logging to be used even when enclave is out of memory | @@ -79,6 +79,7 @@ void oe_log_init_ecall(const char* enclave_path, uint32_t log_level)
static void* _enclave_log_context = NULL;
static oe_enclave_log_callback_t _enclave_log_callback = NULL;
+static char _trace_buffer[OE_LOG_MESSAGE_LEN_MAX];
oe_result_t oe_enclave_log_set_callback(
void* context,
@@ -99,7 +100,7 @@ done:
return result;
}
-static oe_result_t oe_log_enclave_message(
+static oe_result_t _log_enclave_message(
oe_log_level_t level,
const char* message)
{
@@ -108,9 +109,6 @@ static oe_result_t oe_log_enclave_message(
if (!message)
OE_RAISE_NO_TRACE(OE_UNEXPECTED);
- // Take the log file lock.
- OE_CHECK_NO_TRACE(oe_mutex_lock(&_log_lock));
-
if (_enclave_log_callback)
{
(_enclave_log_callback)(
@@ -122,17 +120,15 @@ static oe_result_t oe_log_enclave_message(
if (level > _active_log_level)
{
result = OE_OK;
- goto cleanup;
+ goto done;
}
if ((result = oe_log_ocall(level, message)) != OE_OK)
- goto cleanup;
+ goto done;
}
result = OE_OK;
-cleanup:
- oe_mutex_unlock(&_log_lock);
done:
return result;
}
@@ -144,6 +140,7 @@ oe_result_t oe_log(oe_log_level_t level, const char* fmt, ...)
int n = 0;
int bytes_written = 0;
char* message = NULL;
+ bool locked = false;
// Skip logging for non-debug-allowed enclaves
if (!is_enclave_debug_allowed())
@@ -159,18 +156,19 @@ oe_result_t oe_log(oe_log_level_t level, const char* fmt, ...)
goto done;
}
- if (!(message = oe_malloc(OE_LOG_MESSAGE_LEN_MAX)))
- OE_RAISE_NO_TRACE(OE_OUT_OF_MEMORY);
+ // Take the log file lock.
+ OE_CHECK_NO_TRACE(oe_mutex_lock(&_log_lock));
+ locked = true;
- bytes_written =
- oe_snprintf(message, OE_LOG_MESSAGE_LEN_MAX, "%s:", _enclave_filename);
+ bytes_written = oe_snprintf(
+ _trace_buffer, OE_LOG_MESSAGE_LEN_MAX, "%s:", _enclave_filename);
if (bytes_written < 0)
goto done;
oe_va_start(ap, fmt);
n = oe_vsnprintf(
- &message[bytes_written],
+ &_trace_buffer[bytes_written],
OE_LOG_MESSAGE_LEN_MAX - (size_t)bytes_written,
fmt,
ap);
@@ -179,12 +177,11 @@ oe_result_t oe_log(oe_log_level_t level, const char* fmt, ...)
if (n < 0)
goto done;
- result = oe_log_enclave_message(level, message);
+ result = _log_enclave_message(level, message);
done:
-
- if (message)
- oe_free(message);
+ if (locked)
+ oe_mutex_unlock(&_log_lock);
return result;
}
|
Additional comments about routing instructions/routing engines. | @@ -55,39 +55,39 @@ namespace carto {
*/
ROUTING_ACTION_REACH_VIA_LOCATION,
/**
- * Enter roundabout.
+ * Enter roundabout. Used by Valhalla and OSRM.
*/
ROUTING_ACTION_ENTER_ROUNDABOUT,
/**
- * Leave roundabout.
+ * Leave roundabout. Used by Valhalla and OSRM.
*/
ROUTING_ACTION_LEAVE_ROUNDABOUT,
/**
- * Continue along the roundabout.
+ * Continue along the roundabout. Only used by OSRM.
*/
ROUTING_ACTION_STAY_ON_ROUNDABOUT,
/**
- * Start at the end of the street.
+ * Start at the end of the street. Currently used only by OSRM.
*/
ROUTING_ACTION_START_AT_END_OF_STREET,
/**
- * Enter street while moving against the allowed direction.
+ * Enter street while moving against the allowed direction. Only used by OSRM.
*/
ROUTING_ACTION_ENTER_AGAINST_ALLOWED_DIRECTION,
/**
- * Leave the street while moving aginst the allowed direction.
+ * Leave the street while moving aginst the allowed direction. Only used by OSRM.
*/
ROUTING_ACTION_LEAVE_AGAINST_ALLOWED_DIRECTION,
/**
- * Go up.
+ * Go up. Only used by the SGRE.
*/
ROUTING_ACTION_GO_UP,
/**
- * Go down.
+ * Go down. Only used by SGRE.
*/
ROUTING_ACTION_GO_DOWN,
/**
- * Wait.
+ * Wait. Only used by SGRE.
*/
ROUTING_ACTION_WAIT
};
|
specify statsfile's path
to avoid multi statsfile and not found | @@ -34,7 +34,7 @@ script:
- xmake -P core
- export XMAKE_PROGRAM_DIR=$PWD/xmake
- core/build/xmake lua versioninfo
- - echo 'require("luacov")' > tmp
+ - echo "require('luacov.runner').init({['statsfile']='$PWD/luacov.stats.out',['reportfile']='$PWD/luacov.report.out'})" > tmp
- cat xmake/core/_xmake_main.lua >> tmp
- mv tmp xmake/core/_xmake_main.lua
- cp core/build/xmake $(which xmake) || sudo cp core/build/xmake $(which xmake)
|
newlib: change microseconds offset type | // Offset between FRC timer and the RTC.
// Initialized after reset or light sleep.
#if defined(CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER) && defined(CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER)
-uint64_t s_microseconds_offset = 0;
+int64_t s_microseconds_offset = 0;
#endif
#ifndef CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER
|
Use i32 instead of i8 for x/y offsets
Doesn't matter too much, because this number isn't used in SIMD
computation, only as a memory reference offset. | @@ -655,10 +655,10 @@ static INLINE void reconstruct_color_other(const encoder_control_t *encoder,
const vector2d_t b_ofs = g_sao_edge_offsets[sao->eo_class][1];
// All limited to [-1, 1]
- const int8_t a_xoff = a_ofs.x;
- const int8_t a_yoff = a_ofs.y;
- const int8_t b_xoff = b_ofs.x;
- const int8_t b_yoff = b_ofs.y;
+ const int32_t a_xoff = a_ofs.x;
+ const int32_t a_yoff = a_ofs.y;
+ const int32_t b_xoff = b_ofs.x;
+ const int32_t b_yoff = b_ofs.y;
const uint32_t width_db32 = block_width & ~31;
const uint32_t width_db4 = block_width & ~3;
|
client_http_run_once polish | @@ -258,12 +258,10 @@ main(int argc, char *argv[])
ctx_flows[c]++;
-
ops[i].on_connected = on_connected;
ops[i].on_error = on_error;
ops[i].on_close = on_close;
-
flows[i].id = streams_going;
flows[i].ctx_id = c;
ops[i].userData = &flows[i];
@@ -311,10 +309,10 @@ main(int argc, char *argv[])
if (rc > 0) {
/* there's stuff to do on one or more contexts, do them all */
;
- }
- else {
+ } else {
fprintf(stderr, "Waiting...\n");
}
+
for (c = 0; c < num_ctxs; c++) {
neat_start_event_loop(ctx[c], NEAT_RUN_NOWAIT);
}
|
display: add option to display >1T iterations as 'T' | @@ -63,7 +63,9 @@ __attribute__((format(printf, 1, 2))) static void display_put(const char* fmt, .
}
static void display_printKMG(uint64_t val) {
- if (val >= 1000000000UL) {
+ if (val >= 1000000000000ULL) {
+ display_put(" [%.02LfT]", (long double)val / 1000000000.0L);
+ } else if (val >= 1000000000UL) {
display_put(" [%.02LfG]", (long double)val / 1000000000.0L);
} else if (val >= 1000000UL) {
display_put(" [%.02LfM]", (long double)val / 1000000.0L);
|
Makefile: gard/pflash targets for CI build with HOSTCFLAGS/HOSTGCOVFLAGS
This enables us to do coverage reports on gard/pflash. | @@ -180,10 +180,10 @@ include $(SRC)/libstb/Makefile.inc
# hack for travis-ci and coverity
gard:
- (cd external/gard; make)
+ (cd external/gard; CFLAGS="$(HOSTCFLAGS) $(HOSTGCOVCFLAGS)" make)
pflash:
- (cd external/pflash; make)
+ (cd external/pflash; CFLAGS="$(HOSTCFLAGS) $(HOSTGCOVCFLAGS)" make)
pflash-coverity:
(cd external/pflash; ./build-all-arch.sh)
|
package cache dir | @@ -51,7 +51,7 @@ mkdir -p %{buildroot}%{install_path}/share
mv %{buildroot}/usr/sbin/shine %{buildroot}%{install_path}/sbin/.
mv %{buildroot}/usr/share/shine/shine.init.redhat %{buildroot}%{install_path}/share/.
mv %{buildroot}/usr/share/vim %{buildroot}%{install_path}/share/.
-rm %{buildroot}/var/cache/shine/conf/README
+
# man pages
mkdir -p %{buildroot}%{install_path}/share/man/{man1,man5}
gzip -c doc/shine.1 >%{buildroot}%{install_path}/share/man/man1/shine.1.gz
@@ -94,6 +94,7 @@ rm -rf %{buildroot}
%doc LICENSE README ChangeLog
%{OHPC_ADMIN}
%{OHPC_PUB}
+/var/cache/shine/conf/README
%changelog
* Wed Feb 24 2016 <[email protected]> - 1.4-1
|
Update cmsis_os2.txt
Added links in revision history and added comment on update configuration files. Renamed the section "RTX5 Specifics" to "RTX5 Specific API". | @@ -80,11 +80,14 @@ File/Folder | Content
<tr>
<td>V2.1.0</td>
<td>
+ Updated configuration files: RTX_Config.h for the configuration settings and RTX_config.c for
+ implementing the \ref rtx5_specific.
+
Support for critical and uncritical sections (nesting safe):
- - updated: osKernelLock, osKernelUnlock
- - added: osKernelRestoreLock
+ - updated: \ref osKernelLock, \ref osKernelUnlock
+ - added: \ref osKernelRestoreLock
- Updated Thread and Event Flags:
+ Updated \ref CMSIS_RTOS_ThreadFlagsMgmt "Thread Flags" and \ref CMSIS_RTOS_EventFlags "Event Flags":
- changed flags parameter and return type from int32_t to uint32_t
</td>
</tr>
@@ -1350,7 +1353,7 @@ or libraries require no modifications when using on a different CMSIS-RTOS2 impl
*/
/**
-\addtogroup rtx5_specific RTX5 Specifics
+\addtogroup rtx5_specific RTX5 Specific API
\brief This section describes CMSIS-RTOS RTX5 specifics.
\details
The RTX5 kernel can be customized for different application requirements:
|
VERSION bump to version 2.0.109 | @@ -62,7 +62,7 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
# set version of the project
set(LIBYANG_MAJOR_VERSION 2)
set(LIBYANG_MINOR_VERSION 0)
-set(LIBYANG_MICRO_VERSION 108)
+set(LIBYANG_MICRO_VERSION 109)
set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
# set version of the library
set(LIBYANG_MAJOR_SOVERSION 2)
|
out_es: remove dummy debug line that generated garbage messages | @@ -406,7 +406,6 @@ static int elasticsearch_error_check(struct flb_http_client *c)
goto done;
}
- msgpack_object_print(stdout, key);
if (key.via.str.size != 6) {
continue;
}
|
Fix GuardEHCont check | @@ -389,7 +389,7 @@ VOID PvPeProperties(
if (NT_SUCCESS(PhGetMappedImageLoadConfig32(&PvMappedImage, &config32)) &&
RTL_CONTAINS_FIELD(config32, config32->Size, GuardEHContinuationCount))
{
- if (config32->GuardEHContinuationCount)
+ if (config32->GuardEHContinuationTable && config32->GuardEHContinuationCount)
has_ehcont = TRUE;
}
}
@@ -398,7 +398,7 @@ VOID PvPeProperties(
if (NT_SUCCESS(PhGetMappedImageLoadConfig64(&PvMappedImage, &config64)) &&
RTL_CONTAINS_FIELD(config64, config64->Size, GuardEHContinuationCount))
{
- if (config64->GuardEHContinuationCount)
+ if (config64->GuardEHContinuationTable && config32->GuardEHContinuationCount)
has_ehcont = TRUE;
}
}
|
FEC: fix silly memory corruption | @@ -65,8 +65,8 @@ static __attribute__((always_inline)) void add_fec_block(bpf_state *state, fec_b
}
static __attribute__((always_inline)) void remove_and_free_fec_block(picoquic_cnx_t *cnx, bpf_state *state, fec_block_t *fb){
- free_fec_block(cnx, fb, false);
state->fec_blocks[fb->fec_block_number % MAX_FEC_BLOCKS] = NULL;
+ free_fec_block(cnx, fb, false);
}
// protects the packet and writes the source_fpid
|
DDF: Philips motion sensor add more read/parse functions (wip) | "modelid": "SML001",
"product": "SML001",
"status": "Gold",
+ "sleeper": false,
"md:known_issues": [ ],
"subdevices": [
{
"name": "config/delay"
},
{
- "name": "config/ledindication"
+ "name": "config/ledindication",
+ "read": {"cl": "0x0000", "at": "0x0033", "mf": "0x100b"},
+ "parse": {"cl": "0x0000", "at": "0x0033", "eval": "Item.val = Attr.val"},
+ "refresh.interval": 84000
},
{
"name": "config/on"
[0, "low"],
[1, "medium"],
[2, "high"]
- ]
+ ],
+ "read": {"cl": "0x0406", "at": "0x0030", "mf": "0x100b"},
+ "parse": {"cl": "0x0406", "at": "0x0030", "eval": "Item.val == 0 ? Item.val = Attr.val : Item.val"},
+ "refresh.interval": 84000
},
{
"name": "config/sensitivitymax",
"default": 2
},
{
- "name": "config/usertest"
+ "name": "config/usertest",
+ "read": {"cl": "0x0000", "at": "0x0032", "mf": "0x100b"},
+ "parse": {"cl": "0x0000", "at": "0x0032", "eval": "Item.val = Attr.val"},
+ "refresh.interval": 84000
},
{
"name": "state/lastupdated"
},
{
"name": "state/presence",
+ "parse": {"cl": "0x0406", "at": "0x0000", "eval": "Item.val = Attr.val"},
"awake": true
}
],
},
{
"name": "state/lightlevel",
+ "parse": {"cl": "0x0400", "at": "0x0000", "eval": "Item.val = Attr.val"},
"awake": true
},
{
},
{
"name": "state/temperature",
+ "parse": {"cl": "0x0402", "at": "0x0000", "eval": "Item.val = Attr.val"},
"awake": true
}
],
|
Remove platform-specific configuration | #ifndef PROJECT_CONF_H_
#define PROJECT_CONF_H_
-
-#define QUEUEBUF_CONF_NUM 4
-
-#define UIP_CONF_BUFFER_SIZE 140
-
#define UIP_CONF_ROUTER 0
#define CMD_CONF_OUTPUT slip_radio_cmd_output
#define NETSTACK_CONF_NETWORK slipnet_driver
#define NETSTACK_CONF_FRAMER no_framer
-
-#define UART1_CONF_RX_WITH_DMA 1
-
+/*---------------------------------------------------------------------------*/
#endif /* PROJECT_CONF_H_ */
|
fix: a missing semicolon | @@ -1223,7 +1223,7 @@ static void gen_forward_declare(FILE *fp, struct jc_struct *s)
fprintf(fp, "size_t %s_list_to_json(char *str, size_t len, struct %s **p);\n",
t,t);
- fprintf(fp, "void %s_use_default_inject_settings(struct %s *p)\n", t, t);
+ fprintf(fp, "void %s_use_default_inject_settings(struct %s *p);\n", t, t);
}
static void gen_typedef (FILE *fp, struct jc_struct *s)
|
add test case that doesn't allow mixed array constructors and initalizer lists | @@ -711,6 +711,11 @@ describe("Titan parser", function()
assert_statements_syntax_error([[ (x) = 42 ]], "ExpAssign")
end)
+ it("does not allow mix array constructors and initalizer lists", function()
+ assert_expression_syntax_error([[ { x = 11, 22 } ]], "FieldFieldList")
+ assert_expression_syntax_error([[ { 11, y = 22 } ]], "RCurlyArrCons")
+ end)
+
it("uses specific error labels for some errors", function()
assert_program_syntax_error([[
|
Modify the indentation format | * Change Logs:
* Date Author Notes
* 2018-11-06 SummerGift first version
- * 2019-04-09 jhb
*/
#include "board.h"
-/**
- * @brief System Clock Configuration
- * @retval None
- */
void SystemClock_Config(void)
{
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
@@ -44,8 +39,7 @@ void SystemClock_Config(void)
}
/**Initializes the CPU, AHB and APB busses clocks
*/
- RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
- |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+ RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
@@ -55,8 +49,7 @@ void SystemClock_Config(void)
{
Error_Handler();
}
- PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART3|RCC_PERIPHCLK_DSI
- |RCC_PERIPHCLK_LTDC;
+ PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART3|RCC_PERIPHCLK_DSI|RCC_PERIPHCLK_LTDC;
PeriphClkInit.Usart3ClockSelection = RCC_USART3CLKSOURCE_PCLK1;
PeriphClkInit.DsiClockSelection = RCC_DSICLKSOURCE_DSIPHY;
PeriphClkInit.LtdcClockSelection = RCC_LTDCCLKSOURCE_PLLSAI2_DIV2;
|
Send an illegal parameter alert if the update type in a KeyUpdate is wrong
Previously we sent a decode_error alert. | @@ -583,14 +583,19 @@ MSG_PROCESS_RETURN tls_process_key_update(SSL *s, PACKET *pkt)
}
if (!PACKET_get_1(pkt, &updatetype)
- || PACKET_remaining(pkt) != 0
- || (updatetype != SSL_KEY_UPDATE_NOT_REQUESTED
- && updatetype != SSL_KEY_UPDATE_REQUESTED)) {
+ || PACKET_remaining(pkt) != 0) {
al = SSL_AD_DECODE_ERROR;
SSLerr(SSL_F_TLS_PROCESS_KEY_UPDATE, SSL_R_BAD_KEY_UPDATE);
goto err;
}
+ if (updatetype != SSL_KEY_UPDATE_NOT_REQUESTED
+ && updatetype != SSL_KEY_UPDATE_REQUESTED) {
+ al = SSL_AD_ILLEGAL_PARAMETER;
+ SSLerr(SSL_F_TLS_PROCESS_KEY_UPDATE, SSL_R_BAD_KEY_UPDATE);
+ goto err;
+ }
+
/*
* If we get a request for us to update our sending keys too then, we need
* to additionally send a KeyUpdate message. However that message should
|
esp_eth/CI: Fix app-test to start recv test after sock bound | @@ -37,8 +37,10 @@ def configure_eth_if(func): # type: (typing.Any) -> typing.Any
@configure_eth_if
-def check_eth_recv_packet(so): # type: (socket.socket) -> None
+def check_eth_recv_packet(so, before_recv=None): # type: (socket.socket, typing.Any) -> None
so.settimeout(10)
+ if before_recv is not None:
+ before_recv() # If configured, execute user function just before sock recv
try:
pkt = so.recv(1024)
for i in range(128, 1024):
@@ -68,16 +70,23 @@ def test_component_ut_esp_eth(env, appname): # type: (tiny_test_fw.Env, str) ->
dut = env.get_dut('esp_eth', 'components/esp_eth/test_apps', app_config_name=appname)
dut.start_app()
stdout = dut.expect('Press ENTER to see the list of tests', full_stdout=True)
+
+ Utility.console_log('Running test case: start_and_stop')
dut.write('"start_and_stop"')
stdout += dut.expect("Enter next test, or 'enter' to see menu", full_stdout=True)
ttfw_idf.ComponentUTResult.parse_result(stdout, test_format=TestFormat.UNITY_BASIC)
+
+ Utility.console_log('Running test case: get_set_mac')
dut.write('"get_set_mac"')
stdout = dut.expect("Enter next test, or 'enter' to see menu", full_stdout=True)
ttfw_idf.ComponentUTResult.parse_result(stdout, test_format=TestFormat.UNITY_BASIC)
- dut.write('"ethernet_broadcast_transmit"')
- check_eth_recv_packet()
+
+ Utility.console_log('Running test case: ethernet_broadcast_transmit')
+ check_eth_recv_packet(dut.write('"ethernet_broadcast_transmit"')) # Need to start the test after the socket is bound
stdout = dut.expect("Enter next test, or 'enter' to see menu", full_stdout=True)
ttfw_idf.ComponentUTResult.parse_result(stdout, test_format=TestFormat.UNITY_BASIC)
+
+ Utility.console_log('Running test case: recv_pkt')
dut.write('"recv_pkt"')
expect_result = dut.expect(re.compile(r'([\s\S]*)DUT MAC: ([0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2})'),
timeout=10)
|
Add zcli to ya tool. | "horadric": {
"description": "Run horadric generator"
},
+ "zcli": {
+ "description": "Run zcli (console client for zephyr)"
+ },
"run_python_udf": {
"description": "run_python_udf tool"
},
}
]
},
+ "zcli": {
+ "tools": {
+ "zcli": {
+ "bottle": "zcli",
+ "executable": "zcli"
+ }
+ },
+ "platforms": [
+ {
+ "host": {
+ "os": "LINUX"
+ },
+ "default": true
+ },
+ {
+ "host": {
+ "os": "WIN"
+ },
+ "default": true
+ },
+ {
+ "host": {
+ "os": "DARWIN"
+ },
+ "default": true
+ }
+ ]
+ },
"python3": {
"tools": {
"python3": {
]
}
},
+ "zcli": {
+ "formula": {
+ "sandbox_id": 559933291,
+ "match": "zcli"
+ },
+ "executable": {
+ "zcli": [
+ "zcli"
+ ]
+ }
+ },
"ptpython": {
"formula": {
"sandbox_id": 50746186,
|
Added --hide-referer command line option to the config file. | @@ -441,6 +441,11 @@ double-decode false
#enable-panel REMOTE_USER
#enable-panel GEO_LOCATION
+# Hide a referer but still count it. Wild cards are allowed. i.e., *.bing.com
+#
+#hide-referer *.google.com
+#hide-referer bing.com
+
# Hour specificity. Possible values: `hr` (default), or `min` (tenth
# of a minute).
#
|
Make: show installation instructions after build | @@ -28,6 +28,9 @@ SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench
.PHONY : all libs netlib $(RELA) test ctest shared install
.NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test
+# source: https://stackoverflow.com/questions/52674/simplest-way-to-reverse-the-order-of-strings-in-a-make-variable/14260762#14260762
+reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1))
+
all :: libs netlib $(RELA) tests shared
@echo
@echo " OpenBLAS build complete. ($(LIB_COMPONENTS))"
@@ -82,8 +85,7 @@ ifeq ($(OSNAME), Darwin)
endif
@echo
@echo "To install the library, you can run"
- @echo " make <ARGS> PREFIX=/path/to/your/installation install"
- @echo "where '<ARGS>' is the set of argument used for compilation."
+ @echo " make $(call reverse,$(MAKEFLAGS)) PREFIX=/path/to/your/installation install"
shared :
ifndef NO_SHARED
|
skeleton: clean up the description about using enclave-tls
Fixes: | @@ -191,7 +191,7 @@ Please type the following code to solve the problem
cp /etc/resolv.conf rootfs/etc/
```
-## Run Enclave TLS client
+## Run Enclave TLS client on sgx platform
```shell
cd /opt/enclave-tls/bin
@@ -201,14 +201,12 @@ cd /opt/enclave-tls/bin
./enclave-tls-client -a sgx_la -t openssl -c openssl
```
-## Run shelter
+## Run Enclave TLS client on non-sgx platform
-[shelter](https://github.com/alibaba/inclavare-containers/blob/master/shelter/README.md) can also be used as an Enclave TLS client. After building and installing shelter, you can type the following commands to run shelter as an Enclave TLS client:
+Only support run remote attestation based on ecdsa.
```shell
+cd /opt/enclave-tls/bin
# run sgx_ecdsa remote attestation
-shelter remoteattestation --tls openssl --verifier sgx_ecdsa --crypto openssl
-
-# run sgx_la remote attestation
-shelter remoteattestation --tls openssl --verifier sgx_la --crypto openssl
+./enclave-tls-client -v sgx_ecdsa -t openssl -c openssl
```
|
reformat keys | @@ -107,7 +107,9 @@ static Key keys[] = {
{MODKEY | ShiftMask, XK_Return, spawn, {.v = termcmd}},
{MODKEY, XK_b, togglebar, {0}},
{MODKEY, XK_j, focusstack, {.i = +1}},
+ {MODKEY, XK_Down, focusstack, {.i = +1}},
{MODKEY, XK_k, focusstack, {.i = -1}},
+ {MODKEY, XK_Up, focusstack, {.i = -1}},
{MODKEY|ControlMask, XK_j, pushdown, {0} },
{MODKEY|ControlMask, XK_k, pushup, {0} },
{MODKEY, XK_i, incnmaster, {.i = +1}},
|
[util] export Data() and Size() for TStringBuf in string.pxd. | @@ -5,6 +5,8 @@ cdef extern from "<util/generic/strbuf.h>" nogil:
cdef cppclass TStringBuf:
TStringBuf() except +
TStringBuf(const char*) except +
+ char* Data()
+ size_t Size()
cdef extern from "<util/generic/string.h>" nogil:
|
tests: move ip4 punt setup to its own class
Move interface and packet setup for the ip4 punt test to its own
class so that child classes can be created that use it.
Type: test | @@ -1448,20 +1448,10 @@ class TestIPVlan0(VppTestCase):
self.send_and_expect(self.pg0, pkts, self.pg1)
-class TestIPPunt(VppTestCase):
- """ IPv4 Punt Police/Redirect """
-
- @classmethod
- def setUpClass(cls):
- super(TestIPPunt, cls).setUpClass()
-
- @classmethod
- def tearDownClass(cls):
- super(TestIPPunt, cls).tearDownClass()
-
- def setUp(self):
- super(TestIPPunt, self).setUp()
+class IPPuntSetup(object):
+ """ Setup for IPv4 Punt Police/Redirect """
+ def punt_setup(self):
self.create_pg_interfaces(range(4))
for i in self.pg_interfaces:
@@ -1469,15 +1459,6 @@ class TestIPPunt(VppTestCase):
i.config_ip4()
i.resolve_arp()
- def tearDown(self):
- super(TestIPPunt, self).tearDown()
- for i in self.pg_interfaces:
- i.unconfig_ip4()
- i.admin_down()
-
- def test_ip_punt(self):
- """ IP punt police and redirect """
-
# use UDP packet that have a port we need to explicitly
# register to get punted.
pt_l4 = VppEnum.vl_api_punt_type_t.PUNT_API_TYPE_L4
@@ -1496,13 +1477,33 @@ class TestIPPunt(VppTestCase):
self.vapi.set_punt(is_add=1, punt=punt_udp)
- p = (Ether(src=self.pg0.remote_mac,
+ self.pkt = (Ether(src=self.pg0.remote_mac,
dst=self.pg0.local_mac) /
IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) /
UDP(sport=1234, dport=1234) /
Raw(b'\xa5' * 100))
- pkts = p * 1025
+ def punt_teardown(self):
+ for i in self.pg_interfaces:
+ i.unconfig_ip4()
+ i.admin_down()
+
+
+class TestIPPunt(IPPuntSetup, VppTestCase):
+ """ IPv4 Punt Police/Redirect """
+
+ def setUp(self):
+ super(TestIPPunt, self).setUp()
+ super(TestIPPunt, self).punt_setup()
+
+ def tearDown(self):
+ super(TestIPPunt, self).punt_teardown()
+ super(TestIPPunt, self).tearDown()
+
+ def test_ip_punt(self):
+ """ IP punt police and redirect """
+
+ pkts = self.pkt * 1025
#
# Configure a punt redirect via pg1.
|
[chainmaker][#436]add test_02InitSetTxParam_0005setTxParamFailureLongParam | @@ -130,6 +130,19 @@ START_TEST(test_02InitSetTxParam_0004setTxParamFailureShortParam)
}
END_TEST
+START_TEST(test_02InitSetTxParam_0005setTxParamFailureLongParam)
+{
+ BSINT32 rtnVal;
+ BoatHlchainmakerTx tx_ptr;
+
+ rtnVal = BoatHlchainmakerAddTxParam(&tx_ptr, 12, "key1", "vlaue1", "key2", "vlaue2", "key3", "vlaue3",
+ "key4", "vlaue4", "key5", "vlaue5", "key6", "vlaue6");
+ ck_assert_int_eq(rtnVal, -100);
+}
+END_TEST
+
+
+
Suite *make_parameters_suite(void)
{
/* Create Suite */
@@ -145,6 +158,7 @@ Suite *make_parameters_suite(void)
tcase_add_test(tc_paramters_api, test_02InitSetTxParam_0002TxinitxFailureNullpara);
tcase_add_test(tc_paramters_api, test_02InitSetTxParam_0003SetTxParamSuccess);
tcase_add_test(tc_paramters_api, test_02InitSetTxParam_0004setTxParamFailureShortParam);
+ tcase_add_test(tc_paramters_api, test_02InitSetTxParam_0005setTxParamFailureLongParam);
return s_paramters;
}
|
xeonphi: stub implementation of the config changes | @@ -119,37 +119,21 @@ errval_t xeon_phi_hw_model_query_and_config(void *arg,
retaddr]; */
-
-
- /* map the frame in the iommu space */
-
-#if 0
-
- if (id.base >= phi->apt.pbase &&
- ((id.base + id.bytes) <= (phi->apt.pbase + phi->apt.bytes))) {
-
- debug_printf("%s:%u = %lx -> %lx\n", __FUNCTION__, __LINE__,
- id.base, id.base - phi->apt.pbase);
-
- *retaddr = id.base - phi->apt.pbase;
-
- } else {
+ /* TODO: only do this if IOMMU is present or needs to be changed */
struct dmem dmem;
- err = driverkit_iommu_vspace_map_cl(phi->iommu_client, mem,
+ dmem.vbase = 0;
+ dmem.devaddr = names[0].address;
+ dmem.size = size;
+ err = driverkit_iommu_vspace_map_fixed_cl(xphi->iommu_client, mem,
VREGION_FLAGS_READ_WRITE, &dmem);
if (err_is_fail(err)) {
- return err;
+ DEBUG_ERR(err, "TODO: CLEANUP!");
}
- debug_printf("%s:%u with IOMMU %" PRIxGENPADDR " -> %" PRIxGENPADDR "\n", __FUNCTION__, __LINE__,
- id.base, dmem.devaddr + XEON_PHI_SYSMEM_BASE - 2 * (512UL << 30));
-
- *retaddr = dmem.devaddr + XEON_PHI_SYSMEM_BASE - 2 * (512UL << 30);
- }
-#endif
+ /* TODO: only do this if SMPT needs to be changed is present */
+ smpt_set_address(xphi, 0, 0, 1);
- /* xxx */
return SYS_ERR_OK;
|
YAwn: Require additional plugins for MSR test | @@ -63,6 +63,8 @@ add_plugin (yawn
ADD_TEST
CPP_TEST
TEST_README
+ TEST_REQUIRED_PLUGINS directoryvalue
+ yamlsmith
SOURCES ${SOURCE_FILES}
INCLUDE_DIRECTORIES ${YAEP_INCLUDE_DIR}
LINK_LIBRARIES ${YAEP_LIBRARIES_CPP})
|
Update built-in README. | @@ -91,18 +91,19 @@ static const char fresh_main_py[] =
;
static const char fresh_readme_txt[] =
-"This is a Micro Python board\r\n"
+"Thank you for supporting the OpenMV project!\r\n"
"\r\n"
-"You can get started right away by writing your Python code in 'main.py'.\r\n"
+"To download the IDE, please visit:\r\n"
+"https://openmv.io/pages/download\r\n"
"\r\n"
-"For a serial prompt:\r\n"
-" - Windows: you need to go to 'Device manager', right click on the unknown device,\r\n"
-" then update the driver software, using the 'openmv.inf' file found on this drive.\r\n"
-" Then use a terminal program like Hyperterminal or putty.\r\n"
-" - Mac OS X: use the command: screen /dev/tty.usbmodem*\r\n"
-" - Linux: use the command: screen /dev/ttyACM0\r\n"
+"For tutorials and documentation, please visit:\r\n"
+"http://docs.openmv.io/\r\n"
"\r\n"
-"Please visit https://openmv.io/ or http://micropython.org/help/ for further help.\r\n"
+"For technical support and projects, please visit the forums:\r\n"
+"http://forums.openmv.io/\r\n"
+"\r\n"
+"Please use github to report bugs and issues:\r\n"
+"https://github.com/openmv/openmv\r\n"
;
#ifdef OPENMV1
|
Return non-zero value on connection loss
Make scrscpy to return 0 exit code only in case when the user closes its
app, otherwise, i.e. in case of connection loss, return 1. | @@ -56,7 +56,7 @@ static int event_watcher(void *data, SDL_Event *event) {
}
#endif
-static void event_loop(void) {
+static SDL_bool event_loop(void) {
#ifdef CONTINUOUS_RESIZING_WORKAROUND
SDL_AddEventWatch(event_watcher, NULL);
#endif
@@ -65,10 +65,10 @@ static void event_loop(void) {
switch (event.type) {
case EVENT_DECODER_STOPPED:
LOGD("Video decoder stopped");
- return;
+ return SDL_FALSE;
case SDL_QUIT:
LOGD("User requested to quit");
- return;
+ return SDL_TRUE;
case EVENT_NEW_FRAME:
if (!screen.has_frame) {
screen.has_frame = SDL_TRUE;
@@ -76,7 +76,7 @@ static void event_loop(void) {
screen_show_window(&screen);
}
if (!screen_update_frame(&screen, &frames)) {
- return;
+ return SDL_FALSE;
}
break;
case SDL_WINDOWEVENT:
@@ -109,6 +109,7 @@ static void event_loop(void) {
break;
}
}
+ return SDL_FALSE;
}
static process_t set_show_touches_enabled(const char *serial, SDL_bool enabled) {
@@ -210,7 +211,7 @@ SDL_bool scrcpy(const struct scrcpy_options *options) {
show_touches_waited = SDL_TRUE;
}
- event_loop();
+ ret = event_loop();
LOGD("quit...");
screen_destroy(&screen);
|
Handle platform differences in gmtime_s
MSVC and C11 specify different arguments and return value
meaning for gmtime_s. | @@ -74,6 +74,7 @@ void mbedtls_platform_zeroize( void *buf, size_t len )
#endif /* MBEDTLS_PLATFORM_ZEROIZE_ALT */
#if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_PLATFORM_GMTIME_R_ALT)
+#define __STDC_WANT_LIB_EXT1__ 1
#include <time.h>
#if !defined(_WIN32) && (defined(unix) || \
defined(__unix) || defined(__unix__) || (defined(__APPLE__) && \
@@ -105,7 +106,12 @@ struct tm *mbedtls_platform_gmtime_r( const mbedtls_time_t *tt,
struct tm *tm_buf )
{
#if defined(_WIN32) && !defined(PLATFORM_UTIL_USE_GMTIME)
+#if defined(__STDC_LIB_EXT1__)
+ return( ( gmtime_s( tt, tm_buf ) == 0 ) ? NULL : tm_buf );
+#else
+ /* MSVC and mingw64 argument order and return value are inconsistent with the C11 standard */
return( ( gmtime_s( tm_buf, tt ) == 0 ) ? tm_buf : NULL );
+#endif
#elif !defined(PLATFORM_UTIL_USE_GMTIME)
return( gmtime_r( tt, tm_buf ) );
#else
|
Add note about default number of available profiles and how to increase if desired | @@ -9,6 +9,10 @@ The bluetooth behavior allows management of various settings and states related
between the keyboard and the host. By default, ZMK supports five "profiles" for selecting which bonded host
computer/laptop/keyboard should receive the keyboard input; many of the commands here operation on those profiles.
+:::note Number of Profiles
+Please note there are only five available Bluetooth profiles by default. If you need to increase the number of available profiles you can set `CONFIG_BT_MAX_CONN` in your `zmk-config` `.conf` file.
+:::
+
## Bluetooth Command Defines
Bluetooth command defines are provided through the [`dt-bindings/zmk/bt.h`](https://github.com/zmkfirmware/zmk/blob/main/app/include/dt-bindings/zmk/bt.h) header,
|
specs: set package.cpath and package.path appropriately for luke.
* spec/spec_helper.lua (package.cpath, package.path): Update to
work with luke rather than autotools.
(top_srcdir, top_builddir): Removed unused variables. | @@ -6,21 +6,13 @@ if os.getenv 'installcheck' == nil then
-- directories to the module search paths.
local std = require 'specl.std'
- local top_srcdir = os.getenv 'top_srcdir' or '.'
- local top_builddir = os.getenv 'top_builddir' or '.'
-
package.path = std.package.normalize (
- top_builddir .. '/lib/?.lua',
- top_srcdir .. '/lib/?.lua',
- top_builddir .. '/lib/?/init.lua',
- top_srcdir .. '/lib/?/init.lua',
+ './lib/?.lua',
+ './lib/?/init.lua',
package.path
)
package.cpath = std.package.normalize(
- top_builddir .. '/ext/posix/.libs/?.so',
- top_srcdir .. '/ext/posix/.libs/?.so',
- top_builddir .. '/ext/posix/_libs/?.dll',
- top_srcdir .. '/ext/posix/_libs/?.dll',
+ './linux/?.so',
package.cpath
)
end
|
rm luax_pushpath; | @@ -89,21 +89,6 @@ Path luax_optpath(lua_State* L, int index, const char* fallback) {
return path;
}
-void luax_pushpath(lua_State* L, Path path) {
- for (int i = 0; i < 8; i++) {
- if (path.pieces[i] == P_NONE) {
- lua_pop(L, 1);
- lua_concat(L, 2 * i - 1);
- return;
- }
-
- lua_pushstring(L, Subpaths[path.pieces[i]]);
- lua_pushstring(L, "/");
- }
-
- lovrThrow("Unreachable");
-}
-
static void renderHelper(void* userdata) {
HeadsetRenderData* renderData = userdata;
lua_State* L = renderData->L;
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.