message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Make sure SSL_in_init() returns 0 at SSL_CB_HANDSHAKE_DONE
In 1.1.0 and before calling SSL_in_init() from the info_callback
at SSL_CB_HANDSHAKE_DONE would return 0. This commit fixes it so
that it does again for 1.1.1. This broke Node.
Fixes | @@ -1090,13 +1090,18 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop)
else if (s->ctx->info_callback != NULL)
cb = s->ctx->info_callback;
+ /* The callback may expect us to not be in init at handshake done */
+ ossl_statem_set_in_init(s, 0);
+
if (cb != NULL)
cb(s, SSL_CB_HANDSHAKE_DONE, 1);
- if (!stop)
+ if (!stop) {
+ /* If we've got more work to do we go back into init */
+ ossl_statem_set_in_init(s, 1);
return WORK_FINISHED_CONTINUE;
+ }
- ossl_statem_set_in_init(s, 0);
return WORK_FINISHED_STOP;
}
|
[bluetrum] add default RTT_ROOT | @@ -7,15 +7,14 @@ CROSS_TOOL ='gcc'
if os.getenv('RTT_ROOT'):
RTT_ROOT = os.getenv('RTT_ROOT')
-# else:
-# RTT_ROOT = r'../../..'
+else:
+ RTT_ROOT = r'../../..'
if os.getenv('RTT_CC'):
CROSS_TOOL = os.getenv('RTT_CC')
if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc'
- # EXEC_PATH = r'/opt/gnu-mcu-eclipse/riscv-none-gcc/8.2.0-2.1-20190425-1021/bin'
EXEC_PATH = r'D:/Softwares/RT-ThreadStudio/repo/Extract/ToolChain_Support_Packages/RISC-V/RISC-V-GCC/10.1.0/bin'
else:
print('Please make sure your toolchains is GNU GCC!')
|
update values in performance over heap memory | @@ -39,9 +39,9 @@ ESP32
# Performance over heap memory
| Setup | free heap size |
| --------- | ----------- |
-| SECURE, TCP, IPV4, fresh | 170KB |
-| SECURE, TCP, IPV4, just owned | 89KB |
-| SECURE, TCP, IPV4, owned, rebooted | 162KB |
-| SECURE, TCP, IPV4, just owned, onboarded to the cloud | 86KB |
-| SECURE, TCP, IPV4, owned, rebooted, onboarded to the cloud | 145KB |
+| SECURE, TCP, IPV4, fresh | 166KB |
+| SECURE, TCP, IPV4, just owned | 117KB |
+| SECURE, TCP, IPV4, owned, rebooted | 159KB |
+| SECURE, TCP, IPV4, just owned, onboarded to the cloud | 83KB |
+| SECURE, TCP, IPV4, owned, rebooted, onboarded to the cloud | 141KB |
|
cony patched contrib
cony patched contrib | @@ -7,6 +7,10 @@ ALLOW market/sre/tools/config-primer/src/internal/blogic -> contrib/go/patched/h
# CONTRIB-1581. responsible: grihabor@, g:strm-admin
ALLOW strm/plgo -> contrib/go/patched/hashring
+# CONTRIB-1627. responsible: g:edadeal-go
+ALLOW edadeal -> contrib/go/patched/cony
+ALLOW contrib/go/patched/cony -> contrib/go/patched/cony
+
# STRM-1124. responsible: grihabor@, g:strm-admin
ALLOW strm/plgo -> contrib/go/patched/m3u8
ALLOW contrib/go/patched/m3u8/example -> contrib/go/patched/m3u8
|
cirrus: disable tcl on FreeBSD due to | @@ -62,7 +62,7 @@ bsd_task:
-DCOMMON_FLAGS=-Werror
-DC_STD=-std=c11
-DENABLE_ASAN="${ENABLE_ASAN:-OFF}"
- -DPLUGINS=ALL
+ -DPLUGINS='ALL;-tcl'
-DTARGET_PLUGIN_FOLDER=''
- *print_cmake_options
- *generate
|
Handle missing vendor url case | @@ -279,6 +279,11 @@ def verify_person_linked_vendor(person, vendors):
raise ValueError(f"vendor_id({person.vendor_id}) does not match any from 'vendors' JSON")
# TODO query the server DB to make sure the vendor exists
+ if vendor.url:
+ person.vendor_url = vendor.url
+ person.data["vendorUrl"] = person.vendor_url
+ else:
+ raise ValueError("Linked Vendor does not have approved URL")
else:
raise ValueError("Need either vendor_url or vendor_id")
|
added warning on native when not running sudo / not able to allocate tun | #include <sys/socket.h>
-#define DEBUG DEBUG_FULL
+#define DEBUG DEBUG_NONE
#include "net/ipv6/uip-debug.h"
#ifdef linux
@@ -209,7 +209,9 @@ tun_init()
tunfd = tun_alloc(config_tundev);
if(tunfd == -1) {
- err(1, "failed to allocate tun device ``%s''", config_tundev);
+ printf("Warning: can't allocate tun device when not in sudo - Native platform will run but without network.\n");
+ /* err(1, "failed to allocate tun device ``%s''", config_tundev); */
+ return;
}
PRINTF("Tun open:%d\n", tunfd);
|
Name some functions and vtables | @@ -1233,6 +1233,11 @@ factory.register(0x1416A9D88, "Client::UI::UI3DModule", "", {
})
factory.register(0x1416A9DA0, "Client::UI::UIModule", "Client::UI::UIModuleInterface", {
0x1405C48F0: "ctor",
+ 12: "GetRaptureMacroModule",
+ 13: "GetRaptureHotbarModule",
+ 14: "GetRaptureGearsetModule",
+ 16: "GetItemOrderModule",
+ 17: "GetItemFinderModule",
})
factory.register(0x1416AA5A0, "Client::System::Crypt::SimpleString", "Client::System::Crypt::CryptInterface", {
1: "Encrypt",
@@ -1244,7 +1249,9 @@ factory.register(0x1416AEAE8, "Client::UI::Misc::ConfigModule", "Component::GUI:
0x1405FAFB0: "ctor",
})
factory.register(0x1416AEAF8, "Client::UI::Misc::ConfigModule_Common::Configuration::ConfigBase::ChangeEventInterface", "Common::Configuration::ConfigBase::ChangeEventInterface", {})
-factory.register(0x1416AEBD8, "Client::UI::Misc::RaptureMacroModule", "Client::UI::Misc::UserFileManager::UserFileEvent", {})
+factory.register(0x1416AEBD8, "Client::UI::Misc::RaptureMacroModule", "Client::UI::Misc::UserFileManager::UserFileEvent", {
+ 0x140603B90: "ctor",
+})
factory.register(0x1416AEC40, "Client::UI::Misc::RaptureTextModule", "", {})
factory.register(0x1416AEEB8, "Client::UI::Misc::RaptureLogModule", "Component::Log::LogModule", {
0x140615990: "ctor",
@@ -1254,6 +1261,15 @@ factory.register(0x1416AEF08, "Client::UI::Misc::RaptureHotbarModule", "Client::
0x1406208E0: "ctor",
})
factory.register(0x1416AEF70, "Client::UI::Misc::RaptureHotbarModule_Client::System::Input::InputCodeModifiedInterface", "Client::System::Input::InputData::InputCodeModifiedInterface", {})
+factory.register(0x1416AEFF8, "Client::UI::Misc::RaptureGearsetModule", "Client::UI::Misc::UserFileManager::UserFileEvent", {
+ 0x14062DDC0: "ctor",
+})
+factory.register(0x1416AF068, "Client::UI::Misc::ItemFinderModule", "Client::UI::Misc::UserFileManager::UserFileEvent", {
+ 0x1406316F0: "ctor",
+})
+factory.register(0x1416AF210, "Client::UI::Misc::ItemOrderModule", "Client::UI::Misc::UserFileManager::UserFileEvent", {
+ 0x140640040: "ctor",
+})
factory.register(0x1416AEFE8, "Client::UI::Misc::PronounModule", "Component::Text::TextChecker::ExecNonMacroFunc", {
0x1406296A0: "ctor",
})
|
H7: remove manual bus off handling
remove this | #define CANFD
-#define BUS_OFF_FAIL_LIMIT 2U
-uint8_t bus_off_err[] = {0U, 0U, 0U};
-
typedef struct {
volatile uint32_t header[2];
volatile uint32_t data_word[CANPACKET_DATA_SIZE_MAX/4U];
@@ -34,20 +31,6 @@ void can_set_gmlan(uint8_t bus) {
puts("GMLAN not available on red panda\n");
}
-void cycle_transceiver(uint8_t can_number) {
- // FDCAN1 = trans 1, FDCAN3 = trans 3, FDCAN2 = trans 2 normal or 4 flipped harness
- uint8_t transceiver_number = can_number;
- if (can_number == 2U) {
- uint8_t flip = (car_harness_status == HARNESS_STATUS_FLIPPED) ? 2U : 0U;
- transceiver_number += flip;
- }
- current_board->enable_can_transceiver(transceiver_number, false);
- delay(20000);
- current_board->enable_can_transceiver(transceiver_number, true);
- bus_off_err[can_number] = 0U;
- puts("Cycled transceiver number: "); puth(transceiver_number); puts("\n");
-}
-
// ***************************** CAN *****************************
void process_can(uint8_t can_number) {
if (can_number != 0xffU) {
@@ -96,27 +79,6 @@ void process_can(uint8_t can_number) {
}
}
- // Recover after Bus-off state
- if (((CANx->PSR & FDCAN_PSR_BO) != 0) && ((CANx->CCCR & FDCAN_CCCR_INIT) != 0)) {
- bus_off_err[can_number] += 1U;
- puts("CAN is in Bus_Off state! Resetting... CAN number: "); puth(can_number); puts("\n");
- if (bus_off_err[can_number] > BUS_OFF_FAIL_LIMIT) {
- cycle_transceiver(can_number);
- }
- CANx->IR = 0xFFC60000U; // Reset all flags(Only errors!)
- CANx->CCCR &= ~(FDCAN_CCCR_INIT);
- uint32_t timeout_counter = 0U;
- while((CANx->CCCR & FDCAN_CCCR_INIT) != 0) {
- // Delay for about 1ms
- delay(10000);
- timeout_counter++;
-
- if(timeout_counter >= CAN_INIT_TIMEOUT_MS){
- puts(CAN_NAME_FROM_CANIF(CANx)); puts(" Bus_Off reset timed out!\n");
- break;
- }
- }
- }
EXIT_CRITICAL();
}
}
|
options/rtdl: implement dlopen(NULL) | @@ -24,6 +24,8 @@ frg::manual_box<Loader> globalLoader;
frg::manual_box<RuntimeTlsMap> runtimeTlsMap;
+static SharedObject *executableSO;
+
// Relocates the dynamic linker (i.e. this DSO) itself.
// Assumptions:
// - There are no references to external symbols.
@@ -178,19 +180,19 @@ extern "C" void *interpreterMain(uintptr_t *entry_stack) {
initialRepository->injectObjectFromDts(ldso_soname, ldso_base, _DYNAMIC, 1);
// TODO: support non-zero base addresses?
- auto executable = initialRepository->injectObjectFromPhdrs("(executable)", phdr_pointer,
+ executableSO = initialRepository->injectObjectFromPhdrs("(executable)", phdr_pointer,
phdr_entry_size, phdr_count, entry_pointer, 1);
Loader linker{globalScope.get(), true, 1};
- linker.submitObject(executable);
+ linker.submitObject(executableSO);
linker.linkObjects();
allocateTcb();
linker.initObjects();
if(logEntryExit)
mlibc::infoLogger() << "Leaving ld.so, jump to "
- << (void *)executable->entry << frg::endlog;
- return executable->entry;
+ << (void *)executableSO->entry << frg::endlog;
+ return executableSO->entry;
}
// the layout of this structure is dictated by the ABI
@@ -231,11 +233,13 @@ extern "C" [[gnu::visibility("default")]]
void *__dlapi_open(const char *file, int local) {
// TODO: Thread-safety!
auto rts = rtsCounter++;
-
if(local)
mlibc::infoLogger() << "\e[31mrtdl: RTLD_LOCAL is not supported properly\e[39m"
<< frg::endlog;
+ if(!file)
+ return executableSO;
+
SharedObject *object;
if(frg::string_view{file}.find_first('/') == size_t(-1)) {
object = initialRepository->requestObjectWithName(file, nullptr, rts);
|
Prevent switch from jumping when clicked | @@ -296,12 +296,20 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param)
if(lv_sw_get_anim_time(sw) > 0) {
/* Keep forcing the slider to old_val */
lv_slider_set_value(sw, old_val);
+ ext->slider.drag_value = old_val;
}
#endif
} else if(sign == LV_SIGNAL_PRESS_LOST) {
ext->changed = 0;
if(lv_sw_get_state(sw)) lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_on);
else lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_off);
+#if USE_LV_ANIMATION
+ if(lv_sw_get_anim_time(sw) > 0) {
+ /* Keep forcing the slider to old_val */
+ lv_slider_set_value(sw, old_val);
+ ext->slider.drag_value = old_val;
+ }
+#endif
} else if(sign == LV_SIGNAL_RELEASED) {
if(ext->changed == 0) {
int16_t v = lv_slider_get_value(sw);
|
Enable PIC if only specifying toolchain. | @@ -421,6 +421,10 @@ function _get_configs_for_cross(package, configs, opt)
-- https://github.com/xmake-io/xmake/issues/2170
if not package:is_plat(os.subhost()) then
envs.CMAKE_SYSTEM_NAME = "Linux"
+ else
+ if package:config("pic") ~= false then
+ table.insert(configs, "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
+ end
end
-- avoid find and add system include/library path
-- @see https://github.com/xmake-io/xmake/issues/2037
|
out_bigquery: always release unpacked results after formatting | @@ -408,11 +408,11 @@ static int bigquery_format(const void *data, size_t bytes,
/* Convert from msgpack to JSON */
out_buf = flb_msgpack_raw_to_json_sds(mp_sbuf.data, mp_sbuf.size);
+ msgpack_unpacked_destroy(&result);
msgpack_sbuffer_destroy(&mp_sbuf);
if (!out_buf) {
flb_plg_error(ctx->ins, "error formatting JSON payload");
- msgpack_unpacked_destroy(&result);
return -1;
}
@@ -448,20 +448,20 @@ static void cb_bigquery_flush(const void *data, size_t bytes,
FLB_OUTPUT_RETURN(FLB_RETRY);
}
- /* Reformat msgpack to bigquery JSON payload */
- ret = bigquery_format(data, bytes, tag, tag_len,
- &payload_buf, &payload_size, ctx);
- if (ret != 0) {
- flb_upstream_conn_release(u_conn);
- FLB_OUTPUT_RETURN(FLB_RETRY);
- }
-
/* Get or renew Token */
token = get_google_token(ctx);
if (!token) {
flb_plg_error(ctx->ins, "cannot retrieve oauth2 token");
flb_upstream_conn_release(u_conn);
- flb_sds_destroy(payload_buf);
+ FLB_OUTPUT_RETURN(FLB_RETRY);
+ }
+
+ /* Reformat msgpack to bigquery JSON payload */
+ ret = bigquery_format(data, bytes, tag, tag_len,
+ &payload_buf, &payload_size, ctx);
+ if (ret != 0) {
+ flb_upstream_conn_release(u_conn);
+ flb_sds_destroy(token);
FLB_OUTPUT_RETURN(FLB_RETRY);
}
@@ -471,6 +471,7 @@ static void cb_bigquery_flush(const void *data, size_t bytes,
if (!c) {
flb_plg_error(ctx->ins, "cannot create HTTP client context");
flb_upstream_conn_release(u_conn);
+ flb_sds_destroy(token);
flb_sds_destroy(payload_buf);
FLB_OUTPUT_RETURN(FLB_RETRY);
}
|
examples MAINTENANCE do not prefix plugins with "lib" | @@ -13,5 +13,6 @@ foreach(app_name IN LISTS examples)
endforeach(app_name)
# oven plugin
-add_library(oven SHARED plugin/oven.c)
+add_library(oven MODULE plugin/oven.c)
+set_target_properties(oven PROPERTIES PREFIX "")
target_link_libraries(oven sysrepo)
|
OS Tick Private Timer updated (it now uses IRQ Controller API) | * @file os_tick_ptim.c
* @brief CMSIS OS Tick implementation for Private Timer
* @version V1.0.0
- * @date 13. June 2017
+ * @date 29. June 2017
******************************************************************************/
/*
- * Copyright (c) 2017-2017 ARM Limited. All rights reserved.
+ * Copyright (c) 2017 ARM Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
*/
#include "os_tick.h"
+#include "irq_ctrl.h"
#include "RTE_Components.h"
#include CMSIS_device_header
-#if defined(PTIM) && defined (__GIC_PRESENT) && (__GIC_PRESENT != 0U)
+#if defined(PTIM)
#ifndef PTIM_IRQ_PRIORITY
#define PTIM_IRQ_PRIORITY 0xFFU
@@ -55,13 +56,13 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler) {
PTIM_SetLoadValue (load);
// Disable corresponding IRQ
- GIC_DisableIRQ (PrivTimer_IRQn);
- GIC_ClearPendingIRQ(PrivTimer_IRQn);
+ IRQ_Disable (PrivTimer_IRQn);
+ IRQ_ClearPending(PrivTimer_IRQn);
// Determine number of implemented priority bits
- GIC_SetPriority (PrivTimer_IRQn, 0xFFU);
+ IRQ_SetPriority (PrivTimer_IRQn, 0xFFU);
- prio = GIC_GetPriority (PrivTimer_IRQn);
+ prio = IRQ_GetPriority (PrivTimer_IRQn);
// At least bits [7:4] must be implemented
if ((prio & 0xF0U) == 0U) {
@@ -79,16 +80,16 @@ int32_t OS_Tick_Setup (uint32_t freq, IRQHandler_t handler) {
prio = (PTIM_IRQ_PRIORITY << bits) & 0xFFUL;
// Set Private Timer interrupt priority
- GIC_SetPriority(PrivTimer_IRQn, prio-1U);
+ IRQ_SetPriority(PrivTimer_IRQn, prio-1U);
- // Set edge-triggered and 1-N model bits
- GIC_SetLevelModel(PrivTimer_IRQn, 1, 1);
+ // Set edge-triggered IRQ
+ IRQ_SetMode(PrivTimer_IRQn, IRQ_MODE_TRIG_EDGE);
// Register tick interrupt handler function
- InterruptHandlerRegister(PrivTimer_IRQn, (IRQHandler)handler);
+ IRQ_SetHandler(PrivTimer_IRQn, handler);
- // Enable corresponding IRQ
- GIC_EnableIRQ (PrivTimer_IRQn);
+ // Enable corresponding interrupt
+ IRQ_Enable (PrivTimer_IRQn);
// Set bits: IRQ enable and Auto reload
PTIM_SetControl (0x06U);
@@ -103,7 +104,7 @@ int32_t OS_Tick_Enable (void) {
// Set pending interrupt if flag set
if (PTIM_PendIRQ != 0U) {
PTIM_PendIRQ = 0U;
- GIC_SetPendingIRQ (PrivTimer_IRQn);
+ IRQ_SetPending (PrivTimer_IRQn);
}
// Start the Private Timer
@@ -126,8 +127,8 @@ int32_t OS_Tick_Disable (void) {
PTIM_SetControl (ctrl);
// Remember pending interrupt flag
- if ((GIC_GetIRQStatus (PrivTimer_IRQn) >> 1) != 0) {
- GIC_ClearPendingIRQ (PrivTimer_IRQn);
+ if (IRQ_GetPending(PrivTimer_IRQn) != 0) {
+ IRQ_ClearPending (PrivTimer_IRQn);
PTIM_PendIRQ = 1U;
}
|
OpenSSL::Test.pm: Replace all uses of rel2abs() with abs_path()
rel2abs() doesn't clean the path well enough, which may lead to odd
results when calculating new paths. abs_path() works better for this
sort of thing. | @@ -65,8 +65,7 @@ C<$SRCTOP/test/recipes/99-foo_data/>.
use File::Copy;
use File::Spec::Functions qw/file_name_is_absolute curdir canonpath splitdir
- catdir catfile splitpath catpath devnull abs2rel
- rel2abs/;
+ catdir catfile splitpath catpath devnull abs2rel/;
use File::Path 2.00 qw/rmtree mkpath/;
use File::Basename;
use Cwd qw/getcwd abs_path/;
@@ -1117,8 +1116,8 @@ sub __data_dir {
sub __cwd {
my $dir = catdir(shift);
my %opts = @_;
- my $abscurdir = rel2abs(curdir());
- my $absdir = rel2abs($dir);
+ my $abscurdir = abs_path(curdir());
+ my $absdir = abs_path($dir);
my $reverse = abs2rel($abscurdir, $absdir);
# PARANOIA: if we're not moving anywhere, we do nothing more
@@ -1152,7 +1151,14 @@ sub __cwd {
my @dirtags = sort keys %directories;
foreach (@dirtags) {
if (!file_name_is_absolute($directories{$_})) {
- my $newpath = abs2rel(rel2abs($directories{$_}), rel2abs($dir));
+ my $oldpath = abs_path($directories{$_});
+ my $newbase = abs_path($dir);
+ my $newpath = abs2rel($oldpath, $newbase);
+ if ($debug) {
+ print STDERR "DEBUG: [dir $_] old path: $oldpath\n";
+ print STDERR "DEBUG: [dir $_] new base: $newbase\n";
+ print STDERR "DEBUG: [dir $_] resulting new path: $newpath\n";
+ }
$tmp_directories{$_} = $newpath;
}
}
@@ -1162,7 +1168,14 @@ sub __cwd {
# process can use their values properly as well
foreach (@direnv) {
if (!file_name_is_absolute($ENV{$_})) {
- my $newpath = abs2rel(rel2abs($ENV{$_}), rel2abs($dir));
+ my $oldpath = abs_path($ENV{$_});
+ my $newbase = abs_path($dir);
+ my $newpath = abs2rel($oldpath, $newbase);
+ if ($debug) {
+ print STDERR "DEBUG: [env $_] old path: $oldpath\n";
+ print STDERR "DEBUG: [env $_] new base: $newbase\n";
+ print STDERR "DEBUG: [env $_] resulting new path: $newpath\n";
+ }
$tmp_ENV{$_} = $newpath;
}
}
@@ -1182,6 +1195,9 @@ sub __cwd {
if ($debug) {
print STDERR "DEBUG: __cwd(), directories and files:\n";
+ print STDERR " Moving from $abscurdir\n";
+ print STDERR " Moving to $absdir\n";
+ print STDERR "\n";
print STDERR " \$directories{BLDTEST} = \"$directories{BLDTEST}\"\n";
print STDERR " \$directories{SRCTEST} = \"$directories{SRCTEST}\"\n";
print STDERR " \$directories{SRCDATA} = \"$directories{SRCDATA}\"\n";
@@ -1191,7 +1207,6 @@ sub __cwd {
print STDERR " \$directories{SRCTOP} = \"$directories{SRCTOP}\"\n";
print STDERR " \$directories{BLDTOP} = \"$directories{BLDTOP}\"\n";
print STDERR "\n";
- print STDERR " current directory is \"",curdir(),"\"\n";
print STDERR " the way back is \"$reverse\"\n";
}
|
Edited preparation document | @@ -49,13 +49,13 @@ The following section lists news about the [plugins](https://www.libelektra.org/
### <<Plugin1>>
-- Removed unused variable that threw an error from filecheck.c. _(Vaibhav Ganesh @flackojr)_
+- Removed unused variable that threw an error in filecheck.c. _(Vaibhav Ganesh @flackojr)_
- <<TODO>>
- <<TODO>>
### <<Plugin2>>
-- <<TODO>>
+- Removed unused variable that threw an error in mmapstorage.c. _(Vaibhav Ganesh @flackojr)_
- <<TODO>>
- <<TODO>>
|
Use 2 stop bits for the UART connection | @@ -85,7 +85,7 @@ class Lora():
if not self.uart:
self.uart = UART(8, 19200)
#self.uart = UART(1, 19200) # Use external module
- self.uart.init(19200, bits=8, parity=None, stop=1, timeout=250, timeout_char=100)
+ self.uart.init(19200, bits=8, parity=None, stop=2, timeout=250, timeout_char=100)
def debug_print(self, data):
|
docs: updated CN trans for linker-script-generation and external-ram | @@ -71,6 +71,7 @@ Placing object files
""""""""""""""""""""
Suppose the entirety of ``my_src1.o`` is performance-critical, so it is desirable to place it in RAM. On the other hand, the entirety of ``my_src2.o`` contains symbols needed coming out of deep sleep, so it needs to be put under RTC memory.
+
In the linker fragment file, we can write:
.. code-block:: none
|
Fixes for SPI pins for "P1" pins | compatible = "nordic,nrf-spi";
/* Cannot be used together with i2c0. */
/* status = "okay"; */
- sck-pin = <13>;
+ sck-pin = <45>;
mosi-pin = <10>;
- miso-pin = <11>;
+ miso-pin = <43>;
};
&flash0 {
};
};
};
-
|
Fixed documentation in linear_hash_handler.h | @@ -45,10 +45,8 @@ linear_hash_dict_insert(
@brief Creates an instance of a dictionary.
@details Creates an instance of a dictionary given a @p key_size and
- @p value_size, in bytes as well as the @p dictionary_size, which
- is the maximum number of levels in the skiplist. By nature of the
- structure, the maximum number of elements is bounded only by memory
- use.
+ @p value_size, in bytes. Given an By nature of the
+ structure, the maximum number of elements is bounded only by memory.
@param id
@param key_type
@@ -152,7 +150,7 @@ linear_hash_dict_update(
}
#endif
-#endif /* SKIP_LIST_HANDLER_H_ */
+#endif /* LINEAR_HASH_HANDLER */
ion_status_t
linear_hash_dict_find(
|
verify receivedFrame and reset txAck_done flag. | @@ -29,8 +29,9 @@ corresponding to the incoming frame.
//=========================== defines =========================================
#define LENGTH_PACKET 3+LENGTH_CRC // maximum length is 127 bytes
+#define MAX_PKT_LEN 125+LENGTH_CRC
#define CHANNEL 11 // 24ghz: 11 = 2.405GHz, subghz: 11 = 865.325 in FSK operating mode #1
-#define BEACON_PERIOD 10 // in seconds
+#define BEACON_PERIOD 20 // in seconds
#define TICKS_IN_ONE_SECOND 32768 // (32768>>1) = 500ms @ 32kHz
#define RX_TIMEOUT 10 // 10 = 300us @ 32kHz
@@ -128,6 +129,7 @@ int mote_main(void) {
app_vars.txack_txDone == 1
) {
+ app_vars.txack_txDone = 0;
app_vars.rxpk_rxDone = 0;
app_vars.rx_timeout = 0;
@@ -196,6 +198,12 @@ void cb_startFrame(PORT_TIMER_WIDTH timestamp) {
void cb_endFrame(PORT_TIMER_WIDTH timestamp) {
+ uint8_t packet[MAX_PKT_LEN];
+ uint8_t pkt_len;
+ int8_t rssi;
+ uint8_t lqi;
+ bool crc;
+
if (app_vars.state == S_SEND_BEACON) {
app_vars.txpk_txDone = 1;
@@ -203,8 +211,26 @@ void cb_endFrame(PORT_TIMER_WIDTH timestamp) {
if (app_vars.state == S_LISTEN_PROBE) {
+ radio_getReceivedFrame(
+ packet,
+ &pkt_len,
+ sizeof(packet),
+ &rssi,
+ &lqi,
+ &crc
+ );
+
+ if (
+ crc &&
+ pkt_len==LENGTH_PACKET &&
+ packet[0]=='S' &&
+ packet[1]=='C' &&
+ packet[2]=='M'
+ ) {
+
sctimer_disable();
app_vars.rxpk_rxDone = 1;
+ }
} else {
if (app_vars.state == S_REPLY_ACK) {
|
[lwip] update list_if: add BROADCAST. | @@ -563,6 +563,7 @@ void list_if(void)
if (netif->flags & NETIF_FLAG_LINK_UP) rt_kprintf(" LINK_UP");
else rt_kprintf(" LINK_DOWN");
if (netif->flags & NETIF_FLAG_ETHARP) rt_kprintf(" ETHARP");
+ if (netif->flags & NETIF_FLAG_BROADCAST) rt_kprintf(" BROADCAST");
if (netif->flags & NETIF_FLAG_IGMP) rt_kprintf(" IGMP");
rt_kprintf("\n");
rt_kprintf("ip address: %s\n", ipaddr_ntoa(&(netif->ip_addr)));
|
[kernel][idle] Improve rt_thread_idle_sethook and rt_thread_idle_delhook code. | * dead thread.
* 2016-08-09 ArdaFu add method to get the handler of the idle thread.
* 2018-02-07 Bernard lock scheduler to protect tid->cleanup.
+ * 2018-07-14 armink add idle hook list
*/
#include <rthw.h>
@@ -75,6 +76,7 @@ rt_err_t rt_thread_idle_sethook(void (*hook)(void))
{
rt_size_t i;
rt_base_t level;
+ rt_err_t ret = -RT_EFULL;
/* disable interrupt */
level = rt_hw_interrupt_disable();
@@ -84,16 +86,14 @@ rt_err_t rt_thread_idle_sethook(void (*hook)(void))
if (idle_hook_list[i] == RT_NULL)
{
idle_hook_list[i] = hook;
- /* enable interrupt */
- rt_hw_interrupt_enable(level);
-
- return RT_EOK;
+ ret = RT_EOK;
+ break;
}
}
/* enable interrupt */
rt_hw_interrupt_enable(level);
- return -RT_EFULL;
+ return ret;
}
/**
@@ -108,6 +108,7 @@ rt_err_t rt_thread_idle_delhook(void (*hook)(void))
{
rt_size_t i;
rt_base_t level;
+ rt_err_t ret = -RT_ENOSYS;
/* disable interrupt */
level = rt_hw_interrupt_disable();
@@ -117,16 +118,14 @@ rt_err_t rt_thread_idle_delhook(void (*hook)(void))
if (idle_hook_list[i] == hook)
{
idle_hook_list[i] = RT_NULL;
- /* enable interrupt */
- rt_hw_interrupt_enable(level);
-
- return RT_EOK;
+ ret = RT_EOK;
+ break;
}
}
/* enable interrupt */
rt_hw_interrupt_enable(level);
- return -RT_ENOSYS;
+ return ret;
}
#endif
|
Base 666: Do not export en/decoding functions | #include <kdb.h>
#include <kdberrors.h>
-int decode (Key * key, Key * parent)
+static int decode (Key * key, Key * parent)
{
const char * strVal = keyString (key);
@@ -46,7 +46,7 @@ int decode (Key * key, Key * parent)
return 1;
}
-int encode (Key * key, Key * parent)
+static int encode (Key * key, Key * parent)
{
if (keyIsBinary (key) == 0) return 0;
|
nucleo-l073rz: Add PWM configuration
BSP was missing any PWM devices while board
was capable of having 2 (without additional changes
to PWM driver).
This adds two PWM device configuration that can be used
in application (i.e. pwm_test) | @@ -89,6 +89,20 @@ const struct stm32_hal_i2c_cfg os_bsp_i2c2_cfg = {
};
#endif
+#if MYNEWT_VAL(PWM_0)
+struct stm32_pwm_conf os_bsp_pwm0_cfg = {
+ .tim = TIM3,
+ .irq = TIM3_IRQn,
+};
+#endif
+
+#if MYNEWT_VAL(PWM_1)
+struct stm32_pwm_conf os_bsp_pwm1_cfg = {
+ .tim = TIM2,
+ .irq = TIM2_IRQn,
+};
+#endif
+
static const struct hal_bsp_mem_dump dump_cfg[] = {
[0] = {
.hbmd_start = &_ram_start,
|
Switching fileslower -> funcslower in the man pages | .TH funcslower 8 "2017-03-30" "USER COMMANDS"
.SH NAME
-fileslower \- Trace slow kernel or user function calls.
+funcslower \- Trace slow kernel or user function calls.
.SH SYNOPSIS
-.B fileslower [\-hf] [\-p PID] [\-U | \-K] [-m MIN_MS] [-u MIN_US] [-a ARGUMENTS] [-T] [-t] [-v] function [function ...]
+.B funcslower [\-hf] [\-p PID] [\-U | \-K] [-m MIN_MS] [-u MIN_US] [-a ARGUMENTS] [-T] [-t] [-v] function [function ...]
.SH DESCRIPTION
This script traces a kernel or user function's entry and return points, and
prints a message when the function's latency exceeded the specified threshold.
|
Remove obsolete ocf_cache_wait_for_io_finish from pyocf | @@ -482,7 +482,6 @@ class Cache:
[("cache", c_void_p), ("priv", c_void_p), ("error", c_int)]
)
- self.owner.lib.ocf_cache_wait_for_io_finish(self.cache_handle)
self.owner.lib.ocf_mngt_cache_stop(self.cache_handle, c, None)
c.wait()
|
schema compile BUGFIX removed assert
... because the deviations can cause a false in the assert condition.
Fixes | @@ -3319,7 +3319,6 @@ lys_compile_node_choice_child(struct lysc_ctx *ctx, struct lysp_node *child_p, s
/* Compiled case node cannot point to his corresponding parsed node
* because it exists temporarily. Therefore, it must be set to NULL.
*/
- assert(compiled_case->priv == cs_p);
compiled_case->priv = NULL;
}
|
set alarm for behn timers | @@ -78,6 +78,7 @@ u3_behn_ef_doze(u3_noun wen)
u3_noun now = u3_time_in_tv(&tim_tv);
c3_d gap_d = u3_time_gap_ms(now, u3k(u3t(wen)));
+ teh_u->alm = c3y;
uv_timer_start(&teh_u->tim_u, _behn_time_cb, gap_d, 0);
}
|
Docs - add GreenplumR 1.1.0 to component version table | </thead>
<tbody>
<row>
- <entry colname="col1">1.0.0</entry>
+ <entry colname="col1">1,1,0, 1.0.0</entry>
<entry colname="col2">3.6+</entry>
<entry colname="col3">6.1+</entry>
<entry colname="col4">3.0.2+</entry>
|
Account for lr in aarch64's uc_addr | @@ -49,6 +49,8 @@ uc_addr (unw_tdep_context_t *uc, int reg)
#ifdef __FreeBSD__
if (reg >= UNW_AARCH64_X0 && reg < UNW_AARCH64_X30)
return &uc->uc_mcontext.mc_gpregs.gp_x[reg];
+ else if (reg == UNW_AARCH64_X30)
+ return &uc->uc_mcontext.mc_gpregs.gp_lr;
else if (reg == UNW_AARCH64_SP)
return &uc->uc_mcontext.sp;
else if (reg == UNW_AARCH64_PC)
@@ -58,7 +60,7 @@ uc_addr (unw_tdep_context_t *uc, int reg)
else
return NULL;
#else /* __FreeBSD__ */
- if (reg >= UNW_AARCH64_X0 && reg < UNW_AARCH64_X30)
+ if (reg >= UNW_AARCH64_X0 && reg <= UNW_AARCH64_X30)
return &uc->uc_mcontext.regs[reg];
else if (reg == UNW_AARCH64_SP)
return &uc->uc_mcontext.sp;
|
driver/accelgyro_icm_common.h: Format with clang-format
BRANCH=none
TEST=none | @@ -35,10 +35,8 @@ struct icm_drv_data_t {
uint8_t fifo_buffer[ICM_FIFO_BUFFER] __aligned(sizeof(long));
};
-#define ICM_GET_DATA(_s) \
- ((struct icm_drv_data_t *)(_s)->drv_data)
-#define ICM_GET_SAVED_DATA(_s) \
- (&ICM_GET_DATA(_s)->saved_data[(_s)->type])
+#define ICM_GET_DATA(_s) ((struct icm_drv_data_t *)(_s)->drv_data)
+#define ICM_GET_SAVED_DATA(_s) (&ICM_GET_DATA(_s)->saved_data[(_s)->type])
/*
* Virtual register address is 16 bits:
@@ -125,8 +123,7 @@ static inline void icm_reset_stabilize_ts(const struct motion_sensor_t *s)
st->stabilize_ts[s->type] = 0;
}
-static inline
-int32_t icm_get_sensor_stabilized(const struct motion_sensor_t *s,
+static inline int32_t icm_get_sensor_stabilized(const struct motion_sensor_t *s,
uint32_t ts)
{
struct icm_drv_data_t *st = ICM_GET_DATA(s);
|
Add encrypted api token. | @@ -12,9 +12,9 @@ os:
before_deploy:
deploy:
provider: releases
- api_key: "GITHUB OAUTH TOKEN"
- file: "$TRAVIS_BUILD_DIR/janet-${TRAVIS_TAG}-${TRAVIS_OS_NAME}.tar.gz"
- skip_cleanup: true
+ api_key:
+ secure: JSqAOTH1jmfVlbOuPO3BbY1BhPq+ddiBNPCxuAyKHoVwfO4eNAmq9COI+UwCMWY3dg+YlspufRwkHj//B7QQ6hPbSsKu+Mapu6gr/CAE/jxbfO/E98LkIkUwbGjplwtzw2kiBkHN/Bu6J5X76cwo4D8nwQ1JIcV3nWtoG87t7H4W0R4AYQkbLGAPylgUFr11YMPx2cRBBqCdLAGIrny7kQ/0cRBfkN81R/gUJv/q3OjmUvY7sALXp7mFdZb75QPSilKIDuVUU5hLvPYTeRl6cWI/M+m5SmGZx1rjv5S9Qaw070XoNyt9JAADtbOUnADKvDguDZIP1FCuT1Gb+cnJPzrvk6+OBU9s8UjCTFtgV+LKlhmRZcwV5YQBE94PKRMJNC6VvIWM7UeQ8Zhm1jmQS6ONNWbuoUAlkZP57NtDQa2x0GT2wkubNSQKlaY+6/gwTD9KAJIzaZG7HYXH7b+4g7VbccCyhDAtDZtXgrOIS4WAkNc8rWezRO4H0qHMyON9aCEb0eTE8hWIufbx6ymG4gUxnYO+AkrEYMCwQvU6lS8BsevkaMTVtSShqlQtJ9FRlmJA3MA2ONyqzQXJENqRydyVbpFrKSv+0HbMyhEc5BoKbt0QcTh/slouNV4eASNar/GKN7aP8XKGUeMwIoCcRpP+3ehmwX9SUw7Ah5S42pA=
+ file: janet-${TRAVIS_TAG}-${TRAVIS_OS_NAME}.tar.gz
draft: true
on:
- tags: true
+ repo: bakpakin/janet
|
Add check for unsupported type | @@ -14,6 +14,15 @@ namespace kdb
namespace tools
{
+const std::set<std::string> supportedTypes{
+ "enum", "short", "unsigned_short", "long", "unsigned_long", "long_long", "unsigned_long_long", "float", "double",
+ "long_double"
+ "char",
+ "boolean",
+ "octet",
+ "any", "string"
+};
+
SpecBackendBuilder::SpecBackendBuilder (BackendBuilderInit const & bbi) : MountBackendBuilder (bbi), nodes (0)
{
}
@@ -201,10 +210,20 @@ void SpecReader::checkKey(const Key key) {
&& key.hasMeta ("check/enum")) {
stringStream << "Key " << key.getName() << " has \"type\"=\"" << key.getMeta<std::string>("type") << "\" and \"check/enum\". \"check/enum\" can only be used with \"type=enum\"!";
}
- // Ensure that type and check/type are equal
- else if (key.hasMeta ("type") && key.hasMeta ("check/type")
- && key.getMeta<std::string>("type") != key.getMeta<std::string> ("check/type")) {
- stringStream << "Key " << key.getName() << " has different values for \"type\" and \"check/type\". If both are specified, they must be equal!";
+ // Checks for "type" and "check/type" are equal
+ else if (key.hasMeta ("type")) {
+ std::string keyType = key.getMeta<std::string> ("type");
+ // Check if "type" is supported
+ if(std::find(supportedTypes.begin(), supportedTypes.end(), key.getMeta<std::string> ("type")) == supportedTypes.end()) {
+ stringStream << "Type \"" << key.getMeta<std::string>("type") << "\" of key \"" << key.getName() << "\" is not supported in Elektra!";
+ }
+ // Check if "type" and "check/type" are equal
+ else if (key.hasMeta ("check/type")
+ && key.getMeta<std::string> ("check/type") != keyType)
+ {
+ stringStream << "Key " << key.getName ()
+ << " has different values for \"type\" and \"check/type\". If both are specified, they must be equal!";
+ }
}
if (stringStream.str().length() > 0) {
throw CommandAbortException(stringStream.str());
|
PACSign doc: add description of key naming
Add a table describing the required key naming conventions for
each image type. | @@ -212,6 +212,25 @@ describes the options required based on certification type.
Omitting one key generates a valid, but unauthenticated bitstream. You can only load the
unauthenticated bitstream on a PAC with no root entry hash programmed for that bitstream type.
+### Key Naming Convention ###
+
+Key pairs are required to follow the naming format described in the table below.
+
+| Material Type | Naming Convention |
+|---|---|
+| SR | * \_fim\_ * \_private/public\_ *.pem |
+| FACTORY | * \_fim2\_ * \_private/public\_ *.pem OR * \_factory\_ * \_private/public\_ *.pem |
+| SR_TEST | * \_sr\_test\_ * \_private/public\_ *.pem |
+| SR_CERT | * \_sr\_cert\_ * \_private/public\_ *.pem |
+| BMC | * \_bmc\_ * \_private/public\_ *.pem |
+| BMC_FACTORY | * \_bmc\_factory\_ * \_private/public\_ *.pem |
+| PR | * \_pr\_ * \_private/public\_ *.pem |
+| PR_TEST | * \_pr\_test\_ * \_private/public\_ *.pem |
+| PXE | * \_pxe\_ * \_private/public\_ *.pem |
+| THERM_SR | * \_therm\_sr\_ * \_private/public\_ *.pem |
+| THERM_PR | * \_therm\_pr\_ * \_private/public\_ *.pem |
+| SDM | * \_sdm\_ * \_private/public\_ *.pem |
+
## EXAMPLES ##
The following command generates a root hash programming PR bitstream.
|
SOVERSION bump to version 6.1.19 | @@ -68,7 +68,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_
# with backward compatible change and micro version is connected with any internal change of the library.
set(SYSREPO_MAJOR_SOVERSION 6)
set(SYSREPO_MINOR_SOVERSION 1)
-set(SYSREPO_MICRO_SOVERSION 18)
+set(SYSREPO_MICRO_SOVERSION 19)
set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION})
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
|
fix gmake2 utility outputting an entire set of elements. | gmake2.shellType,
utility.initialize,
utility.createFileTable,
+ utility.outputConfigurationSection,
utility.outputFilesSection,
utility.outputRulesSection,
utility.outputFileRuleSection,
end
+ function utility.outputConfigurationSection(prj)
+ _p('# Configurations')
+ _p('# #############################################')
+ _p('')
+ gmake2.outputSection(prj, utility.elements.configuration)
+ end
+
+
--
-- Write out the file sets.
|
enclave-tls: add debug mode
This patch solves the error when setting DEBUG=1: hidden symbol `stat' in
/usr/lib/x86_64-linux-gnu/libc_nonshared.a(stat.oS) is referenced by DSO.
Fixes: | @@ -60,7 +60,7 @@ endif
libenclave_tls_objs := $(libenclave_tls_files:.c=.o)
$(Build_Libdir)/$(libenclave_tls): $(Build_Dependencies) $(libenclave_tls_objs)
@$(INSTALL) -d -m 0755 $(dir $@)
- $(LD) $(Enclave_Tls_Ldflags) -soname=$(notdir $@).$(Major_Version) -o $@ $(libenclave_tls_objs) -ldl $(Enclave_Tls_Extra_Ldflags)
+ $(LD) $(Enclave_Tls_Ldflags) -soname=$(notdir $@).$(Major_Version) -o $@ $(libenclave_tls_objs) -ldl -lc $(Enclave_Tls_Extra_Ldflags)
$(libenclave_tls_objs): %.o: %.c
$(CC) -c $(Enclave_Tls_Cflags) -o $@ $<
|
sse4.1: fix _mm_blend_{ps,pd} mask
It was using 0x80 instead of the high bit of the relevant type. | -/* Copyright (c) 2017 Evan Nemerson <[email protected]>
+/* Copyright (c) 2017-2018 Evan Nemerson <[email protected]>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -163,7 +163,7 @@ simde_mm_blendv_pd (simde__m128d a, simde__m128d b, simde__m128d mask) {
simde__m128d r;
SIMDE__VECTORIZE
for (size_t i = 0 ; i < (sizeof(r.f64) / sizeof(r.f64[0])) ; i++) {
- if (mask.u64[i] & 0x80) {
+ if (mask.u64[i] & (UINT64_C(1) << 63)) {
r.f64[i] = b.f64[i];
} else {
r.f64[i] = a.f64[i];
@@ -182,7 +182,7 @@ simde_mm_blendv_ps (simde__m128 a, simde__m128 b, simde__m128 mask) {
simde__m128 r;
SIMDE__VECTORIZE
for (size_t i = 0 ; i < (sizeof(r.f32) / sizeof(r.f32[0])) ; i++) {
- if (mask.u32[i] & 0x80) {
+ if (mask.u32[i] & (UINT32_C(1) << 31)) {
r.f32[i] = b.f32[i];
} else {
r.f32[i] = a.f32[i];
|
plugins types BUGFIX leafref can match several data nodes
Fixes sysrepo/sysrepo#2930 | @@ -1005,8 +1005,7 @@ lyplg_type_resolve_leafref(const struct lysc_type_leafref *lref, const struct ly
/* check the result */
if (target_path) {
- /* no or exact match */
- assert(!set.used || (set.used == 1));
+ /* no or exact match(es) */
i = 0;
} else {
/* check whether any matches */
|
build: update GoogleCloudPlatform/github-actions/setup-gcloud to 0.2.0 | @@ -100,7 +100,7 @@ jobs:
name: mars
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- - uses: GoogleCloudPlatform/github-actions/[email protected]
+ - uses: GoogleCloudPlatform/github-actions/[email protected]
with:
version: '290.0.1'
service_account_key: ${{ secrets.GCS_SERVICE_ACCOUNT_KEY }}
|
Add MobHunt to EventHandlerType | @@ -58,6 +58,7 @@ public enum EventHandlerType : ushort {
InstanceContentGuide = 0x001D,
HousingAethernet = 0x001E,
FcTalk = 0x001F,
+ MobHunt = 0x0020,
Adventure = 0x0021,
DailyQuestSupply = 0x0022,
TripleTriad = 0x0023,
|
binfmt: Check return pointer.
Function builtin_for_index may return NULL.
We must check this to prevent visit invalid address. | @@ -97,6 +97,12 @@ static int builtin_loadbinary(FAR struct binary_s *binp,
*/
builtin = builtin_for_index(index);
+ if (builtin == NULL)
+ {
+ berr("ERROR: %s is not a builtin application\n", filename);
+ return -ENOENT;
+ }
+
binp->entrypt = builtin->main;
binp->stacksize = builtin->stacksize;
binp->priority = builtin->priority;
|
OcDevicePathLib: Fix Hyper-V startup disk device path expansion
Hyper-V device paths changed to allow for hot add/remove of disks per | @@ -838,6 +838,9 @@ BmConnectUsbShortFormDevicePath (
/Scsi(0x0,0x0)
/HD(2,GPT,63882141-5773-4630-B8FD-2C6E4A491C78,0x64028,0x3A66090)
+ Additionally, MacHyperVSupport exposes disks as individual SCSI targets to properly support hotplug
+ where Hyper-V exposes just a single target.
+
@param[in] FilePath macOS-made device path with ACPI parts trimmed (i.e. Scsi(0x0, 0x0)/.../File).
@return real Hyper-V device path or NULL.
@@ -856,9 +859,21 @@ BmExpandHyperVDevicePath (
EFI_DEVICE_PATH_PROTOCOL *Node;
EFI_DEVICE_PATH_PROTOCOL *NewDevicePath;
UINTN HvSuffixSize;
+ SCSI_DEVICE_PATH *FileScsiPath;
+ SCSI_DEVICE_PATH *HvScsiPath;
DebugPrintDevicePath (DEBUG_INFO, "OCDP: Expanding Hyper-V DP", FilePath);
+ //
+ // Get SCSI device node from file path, if any.
+ //
+ FileScsiPath = NULL;
+ if ( (DevicePathType (FilePath) == MESSAGING_DEVICE_PATH)
+ && (DevicePathSubType (FilePath) == MSG_SCSI_DP)) {
+ FileScsiPath = (SCSI_DEVICE_PATH *) FilePath;
+ FilePath = NextDevicePathNode (FilePath);
+ }
+
Status = gBS->LocateHandleBuffer (
ByProtocol,
&gEfiSimpleFileSystemProtocolGuid,
@@ -884,6 +899,21 @@ BmExpandHyperVDevicePath (
DebugPrintDevicePath (DEBUG_INFO, "OCDP: Matching Hyper-V DP", HvDevicePath);
for (Node = HvDevicePath; !IsDevicePathEnd (Node); Node = NextDevicePathNode (Node)) {
+ //
+ // Skip over SCSI paths if the target of the file path matches the LUN of this one.
+ //
+ if ( FileScsiPath != NULL
+ && (DevicePathType (Node) == MESSAGING_DEVICE_PATH)
+ && (DevicePathSubType (Node) == MSG_SCSI_DP))
+ {
+ HvScsiPath = (SCSI_DEVICE_PATH*) Node;
+ if (HvScsiPath->Pun == FileScsiPath->Lun && HvScsiPath->Lun == FileScsiPath->Pun) {
+ continue;
+ } else {
+ break;
+ }
+ }
+
//
// Skip till we find the matching node in the middle of macOS-made DP.
//
|
naive: update wires and path in azimuth | :: TODO: add poke action to allow switching?
:: eth snapshot could also be considered
::
- %mainnet
+ %local
:: TODO: maybe flop the endianness here so metamask signs it in normal
:: order?
::
:- [%give %fact ~[path] %azimuth-udiffs !>(~[i.udiffs])]
$(udiffs t.udiffs)
::
-++ aggregator-update
+++ tx-update
|= effects=(list tagged-diff)
^- (list card:agent:gall)
%+ murn effects
?. ?=(%tx +<.tag) ~
%- some
^- card:agent:gall
- [%give %fact ~[/aggregator] %naive-diffs !>(+.tag)]
+ [%give %fact ~[/txs] %naive-diffs !>(+.tag)]
::
++ get-network
|= =network
|= =path
^- (quip card:agent:gall _this)
?< =(/sole/drum path)
- ?: =(/aggregator path)
+ ?: =(/txs path)
:_ this
[%give %fact ~ %naive-state !>(nas.state)]~
=/ who=(unit ship)
==
=? nas.state ?=(%history -.diff) *^state:naive
=^ effects nas.state
- %^ run-logs
+ =; nas=^state:naive
+ (run-logs nas loglist.diff net)
?- -.diff
:: %history *^state:naive
%history nas.state
%logs nas.state
==
- loglist.diff
- net
::
:_ this
%+ weld
- (aggregator-update effects)
+ (tx-update effects)
(jael-update (to-udiffs effects))
::
++ on-arvo on-arvo:def
|
u3: removes obsolete bail:need assertion | @@ -612,7 +612,6 @@ c3_w Exit;
** %intr :: interrupt
** %fail :: computability failure
** %over :: stack overflow (a kind of %fail)
-** %need :: namespace block
** %meme :: out of memory
**
** These are equivalents of the full exception noun, the error ball:
@@ -673,21 +672,15 @@ u3m_bail(u3_noun how)
/* Reconstruct a correct error ball.
*/
- {
if ( _(u3ud(how)) ) {
switch ( how ) {
case c3__exit: {
how = u3nc(2, u3R->bug.tax);
- break;
- }
- case c3__need: {
- c3_assert(0);
- }
+ } break;
+
default: {
how = u3nt(3, how, u3R->bug.tax);
- break;
- }
- }
+ } break;
}
}
|
Extract a generic +require-authorization gate. | ::
"</body></html>"
==
+:: +require-authorization: redirect to the login page when unauthenticated
+::
+++ require-authorization
+ |* [=bone move=mold this=*]
+ |= handler=$-(inbound-request:light (quip move _this))
+ |= =inbound-request:light
+ ^- (quip move _this)
+ ::
+ ?: authenticated.inbound-request
+ (handler inbound-request)
+ ::
+ :_ this
+ ^- (list move)
+ =/ redirect=cord
+ %- crip
+ "/~/login?redirect={(trip url.http-request.inbound-request)}"
+ [bone [%http-response %start 307 ['location' redirect]~ ~ %.y]]~
--
|%
::
:- ^- move
[ost.bow %wait /timer (add now.bow ~s1)]
moves
-::
-:: ++ require-authorization
-:: |= handle=$-(inbound-request:light (quip move _this))
-:: |= =inbound-request:light
-:: ^- (quip move _this)
-:: ::
-:: ::
-:: (handle inbound-request)
-
:: +poke-handle-http-request: received on a new connection established
::
++ poke-handle-http-request
+ %- (require-authorization ost.bow move this)
|= =inbound-request:light
^- (quip move _this)
::
- ?. authenticated.inbound-request
- :_ this
- ^- (list move)
- =/ redirect=cord
- %- crip
- "/~/login?redirect={(trip url.http-request.inbound-request)}"
- [ost.bow [%http-response %start 307 ['location' redirect]~ ~ %.y]]~
- ::
=+ request-line=(parse-request-line url.http-request.inbound-request)
~& [%request-line request-line]
=/ name=@t
|
Fix build with --with-cryptopp --disable-shared
Adds -lstdc++ to LIBS in configure when cryptopp is enabled. Without
lstdc++ linking fails when configured with --with-cryptopp and
disable-shared. | @@ -70,6 +70,7 @@ AS_IF([test "x$with_cryptopp" = "xyes"],
)
AM_CONDITIONAL([USE_CRYPTOPP], [test "x$with_cryptopp" = "xyes"])
+AS_IF([test "x$with_cryptopp" = "xyes"], [cryptopp_LIBS="$cryptopp_LIBS -lstdc++"])
CPPFLAGS="$CPPFLAGS $cryptopp_CFLAGS"
LIBS="$LIBS $cryptopp_LIBS"
|
Removed prerelease naming from RHEL | @@ -30,7 +30,7 @@ osname=$(cat /etc/os-release | grep -e ^NAME=)
rpmname="Not_Found"
if [[ $osname =~ "Red Hat" ]]; then
echo "Red Hat found!!!"
- rpmname=${1:-aomp_REDHAT_7_prerelease}
+ rpmname=${1:-aomp_REDHAT_7}
fi
if [[ $osname =~ "SUSE" ]]; then
|
Reformat kconfig tests | @@ -197,18 +197,13 @@ TEST (kconfig, read_tests)
TEST (kconfig, invalid_read_tests)
{
test_read_fails ("[openGroupName");
- test_read_fails ("multiple.locales[en][de]" //
- );
+ test_read_fails ("multiple.locales[en][de]");
test_read_fails ("[content after the group]name\n");
test_read_fails ("[content after the group name] \n");
- test_read_fails ("content after[locale] textt" //
- );
- test_read_fails ("[invalid escape \\character]" //
- );
- test_read_fails ("invalid escape \\character in=key name" //
- );
- test_read_fails ("invalid escape=\\character in key value" //
- );
+ test_read_fails ("content after[locale] textt");
+ test_read_fails ("[invalid escape \\character]");
+ test_read_fails ("invalid escape \\character in=key name");
+ test_read_fails ("invalid escape=\\character in key value");
}
// -- Main ---------------------------------------------------------------------------------------------------------------------------------
|
hammer: Use different KB scanning matrix for masterball
ODM/OEM decided to change pinout.
BRANCH=none
TEST=make BOARD=masterball
TEST=Check that there is not interrupt conflict in gpio.inc | @@ -21,6 +21,31 @@ GPIO_INT(TABLET_MODE_L, PIN(B, 11), GPIO_PULL_UP | GPIO_INT_BOTH, gmr_tablet_swi
#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH)
#define GPIO_KB_OUTPUT GPIO_ODR_HIGH
+#ifdef BOARD_MASTERBALL
+GPIO_INT(KB_IN00, PIN(B, 2), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN01, PIN(B, 13), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN02, PIN(B, 1), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN03, PIN(A, 6), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN04, PIN(B, 10), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN05, PIN(B, 12), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN06, PIN(A, 7), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+GPIO_INT(KB_IN07, PIN(B, 0), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
+
+/* Do not forget to update KB_OUT_PORT_LIST to match this. */
+GPIO(KB_OUT00, PIN(C, 15), GPIO_KB_OUTPUT)
+GPIO(KB_OUT01, PIN(C, 14), GPIO_KB_OUTPUT)
+GPIO(KB_OUT02, PIN(A, 2), GPIO_KB_OUTPUT)
+GPIO(KB_OUT03, PIN(A, 1), GPIO_KB_OUTPUT)
+GPIO(KB_OUT04, PIN(F, 1), GPIO_KB_OUTPUT)
+GPIO(KB_OUT05, PIN(A, 3), GPIO_KB_OUTPUT)
+GPIO(KB_OUT06, PIN(A, 0), GPIO_KB_OUTPUT)
+GPIO(KB_OUT07, PIN(F, 0), GPIO_KB_OUTPUT)
+GPIO(KB_OUT08, PIN(A, 5), GPIO_KB_OUTPUT)
+GPIO(KB_OUT09, PIN(A, 4), GPIO_KB_OUTPUT)
+GPIO(KB_OUT10, PIN(B, 14), GPIO_KB_OUTPUT)
+GPIO(KB_OUT11, PIN(B, 15), GPIO_KB_OUTPUT)
+GPIO(KB_OUT12, PIN(A, 8), GPIO_KB_OUTPUT)
+#else /* !BOARD_MASTERBALL */
GPIO_INT(KB_IN00, PIN(A, 4), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
#ifdef BOARD_WHISKERS
GPIO_INT(KB_IN01, PIN(B, 10), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt)
@@ -53,6 +78,7 @@ GPIO(KB_OUT09, PIN(C, 15), GPIO_KB_OUTPUT)
GPIO(KB_OUT10, PIN(F, 1), GPIO_KB_OUTPUT)
GPIO(KB_OUT11, PIN(F, 0), GPIO_KB_OUTPUT)
GPIO(KB_OUT12, PIN(C, 13), GPIO_KB_OUTPUT)
+#endif /* !BOARD_MASTERBALL */
/* I2C pins should be configured as inputs until I2C module is */
/* initialized. This will avoid driving the lines unintentionally.*/
|
neighbor advertisement must with target_link option | @@ -5050,6 +5050,8 @@ send_ip6_na_w_addr (vlib_main_t * vm,
h->neighbor.target_address = ip6_addr[0];
h->neighbor.advertisement_flags = clib_host_to_net_u32
(ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE);
+ h->link_layer_option.header.type =
+ ICMP6_NEIGHBOR_DISCOVERY_OPTION_target_link_layer_address;
clib_memcpy (h->link_layer_option.ethernet_address,
hi->hw_address, vec_len (hi->hw_address));
h->neighbor.icmp.checksum =
|
Windows/Cygwin dlls need the executable bit set
CLA: trivial | @@ -622,7 +622,7 @@ install_runtime_libs: build_libs
: {- output_off() unless windowsdll(); "" -}; \
$(ECHO) "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
cp $$s $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
- chmod 644 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
+ chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
$(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
: {- output_on() unless windowsdll(); "" -}{- output_off() if windowsdll(); "" -}; \
|
Allow start time to be set with EN_settimeparam
Add additional case for `EN_STARTTIME` to the `EN_settimeparam`
function. | @@ -1591,6 +1591,11 @@ int DLLEXPORT EN_settimeparam(EN_Project p, int param, long value)
time->Qtime = value;
break;
+ case EN_STARTTIME:
+ if (value < 0) return 213;
+ time->Tstart = value;
+ break;
+
default:
return 251;
}
|
Fix MCF Simplified UI Web job | @@ -337,6 +337,7 @@ function addWebConnector(){
},1500));
} else {
$("#addWeb").trigger("reset");
+ var jobStarted = "";
if(document.getElementById('startJobWeb').checked) {
jobStarted = " and started";
}
|
mm/mm_heap/mm_free : Add givesemaphore before returning failure case
Before double free checking, we took semaphore for that heap. So before returning, we should give the semaphore. | @@ -129,6 +129,7 @@ void mm_free(FAR struct mm_heap_s *heap, FAR void *mem)
* 3rd scenario: ptr = malloc(100); free(ptr); if(ptr) { free(ptr); }
*/
mdbg("Attempt for double freeing a pointer or releasing an unallocated pointer\n");
+ mm_givesemaphore(heap);
return;
}
#ifdef CONFIG_DEBUG_MM_HEAPINFO
|
Added test run in Docker build | @@ -10,10 +10,9 @@ RUN apt update \
COPY . .
-RUN make dictu DISABLE_HTTP=1
-
-RUN cp dictu /usr/bin/ \
+RUN make dictu DISABLE_HTTP=1 \
+ && cp dictu /usr/bin/ \
+ && dictu tests/runTests.du \
&& rm -rf *
CMD ["dictu"]
-
|
cirrus: remove python2 installation | @@ -153,7 +153,6 @@ mac_task:
brew update # Work around for [Homebrew Services issue 206](https://github.com/Homebrew/homebrew-services/issues/206)
brew services start dbus
- | # Install Python
- brew install python@2; brew link --overwrite python@2
brew install python || brew upgrade python
- | # Install Python packages
pip install cmake-format[yaml]==0.6.3
|
api: removing namespace conflict | @@ -7,7 +7,8 @@ export * as groups from './groups';
export * from './hark';
export * as hark from './hark';
export * from './invite';
-export * as invite from './invite';
+// this conflicts with /groups/lib invite
+// export * as invite from './invite';
export * from './metadata';
export * as metadata from './metadata';
export * from './settings';
|
removed bosch safety forwarding restriction on 29 bit addresses | @@ -126,7 +126,7 @@ static int honda_fwd_hook(int bus_num, CAN_FIFOMailBox_TypeDef *to_fwd) {
int bus_fwd_num = -1;
if (bosch_hardware && (bus_num == 1 || bus_num == 2)) {
int addr = to_fwd->RIR>>21;
- bus_fwd_num = addr != 0xE4 && addr != 0x33D && addr < 0x1000 ? (uint8_t)(~bus_num & 0x3) : -1;
+ bus_fwd_num = addr != 0xE4 && addr != 0x33D ? (uint8_t)(~bus_num & 0x3) : -1;
}
return bus_fwd_num;
}
|
fix spinner follinwg by circle followpionts bugs | @@ -102,7 +102,7 @@ def add_followpoints(beatmap, component, frame_info, preempt_followpoint):
if frame_info.cur_time + preempt_followpoint >= frame_info.obj_endtime and frame_info.index_fp + 2 < len(
beatmap.hitobjects):
frame_info.index_fp += 1
-
+ if "new combo" not in beatmap.hitobjects[frame_info.index_fp]["type"]:
component.followpoints.add_fp(frame_info.x_end, frame_info.y_end, frame_info.obj_endtime,
beatmap.hitobjects[frame_info.index_fp])
|
demos: Add clean target for bio/Makefile
CLA: trivial | @@ -28,3 +28,6 @@ server-conf: server-conf.o
client-arg client-conf saccept sconnect server-arg server-cmod server-conf:
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+
+clean:
+ $(RM) *.o client-arg client-conf saccept sconnect server-arg server-cmod server-conf
|
Disabled %cake-woot-bad printf in ames. | ==
::
%cake
- ~? ?=(^ r.bon) [%cake-woot-bad hen r.bon]
+ :: ~? ?=(^ r.bon) [%cake-woot-bad hen r.bon]
:_ fox
:~ [s.bon %give %woot q.p.bon r.bon]
==
|
Lower required Elixir version | @@ -5,7 +5,7 @@ defmodule Elektra.MixProject do
[
app: :elektra,
version: "0.1.0",
- elixir: "~> 1.13",
+ elixir: ">= 1.10.0",
start_permanent: Mix.env() == :prod,
deps: deps()
]
|
Issue PartyMember.ContentID | @@ -9,7 +9,7 @@ namespace FFXIVClientStructs.FFXIV.Group
[FieldOffset(0x190)] public float X;
[FieldOffset(0x194)] public float Y;
[FieldOffset(0x198)] public float Z;
- [FieldOffset(0x1A0)] public long Unk_1A0;
+ [FieldOffset(0x1A0)] public long ContentID;
[FieldOffset(0x1A8)] public uint ObjectID;
[FieldOffset(0x1AC)] public uint Unk_ObjectID_1;
[FieldOffset(0x1B0)] public uint Unk_ObjectID_2;
|
nrf/pin: Print pull information in Pin.__str__. | @@ -215,8 +215,22 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
pin_obj_t *self = self_in;
- mp_printf(print, "Pin(%d, mode=%s)", self->pin,
- (nrf_gpio_pin_dir_get(self->pin) == NRF_GPIO_PIN_DIR_OUTPUT) ? "OUT" : "IN");
+ char *pull = "PULL_DISABLED";
+ switch (nrf_gpio_pin_pull_get(self->pin)) {
+ case NRF_GPIO_PIN_PULLUP:
+ pull = "PULL_UP";
+ break;
+ case NRF_GPIO_PIN_PULLDOWN:
+ pull = "PULL_DOWN";
+ break;
+ default:
+ break;
+ }
+
+ mp_printf(print, "Pin(%d, mode=%s, pull=%s)",
+ self->pin,
+ (nrf_gpio_pin_dir_get(self->pin) == NRF_GPIO_PIN_DIR_OUTPUT) ? "OUT" : "IN",
+ pull);
}
STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *pin, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
|
Allow using variables in RHS of toplevel variable definitions
We weren't testing this before and it came up when trying to initialize
function-typed global variables in statements like the following
local f:integer->integer = g | @@ -4,7 +4,7 @@ local checker = require "titan-compiler.checker"
local global_upvalues = {}
-local analyze = ast_iterator.new()
+local analyze_upvalues
-- Analyzes when global variables are used, to optimize reading and writing to
-- them. Our current approach is to store global variables in a flat (not safe
@@ -27,12 +27,12 @@ local analyze = ast_iterator.new()
-- Integer, describes the index of the variable in the upvalue table.
--
-- _referenced_globals:
--- In Toplevel.Func nodes.
+-- In Program node and Toplevel.Func nodes.
-- List of integers, describes what global variables the function uses.
function global_upvalues.analyze(filename, input)
local prog, errors = checker.check(filename, input)
if not prog then return false, errors end
- analyze:Program(prog)
+ analyze_upvalues(prog)
return prog, errors
end
@@ -51,7 +51,18 @@ local function toplevel_is_value_declaration(tlnode)
end
end
-function analyze:Program(prog)
+local function sorted_keys(obj)
+ local ks = {}
+ for k, _ in pairs(obj) do
+ table.insert(ks, k)
+ end
+ table.sort(ks)
+ return ks
+end
+
+local analyze = ast_iterator.new()
+
+analyze_upvalues = function(prog)
local n_globals = 0
for _, tlnode in ipairs(prog) do
if toplevel_is_value_declaration(tlnode) then
@@ -61,22 +72,19 @@ function analyze:Program(prog)
end
prog._n_globals = n_globals
- ast_iterator.Program(self, prog)
+ local referenced_globals_map = {}
+ analyze:Program(prog, referenced_globals_map)
+ prog._referenced_globas = sorted_keys(referenced_globals_map)
end
-function analyze:Toplevel(tlnode)
+function analyze:Toplevel(tlnode, referenced_globals_map)
local tag = tlnode._tag
if tag == ast.Toplevel.Func then
- local referenced_globals_map = {}
- analyze:Stat(tlnode.block, referenced_globals_map)
- local referenced_globals = {}
- for index, _ in pairs(referenced_globals_map) do
- table.insert(referenced_globals, index)
- end
- table.sort(referenced_globals)
- tlnode._referenced_globals = referenced_globals
+ local func_referenced_globals_map = {}
+ analyze:Stat(tlnode.block, func_referenced_globals_map)
+ tlnode._referenced_globals = sorted_keys(func_referenced_globals_map)
else
- ast_iterator.Toplevel(self, tlnode)
+ ast_iterator.Toplevel(self, tlnode, referenced_globals_map)
end
end
|
Remove C from code block | @@ -725,7 +725,7 @@ If you prefer a different order, call `mbedtls_ssl_conf_curves()` when configuri
### SSL key export interface change
This affects users of the SSL key export APIs:
-```C
+```
mbedtls_ssl_conf_export_keys_cb()
mbedtls_ssl_conf_export_keys_ext_cb()
```
|
Updated README.md with swift configuration information | @@ -212,6 +212,38 @@ cglm_dep = dependency('cglm', fallback : 'cglm', 'cglm_dep')
executable('exe', 'src/main.c', dependencies : cglm_dep)
```
+### Swift (Swift Package Manager)
+
+Currently only default build options are supported. Add **cglm** dependency to your project:
+
+```swift
+...
+Package(
+ ...
+ dependencies: [
+ ...
+ .package(url: "https://github.com/recp/cglm", .branch("master")),
+ ]
+ ...
+)
+```
+
+Now add **cgml** as a dependency to your target. Product choices are:
+- **cglm** for inlined version of the library which can be linked only statically
+- **cglmc** for a compiled version of the library with no linking limitation
+
+```swift
+...
+.target(
+ ...
+ dependencies: [
+ ...
+ .product(name: "cglm", package: "cglm"),
+ ]
+ ...
+)
+...
+```
### Unix (Autotools)
|
Add Debug to docker compose test. | @@ -24,4 +24,5 @@ services:
image: metacall/core:dev
build:
args:
+ METACALL_BUILD_TYPE: Debug
METACALL_BUILD_OPTIONS: root python ruby netcore5 nodejs typescript file rpc examples tests scripts ports dynamic install pack sanitizer # v8 coverage benchmarks
|
[numerics] correct order in Cholesky factorization | @@ -3031,9 +3031,12 @@ int NM_posv_expert(NumericsMatrix* A, double *b, unsigned keep)
p->solver_free_hook = &NSM_free_p;
p->dWork = (double*) malloc(A->size1 * sizeof(double));
p->dWorkSize = A->size1;
+
CSparseMatrix_factors* cs_chol_A = (CSparseMatrix_factors*) malloc(sizeof(CSparseMatrix_factors));
+
numerics_printf_verbose(2,"NM_posv_expert, we compute factors and keep it" );
- CHECK_RETURN(CSparsematrix_chol_factorization(0, NM_csc(A), cs_chol_A));
+ CHECK_RETURN(CSparsematrix_chol_factorization(1, NM_csc(A), cs_chol_A));
+
p->linear_solver_data = cs_chol_A;
}
@@ -3046,7 +3049,7 @@ int NM_posv_expert(NumericsMatrix* A, double *b, unsigned keep)
info = !cs_cholsol(1, NM_csc(A), b);
if (info > 0)
{
- printf("NM_posv: cs_cholsol failed. info = %i\n", info);
+ numerics_printf("NM_posv: cs_cholsol failed. info = %i\n", info);
}
//DEBUG_EXPR(NV_display)
}
|
fix sidebar overflow | jQuery(document).ready(function($) {
- $('span#secondary-menu-button').click(function() {
+ $("span#secondary-menu-button").click(function() {
if ($(window).width() < 768) {
- $('div.container-sidebar').toggleClass('-expanded-submenu');
+ $("div.container-sidebar").toggleClass("-expanded-submenu");
}
});
getNavbarOffset = function() {
- return $('#banner').height()
- }
+ return $("#banner").height();
+ };
- $('#navbar').affix({
+ $("#navbar").affix({
offset: { top: getNavbarOffset }
- })
+ });
$(window).resize(function() {
- $('#navbar').affix('checkPosition')
- })
+ $("#navbar").affix("checkPosition");
+ });
+});
+
+function manageDocSidebar() {
+ if (window.matchMedia("(max-width: 992px)").matches) {
+ // menu above content
+ $("#docSidebar").css("height", "initial");
+ $("#docSidebar").css("overflow-y", "initial");
+ } else {
+ // side by side - menu + content
+ var sidebarHeight = $("#docSidebar").height();
+ console.log("sidebar at " + sidebarHeight);
+
+ var visibleHeight = $(window).height() - $("#navbar").height();
+ console.log("visible at " + visibleHeight);
+
+ // Fix the sidebar height to the visible window
+ $("#docSidebar").css("height", visibleHeight);
+
+ // If the sidebar content is larger than visible height give it scrollability.
+ if (sidebarHeight <= visibleHeight) {
+ $("#docSidebar").css("overflow-y", "hidden");
+ } else {
+ $("#docSidebar").css("overflow-y", "scroll");
+ }
+ }
+}
+
+$(document).ready(function() {
+ $("#docSidebar").css("overflow-x", "hidden");
+ manageDocSidebar();
+ $(window).on("resize", manageDocSidebar);
});
|
Cirrus: Install system files in FreeBSD build jobs
Since we should check, if installing system files works correctly, we
enable the option `INSTALL_SYSTEM_FILES` in our FreeBSD build jobs
again. | @@ -24,6 +24,7 @@ bsd_task:
- > # We use `-std=c11`, since the header `math.h` on FreeBSD requires C11 features
cmake
-DBINDINGS='ALL;-io_glib'
+ -DINSTALL_SYSTEM_FILES=ON
-DCMAKE_SKIP_INSTALL_RPATH=ON
-DCOMMON_FLAGS=-Werror
-DC_STD=-std=c11
|
Fix typo in imu_init for quicksilver imu | @@ -69,7 +69,7 @@ void imu_init() {
#ifdef QUICKSILVER_IMU
filter_lp_pt1_init(&filter, filter_pass1, 3, PT1_FILTER_HZ);
- filter_lp_pt1_init(&filter, filter_pass1, 3, PT1_FILTER_HZ);
+ filter_lp_pt1_init(&filter, filter_pass2, 3, PT1_FILTER_HZ);
#endif
}
|
Docs: Clarify Status of 3rd Party ACPI Fixes | @@ -842,9 +842,8 @@ can also be found in \href{https://dortania.github.io}{Dortania}'s
For more exotic cases, there are several alternatives such as
\href{https://github.com/daliansky}{daliansky}'s
\href{https://github.com/daliansky/OC-little}{ACPI sample collection}
-(\href{https://github.com/5T33Z0/OC-Little-Translated}{English Translation by 5T33Z0 et al},
-may be outdated and contain typos). Note however that the quality of the suggested solutions
-will be variable.
+(\href{https://github.com/5T33Z0/OC-Little-Translated}{English Translation by 5T33Z0 et al}).
+Please note however, that suggested solutions from third parties may be outdated or may contain errors.
\subsection{Properties}\label{acpiprops}
|
Fixed pid_file pattern misprint introduced in 231:6832cdee961e. | @@ -741,7 +741,7 @@ nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt)
rt->engine = interface->name;
- ret = nxt_file_name_create(rt->mem_pool, &file_name, "s%Z", rt->pid);
+ ret = nxt_file_name_create(rt->mem_pool, &file_name, "%s%Z", rt->pid);
if (nxt_slow_path(ret != NXT_OK)) {
return NXT_ERROR;
}
|
vs2017 build script | @echo off
call tools\gen-version.cmd
@setlocal ENABLEEXTENSIONS
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
-echo ***************************************************************************************************
-echo ***************************************************************************************************
-echo ** Building projects using MSBuild... **
-echo ***************************************************************************************************
-echo ***************************************************************************************************
+echo "Building using Visual Studio 2017 tools"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
set platform=
-msbuild Solutions\AriaSDK.sln /target:build\build-sdk /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=Win32
-msbuild Solutions\AriaSDK.sln /target:build\build-sdk /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=Win32
-msbuild Solutions\AriaSDK.sln /target:build\build-sdk /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
-msbuild Solutions\AriaSDK.sln /target:build\build-sdk /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
-msbuild Solutions\AriaSDK.sln /target:win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=ARM
-msbuild Solutions\AriaSDK.sln /target:win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=ARM
+set SOLUTION=Solutions\AriaSDK.sln
+
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-static,net40,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=Win32
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-static,net40,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=Win32
+
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-static,net40,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-static,net40,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
+
+msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=ARM
+msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=ARM
\ No newline at end of file
|
Improve t4p4s.sh: use lld with gcc | @@ -607,7 +607,12 @@ if [ "$(optvalue p4)" == off ] && [ "$(optvalue c)" == off ] && [ "$(optvalue ru
fi
T4P4S_CC=${T4P4S_CC-$(find_tool "-" clang gcc)}
+if [[ ! "$T4P4S_CC" =~ "clang" ]]; then
+ # note: when using gcc, only lld seems to be supported, not lld-VSN
+ T4P4S_LD=${T4P4S_LD-$(find_tool lld bfd gold)}
+else
T4P4S_LD=${T4P4S_LD-$(find_tool "-" lld bfd gold)}
+fi
DEBUGGER=${DEBUGGER-$(find_tool "-" lldb gdb)}
verbosemsg "Using $(cc 0)CC$nn=$(cc 1)$T4P4S_CC$nn, $(cc 0)LD$nn=$(cc 1)$T4P4S_LD$nn, $(cc 0)PYTHON3$nn=$(cc 1)${PYTHON3}$nn, $(cc 0)DBG$nn=$(cc 1)${DEBUGGER}$nn"
|
Bump version number in the documentation | @@ -6,8 +6,8 @@ jazzy \
--author "Data Theorem" \
--author_url https://datatheorem.github.io \
--github_url https://github.com/datatheorem/TrustKit \
- --github-file-prefix https://github.com/datatheorem/TrustKit/tree/1.4.2 \
- --module-version 1.4.2 \
+ --github-file-prefix https://github.com/datatheorem/TrustKit/tree/1.5.0 \
+ --module-version 1.5.0 \
--umbrella-header TrustKit/TrustKit.h \
--framework-root . \
--module TrustKit \
|
Make the conn suffix list the same as item list
At the default of '20' a constant realloc and free'ing would add a performance
penalty to what could be moderately sized multigets. | #define ITEM_LIST_INITIAL 200
/** Initial size of list of CAS suffixes appended to "gets" lines. */
-#define SUFFIX_LIST_INITIAL 20
+#define SUFFIX_LIST_INITIAL 100
/** Initial size of the sendmsg() scatter/gather array. */
#define IOV_LIST_INITIAL 400
|
export MBEDTLS_DEPRECATED from platform_util.h
Since there are no longer any alternative
MBEDTLS_DEPRECATED definitions in the codebase,
MBEDTLS_DEPRECATED can now be exported without breaking
anything. | @@ -42,10 +42,6 @@ extern "C" {
/* Internal helper macros for deprecating API constants. */
#if !defined(MBEDTLS_DEPRECATED_REMOVED)
#if defined(MBEDTLS_DEPRECATED_WARNING)
-/* Deliberately don't (yet) export MBEDTLS_DEPRECATED here
- * to avoid conflict with other headers which define and use
- * it, too. We might want to move all these definitions here at
- * some point for uniformity. */
#define MBEDTLS_DEPRECATED __attribute__((deprecated))
MBEDTLS_DEPRECATED typedef char const * mbedtls_deprecated_string_constant_t;
#define MBEDTLS_DEPRECATED_STRING_CONSTANT( VAL ) \
@@ -53,7 +49,6 @@ MBEDTLS_DEPRECATED typedef char const * mbedtls_deprecated_string_constant_t;
MBEDTLS_DEPRECATED typedef int mbedtls_deprecated_numeric_constant_t;
#define MBEDTLS_DEPRECATED_NUMERIC_CONSTANT( VAL ) \
( (mbedtls_deprecated_numeric_constant_t) ( VAL ) )
-#undef MBEDTLS_DEPRECATED
#else /* MBEDTLS_DEPRECATED_WARNING */
#define MBEDTLS_DEPRECATED_STRING_CONSTANT( VAL ) VAL
#define MBEDTLS_DEPRECATED_NUMERIC_CONSTANT( VAL ) VAL
|
[mechanics_io] handle nslaws string storage as utf-8 in Python 3 | @@ -1310,6 +1310,8 @@ class Hdf5():
assert np.shape(stops)[1] == 3, 'Joint stops shape must be (?,3)'
if nslaws is None:
nslaws = [Kernel.NewtonImpactNSL(0.0)]*np.shape(stops)[0]
+ elif isinstance(nslaws,bytes):
+ nslaws = [self._nslaws[nslaws.decode('utf-8')]]*np.shape(stops)[0]
elif isinstance(nslaws,str):
nslaws = [self._nslaws[nslaws]]*np.shape(stops)[0]
else:
@@ -1326,10 +1328,13 @@ class Hdf5():
# The per-axis friction NSL, can be ''
if friction is not None:
- if isinstance(friction,basestring):
+ if isinstance(friction,str):
friction = [friction]
+ elif isinstance(friction,bytes):
+ friction = [friction.decode('utf-8')]
else:
- assert hasattr(friction, '__iter__')
+ friction = [(f.decode('utf-8') if isinstance(f,bytes) else f)
+ for f in friction]
for ax,fr_nslaw in enumerate(friction):
if fr_nslaw == '': # no None in hdf5, use empty string
continue # instead for no NSL on an axis
@@ -2268,14 +2273,13 @@ class Hdf5():
if allow_self_collide in [True, False]:
joint.attrs['allow_self_collide']=allow_self_collide
if nslaws is not None:
- joint.attrs['nslaws'] = nslaws # either name of one nslaw, or a
- # list of names same length as stops
+ # either name of one nslaw, or a list of names same length as stops
+ joint.attrs['nslaws'] = np.array(nslaws, dtype='S')
if stops is not None:
joint.attrs['stops'] = stops # must be a table of [[axis,pos,dir]..]
if friction is not None:
- joint.attrs['friction'] = friction # must be an NSL name (e.g.
- # RelayNSL), or list of same
-
+ # must be an NSL name (e.g. RelayNSL), or list of same
+ joint.attrs['friction'] = np.array(friction, dtype='S')
def addBoundaryCondition(self, name, object1, indices=None, bc_class='HarmonicBC',
v=None, a=None, b=None, omega=None, phi=None):
|
include mk_repo utility in binary tarballs | @@ -164,10 +164,11 @@ foreach my $distro (@distros) {
$file_update->spew_utf8( $contents );
# Copy mk_repo utility
+ print "Adding mk_repo utility\n";
File::Copy::copy("mk_repo","$tmp_dir") || die "Unable to copy mk_repo\n";
# Assemble final tarball
- $tar_args .= "$distro";
+ $tar_args .= "$distro mk_repo";
print "\nCreating dist tarball for $distro:$arch -- \n";
print "\ntar command -> tar $tar_args\n\n";
system("tar $tar_args");
|
Fix USB crash on disconnect | * @{
*/
+
/**
* @}
*/
#define USBD_PID 0xf1d1
#else
#define USBD_VID 0x2C97
-#if TARGET_ID == 0x31000002 // blue
+#if defined(TARGET_BLUE) // blue
#define USBD_PID 0x0000
const uint8_t const USBD_PRODUCT_FS_STRING[] = {
4 * 2 + 2, USB_DESC_TYPE_STRING, 'B', 0, 'l', 0, 'u', 0, 'e', 0,
};
-#elif TARGET_ID == 0x31100002 // nano s
+#elif defined(TARGET_NANOS) // nano s
#define USBD_PID 0x0001
const uint8_t const USBD_PRODUCT_FS_STRING[] = {
6 * 2 + 2, USB_DESC_TYPE_STRING,
@@ -134,7 +135,7 @@ const uint8_t const USBD_PRODUCT_FS_STRING[] = {
' ', 0,
'S', 0,
};
-#elif TARGET_ID == 0x31200002 // aramis
+#elif defined(TARGET_ARAMIS) // aramis
#define USBD_PID 0x0002
const uint8_t const USBD_PRODUCT_FS_STRING[] = {
6 * 2 + 2, USB_DESC_TYPE_STRING,
@@ -462,9 +463,11 @@ uint8_t USBD_HID_DataOut_impl(USBD_HandleTypeDef *pdev, uint8_t epnum,
U2F_MEDIA_USB);
#endif
} else {
+ // avoid troubles when an apdu has not been replied yet
+ if (G_io_apdu_media == IO_APDU_MEDIA_NONE) {
// add to the hid transport
- switch (
- io_usb_hid_receive(io_usb_send_apdu_data, buffer,
+ switch (io_usb_hid_receive(
+ io_usb_send_apdu_data, buffer,
io_seproxyhal_get_ep_rx_size(HID_EPOUT_ADDR))) {
default:
break;
@@ -476,6 +479,7 @@ uint8_t USBD_HID_DataOut_impl(USBD_HandleTypeDef *pdev, uint8_t epnum,
break;
}
}
+ }
return USBD_OK;
}
|
vere: fixes Makefile test-runner, exiting on failed test | @@ -33,7 +33,12 @@ CFLAGS := $(CFLAGS)
all: $(all_exes)
test: $(test_exes)
- for x in $^; do echo "\n$$x" && ./$$x; done
+ @FAIL=0; \
+ for x in $^; \
+ do echo "\n$$x" && ./$$x; \
+ if [ $$? != 0 ]; then FAIL=1; fi; \
+ done; \
+ if [ $$FAIL != 0 ]; then echo "\n" && exit 1; fi;
clean:
rm -f ./tags $(all_objs) $(all_exes)
|
super-rsu: move log file to /var/lib/opae
This satisfies bandit issue B108:hardcoded_tmp_directory. | #! /usr/bin/env python
-# Copyright(c) 2019, Intel Corporation
+# Copyright(c) 2019-2020, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -91,7 +91,8 @@ OPAE_NVMUPDATE_EXE = os.path.join(OPAE_SHARE, 'bin', NVMUPDATE_EXE)
LOG = logging.getLogger(__name__)
TRACE = logging.DEBUG - 5
logging.addLevelName(TRACE, 'TRACE')
-RSU_TMP_LOG = '/tmp/super-rsu.log'
+RSU_LOG_DIR = '/var/lib/opae'
+RSU_LOG = os.path.join(RSU_LOG_DIR, 'super-rsu.log')
SECURE_UPDATE_VERSION = 4
@@ -1214,9 +1215,9 @@ def main():
'info',
'notset'], default='info',
help='log level to use')
- parser.add_argument('--log-file', default=RSU_TMP_LOG,
+ parser.add_argument('--log-file', default=RSU_LOG,
help='destination logfile'
- '- default is {}'.format(RSU_TMP_LOG))
+ '- default is {}'.format(RSU_LOG))
parser.add_argument('--rsu-only', default=False, action='store_true',
help='only perform the RSU command')
parser.add_argument('--with-rsu', default=False, action='store_true',
@@ -1243,14 +1244,15 @@ def main():
logging.basicConfig(format=logfmt,
level=getattr(logging, args.log_level.upper(), level))
- if args.log_file == RSU_TMP_LOG:
+ if args.log_file == RSU_LOG:
+ os.makedirs(RSU_LOG_DIR, exist_ok=True)
try:
fh = logging.handlers.RotatingFileHandler(args.log_file,
backupCount=50)
fh.doRollover()
except IOError:
sys.stderr.write('Could not rollover log file: {}\n'.format(
- RSU_TMP_LOG))
+ RSU_LOG))
fh = None
else:
try:
|
VERSION bump to version 0.8.46 | @@ -28,7 +28,7 @@ set(CMAKE_C_FLAGS_DEBUG "-g -O0")
# set version
set(LIBNETCONF2_MAJOR_VERSION 0)
set(LIBNETCONF2_MINOR_VERSION 8)
-set(LIBNETCONF2_MICRO_VERSION 45)
+set(LIBNETCONF2_MICRO_VERSION 46)
set(LIBNETCONF2_VERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION}.${LIBNETCONF2_MICRO_VERSION})
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION})
|
Avoid taking the root of a negative number
Fixes where numpy 1.17+ would report the (transient) FE_INVALID exception raised for the domain error. | @@ -48,7 +48,7 @@ int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (
BLASLONG width, i;
BLASLONG n_from, n_to;
- double dnum, nf, nt, di;
+ double dnum, nf, nt, di, dinum;
int num_cpu;
int mask = 0;
@@ -109,7 +109,11 @@ int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (
if (nthreads - num_cpu > 1) {
di = (double)i;
- width = (BLASLONG)(( sqrt(di * di + dnum) - di + mask)/(mask+1)) * (mask+1);
+ dinum = di * di +dnum;
+ if (dinum <0)
+ width = (BLASLONG)(( - di + mask)/(mask+1)) * (mask+1);
+ else
+ width = (BLASLONG)(( sqrt(dinum) - di + mask)/(mask+1)) * (mask+1);
if ((width <= 0) || (width > n_to - i)) width = n_to - i;
@@ -136,9 +140,7 @@ int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (
nf = (double)(arg -> n - n_from);
nt = (double)(arg -> n - n_to);
-
dnum = (nt * nt - nf * nf) / (double)nthreads;
-
num_cpu = 0;
range[0] = n_from;
@@ -149,8 +151,11 @@ int CNAME(int mode, blas_arg_t *arg, BLASLONG *range_m, BLASLONG *range_n, int (
if (nthreads - num_cpu > 1) {
di = (double)(arg -> n - i);
- width = ((BLASLONG)((-sqrt(di * di + dnum) + di) + mask)/(mask+1)) * (mask+1);
-
+ dinum = di * di + dnum;
+ if (dinum<0)
+ width = ((BLASLONG)(di + mask)/(mask+1)) * (mask+1);
+ else
+ width = ((BLASLONG)((-sqrt(dinum) + di) + mask)/(mask+1)) * (mask+1);
if ((width <= 0) || (width > n_to - i)) width = n_to - i;
} else {
|
docs: update the usage of MALLOC_CAP_32BIT on ESP32 chips | @@ -105,12 +105,13 @@ Use the ``MALLOC_CAP_DMA`` flag to allocate memory which is suitable for use wit
32-Bit Accessible Memory
^^^^^^^^^^^^^^^^^^^^^^^^
-If a certain memory structure is only addressed in 32-bit units, for example an array of ints or pointers, it can be
-useful to allocate it with the ``MALLOC_CAP_32BIT`` flag. This also allows the allocator to give out IRAM memory; something
-which it can't do for a normal malloc() call. This can help to use all the available memory in the {IDF_TARGET_NAME}.
+If a certain memory structure is only addressed in 32-bit units, for example an array of ints or pointers, it can be useful to allocate it with the ``MALLOC_CAP_32BIT`` flag. This also allows the allocator to give out IRAM memory; something which it can't do for a normal malloc() call. This can help to use all the available memory in the {IDF_TARGET_NAME}.
-Memory allocated with ``MALLOC_CAP_32BIT`` can *only* be accessed via 32-bit reads and writes, any other type of access will
-generate a fatal LoadStoreError exception.
+.. only:: CONFIG_IDF_TARGET_ARCH_XTENSA and SOC_CPU_HAS_FPU
+
+ Please note that on {IDF_TARGET_NAME} series chips, ``MALLOC_CAP_32BIT`` cannot be used for storing floating-point variables. This is because ``MALLOC_CAP_32BIT`` may return instruction RAM, and the floating-point assembly instructions on {IDF_TARGET_NAME} cannot access instruction RAM.
+
+Memory allocated with ``MALLOC_CAP_32BIT`` can *only* be accessed via 32-bit reads and writes, any other type of access will generate a fatal LoadStoreError exception.
.. only:: SOC_SPIRAM_SUPPORTED
|
Try another signing profile | @@ -34,6 +34,6 @@ jobs:
target: linux_build_container2
inputs:
command: 'sign'
- signing_profile: 'CP-450779-Pgp'
+ signing_profile: 'CP-450779-pgpdetached'
files_to_sign: '**/*.rpm;**/*.deb'
search_root: '$(ob_outputDirectory)'
|
gradle: do not print task properties | @@ -52,9 +52,10 @@ gradle.taskGraph.whenReady { taskGraph ->
task.inputs.files.each { input ->
logger.lifecycle(" IF $input")
}
- task.inputs.properties.each { input ->
- logger.lifecycle(" IP $input")
- }
+
+ // task.inputs.properties.each { input ->
+ // logger.lifecycle(" IP $input")
+ // }
task.outputs.files.each { output ->
logger.lifecycle(" OF $output")
|
Fixed coap packet parser message buffer out-of-bounds read bugs.
Fixed bugs in coap_parse_message() function that caused read memory access beyond the message buffer due to insufficient verification of buffer pointer arithemtic operations result. | @@ -416,6 +416,12 @@ coap_serialize_message(coap_message_t *coap_pkt, uint8_t *buffer)
coap_status_t
coap_parse_message(coap_message_t *coap_pkt, uint8_t *data, uint16_t data_len)
{
+ if(data_len < COAP_HEADER_LEN) {
+ /* Too short - malformed CoAP message */
+ LOG_WARN("BAD REQUEST: message too short\n");
+ return BAD_REQUEST_4_00;
+ }
+
/* initialize message */
memset(coap_pkt, 0, sizeof(coap_message_t));
@@ -443,6 +449,11 @@ coap_parse_message(coap_message_t *coap_pkt, uint8_t *data, uint16_t data_len)
}
uint8_t *current_option = data + COAP_HEADER_LEN;
+ if(current_option + coap_pkt->token_len > data + data_len) {
+ /* Malformed CoAP message - token length out od message bounds */
+ LOG_WARN("BAD REQUEST: token outside message buffer");
+ return BAD_REQUEST_4_00;
+ }
memcpy(coap_pkt->token, current_option, coap_pkt->token_len);
LOG_DBG("Token (len %u) [0x%02X%02X%02X%02X%02X%02X%02X%02X]\n",
@@ -478,6 +489,11 @@ coap_parse_message(coap_message_t *coap_pkt, uint8_t *data, uint16_t data_len)
option_delta = current_option[0] >> 4;
option_length = current_option[0] & 0x0F;
++current_option;
+ if(current_option >= data + data_len) {
+ /* Malformed CoAP - out of bounds */
+ LOG_WARN("BAD REQUEST: option delta outside message buffer\n");
+ return BAD_REQUEST_4_00;
+ }
if(option_delta == 13) {
option_delta += current_option[0];
@@ -486,10 +502,21 @@ coap_parse_message(coap_message_t *coap_pkt, uint8_t *data, uint16_t data_len)
option_delta += 255;
option_delta += current_option[0] << 8;
++current_option;
+ if(current_option >= data + data_len) {
+ /* Malformed CoAP - out of bounds */
+ LOG_WARN("BAD REQUEST: option delta outside message buffer\n");
+ return BAD_REQUEST_4_00;
+ }
option_delta += current_option[0];
++current_option;
}
+ if(current_option >= data + data_len) {
+ /* Malformed CoAP - out of bounds */
+ LOG_WARN("BAD REQUEST: option delta outside message buffer\n");
+ return BAD_REQUEST_4_00;
+ }
+
if(option_length == 13) {
option_length += current_option[0];
++current_option;
@@ -497,6 +524,11 @@ coap_parse_message(coap_message_t *coap_pkt, uint8_t *data, uint16_t data_len)
option_length += 255;
option_length += current_option[0] << 8;
++current_option;
+ if(current_option >= data + data_len) {
+ /* Malformed CoAP - out of bounds */
+ LOG_WARN("BAD REQUEST: option length outside message buffer\n");
+ return BAD_REQUEST_4_00;
+ }
option_length += current_option[0];
++current_option;
}
|
Update hydraul.c
Fixes a bug that was adding time on-line to a closed pump's energy usage for the time step just prior to when a rule-based control re-opens it. | @@ -895,7 +895,7 @@ void addenergy(Project *pr, long hstep)
// Skip closed pumps
pump = &net->Pump[j];
k = pump->Link;
- if (hyd->LinkStatus[k] <= CLOSED) continue;
+ if (pump->Energy.CurrentEffic == 0.0) continue;
q = MAX(QZERO, ABS(hyd->LinkFlow[k]));
// Find pump-specific energy cost
|
Fix no-err
Skip the test_CTX_print_errors in cmp_ctx_test if no-err has been
configured. | @@ -109,6 +109,8 @@ static int test_CTX_reinit(void)
return result;
}
+#ifndef OPENSSL_NO_ERR
+
static int msg_total_size = 0;
static int msg_total_size_log_cb(const char *func, const char *file, int line,
OSSL_CMP_severity level, const char *msg)
@@ -184,6 +186,7 @@ static int test_CTX_print_errors(void)
EXECUTE_TEST(execute_CTX_print_errors_test, tear_down);
return result;
}
+#endif
static int execute_CTX_reqExtensions_have_SAN_test(
OSSL_CMP_CTX_TEST_FIXTURE *fixture)
@@ -787,11 +790,13 @@ int setup_tests(void)
* with OSSL_CMP_severity OSSL_CMP_LOG_ERR/WARNING/DEBUG/INFO:
*/
ADD_TEST(test_cmp_ctx_log_cb);
+#ifndef OPENSSL_NO_ERR
/* also tests OSSL_CMP_CTX_set_log_cb(), OSSL_CMP_print_errors_cb(),
ossl_cmp_add_error_txt(), and the macros
ossl_cmp_add_error_data and ossl_cmp_add_error_line:
*/
ADD_TEST(test_CTX_print_errors);
+#endif
/* message transfer: */
ADD_TEST(test_CTX_set1_get0_serverPath);
ADD_TEST(test_CTX_set1_get0_serverName);
|
install qemu-system-arm in docker | @@ -251,7 +251,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
unzip \
wget \
xxd \
- qemu \
+ qemu-system-arm \
&& rm -rf /var/lib/apt/lists/*
# Configure out base setup for adding python packages
|
added gratipay | # [](http://www.ohler.com/oj) gem
-[](http://travis-ci.org/ohler55/oj?branch=master) [](https://ci.appveyor.com/project/ohler55/oj)  
+[](http://travis-ci.org/ohler55/oj?branch=master) [](https://ci.appveyor.com/project/ohler55/oj)   [](https://gratipay.com/oj/)
A *fast* JSON parser and Object marshaller as a Ruby gem.
|
Disable pipe lock for AIX
flock function on AIX only permits exclusive lock on file opened
for writing. Exclusive lock on file opened for reading will fail
always. Disable this on AIX platform. | @@ -890,7 +890,7 @@ int gfile_open(gfile_t* fd, const char* fpath, int flags, int* response_code, co
return 1;
}
-#ifndef WIN32
+#if !defined(WIN32) && !defined(_AIX)
if (!is_win_pipe && (flags == GFILE_OPEN_FOR_READ))
{
/* Restrict only one reader session for each PIPE */
|
[core] HTTP/2 GOAWAY after timeout before read (fixes
HTTP/2 send GOAWAY soon after keep-alive timeout, before potentially
reading new stream requests, which will then have to be reset.
x-ref:
"Chrome gives random net::ERR_HTTP2_PROTOCOL_ERROR" | @@ -1460,6 +1460,7 @@ static void connection_check_timeout (connection * const con, const unix_time64_
con->fd);
}
connection_set_state(r, CON_STATE_RESPONSE_END);
+ con->is_readable = 0;
changed = 1;
}
}
|
[tools][vsc] Support Chinese path | @@ -64,13 +64,13 @@ def GenerateCFiles(env):
json_obj = {}
json_obj['configurations'] = [config_obj]
- vsc_file.write(json.dumps(json_obj, indent=4))
+ vsc_file.write(json.dumps(json_obj, ensure_ascii=False, indent=4))
vsc_file.close()
return
def GenerateVSCode(env):
- print('Update setting files for VSCode...'),
+ print('Update setting files for VSCode...')
GenerateCFiles(env)
print('Done!')
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.