message
stringlengths
6
474
diff
stringlengths
8
5.22k
linux-firmware-rpidistro: fix wifi driver loading on cm4
@@ -63,6 +63,7 @@ do_install() { # add compat links. Fixes errors like # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt failed with error -2 ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt + ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt ln -s brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt ln -s brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
Add spdm kernel to wgs64
@@ -18,6 +18,11 @@ int main(void) { { // nothing } + #pragma omp target teams distribute parallel for thread_limit(64) + for (int k =0; k < n; k++) + { + // nothing + } printf("Succeeded\n"); return fail;
gard: Replace is_valid_id with is_valid_record() It was annoying me.
@@ -182,9 +182,9 @@ static const char *path_type_to_str(enum path_type t) return "Unknown"; } -static bool is_valid_id(uint32_t record_id) +static bool is_valid_record(struct gard_record *g) { - return record_id != CLEARED_RECORD_ID; + return be32toh(g->record_id) != CLEARED_RECORD_ID; } static int do_iterate(struct gard_ctx *ctx, @@ -246,7 +246,7 @@ static int count_valid_records_i(struct gard_ctx *ctx, int pos, struct gard_reco if (!gard || !priv) return -1; - if (is_valid_id(be32toh(gard->record_id))) + if (is_valid_record(gard)) (*(int *)priv)++; return 0; @@ -272,7 +272,7 @@ static int do_list_i(struct gard_ctx *ctx, int pos, struct gard_record *gard, vo if (!gard) return -1; - if (is_valid_id(be32toh(gard->record_id))) + if (is_valid_record(gard)) printf("| %08x | %08x | %-15s |\n", be32toh(gard->record_id), be32toh(gard->errlog_eid), path_type_to_str(gard->target_id.type_size >> PATH_TYPE_SHIFT));
Update: build.sh: improved build script as Seth suggested
-Str="" -for i in ./src/*.c -do - Str=$Str" ${i%.c}.c" -done +Str=`ls src/*.c | xargs` echo $Str gcc -DSDR_BLOCK_TYPE=__uint128_t -D_POSIX_C_SOURCE=199506L -pedantic -std=c99 -g3 -O3 -Wall -Werror $Str -lm -oANSNA
Added BT Configuration Management to Raise Layer Added Function Keys, and some Navigation Keys to Lower Layer.
lower_layer { bindings = < -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 +&trans &trans &trans &trans &trans &trans &kp PG_UP &kp HOME &kp UP &kp END &trans &kp F12 +&trans &trans &trans &trans &trans &trans &kp PG_DN &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; raise_layer { bindings = < +&trans &trans &trans &trans &trans &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &reset &bootloader &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &bt BT_CLR &trans >; sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
fix: avoid warning warning C26451: Arithmetic overflow: Using operator '+' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator '+' to avoid overflow (io.2).
@@ -1036,7 +1036,7 @@ static size_t mi_os_numa_nodex() { static size_t mi_os_numa_node_countx(void) { ULONG numa_max = 0; GetNumaHighestNodeNumber(&numa_max); - return (numa_max + 1); + return ((size_t)numa_max + 1); } #elif defined(__linux__) #include <sys/syscall.h> // getcpu
language-server: fix parser
;~(plug sym ;~(pfix gap fas (more fas urs:ab))) :: %+ rune cen - ;~(plug sym ;~(pfix cen sym)) + ;~(plug sym ;~(pfix gap ;~(pfix cen sym))) :: %+ rune buc ;~ (glue gap)
biquad help file fix
@@ -185,4 +185,5 @@ void biquad_tilde_setup(void) class_addmethod(biquad_class, (t_method) biquad_stoke, gensym("stoke"), A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0); class_addmethod(biquad_class, (t_method) biquad_smooth, gensym("smooth"), A_DEFFLOAT, 0); + class_sethelpsymbol(biquad_class, gensym("biquad~")); }
signal: add sigisemptyset, sigandset, sigorset api refs:https://man7.org/linux/man-pages/man3/sigorset.3.html
# define SIG_HOLD ((_sa_handler_t)1) /* Used only with sigset() */ #endif +#define sigisemptyset(set) (!*(set)) +#define sigorset(dest, left, right) (!(*(dest) = *(left) | *(right))) +#define sigandset(dest, left, right) (!(*(dest) = *(left) & *(right))) + /******************************************************************************** * Public Types ********************************************************************************/
non-recursive test version
@@ -62,6 +62,31 @@ static void init(grib_action_class *c) GRIB_MUTEX_UNLOCK(&mutex1); } +#if 0 +/* A non-recursive version */ +static void init(grib_action_class *c) +{ + if (!c) return; + + GRIB_MUTEX_INIT_ONCE(&once,&init_mutex); + GRIB_MUTEX_LOCK(&mutex1); + if(!c->inited) + { + if(c->super) { + grib_action_class *g = *(c->super); + if (g && !g->inited) { + Assert(g->super == NULL); + g->init_class(g); + g->inited = 1; + } + } + c->init_class(c); + c->inited = 1; + } + GRIB_MUTEX_UNLOCK(&mutex1); +} +#endif + void grib_dump(grib_action* a, FILE* f, int l) { grib_action_class *c = a->cclass;
hw: mcu: pic32mz2048efg100: Implement watchdog
* under the License. */ +#include <xc.h> #include "hal/hal_watchdog.h" -#include <assert.h> - int hal_watchdog_init(uint32_t expire_msecs) { - return (0); + /* + * Cannot change watchdog prescaler at runtime. + * Only check if the watchdog timer is greater than expire_msecs. + */ + uint32_t wdt_period = 1; + wdt_period <<= (WDTCON & _WDTCON_RUNDIV_MASK) >> _WDTCON_RUNDIV_POSITION; + + return wdt_period < expire_msecs ? -1 : 0; } void hal_watchdog_enable(void) { + WDTCONSET = _WDTCON_ON_MASK; } void hal_watchdog_tickle(void) { + volatile uint16_t *wdtclrkey = (volatile uint16_t*)&WDTCON + 1; + *wdtclrkey = 0x5743; } \ No newline at end of file -
ensure webassembly allocation sizes are page aligned
@@ -225,12 +225,12 @@ static void* mi_win_virtual_alloc(void* addr, size_t size, size_t try_alignment, #elif defined(__wasi__) static void* mi_wasm_heap_grow(size_t size, size_t try_alignment) { - uintptr_t base = __builtin_wasm_memory_size(0) * os_page_size; + uintptr_t base = __builtin_wasm_memory_size(0) * _mi_os_page_size(); uintptr_t aligned_base = _mi_align_up(base, (uintptr_t) try_alignment); - size_t alloc_size = aligned_base - base + size; - mi_assert(alloc_size >= size); + size_t alloc_size = _mi_align_up( aligned_base - base + size, _mi_os_page_size()); + mi_assert(alloc_size >= size && (alloc_size % _mi_os_page_size()) == 0); if (alloc_size < size) return NULL; - if (__builtin_wasm_memory_grow(0, alloc_size / os_page_size) == SIZE_MAX) { + if (__builtin_wasm_memory_grow(0, alloc_size / _mi_os_page_size()) == SIZE_MAX) { errno = ENOMEM; return NULL; } @@ -321,7 +321,7 @@ static void* mi_os_mem_alloc(size_t size, size_t try_alignment, bool commit, mi_ if (commit) flags |= MEM_COMMIT; p = mi_win_virtual_alloc(NULL, size, try_alignment, flags); #elif defined(__wasi__) - p = mi_wasm_herap_grow(size, try_alignment); + p = mi_wasm_heap_grow(size, try_alignment); #else int protect_flags = (commit ? (PROT_WRITE | PROT_READ) : PROT_NONE); p = mi_unix_mmap(size, try_alignment, protect_flags);
udp: fix buffer trace Type: fix
@@ -317,14 +317,13 @@ udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } done: + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE)) + udp_trace_buffer (vm, node, b[0], s0, error0); b += 1; n_left_from -= 1; udp_inc_err_counter (err_counters, error0, 1); - - if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE)) - udp_trace_buffer (vm, node, b[0], s0, error0); } vlib_buffer_free (vm, first_buffer, frame->n_vectors);
fixing invalid xml introduced in recent PR
<body> <p>Reports the version number of the server as a string. A version modifier argument might be appended to the numeric portion of the - version string, example: <i>5.0.0 beta</i></p>. + version string, example: <i>5.0.0 beta</i>.</p> <table id="gp_server_version_table"> <tgroup cols="3"> <colspec colnum="1" colname="col1" colwidth="1*"/>
sdl: video: Fix ShowMessageBox()
@@ -725,8 +725,8 @@ func ShowMessageBox(data *MessageBoxData) (buttonid int32, err error) { colorScheme: data.ColorScheme.cptr(), } - buttonid = C.ShowMessageBox(cdata) - return int32(buttonid), errorFromInt(int(buttonid)) + buttonid = int32(C.ShowMessageBox(cdata)) + return buttonid, errorFromInt(int(buttonid)) } // IsScreenSaverEnabled reports whether the screensaver is currently enabled.
Rename Bot Account Name
@@ -409,7 +409,7 @@ if ($MergeDataFiles) { # Commit the output file. git config user.email "[email protected]" - git config user.name "QUIC Dev Bot" + git config user.name "QUIC Dev[bot]" git add . git status git commit -m "Commit WAN Perf Results for $CurCommitHash"
ChannelPopoverRoutes: add rootUrl type
@@ -22,6 +22,7 @@ import { isChannelAdmin, isHost } from '~/logic/lib/group'; interface ChannelPopoverRoutesProps { baseUrl: string; + rootUrl: string; association: Association; group: Group; groups: Groups;
zephyr: Sort file list by config option Sort the cmake file list by the config option name. BRANCH=none TEST=build and boot on volteer Tested-by: Simon Glass
@@ -34,7 +34,15 @@ zephyr_include_directories_ifdef( add_subdirectory_ifdef(CONFIG_PLATFORM_EC "shim") -zephyr_sources_ifdef(CONFIG_PLATFORM_EC "${PLATFORM_EC}/common/base32.c") +# CONFIG_PLATFORM_EC files that don't relate to something below should be +# included here, sorted by filename. This is common functionality which is +# supported by all boards and emulators (including unit tests) using the shim +# layer. +zephyr_sources_ifdef(CONFIG_PLATFORM_EC "${PLATFORM_EC}/common/base32.c" + "${PLATFORM_EC}/common/queue.c") + +# Now include files that depend on or relate to other CONFIG options, sorted by +# CONFIG zephyr_sources_ifdef(CONFIG_PLATFORM_EC_CBI "${PLATFORM_EC}/common/cbi.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ "${PLATFORM_EC}/common/chipset.c") @@ -42,27 +50,26 @@ zephyr_sources_ifdef(CONFIG_PLATFORM_EC_ESPI "${PLATFORM_EC}/common/espi.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC "${PLATFORM_EC}/common/extpower_common.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_EXTPOWER_GPIO "${PLATFORM_EC}/common/extpower_gpio.c") -zephyr_sources_ifdef(CONFIG_SHELL "${PLATFORM_EC}/common/gpio_commands.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_HOSTCMD "${PLATFORM_EC}/common/host_command.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_HOSTCMD "${PLATFORM_EC}/common/host_event_commands.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_I2C "${PLATFORM_EC}/common/i2c_controller.c") +zephyr_sources_ifdef(CONFIG_PLATFORM_EC_KEYBOARD + "${PLATFORM_EC}/common/keyboard_scan.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_8042 "${PLATFORM_EC}/common/keyboard_8042.c" "${PLATFORM_EC}/common/keyboard_8042_sharedlib.c") -zephyr_sources_ifdef(CONFIG_PLATFORM_EC_KEYBOARD - "${PLATFORM_EC}/common/keyboard_scan.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_LID_SWITCH "${PLATFORM_EC}/common/lid_switch.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_PORT80 "${PLATFORM_EC}/common/port80.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWER_BUTTON "${PLATFORM_EC}/common/power_button.c") -zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ_INTEL - "${PLATFORM_EC}/common/power_button_x86.c") -zephyr_sources_ifdef(CONFIG_PLATFORM_EC "${PLATFORM_EC}/common/queue.c") -zephyr_sources_ifdef(CONFIG_PLATFORM_EC_TIMER "${PLATFORM_EC}/common/timer.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ "${PLATFORM_EC}/power/common.c") -zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ_INTEL - "${PLATFORM_EC}/power/intel_x86.c") zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ_ICELAKE "${PLATFORM_EC}/power/icelake.c") +zephyr_sources_ifdef(CONFIG_PLATFORM_EC_POWERSEQ_INTEL + "${PLATFORM_EC}/common/power_button_x86.c" + "${PLATFORM_EC}/power/intel_x86.c") +zephyr_sources_ifdef(CONFIG_PLATFORM_EC_TIMER "${PLATFORM_EC}/common/timer.c") + +zephyr_sources_ifdef(CONFIG_SHELL "${PLATFORM_EC}/common/gpio_commands.c")
add supported versions extension
@@ -400,15 +400,49 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context* ssl, return( 0 ); } +/* + * ssl_write_supported_versions_ext(): + * + * struct { + * ProtocolVersion versions<2..254>; + * } SupportedVersions; + */ static void ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl, unsigned char* buf, unsigned char* end, size_t* olen ) { - ((void) ssl); - ((void) buf); - ((void) end); - ((void) olen); + unsigned char *p = buf; + + *olen = 0; + + MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding supported version extension" ) ); + + if( end < p || (size_t)( end - p ) < 7 ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "buffer too small" ) ); + return; + } + + *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS >> 8 ) & 0xFF ); + *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS ) & 0xFF ); + + /* total length */ + *p++ = 0x00; + *p++ = 3; + + /* length of next field */ + *p++ = 0x2; + + /* This implementation only supports a single TLS version, and only + * advertises a single value. + */ + mbedtls_ssl_write_version( ssl->conf->max_major_ver, ssl->conf->max_minor_ver, + ssl->conf->transport, p ); + + MBEDTLS_SSL_DEBUG_MSG( 3, ( "supported version: [%d:%d]", ssl->conf->max_major_ver, ssl->conf->max_minor_ver ) ); + + *olen = 7; } #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
config_tools: add sanity check for PSRAM and RDT RDT_ENABLED and PSRAM_ENABLED should not by y simultaneously.
@@ -150,6 +150,7 @@ Machine Check Error on Page Size Change.</xs:documentation> </xs:annotation> </xs:element> </xs:all> + <xs:assert test="not (RDT/RDT_ENABLED = 'y' and PSRAM/PSRAM_ENABLED = 'y')"/> </xs:complexType> <xs:complexType name="MemoryOptionsType">
Call getrandom via syscall directly on Linux. Doing this because getrandom wasn't added to glibc until 2.25.
@@ -206,7 +206,8 @@ finish_random(void) } #endif #elif defined(__linux__) -#include <sys/random.h> +#include <unistd.h> +#include <sys/syscall.h> void init_random(void) @@ -222,7 +223,8 @@ read_random(void *buf, size_t size) position = 0; while (position < size) { - n = getrandom((char *)buf + position, size - position, 0); + // Using syscall directly because getrandom isn't present in glibc < 2.25. + n = syscall(__NR_getrandom, (char *)buf + position, size - position, 0); if (n > 0) { position += n; }
Fix up comment tests to work in builds
@@ -5759,7 +5759,7 @@ START_TEST(test_utf16_be_comment) "\0<\0!\0-\0-\0 \0C\0o\0m\0m\0e\0n\0t\0 \0A\0 \0-\0-\0>\0\n" /* <doc/> */ "\0<\0d\0o\0c\0/\0>"; - const XML_Char *expected = " Comment A "; + const XML_Char *expected = XCS(" Comment A "); CharData storage; CharData_Init(&storage); @@ -5779,7 +5779,7 @@ START_TEST(test_utf16_le_comment) "<\0!\0-\0-\0 \0C\0o\0m\0m\0e\0n\0t\0 \0B\0 \0-\0-\0>\0\n\0" /* <doc/> */ "<\0d\0o\0c\0/\0>\0"; - const XML_Char *expected = " Comment B "; + const XML_Char *expected = XCS(" Comment B "); CharData storage; CharData_Init(&storage);
Copy knob_area to ext
@@ -403,6 +403,8 @@ static void draw_knob(lv_obj_t * rotary, const lv_area_t * clip_area) lv_coord_t center_y = rotary->coords.y1 + r + top_bg; lv_coord_t knob_inner = lv_obj_get_style_pad_inner(rotary, LV_ROTARY_PART_KNOB); + lv_rotary_ext_t * ext = lv_obj_get_ext_attr(rotary); + if(r > 0) { knob_area.x1 = center_x - r + indic_width + knob_inner; knob_area.x2 = center_x + r - indic_width - knob_inner;
[mod_openssl] use newer openssl 3.0.0 func replace X509_STORE_load_locations() with X509_STORE_load_file()
@@ -779,7 +779,12 @@ mod_openssl_load_cacerts (const buffer *ssl_ca_file, log_error_st *errh) static int mod_openssl_load_cacrls (X509_STORE *store, const buffer *ssl_ca_crl_file, server *srv) { - if (1 != X509_STORE_load_locations(store, ssl_ca_crl_file->ptr, NULL)) { + #if OPENSSL_VERSION_NUMBER >= 0x30000000L + if (1 != X509_STORE_load_file(store, ssl_ca_crl_file->ptr)) + #else + if (1 != X509_STORE_load_locations(store, ssl_ca_crl_file->ptr, NULL)) + #endif + { log_error(srv->errh, __FILE__, __LINE__, "SSL: %s %s", ERR_error_string(ERR_get_error(), NULL), ssl_ca_crl_file->ptr);
Add nrf cambus read/write byte functions.
@@ -107,6 +107,50 @@ int cambus_gencall(cambus_t *bus, uint8_t cmd) return 0; } +int cambus_readb(cambus_t *bus, uint8_t slv_addr, uint8_t reg_addr, uint8_t *reg_data) +{ + int ret = 0; + slv_addr = slv_addr >> 1; + + nrfx_twi_enable(&bus->i2c); + nrfx_twi_xfer_desc_t desc1 = NRFX_TWI_XFER_DESC_TX(slv_addr, &reg_addr, 1); + if (nrfx_twi_xfer(&bus->i2c, &desc1, NRFX_TWI_FLAG_TX_NO_STOP) != NRFX_SUCCESS) { + ret = -1; + goto i2c_error; + } + + nrfx_twi_xfer_desc_t desc2 = NRFX_TWI_XFER_DESC_RX(slv_addr, reg_data, 1); + if (nrfx_twi_xfer(&bus->i2c, &desc2, 0) != NRFX_SUCCESS) { + ret = -1; + } + +i2c_error: + nrfx_twi_disable(&bus->i2c); + return ret; +} + +int cambus_writeb(cambus_t *bus, uint8_t slv_addr, uint8_t reg_addr, uint8_t reg_data) +{ + int ret = 0; + slv_addr = slv_addr >> 1; + + nrfx_twi_enable(&bus->i2c); + nrfx_twi_xfer_desc_t desc1 = NRFX_TWI_XFER_DESC_TX(slv_addr, &reg_addr, 1); + if (nrfx_twi_xfer(&bus->i2c, &desc1, NRFX_TWI_FLAG_SUSPEND) != NRFX_SUCCESS) { + ret = -1; + goto i2c_error; + } + + nrfx_twi_xfer_desc_t desc2 = NRFX_TWI_XFER_DESC_TX(slv_addr, &reg_data, 1); + if (nrfx_twi_xfer(&bus->i2c, &desc2, 0) != NRFX_SUCCESS) { + ret = -1; + } + +i2c_error: + nrfx_twi_disable(&bus->i2c); + return ret; +} + int cambus_read_bytes(cambus_t *bus, uint8_t slv_addr, uint8_t *buf, int len, uint32_t flags) { int ret = 0;
improve bad count detection in huf decompress
@@ -1052,7 +1052,10 @@ hufUncompress (const char compressed[], unsigned short raw[], int nRaw) { - if (nCompressed == 0) + // + // nead at least 20 bytes for header + // + if (nCompressed < 20 ) { if (nRaw != 0) notEnoughData(); @@ -1072,7 +1075,8 @@ hufUncompress (const char compressed[], if ( ptr + (nBits+7 )/8 > compressed+nCompressed) { - throw Iex::InputExc("invalid bit count for data size in Huf data"); + notEnoughData(); + return; } //
asurada: update USB PID PID allocated in cl/370096781 TEST=make BRANCH=asurada Tested-by: Ting Shen
#define CONFIG_USB_PD_TRY_SRC #define CONFIG_USB_PD_VBUS_DETECT_PPC #define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT -#define CONFIG_USB_PID 0x5566 /* TODO: update PID */ +#define CONFIG_USB_PID 0x5053 #define CONFIG_USB_POWER_DELIVERY #define PD_MAX_CURRENT_MA 3000
nix: remove lib/base64 from solid pill staging
@@ -28,7 +28,6 @@ done # FIXME: reduce this list cp $ARVO/app/lens.hoon ./pier/home/app/ cp $ARVO/app/dojo.hoon ./pier/home/app/ -cp $ARVO/lib/base64.hoon ./pier/home/lib/ cp $ARVO/lib/plume.hoon ./pier/home/lib/ cp $ARVO/lib/server.hoon ./pier/home/lib/ cp $ARVO/lib/sole.hoon ./pier/home/lib/
[kernel] fix issue with hasNsProblems
@@ -508,7 +508,8 @@ void TimeStepping::newtonSolve(double criterion, unsigned int maxStep) prepareNewtonIteration(); computeFreeState(); //bool hasNSProblems = (!_allNSProblems->empty() && indexSet0.size() > 0) ? true : false; - // if (hasNSProblems) + bool hasNSProblems = (!_allNSProblems->empty()) ? true : false; + if (hasNSProblems) info = computeOneStepNSProblem(SICONOS_OSNSP_TS_VELOCITY); // Check output from solver (convergence or not ...) if (!checkSolverOutput) @@ -519,8 +520,8 @@ void TimeStepping::newtonSolve(double criterion, unsigned int maxStep) update(); - // hasNSProblems = (!_allNSProblems->empty() && indexSet0.size() > 0) ? true : false; - // if (hasNSProblems) + hasNSProblems = (!_allNSProblems->empty()) ? true : false; + if (hasNSProblems) saveYandLambdaInOldVariables(); } @@ -548,10 +549,11 @@ void TimeStepping::newtonSolve(double criterion, unsigned int maxStep) // is also relevant here. //InteractionsGraph& indexSet0 = *_nsds->topology()->indexSet0(); //bool hasNSProblems = (!_allNSProblems->empty() && indexSet0.size() > 0) ? true : false; - // if (hasNSProblems) - // { + bool hasNSProblems = (!_allNSProblems->empty()) ? true : false; + if (hasNSProblems) + { info = computeOneStepNSProblem(SICONOS_OSNSP_TS_VELOCITY); - // } + } // Check output from solver (convergence or not ...) if (!checkSolverOutput) DefaultCheckSolverOutput(info); @@ -566,15 +568,16 @@ void TimeStepping::newtonSolve(double criterion, unsigned int maxStep) updateInteractionsNewtonIteration(); updateWorldFromDS(); //hasNSProblems = (!_allNSProblems->empty() && indexSet0.size() > 0) ? true : false; + hasNSProblems = (!_allNSProblems->empty()) ? true : false; updateOutput(); } _isNewtonConverge = newtonCheckConvergence(criterion); if (!_isNewtonConverge && !info) { - //hasNSProblems = (!_allNSProblems->empty() && indexSet0.size() > 0) ? true : false; + hasNSProblems = (!_allNSProblems->empty()) ? true : false; - //if (hasNSProblems) + if (hasNSProblems) saveYandLambdaInOldVariables(); }
Remove the `OR ANDROID` condition to set `BSON_HAVE_SYSCALL_TID` to 0.
@@ -135,7 +135,7 @@ else () endif () set (BSON_EXTRA_ALIGN 1) CHECK_SYMBOL_EXISTS(SYS_gettid sys/syscall.h BSON_HAVE_SYSCALL_TID) - if (NOT BSON_HAVE_SYSCALL_TID OR APPLE OR ANDROID) + if (NOT BSON_HAVE_SYSCALL_TID OR APPLE) set (BSON_HAVE_SYSCALL_TID 0) endif () CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
ExtendedTools: Add workaround for BSOD on LTSB versions of Win10
@@ -535,7 +535,7 @@ PETP_GPU_ADAPTER EtpAddDisplayAdapter( } } - if (WindowsVersion >= WINDOWS_10) + if (WindowsVersion >= WINDOWS_10_RS4) // Note: Changed to RS4 due to reports of BSODs on LTSB versions of RS3 { adapter->NodeNameList = PhCreateList(adapter->NodeCount); @@ -618,7 +618,7 @@ BOOLEAN EtpInitializeD3DStatistics( if (!NT_SUCCESS(D3DKMTOpenAdapterFromDeviceName(&openAdapterFromDeviceName))) continue; - if (WindowsVersion >= WINDOWS_8 && deviceAdapterList->Count > 1) + if (WindowsVersion >= WINDOWS_10_RS4 && deviceAdapterList->Count > 1) // Note: Changed to RS4 due to reports of BSODs on LTSB versions of RS3 { if (EtpIsGpuSoftwareDevice(openAdapterFromDeviceName.AdapterHandle)) { @@ -627,7 +627,7 @@ BOOLEAN EtpInitializeD3DStatistics( } } - if (WindowsVersion >= WINDOWS_10_RS3) + if (WindowsVersion >= WINDOWS_10_RS4) // Note: Changed to RS4 due to reports of BSODs on LTSB versions of RS3 { D3DKMT_SEGMENTSIZEINFO segmentInfo; @@ -689,7 +689,7 @@ BOOLEAN EtpInitializeD3DStatistics( aperture = queryStatistics.QueryResult.SegmentInformationV1.Aperture; } - if (WindowsVersion < WINDOWS_10_RS3) + if (WindowsVersion < WINDOWS_10_RS4) // Note: Changed to RS4 due to reports of BSODs on LTSB versions of RS3 { if (aperture) EtGpuSharedLimit += commitLimit;
vere: partially prevent forwarding loops by excluding self-galaxy lanes
@@ -868,16 +868,46 @@ _ames_forward(u3_panc* pac_u, u3_noun las) } { - u3_noun los = las; u3_noun pac = _ames_serialize_packet(pac_u, c3y); - while ( u3_nul != las ) { - _ames_ef_send(sam_u, u3k(u3h(las)), u3k(pac)); - las = u3t(las); + u3_noun tag, dat, lan, t = las; + + while ( u3_nul != t ) { + u3x_cell(t, &lan, &t); + + // validate lane and skip self if galaxy + // + if ( c3n == u3r_cell(lan, &tag, &dat) ) { + u3l_log("ames: bogus lane\n"); + u3m_p("lan", lan); } - u3z(los); u3z(pac); + else { + c3_o sen_o = c3y; + c3_d who_d[2]; + + if ( c3y == tag ) { + u3r_chubs(0, 2, who_d, dat); + + if ( (who_d[0] == sam_u->pir_u->who_d[0]) + && (who_d[1] == sam_u->pir_u->who_d[1]) ) + { + sen_o = c3n; + if ( u3C.wag_w & u3o_verbose ) { + u3l_log("ames: forward skipping self\n"); + } + } + } + + if ( c3y == sen_o ) { + _ames_ef_send(sam_u, u3k(lan), u3k(pac)); + } + } + } + + u3z(pac); } _ames_panc_free(pac_u); + u3z(las); } /* _ames_lane_scry_cb(): learn lane to forward packet on
Clean Up Support Doc
@@ -4,14 +4,15 @@ An MsQuic release begins its life in the master branch where it receives feature ## MsQuic Releases -MsQuic releases will correspond to Windows releases. When Windows releases to GA then we will create a new MsQuic release branch from master. The release branch will likely be created at the same time as in Windows: when we hit stabilization. The release will be finalized/published when Windows GAs. Once finalized the release branch will be serviced with security and bug fixes throughout its lifecycle which will end at the same time as the Windows release support ends. +MsQuic releases will correspond to Windows releases. A release branch will be created for each Windows release. The release branch will be created at the same time as in Windows: when we hit stabilization. Then, the release will be finalized some time before Windows GAs. Once finalized the release branch will only be serviced with security and bug fixes throughout its lifecycle, which will end at the same time as the Windows release support ends. This table describes the version, release date and end of support for MsQuic releases. | Version | Release Date | Support Type | End of Support | | -- | -- | -- | -- | -| [MsQuic 1.0.0](https://techcommunity.microsoft.com/t5/networking-blog/bg-p/NetworkingBlog) | TBA | SAC | TBA | +| [MsQuic 1.0](https://techcommunity.microsoft.com/t5/networking-blog/bg-p/NetworkingBlog) | June 2020 | SAC | December 2021 | +\* Future release dates are subject to change. ## MsQuic Branches @@ -19,7 +20,7 @@ MsQuic has two types of branches **master** and **release** defined as: * **Master** - The master branch receives security and bug fixes just the same as the release branches. However, the master branch is where active development happens and because of this the master branch may experience breaking changes as we develop new features. -* **Release** - Release branches only receive security and bug fix servicing and are considered stable. There should be no breaking changes in these branches, and they can be used for stable products. +* **Release** - Release branches only receive security and bug fixes, and are considered stable. There should be no breaking changes in these branches, and they can be used for stable products. \* Both types of branch receive critical fixes throughout their lifecycle, for security, reliability. @@ -27,10 +28,10 @@ MsQuic has two types of branches **master** and **release** defined as: MsQuic support lifecycle is governed by the Windows Server servicing channels: [LTSC and SAC](https://docs.microsoft.com/en-us/windows-server/get-started-19/servicing-channels-19) -* **LTSC ** release branches marked LTSC will be serviced for 5 years mainstream and 5 years extended. -* **SAC ** release branches marked SAC will be serviced for 18 months. -* **Master** is not considered supported because it is an active development branch. It does however receive security and bug fixes. +* **LTSC** release branches will be serviced for 5 years mainstream and 5 years extended. +* **SAC** release branches will be serviced for 18 months. +* **Master** is not considered supported branch because it is under active development. It does however receive security and bug fixes. ### End of support -End of support refers to the date when Microsoft no longer provides fixes, updates, or online technical assistance for your product. As this date nears, make sure you have the latest available update\* installed. Without Microsoft support, you will no longer receive security updates that can help protect your machine from harmful viruses, spyware, and other malicious software that can steal your personal information. +End of support refers to the date when Microsoft no longer provides fixes, updates, or online technical assistance for your product. As this date nears, make sure you have the latest available update installed. Without Microsoft support, you will no longer receive security updates that can help protect your machine from harmful viruses, spyware, and other malicious software that can steal your personal information.
Lazor: Add a new SKU ID 6 for Limozeen Add a new SKU ID 6 for Limozeen. BRANCH=Trogdor TEST=Built the image.
@@ -386,14 +386,14 @@ void lid_angle_peripheral_enable(int enable) static int board_is_clamshell(void) { - /* SKU ID of Limozeen: 4, 5 */ - return sku_id == 4 || sku_id == 5; + /* SKU ID of Limozeen: 4, 5, 6 */ + return sku_id == 4 || sku_id == 5 || sku_id == 6; } enum battery_cell_type board_get_battery_cell_type(void) { - /* SKU ID of Limozeen: 4, 5 -> 3S battery */ - if (sku_id == 4 || sku_id == 5) + /* SKU ID of Limozeen: 4, 5, 6 -> 3S battery */ + if (sku_id == 4 || sku_id == 5 || sku_id == 6) return BATTERY_CELL_TYPE_3S; return BATTERY_CELL_TYPE_UNKNOWN; @@ -573,7 +573,7 @@ __override uint16_t board_get_ps8xxx_product_id(int port) * Lazor (SKU_ID: 0, 1, 2, 3) rev 3+ changes TCPC from PS8751 to * PS8805. * - * Limozeen (SKU_ID: 4, 5) all-rev uses PS8805. + * Limozeen (SKU_ID: 4, 5, 6) all-rev uses PS8805. */ if ((sku_id == 0 || sku_id == 1 || sku_id == 2 || sku_id == 3) && system_get_board_version() < 3)
mangle: add Shrink's to counterbalance all Insert's
@@ -809,7 +809,10 @@ static void mangle_Resize(run_t* run, bool printable) { void mangle_mangleContent(run_t* run, unsigned slow_factor) { static void (*const mangleFuncs[])(run_t * run, bool printable) = { - /* Every *Insert or Expand expands file, so add one Shrink for each */ + /* Every *Insert or Expand expands file, so add more Shrink's */ + mangle_Shrink, + mangle_Shrink, + mangle_Shrink, mangle_Shrink, mangle_Expand, mangle_Bit,
py/send_message: fix btc sign demo The prevout hash was wrong.
@@ -281,7 +281,9 @@ class SendMessage: bip44_account: int = 0 + HARDENED inputs: List[bitbox02.BTCInputType] = [ { - "prev_out_hash": b"11111111111111111111111111111111", + "prev_out_hash": binascii.unhexlify( + "c58b7e3f1200e0c0ec9a5e81e925baface2cc1d4715514f2d8205be2508b48ee" + ), "prev_out_index": 0, "prev_out_value": int(1e8 * 0.60005), "sequence": 0xFFFFFFFF, @@ -303,7 +305,9 @@ class SendMessage: }, }, { - "prev_out_hash": b"11111111111111111111111111111111", + "prev_out_hash": binascii.unhexlify( + "c58b7e3f1200e0c0ec9a5e81e925baface2cc1d4715514f2d8205be2508b48ee" + ), "prev_out_index": 1, "prev_out_value": int(1e8 * 0.60005), "sequence": 0xFFFFFFFF,
in_thermal: validate file descriptor on initialization (CID 251488)
@@ -77,19 +77,27 @@ static inline int proc_temperature(struct flb_in_thermal_config *ctx, struct tem } #ifdef FLB_HAVE_REGEX - if (ctx->name_regex && !flb_regex_match(ctx->name_regex, (unsigned char *) e->d_name, strlen(e->d_name))) { + if (ctx->name_regex && !flb_regex_match(ctx->name_regex, + (unsigned char *) e->d_name, + strlen(e->d_name))) { continue; } #endif if (!strncmp(e->d_name, "thermal_zone", 12)) { strncpy(info[i].name, e->d_name, IN_THERMAL_FILENAME_LEN); - if (snprintf(filename, IN_THERMAL_FILENAME_LEN, "/sys/class/thermal/%s/type", e->d_name)<=0) - { + if (snprintf(filename, IN_THERMAL_FILENAME_LEN, + "/sys/class/thermal/%s/type", e->d_name) <=0 ) { continue; } f = fopen(filename, "r"); + if (!f) { + flb_errno(); + flb_error("[in_thermal] cannot read %s", filename); + continue; + } + if (f && fgets(info[i].type, IN_THERMAL_TYPE_LEN, f) && strlen(info[i].type)>1) { /* Remove trailing \n */ for (j=0; info[i].type[j]; ++j) {
Improve function call in garbage collector set debug status on python loader (still not working properly...).
@@ -43,9 +43,13 @@ typedef struct loader_impl_py_type PyObject * builtins_module; PyObject * traceback_module; PyObject * traceback_format_exception; + + #if (!defined(NDEBUG) || defined(DEBUG) || defined(_DEBUG) || defined(__DEBUG) || defined(__DEBUG__)) PyObject * gc_module; + PyObject * gc_set_debug; PyObject * gc_debug_leak; PyObject * gc_debug_stats; + #endif } * loader_impl_py; @@ -613,6 +617,12 @@ int py_loader_impl_initialize_gc(loader_impl_py py_impl) Py_DECREF(module_name); if (py_impl->gc_module != NULL) + { + py_impl->gc_set_debug = PyObject_GetAttrString(py_impl->gc_module, "set_debug"); + + if (py_impl->gc_set_debug != NULL) + { + if (PyCallable_Check(py_impl->gc_set_debug)) { py_impl->gc_debug_leak = PyDict_GetItemString(PyModule_GetDict(py_impl->gc_module), "DEBUG_LEAK"); py_impl->gc_debug_stats = PyDict_GetItemString(PyModule_GetDict(py_impl->gc_module), "DEBUG_STATS"); @@ -624,6 +634,10 @@ int py_loader_impl_initialize_gc(loader_impl_py py_impl) return 0; } + } + + Py_XDECREF(py_impl->gc_set_debug); + } Py_DECREF(py_impl->gc_module); } @@ -673,7 +687,7 @@ loader_impl_data py_loader_impl_initialize(loader_impl impl, configuration confi { if (py_loader_impl_initialize_gc(py_impl) != 0) { - PyObject_CallMethod(py_impl->gc_module, "set_debug", "i", 0xFF /* py_impl->gc_debug_stats | py_impl->gc_debug_leak */); + PyObject_CallMethodObjArgs(py_impl->gc_module, py_impl->gc_set_debug, py_impl->gc_debug_leak /* py_impl->gc_debug_stats */); } else { @@ -1240,6 +1254,8 @@ int py_loader_impl_destroy(loader_impl impl) { py_loader_impl_gc_print(py_impl); + Py_DECREF(py_impl->gc_set_debug); + Py_DECREF(py_impl->gc_debug_leak); Py_DECREF(py_impl->gc_debug_stats);
openxr: fix xrLocateViews call; The input parameter is a count, not a size The view structs must be initialized with a type
@@ -607,8 +607,13 @@ static void getViews(XrView views[2], uint32_t* count) { .space = state.referenceSpace }; + for (uint32_t i = 0; i < 2; i++) { + views[i].type = XR_TYPE_VIEW; + views[i].next = NULL; + } + XrViewState viewState = { .type = XR_TYPE_VIEW_STATE }; - XR(xrLocateViews(state.session, &viewLocateInfo, &viewState, 2 * sizeof(XrView), count, views)); + XR(xrLocateViews(state.session, &viewLocateInfo, &viewState, 2, count, views)); } static uint32_t openxr_getViewCount(void) {
Fix issue Fix a crash in the python binding when trying to open a perf buffer in python < 3.6 See
@@ -445,12 +445,12 @@ class BPF(object): if map_fd < 0: raise KeyError if not keytype: - key_desc = lib.bpf_table_key_desc(self.module, name) + key_desc = lib.bpf_table_key_desc(self.module, name).decode("utf-8") if not key_desc: raise Exception("Failed to load BPF Table %s key desc" % name) keytype = BPF._decode_table_type(json.loads(key_desc)) if not leaftype: - leaf_desc = lib.bpf_table_leaf_desc(self.module, name) + leaf_desc = lib.bpf_table_leaf_desc(self.module, name).decode("utf-8") if not leaf_desc: raise Exception("Failed to load BPF Table %s leaf desc" % name) leaftype = BPF._decode_table_type(json.loads(leaf_desc))
removed old lib
@@ -96,8 +96,11 @@ IF (VISUS_INCLUDE_DIR) FIND_LIBRARY(VISUS_SSL_LIB ssl ${VISUS_DIR}/lib NO_DEFAULT_PATH) FIND_LIBRARY(VISUS_CRYPTO_LIB libcrypto ${VISUS_DIR}/lib NO_DEFAULT_PATH) +# FIND_LIBRARY(VISUS_SIMPLEIO_LIB visussimpleio ${VISUS_DIR}/lib NO_DEFAULT_PATH) + SET(VISUS_CORE_LIBRARIES ${VISUS_LIB} +# ${VISUS_SIMPLEIO_LIB} ) SET(VISUS_ADDL_LIBRARIES
BugID:18028258:rebase tinyengine from 1.3.0 to latest alios things set tiny as defalut engine
@@ -6,8 +6,8 @@ $(NAME)_SUMMARY := an engine for javascript application development $(NAME)_SOURCES := tinyengine_app.c #choose JSE_TINYENGINE OR JSE_DUKTAPE here -export AOS_CONFIG_TINYENGINE_TYPE=JSE_DUKTAPE -#export AOS_CONFIG_TINYENGINE_TYPE=JSE_TINYENGINE +#export AOS_CONFIG_TINYENGINE_TYPE=JSE_DUKTAPE +export AOS_CONFIG_TINYENGINE_TYPE=JSE_TINYENGINE $(NAME)_COMPONENTS := log yloop cli feature.linkkit-mqtt cjson netmgr middleware.uagent.uota $(NAME)_COMPONENTS += 3rdparty.experimental.fs.spiffs
Update the comments for commit Commit fixed an issue that global transaction still continues even after FTS changed cluster configuration during the transaction. The fix worked perfectly but the comments could use some clarification where we found confusing.
@@ -79,8 +79,14 @@ cdbgang_createGang_async(List *segments, SegmentType segmentType) newGangDefinition = buildGangDefinition(segments, segmentType); CurrentGangCreating = newGangDefinition; /* - * If we're in a global transaction, and there is some primary segment down, + * If we're in a global transaction, and there is some segment configuration change, * we have to error out so that the current global transaction can be aborted. + * This is because within a transaction we use cached version of configuration information + * obtained at start of transaction, which we can't update in-middle of transaction. + * so QD will still talk to the old primary but not a new promoted one. This isn't an issue + * if the old primary is completely down since we'll find a FATAL error during communication, + * but becomes an issue if the old primary is working and acting like normal to QD. + * * Before error out, we need to reset the session instead of disconnectAndDestroyAllGangs. * The latter will drop CdbComponentsContext what we will use in AtAbort_Portals. * Because some primary segment is down writerGangLost will be marked when recycling gangs,
Data Structures: Fix minor spelling mistakes
@@ -108,7 +108,7 @@ Instead, we try to reuse sets in the following ways: is useful in situations where many operations have to be applied in a sequence reducing the given `KeySet` until no more keys are left. - None of the reference pointers changes in this situation. + None of the reference pointers change in this situation. `ksCut(KeySet *ks, const Key *cutpoint)` works that way. All keys below the `cutpoint` are moved from `ks` to the returned key @@ -252,7 +252,7 @@ When using null pointers and range checks, the function is noticeably slower than without. With the same amount of checks, using an external cursor is not much faster than -the `ksNext()`. +`ksNext()`. External cursor with checks is in a benchmark about 10% faster.
Update boat_demo.c Optimize log printing
@@ -59,9 +59,7 @@ mbedtls_pem_context; #ifdef BOAT_TEST __BOATSTATIC BOAT_RESULT platone_createOnetimeWallet() { - xy_printf("Ready to run platone_createOnetimeWallet1.\n"); - xy_printf("Ready to run platone_createOnetimeWallet2.\n"); - xy_printf("Ready to run platone_createOnetimeWallet3.\n"); + xy_printf("Ready to run platone_createOnetimeWallet.\n"); BSINT32 index; BoatPlatoneWalletConfig wallet_config = {0}; BUINT8 binFormatKey[32] = {0}; @@ -291,7 +289,6 @@ end: static void* boat_task_entry(void *args) { xy_work_lock(1); - xy_printf("boatiotsdk boat_task_entry!!! \n"); xy_sleep(30000); #ifdef BOAT_TEST
distro-packages/python-Cython: test centos flavor macro
@@ -21,16 +21,16 @@ Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/C/Cython/Cython-%{version}.tar.gz Source1: python-Cython-rpmlintrc %if 0%{?sles_version} || 0%{?suse_version} -BuildRequires: %{python_module devel} BuildRequires: %{python_module xml} BuildRequires: fdupes Requires(post): update-alternatives Requires(postun): update-alternatives %else +BuildRequires: %{python_module devel} BuildRequires: libxml2-python Requires: libxml2-python -BuildRequires: python-devel -BuildRequires: python34-devel +#BuildRequires: python-devel +#BuildRequires: python34-devel Requires(post): chkconfig Requires(postun): chkconfig %endif
oc_obt:use PSK ciphersuite for provisioning reqs
@@ -1363,6 +1363,9 @@ oc_obt_provision_role_certificate(oc_role_t *roles, oc_uuid_t *uuid, /** 1) switch dos to RFPRO */ + + oc_tls_select_psk_ciphersuite(); + p->switch_dos = switch_dos(device, OC_DOS_RFPRO, device_RFPRO, p); if (!p->switch_dos) { oc_memb_free(&oc_credprov_ctx_m, p); @@ -1410,6 +1413,9 @@ oc_obt_provision_identity_certificate(oc_uuid_t *uuid, oc_obt_status_cb_t cb, /** 1) switch dos to RFPRO */ + + oc_tls_select_psk_ciphersuite(); + p->switch_dos = switch_dos(device, OC_DOS_RFPRO, device_RFPRO, p); if (!p->switch_dos) { oc_memb_free(&oc_credprov_ctx_m, p); @@ -1456,6 +1462,8 @@ oc_obt_provision_pairwise_credentials(oc_uuid_t *uuid1, oc_uuid_t *uuid2, p->device1 = device1; p->device2 = device2; + oc_tls_select_psk_ciphersuite(); + p->switch_dos = switch_dos(device1, OC_DOS_RFPRO, device1_RFPRO, p); if (!p->switch_dos) { oc_memb_free(&oc_credprov_ctx_m, p); @@ -1873,6 +1881,8 @@ oc_obt_provision_ace(oc_uuid_t *uuid, oc_sec_ace_t *ace, r->ace = ace; r->device = device; + oc_tls_select_psk_ciphersuite(); + r->switch_dos = switch_dos(device, OC_DOS_RFPRO, provision_ace, r); if (!r->switch_dos) { free_ace(ace);
esp32/mpthreadport: Prevent deadlocks when deleting all threads. vTaskDelete now immediately calls vPortCleanUpTCB, which requires the thread_mutex mutex, so vTaskDelete must be called after this mutex is released.
@@ -205,17 +205,27 @@ void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) { } void mp_thread_deinit(void) { + for (;;) { + // Find a task to delete + TaskHandle_t id = NULL; mp_thread_mutex_lock(&thread_mutex, 1); for (thread_t *th = thread; th != NULL; th = th->next) { - // don't delete the current task - if (th->id == xTaskGetCurrentTaskHandle()) { - continue; + // Don't delete the current task + if (th->id != xTaskGetCurrentTaskHandle()) { + id = th->id; + break; } - vTaskDelete(th->id); } mp_thread_mutex_unlock(&thread_mutex); - // allow FreeRTOS to clean-up the threads - vTaskDelay(2); + + if (id == NULL) { + // No tasks left to delete + break; + } else { + // Call FreeRTOS to delete the task (it will call vPortCleanUpTCB) + vTaskDelete(id); + } + } } #else
[Meta] build_kernel.py copies os_dist/ to axle-sysroot/
@@ -93,6 +93,25 @@ def build_initrd() -> None: shutil.copy(generated_initrd.as_posix(), staged_initrd.as_posix()) +def build_dist_tree() -> None: + dist_folder = Path(__file__).parents[1] / "os_dist" + sysroot = Path(__file__).parents[1] / "axle-sysroot" + for path in dist_folder.rglob("*"): + if path.name == '.DS_Store': + continue + + relative_to_root = path.relative_to(dist_folder) + sysroot_path = sysroot / relative_to_root + + if path.is_dir(): + sysroot_path.mkdir(exist_ok=True) + continue + + if not sysroot_path.exists() or copied_file_is_outdated(path, sysroot_path): + print(f'Copying {path} to {sysroot_path}') + shutil.copy(path.as_posix(), sysroot_path.as_posix()) + + def main(): parser = argparse.ArgumentParser() parser.add_argument("--force_rebuild_programs", nargs="*", action="store") @@ -148,6 +167,8 @@ def main(): build_meson_projects() build_rust_programs() + build_dist_tree() + # Build ramdisk build_initrd()
chore: change image tags in demo README to GitHub markdown
@@ -57,7 +57,7 @@ Shows how the widgets look like out of the box using the built-in material theme See in [widgets](https://github.com/lvgl/lvgl/tree/master/demos/widgets) folder. -<img src="https://github.com/lvgl/lvgl/tree/master/demos/widgets/screenshot1.png?raw=true" width=600px alt="Basic demo to show the widgets of LVGL"> +![Basic demo to show the widgets of LVGL](widgets/screenshot1.png) For running this demo properly, please make sure **LV_MEM_SIZE** is at least **38KB** (and **48KB** is recommended): @@ -72,7 +72,7 @@ The music player demo shows what kind of modern, smartphone-like user interfaces See in [music](https://github.com/lvgl/lvgl/tree/master/demos/music) folder. -<img src="https://github.com/lvgl/lvgl/tree/master/demos/music/screenshot1.gif?raw=true" width=600px alt="Music player demo with LVGL"> +![Music player demo with LVGL](music/screenshot1.gif) ### Keypad and encoder LVGL allows you to control the widgets with a keypad and/or encoder without a touchpad. This demo shows how to handle buttons, drop-down lists, rollers, sliders, switches, and text inputs without touchpad. @@ -80,17 +80,17 @@ Learn more about the touchpad-less usage of LVGL [here](https://docs.lvgl.io/mas See in [keypad_encoder](https://github.com/lvgl/lvgl/tree/master/demos/keypad_encoder) folder. -<img src="https://github.com/lvgl/lvgl/tree/master/demos/keypad_encoder/screenshot1.png?raw=true" width=600px alt="Keypad and encoder navigation in LVGL embedded GUI library"> +![Keypad and encoder navigation in LVGL embedded GUI library](keypad_encoder/screenshot1.png) ### Benchmark A demo to measure the performance of LVGL or to compare different settings. See in [benchmark](https://github.com/lvgl/lvgl/tree/master/demos/benchmark) folder. -<img src="https://github.com/lvgl/lvgl/tree/master/demos/benchmark/screenshot1.png?raw=true" width=600px alt="Benchmark demo with LVGL embedded GUI library"> +![Benchmark demo with LVGL embedded GUI library](benchmark/screenshot1.png) ### Stress A stress test for LVGL. It contains a lot of object creation, deletion, animations, style usage, and so on. It can be used if there is any memory corruption during heavy usage or any memory leaks. See in [stress](https://github.com/lvgl/lvgl/tree/master/demos/stress) folder. -<img src="https://github.com/lvgl/lvgl/tree/master/demos/stress/screenshot1.png?raw=true" width=600px alt="Stress test for LVGL"> +![Stress test for LVGL](stress/screenshot1.png) ## Contributing For contribution and coding style guidelines, please refer to the file docs/CONTRIBUTING.md in the main LVGL repo:
Fix long delay when JPEG encoding overflows.
@@ -130,12 +130,13 @@ void HAL_JPEG_GetDataCallback(JPEG_HandleTypeDef *hjpeg, uint32_t NbDecodedData) } else if (jpeg_enc.y_offset == jpeg_enc.img_h) { // Compression is done. HAL_JPEG_ConfigInputBuffer(hjpeg, NULL, 0); + HAL_JPEG_Resume(hjpeg, JPEG_PAUSE_RESUME_INPUT); } else { // Set the next MCU. HAL_JPEG_ConfigInputBuffer(hjpeg, get_mcu(), jpeg_enc.mcu_size); - } HAL_JPEG_Resume(hjpeg, JPEG_PAUSE_RESUME_INPUT); } +} void HAL_JPEG_DataReadyCallback (JPEG_HandleTypeDef *hjpeg, uint8_t *pDataOut, uint32_t OutDataLength) { @@ -201,7 +202,7 @@ bool jpeg_compress(image_t *src, image_t *dst, int quality, bool realloc) } // NOTE: output buffer size is stored in dst->bpp - if (HAL_JPEG_Encode(&JPEG_Handle, get_mcu(), jpeg_enc.mcu_size, dst->pixels, dst->bpp, 10000) != HAL_OK) { + if (HAL_JPEG_Encode(&JPEG_Handle, get_mcu(), jpeg_enc.mcu_size, dst->pixels, dst->bpp, 3000) != HAL_OK) { // Initialization error return true; }
Defend against counterfeit /usr/share/zoneinfo/UTC.
@@ -137,7 +137,8 @@ def main(): # directory. To stabilize the names of these symbols we need to fix mtime, # timezone, and cwd. os.environ['LD_PRELOAD'] = mtime0 - os.environ['TZ'] = 'UTC' + os.environ['TZ'] = 'UTC0' # POSIX fixed offset format. + os.environ['TZDIR'] = '/var/empty' # Against counterfeit /usr/share/zoneinfo/$TZ. if dump_args: sys.stdout.write('\n'.join(command))
rtt: Mark old RTT settings as deprecated New "newt" can emit a warning when deprecated settings are overridden.
@@ -52,8 +52,10 @@ syscfg.defs: # Values below are deprecated and only used for backwards compatibility. # Please use new values instead. RTT_BUFFER_SIZE_UP: - description: 'Size of the output buffer' + description: 'Use RTT_TERMINAL_BUFFER_SIZE_UP instead' + deprecated: 1 value: 1024 RTT_BUFFER_SIZE_DOWN: - description: 'Size of the input buffer' + description: 'Use RTT_TERMINAL_BUFFER_SIZE_DOWN instead' + deprecated: 1 value: 16
Fix typo Oops. Made a typo in
@@ -344,7 +344,7 @@ F4 - `STM32 F411ve Discovery <https://www.st.com/en/evaluation-tools/32f411ediscovery.html>`__ - `STM32 F412zg Discovery <https://www.st.com/en/evaluation-tools/32f412gdiscovery.html>`__ - `STM32 F412zg Nucleo <https://www.st.com/en/evaluation-tools/nucleo-f412zg.html>`__ -- `STM32 F439zg Nucleo <https://www.st.com/en/evaluation-tools/nucleo-f439zi.html>`__ +- `STM32 F439zi Nucleo <https://www.st.com/en/evaluation-tools/nucleo-f439zi.html>`__ F7 ^^
Modify visit-notify-test-failure to convert known noreply addresses to real addresses.
@@ -96,6 +96,12 @@ if test "$lastpass" != "0" ; then git log $lastpass..HEAD | grep '^Author: ' | sed 's/>//' | cut -d'<' -f2 | sort | uniq >> modifiers fi +# +# Convert any known email addresses with noreply in them. +# +sed -i "s/[email protected]/[email protected]/" modifiers +sed -i "s/[email protected]/[email protected]/" modifiers + # # Build the email list of modifiers. #
Tests: making available versions unique.
@@ -142,10 +142,9 @@ def pytest_sessionstart(session): # discover available modules from unit.log for module in re.findall(r'module: ([a-zA-Z]+) (.*) ".*"$', log, re.M): - if module[0] not in option.available['modules']: - option.available['modules'][module[0]] = [module[1]] - else: - option.available['modules'][module[0]].append(module[1]) + versions = option.available['modules'].setdefault(module[0], []) + if module[1] not in versions: + versions.append(module[1]) # discover modules from check
oic; if ble_att_mtu() returns 0, assume that connection is gone.
@@ -337,7 +337,11 @@ oc_send_buffer_gatt(struct os_mbuf *m) STATS_INCN(oc_ble_stats, obytes, OS_MBUF_PKTLEN(m)); mtu = ble_att_mtu(conn_handle); - assert(mtu > 4); + if (mtu < 4) { + oc_ble_coap_conn_del(conn_handle); + os_mbuf_free_chain(m); + return; + } mtu -= 3; /* # of bytes for ATT notification base */ if (oc_ble_frag(m, mtu)) {
do not build or install debug libs for trunk because HIP does not yet support printf, also fix rsync command when using COPYSOURCE
@@ -129,6 +129,8 @@ fi # This is how we tell the hsa plugin where to find hsa export HSA_RUNTIME_PATH=$ROCM_DIR/hsa +# Trunk does not yet use standard library search for HIP device libs +# So tell HIP where to find rocm-device-libs with HIP_DEVICE_LIB_PATH if [ "$AOMP_BUILD_TRUNK" != 0 ] ; then export HIP_DEVICE_LIB_PATH=$ROCM_DIR/lib fi @@ -140,8 +142,9 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then echo "Use ""$0 nocmake"" or ""$0 install"" to avoid FRESH START." if [ $COPYSOURCE ] ; then - echo rsync -av --exclude ".git" --delete $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp/ $BUILD_DIR/$AOMP_PROJECT_REPO_NAME/openmp/ - rsync -av --exclude ".git" --delete $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp/ $BUILD_DIR/$AOMP_PROJECT_REPO_NAME/openmp/ + mkdir -p $BUILD_DIR/$AOMP_PROJECT_REPO_NAME + echo rsync -av --delete $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp $BUILD_DIR/$AOMP_PROJECT_REPO_NAME + rsync -av --delete $AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp $BUILD_DIR/$AOMP_PROJECT_REPO_NAME fi echo rm -rf $BUILD_DIR/build/openmp @@ -164,7 +167,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then fi # We cannot build debug libs with hip till hip has support for robust posix printf - if [ "$AOMP_BUILD_TRUNK" != 0 ] ; then + if [ "$AOMP_BUILD_TRUNK" == 0 ] ; then echo rm -rf $BUILD_DIR/build/openmp_debug rm -rf $BUILD_DIR/build/openmp_debug MYCMAKEOPTS="$COMMON_CMAKE_OPTS -DLIBOMPTARGET_NVPTX_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug $AOMP_ORIGIN_RPATH -DROCM_DIR=$ROCM_DIR" @@ -200,7 +203,7 @@ if [ $? != 0 ] ; then exit 1 fi -if [ "$AOMP_BUILD_TRUNK" != 0 ] ; then +if [ "$AOMP_BUILD_TRUNK" == 0 ] ; then cd $BUILD_DIR/build/openmp_debug echo echo @@ -231,7 +234,7 @@ if [ "$1" == "install" ] ; then exit 1 fi - if [ "$AOMP_BUILD_TRUNK" != 0 ] ; then + if [ "$AOMP_BUILD_TRUNK" == 0 ] ; then cd $BUILD_DIR/build/openmp_debug echo echo " -----Installing to $INSTALL_OPENMP/lib-debug ---- "
Update Ref_PMU8.txt
@@ -37,7 +37,7 @@ ARM_PMU_CNTR_Enable(PMU_CNTENSET_CCNTR_ENABLE_Msk|PMU_CNTENSET_CNT0_ENABLE_Msk|P // Stop incrementing Cycle Count Register and Event Counter Registers 0 & 1 -ARM_PMU_CNTR_Disable(PMU_CNTENCLR_CCNTR_ENABLE_Msk|PMU_CNTENSET_CNT0_ENABLE_Msk|PMU_CNTENSET_CNT1_ENABLE_Msk); +ARM_PMU_CNTR_Disable(PMU_CNTENCLR_CCNTR_ENABLE_Msk|PMU_CNTENCLR_CNT0_ENABLE_Msk|PMU_CNTENCLR_CNT1_ENABLE_Msk); // Get cycle count, number of instructions retired and number of L1 D-Cache misses (on read)
[str-xxx] Explicitly disable warnings
#define strnicmp _strnicmp /* Secure versions of functions */ + /* Explicitly disable warnings by pragma/define, see: + * https://www.codegrepper.com/code-examples/c/crt+secure+no+warnings */ + #pragma warning(disable : 4996) + #define _CRT_SECURE_NO_WARNINGS #if 0 /* * The current issues with those 4 defines:
Returned ability to load data from YT to Pool
@@ -324,6 +324,8 @@ class Pool(_PoolBase): """ Check files existence. """ + scheme_end = data.find('://') + if scheme_end == -1: if not os.path.isfile(data): raise CatBoostError("Invalid data path='{}': file does not exist.".format(data)) if column_description is not None and not os.path.isfile(column_description):
BugID:18920199:call all the tcp-ip related function only if the compile switcher CONFIG_NO_TCPIP is off
@@ -64,10 +64,27 @@ static void app_pre_init(void) } #endif - - #ifdef AOS_COMP_CLI +static uint8_t hex(char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + if (c >= 'a' && c <= 'z') + return c - 'a' + 10; + if (c >= 'A' && c <= 'Z') + return c - 'A' + 10; + return 0; +} + +static void hexstr2bin(const char *macstr, uint8_t *mac, int len) +{ + int i; + for (i=0;i < len && macstr[2 * i];i++) { + mac[i] = hex(macstr[2 * i]) << 4; + mac[i] |= hex(macstr[2 * i + 1]); + } +} #ifndef CONFIG_NO_TCPIP static void udp_cmd(char *buf, int len, int argc, char **argv) @@ -152,33 +169,12 @@ void tcpip_cli_init(void) { aos_cli_register_commands(&tcpip_cli_cmd[0],sizeof(tcpip_cli_cmd) / sizeof(struct cli_command)); } -#endif void wifi_debug_cmd(char *buf, int len, int argc, char **argv) { hal_wifi_start_debug_mode(NULL); } -static uint8_t hex(char c) -{ - if (c >= '0' && c <= '9') - return c - '0'; - if (c >= 'a' && c <= 'z') - return c - 'a' + 10; - if (c >= 'A' && c <= 'Z') - return c - 'A' + 10; - return 0; -} - -static void hexstr2bin(const char *macstr, uint8_t *mac, int len) -{ - int i; - for (i=0;i < len && macstr[2 * i];i++) { - mac[i] = hex(macstr[2 * i]) << 4; - mac[i] |= hex(macstr[2 * i + 1]); - } -} - void mac_cmd(char *buf, int len, int argc, char **argv) { uint8_t mac[6]; @@ -212,6 +208,7 @@ void hal_wifi_cli_init(void) { aos_cli_register_commands(&wifi_cli_cmd[0],sizeof(wifi_cli_cmd) / sizeof(struct cli_command)); } +#endif /*!defined CONFIG_NO_TCPIP */ void cli_service_init(kinit_t *kinit) { @@ -224,8 +221,9 @@ void cli_service_init(kinit_t *kinit) #endif #ifndef CONFIG_NO_TCPIP tcpip_cli_init(); -#endif hal_wifi_cli_init(); +#endif + } return; }
oc_introspection: fix overrun
@@ -42,7 +42,7 @@ gen_idd_tag(const char *name, size_t device_index, char *idd_tag) snprintf(idd_tag, MAX_TAG_LENGTH, "%s_%zd", name, device_index); idd_tag_len = (idd_tag_len < MAX_TAG_LENGTH) ? idd_tag_len + 1 : MAX_TAG_LENGTH; - idd_tag[idd_tag_len] = '\0'; + idd_tag[idd_tag_len - 1] = '\0'; } void
docs: Sync up EN and CN lines of ble-mesh, wifi, and i2c
@@ -2479,7 +2479,6 @@ The parameters not mentioned in the following table should be set to the default - 31.5 - 27.7 - .. only:: esp32s3 .. list-table:: @@ -2577,14 +2576,12 @@ The parameters not mentioned in the following table should be set to the default The test was performed with a single stream in a shielded box using an ASUS RT-N66U router. {IDF_TARGET_NAME}'s CPU is single core with 160 MHz. {IDF_TARGET_NAME}'s flash is in QIO mode with 80 MHz. - .. only:: esp32c2 .. note:: The test was performed with a single stream in a shielded box using an Redmi RM2100 router. {IDF_TARGET_NAME}'s CPU is single core with 120 MHz. {IDF_TARGET_NAME}'s flash is in QIO mode with 60 MHz. - .. only:: esp32 **Ranks:**
add fget() and fset() bindings for Janet
@@ -777,11 +777,25 @@ static Janet janet_keyp(int32_t argc, Janet* argv) static Janet janet_fget(int32_t argc, Janet* argv) { - return janet_wrap_nil(); + janet_fixarity(argc, 2); + + s32 index = janet_getinteger(argv, 0); + u8 flag = janet_getinteger(argv, 1); + + tic_mem* memory = (tic_mem*)getJanetMachine(); + return janet_wrap_boolean(tic_api_fget(memory, index, flag)); } static Janet janet_fset(int32_t argc, Janet* argv) { + janet_fixarity(argc, 3); + + s32 index = janet_getinteger(argv, 0); + u8 flag = janet_getinteger(argv, 1); + bool value = janet_getboolean(argv, 2); + + tic_mem* memory = (tic_mem*)getJanetMachine(); + tic_api_fset(memory, index, flag, value); return janet_wrap_nil(); }
workflows: add extra job to validate matrix. * Check that the entire unit test matrix passes correctly. This will be used to add a github branch check.
@@ -78,3 +78,13 @@ jobs: CC: gcc CXX: g++ FLB_OPT: ${{ matrix.flb_option }} + + run-all-unit-tests: + if: ${{ always() }} + runs-on: ubuntu-latest + name: Unit tests (matrix) + needs: run-unit-tests-amd64 + steps: + - name: Check build matrix status + if: ${{ needs.build.result != 'success' }} + run: exit 1 \ No newline at end of file
VERSION bump to version 1.4.0
@@ -30,8 +30,8 @@ endif() # minor version changes with added functionality (new tool, functionality of the tool or library, ...) and # micro version is changed with a set of small changes or bugfixes anywhere in the project. set(SYSREPO_MAJOR_VERSION 1) -set(SYSREPO_MINOR_VERSION 3) -set(SYSREPO_MICRO_VERSION 70) +set(SYSREPO_MINOR_VERSION 4) +set(SYSREPO_MICRO_VERSION 0) set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_MICRO_VERSION}) # Version of the library
sockeye: don't use low memory regions when allocating vspace
@@ -96,7 +96,7 @@ add_process(S, Enum, NewS) :- state_add(S2, overlay(OUT_ID, DRAM_ID), S3), % Reserve memory for the process, the OUT/PROC0 node is the one where % initially the process (virtual) addresses are issued. - Limit = 1099511627775, % (512 << 31) - 1 + Limit = 10995116277760, % (512 << 31) - 1 state_add(S3, in_use(region(OutId, block(0,Limit))), NewS). iommu_enabled :-
Bump to 0.6.8
project('MangoHud', ['c', 'cpp'], - version : 'v0.6.7', + version : 'v0.6.8', license : 'MIT', meson_version: '>=0.60.0', default_options : ['buildtype=release', 'c_std=c99', 'cpp_std=c++14', 'warning_level=2']
host/l2cap: disconnect if received packet is larger than MPS Peer sending packet larger than MPS is invalid, and should be met with L2CAP channel disconnection. This affects L2CAP/LE/CFC/BV-27-C
@@ -388,6 +388,16 @@ ble_l2cap_rx(struct ble_hs_conn *conn, goto err; } + /* For CIDs from dynamic range we check if SDU size isn't larger than MPS */ + if (chan->dcid >= 0x0040 && chan->dcid <= 0x007F && l2cap_hdr.len > chan->my_coc_mps) { + /* Data exceeds MPS */ + BLE_HS_LOG(ERROR, "error: sdu_len > chan->my_coc_mps (%d>%d)\n", + l2cap_hdr.len, chan->my_coc_mps); + ble_l2cap_disconnect(chan); + rc = BLE_HS_EBADDATA; + goto err; + } + if (chan->rx_buf != NULL) { /* Previous data packet never completed. Discard old packet. */ ble_l2cap_remove_rx(conn, chan);
Fix BIO_set_indent() check This function returns an errorcode <= 0, but only < 0 is checked. Other callers that check the return value perform this check correctly. Fix it by changing the check to <= 0. CLA: trivial
@@ -50,7 +50,7 @@ static int asn1_print_info(BIO *bp, long offset, int depth, int hl, long len, pop_f_prefix = 1; } saved_indent = BIO_get_indent(bp); - if (BIO_set_prefix(bp, str) <= 0 || BIO_set_indent(bp, indent) < 0) + if (BIO_set_prefix(bp, str) <= 0 || BIO_set_indent(bp, indent) <= 0) goto err; }
prepare FBT & SAE deep packet inspection
@@ -4330,9 +4330,24 @@ reassociationresponseframecount++; return; } /*===========================================================================*/ -void process80211authentication(uint32_t caplen, uint32_t wdsoffset, uint8_t *packet) +void process80211fbtauthentication() { + +authenticationfbtframecount++; +return; +} +/*===========================================================================*/ +void process80211saeauthentication() +{ + + +authenticationsaeframecount++; +return; +} +/*===========================================================================*/ +void process80211authentication(uint32_t caplen, uint32_t wdsoffset, uint8_t *packet) +{ authf_t *auth; vendor_t *vendorauth; uint8_t *packet_ptr; @@ -4349,7 +4364,6 @@ if(caplen < (uint32_t)MAC_SIZE_NORM +wdsoffset +(uint32_t)AUTHENTICATIONFRAME_SI { return; } - mac_t *macf; macf = (mac_t*)packet; packet_ptr = packet +MAC_SIZE_NORM +wdsoffset; @@ -4359,35 +4373,35 @@ if(macf->protected == 1) { authenticationskframecount++; } -else if(ntohs(auth->authentication_algho) == OPEN_SYSTEM) +else if(auth->authentication_algho == OPEN_SYSTEM) { authenticationosframecount++; } -else if(ntohs(auth->authentication_algho) == SHARED_KEY) +else if(auth->authentication_algho == SHARED_KEY) { authenticationskframecount++; } -else if(ntohs(auth->authentication_algho) == FBT) +else if(auth->authentication_algho == FBT) { - authenticationfbtframecount++; + process80211fbtauthentication(); } -else if(ntohs(auth->authentication_algho) == SAE) +else if(auth->authentication_algho == SAE) { - authenticationsaeframecount++; + process80211saeauthentication(); } -else if(ntohs(auth->authentication_algho) == FILS) +else if(auth->authentication_algho == FILS) { authenticationfilsframecount++; } -else if(ntohs(auth->authentication_algho) == FILSPFS) +else if(auth->authentication_algho == FILSPFS) { authenticationfilspfsframecount++; } -else if(ntohs(auth->authentication_algho) == FILSPK) +else if(auth->authentication_algho == FILSPK) { authenticationfilspkframecount++; } -else if(ntohs(auth->authentication_algho) == NETWORKEAP) +else if(auth->authentication_algho == NETWORKEAP) { authenticationnetworkeapframecount++; } @@ -4400,10 +4414,9 @@ if(caplen < (uint32_t)MAC_SIZE_NORM +wdsoffset +(uint32_t)AUTHENTICATIONFRAME_SI { return; } + packet_ptr = packet +MAC_SIZE_NORM +wdsoffset +AUTHENTICATIONFRAME_SIZE; vendorauth = (vendor_t*)packet_ptr; - - if(vendorauth->tagnr != 0xdd) { return;
Add handshake_set_state helper function
@@ -1323,4 +1323,14 @@ static inline int mbedtls_ssl_conf_is_hybrid_tls12_tls13( const mbedtls_ssl_conf } #endif /* MBEDTLS_SSL_PROTO_TLS1_2 && MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL*/ +#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) + +static inline void mbedtls_ssl_handshake_set_state( mbedtls_ssl_context* ssl, + int state ) +{ + ssl->state = state; +} + +#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */ + #endif /* ssl_misc.h */
Fix compiler warning in config assert() on 64 bit architecture * Replace the following code that was used to force an assert: configASSERT( pxTCB->ulNotifiedValue[ uxIndexToNotify ] == ~0UL ); with: configASSERT( xTickCount == ( TickType_t ) 0 ); Because the former generates a warning on 64-bit architectures.
@@ -4887,7 +4887,7 @@ TickType_t uxTaskResetEventItemValue( void ) /* Should not get here if all enums are handled. * Artificially force an assert by testing a value the * compiler can't assume is const. */ - configASSERT( pxTCB->ulNotifiedValue[ uxIndexToNotify ] == ~0UL ); + configASSERT( xTickCount == ( TickType_t ) 0 ); break; } @@ -5030,7 +5030,7 @@ TickType_t uxTaskResetEventItemValue( void ) /* Should not get here if all enums are handled. * Artificially force an assert by testing a value the * compiler can't assume is const. */ - configASSERT( pxTCB->ulNotifiedValue[ uxIndexToNotify ] == ~0UL ); + configASSERT( xTickCount == ( TickType_t ) 0 ); break; }
Add missing state test coverage
@@ -3938,6 +3938,28 @@ void aead_multipart_state_test( int key_type_arg, data_t *key_data, psa_aead_abort( &operation ); + /* ------------------------------------------------------- */ + + operation = psa_aead_operation_init( ); + + PSA_ASSERT( psa_aead_encrypt_setup( &operation, key, alg ) ); + + TEST_EQUAL( psa_aead_decrypt_setup( &operation, key, alg ), + PSA_ERROR_BAD_STATE ); + + psa_aead_abort( &operation ); + + /* ------------------------------------------------------- */ + + operation = psa_aead_operation_init( ); + + PSA_ASSERT( psa_aead_decrypt_setup( &operation, key, alg ) ); + + TEST_EQUAL( psa_aead_encrypt_setup( &operation, key, alg ), + PSA_ERROR_BAD_STATE ); + + psa_aead_abort( &operation ); + /* Test for not setting a nonce. */ operation = psa_aead_operation_init( ); @@ -3963,6 +3985,54 @@ void aead_multipart_state_test( int key_type_arg, data_t *key_data, psa_aead_abort( &operation ); + /* Test for double generating nonce. */ + + operation = psa_aead_operation_init( ); + + PSA_ASSERT( psa_aead_encrypt_setup( &operation, key, alg ) ); + + PSA_ASSERT( psa_aead_generate_nonce( &operation, nonce_buffer, + PSA_AEAD_NONCE_MAX_SIZE, + &nonce_length ) ); + + TEST_EQUAL( psa_aead_generate_nonce( &operation, nonce_buffer, + PSA_AEAD_NONCE_MAX_SIZE, + &nonce_length ), + PSA_ERROR_BAD_STATE ); + + + psa_aead_abort( &operation ); + + /* Test for generate nonce then set and vice versa */ + + operation = psa_aead_operation_init( ); + + PSA_ASSERT( psa_aead_encrypt_setup( &operation, key, alg ) ); + + PSA_ASSERT( psa_aead_generate_nonce( &operation, nonce_buffer, + PSA_AEAD_NONCE_MAX_SIZE, + &nonce_length ) ); + + TEST_EQUAL( psa_aead_set_nonce( &operation, nonce->x, nonce->len ), + PSA_ERROR_BAD_STATE ); + + psa_aead_abort( &operation ); + + /* ------------------------------------------------------- */ + + operation = psa_aead_operation_init( ); + + PSA_ASSERT( psa_aead_encrypt_setup( &operation, key, alg ) ); + + PSA_ASSERT( psa_aead_set_nonce( &operation, nonce->x, nonce->len ) ); + + TEST_EQUAL( psa_aead_generate_nonce( &operation, nonce_buffer, + PSA_AEAD_NONCE_MAX_SIZE, + &nonce_length ), + PSA_ERROR_BAD_STATE ); + + psa_aead_abort( &operation ); + /* Test for generating nonce in decrypt setup. */ operation = psa_aead_operation_init( );
remove win installer references
@@ -182,8 +182,9 @@ build-windows-64: popd # Build - make win_installer + make win + ls -la bin # Deploy output test -d results || mkdir results - cp bin/*installer.exe results + #cp bin/*installer.exe results
[mod_webdav] define HAVE_RENAMEAT2 earlier (including linux/fs.h later might reveal RENAME_NOREPLACE)
#include <string.h> #include <unistd.h> /* getpid() linkat() rmdir() unlinkat() */ +#ifdef RENAME_NOREPLACE /*(renameat2() not well-supported yet)*/ +#define HAVE_RENAMEAT2 +#endif + #ifdef HAVE_COPY_FILE_RANGE #ifdef __FreeBSD__ typedef off_t loff_t; @@ -2794,7 +2798,7 @@ webdav_copytmp_rename (const plugin_config * const pconf, } while (0); const int overwrite = (*flags & WEBDAV_FLAG_OVERWRITE); - #ifndef RENAME_NOREPLACE /*(renameat2() not well-supported yet)*/ + #ifndef HAVE_RENAMEAT2 if (!overwrite) { struct stat stb; if (0 == lstat(dst->path.ptr, &stb) || errno != ENOENT) @@ -2836,7 +2840,7 @@ webdav_copymove_file (const plugin_config * const pconf, { const int overwrite = (*flags & WEBDAV_FLAG_OVERWRITE); if (*flags & WEBDAV_FLAG_MOVE_RENAME) { - #ifndef RENAME_NOREPLACE /*(renameat2() not well-supported yet)*/ + #ifndef HAVE_RENAMEAT2 if (!overwrite) { struct stat st; if (0 == lstat(dst->path.ptr, &st) || errno != ENOENT) @@ -3021,7 +3025,7 @@ webdav_copymove_dir (const plugin_config * const pconf, int make_destdir = 1; const int overwrite = (flags & WEBDAV_FLAG_OVERWRITE); if (flags & WEBDAV_FLAG_MOVE_RENAME) { - #ifndef RENAME_NOREPLACE /*(renameat2() not well-supported yet)*/ + #ifndef HAVE_RENAMEAT2 if (!overwrite) { if (0 == lstat(dst->path.ptr, &st) || errno != ENOENT) { webdav_xml_response_status(r, &src->rel_path, 412); @@ -4688,7 +4692,7 @@ mod_webdav_put_linkat_rename (request_st * const r, pathproc[sizeof("/proc/self/fd/")-1+plen] = '\0'; if (0 == linkat(AT_FDCWD, pathproc, AT_FDCWD, pathtemp, AT_SYMLINK_FOLLOW)){ struct stat st; - #ifdef RENAME_NOREPLACE /*(renameat2() not well-supported yet)*/ + #ifdef HAVE_RENAMEAT2 if (0 == renameat2(AT_FDCWD, pathtemp, AT_FDCWD, r->physical.path.ptr, RENAME_NOREPLACE)) http_status_set_fin(r, 201); /* Created */
automation: Added thread protection to stdio logging wrappers No issue with this so far, but just to be on the safe side.
@@ -2,6 +2,7 @@ import os import sys import logging from logging import StreamHandler +from threading import Lock import verboselogs import coloredlogs @@ -26,38 +27,49 @@ class ULog(): """Console logging handler that prints to stdout via file descriptor""" def __init__(self, stdout): StreamHandler.__init__(self) + self._mutex = Lock() self.stdout = stdout def emit(self, record): """This function will be called by the logging module""" + self._mutex.acquire() msg = self.format(record) stdout_fd = self.stdout.fileno() os.write(stdout_fd, str.encode(msg + "\n")) + self._mutex.release() class ULogWrapper: """Logging wrapper""" def __init__(self, level): self._level = level self._buffer = "" + self._mutex = Lock() + + def _flush(self, only_flush_complete_lines=False): + """Common flush function + This will do the actual logging""" + if "\n" in self._buffer: + lines = self._buffer.splitlines() + for l in lines[:-1]: + self._level(l.rstrip()) + self._buffer = lines[-1] + + if not only_flush_complete_lines and len(self._buffer.rstrip()) > 0: + self._level(self._buffer.rstrip()) + self._buffer = "" def write(self, string): - """This function will be called by the logging module""" + """This function will be called when writing to the wrapped stdio""" + self._mutex.acquire() self._buffer += string - self.flush() + self._flush(only_flush_complete_lines=True) + self._mutex.release() def flush(self): - """This function will be called by the logging module""" - if len(self._buffer) > 0: - last_is_eol = self._buffer[-1] == '\n' - lines = self._buffer.splitlines() - if last_is_eol: - self._buffer = "" - else: - self._buffer = lines[-1] - lines = lines[:-1] - - for line in lines: - self._level(line.rstrip()) + """This function will be called when flushing the wrapped stdio""" + self._mutex.acquire() + self._flush() + self._mutex.release() _logging_is_setup = False
workflows: update unit-tests timeout to 60 minutes. Set timeout-minutes: 60
@@ -25,7 +25,7 @@ on: jobs: run-ubuntu-unit-tests: runs-on: ubuntu-18.04 - timeout-minutes: 30 + timeout-minutes: 60 strategy: fail-fast: false matrix: @@ -78,7 +78,7 @@ jobs: needs: - run-ubuntu-unit-tests runs-on: macos-latest - timeout-minutes: 30 + timeout-minutes: 60 strategy: fail-fast: false matrix:
Eyre will %bake builds using ford-turbo now.
?: ?=([%complete %error *] result.sih) ~& [%fail-on-error result.sih] (fail-turbo 404 message.build-result.result.sih) - ~& %kinda-pass + ~& [%inside-turbo-ha-handler tee] =/ cay=cage (result-to-cage:ford-api build-result.result.sih) ?: ?=($red-quri p.cay) =+ url=(apex:en-purl ((hard quri) q.q.cay)) (give-thou 307 [location+(crip url)]~ ~) :: (give-html:abet 200 ~ (redir:xml url)) ?. ?=($mime p.cay) + ~& [%mime-casting-inside-turbo-response tee] =+ bek=(norm-beak -:(need (de-beam p.tee))) =+ tee-ses=?~(ses tee [%ac u.ses tee]) :: TODO: Why cast here? Shouldn't the cast wrap the previous result? :: :: =+ dep=(crip "W/{(en-json %s (scot %uv p.sih))}") =+ hit=[200 ~[content-type+(en-mite mit)] ~ rez] :: etag+dep + ~& [%giving-turbo-thou tee] (give-thou (add-cookies cug hit)) == :: ?> ?=([%f %made *] sih) (give-thou 307 [location+(crip url)]~ ~) :: (give-html:abet 200 ~ (redir:xml url)) ?. ?=($mime p.cay) - ~& [%mime-casting tee] + ~& [%mime-casting-to-turbo tee] =+ bek=(norm-beak -:(need (de-beam p.tee))) =+ tee-ses=?~(ses tee [%ac u.ses tee]) :: TODO: Why cast here? Shouldn't the cast wrap the previous result? $html (give-html 200 cug p.pez) $htme (give-html 401 cug p.pez) $bake - :: TODO: this needs reworking here. + + ~& [%bake pez] + %+ exec-turbo-live p.pez + ^- schematic:ford-api + :- %alts :~ + ^- schematic:ford-api + [%bake q.pez r.pez [[p q] s]:s.pez] :: - =+ req=[%bake mar=q.pez [r s]:pez] - =+ red=req(mar %red-quri) - (exec-live p.pez -.s.pez `silk:ford`[%alts ~[req red]]) + ^- schematic:ford-api + [%bake %red-quri r.pez [[p q] s]:s.pez] + == + + :: :: TODO: this needs reworking here. + :: :: + :: =+ req=[%bake mar=q.pez [r s]:pez] + :: =+ red=req(mar %red-quri) + :: (exec-live p.pez -.s.pez `silk:ford`[%alts ~[req red]]) :: $red =+ url=(en-purl hat pok(p [~ %html]) quy)
vat2: do not require _crc field in API messages Type: improvement
@@ -133,17 +133,16 @@ vat2_register_function (char *name, cJSON (*f) (cJSON *), static int vat2_exec_command_by_name (char *msgname, cJSON *o) { + u32 crc = 0; if (filter_message (msgname)) return 0; cJSON *crc_obj = cJSON_GetObjectItem (o, "_crc"); - if (!crc_obj) + if (crc_obj) { - fprintf (stderr, "Missing '_crc' element!\n"); - return -1; - } char *crc_str = cJSON_GetStringValue (crc_obj); - u32 crc = (u32) strtol (crc_str, NULL, 16); + crc = (u32) strtol (crc_str, NULL, 16); + } uword *p = hash_get_mem (function_by_name, msgname); if (!p) @@ -151,7 +150,7 @@ vat2_exec_command_by_name (char *msgname, cJSON *o) fprintf (stderr, "No such command %s\n", msgname); return -1; } - if (crc != apifuncs[p[0]].crc) + if (crc && crc != apifuncs[p[0]].crc) { fprintf (stderr, "API CRC does not match: %s!\n", msgname); }
linux-raspberrypi-dev: Switch to rpi-4.12.y Linux v4.12 is now released.
@@ -7,8 +7,8 @@ python __anonymous() { FILESEXTRAPATHS_prepend := "${THISDIR}/linux-raspberrypi:" -LINUX_VERSION ?= "4.11" -LINUX_RPI_DEV_BRANCH ?= "rpi-4.11.y" +LINUX_VERSION ?= "4.12" +LINUX_RPI_DEV_BRANCH ?= "rpi-4.12.y" SRCREV = "${AUTOREV}" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=${LINUX_RPI_DEV_BRANCH} \
pmap: set next pointer in vnode to null when using PMAP_ARRAY
@@ -350,6 +350,7 @@ errval_t alloc_vnode(struct pmap_x86 *pmap, struct vnode *root, root->u.vnode.children = newvnode; newvnode->u.vnode.children = NULL; #elif defined(PMAP_ARRAY) + newvnode->next = NULL; newvnode->u.vnode.children = slab_alloc(&pmap->ptslab); assert(newvnode->u.vnode.children); memset(newvnode->u.vnode.children, 0, sizeof(struct vode *)*PTABLE_SIZE); @@ -565,6 +566,7 @@ static errval_t deserialise_tree(struct pmap *pmap, struct serial_entry **in, n->next = parent->u.vnode.children; parent->u.vnode.children = n; #elif defined(PMAP_ARRAY) + n->next = NULL; if (slab_freecount(&pmapx->ptslab) < 4) { err = pmapx->refill_ptslab(pmapx, 32); if (err_is_fail(err)) {
Initial 5100.22 tests (Issue
@@ -42,6 +42,12 @@ TESTFILES = \ pwg5100.15.test \ pwg5100.16.test \ pwg5100.17.test \ + pwg5100.18.test \ + pwg5100.22.test \ + pwg5100.22-base.test \ + pwg5100.22-notifications.test \ + pwg5100.22-printers.test \ + pwg5100.22-resources.test \ rfc3380.test \ rfc3995-3996.test \ rfc3998.test \
Fix the accounting for fragmented unordered messages when using interleaving. This was reported for the userland stack in
#if defined(__FreeBSD__) && !defined(__Userspace__) #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 362173 2020-06-14 09:50:00Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 362581 2020-06-24 14:47:51Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -1141,6 +1141,16 @@ sctp_deliver_reasm_check(struct sctp_tcb *stcb, struct sctp_association *asoc, #endif SCTP_STAT_INCR_COUNTER64(sctps_reasmusrmsgs); TAILQ_REMOVE(&strm->uno_inqueue, control, next_instrm); + if (asoc->size_on_all_streams >= control->length) { + asoc->size_on_all_streams -= control->length; + } else { +#ifdef INVARIANTS + panic("size_on_all_streams = %u smaller than control length %u", asoc->size_on_all_streams, control->length); +#else + asoc->size_on_all_streams = 0; +#endif + } + sctp_ucount_decr(asoc->cnt_on_all_streams); control->on_strm_q = 0; } if (control->on_read_q == 0) { @@ -1409,7 +1419,7 @@ sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc, } /* Must be added to the stream-in queue */ if (created_control) { - if (unordered == 0) { + if ((unordered == 0) || (asoc->idata_supported)) { sctp_ucount_incr(asoc->cnt_on_all_streams); } if (sctp_place_control_in_stream(strm, asoc, control)) {
add description for audio framework doxygen the "@brief" in pcm config, pcm mask, pcm_format, pcm_param is missing and is not displayed of doxygen.
@@ -138,8 +138,9 @@ extern "C" { */ #define PCM_STATE_DISCONNECTED 0x08 -/** Audio sample format of a PCM. - * The first letter specifiers whether the sample is signed or unsigned. +/** + * @brief Audio sample format of a PCM. + * @details The first letter specifiers whether the sample is signed or unsigned. * The letter 'S' means signed. The letter 'U' means unsigned. * The following number is the amount of bits that the sample occupies in memory. * Following the underscore, specifiers whether the sample is big endian or little endian. @@ -173,13 +174,16 @@ enum pcm_format { PCM_FORMAT_MAX }; -/** A bit mask of 256 bits (32 bytes) that describes some hardware parameters of a PCM */ +/** + * @brief A bit mask of 256 bits (32 bytes) that describes some hardware parameters of a PCM + */ struct pcm_mask { /** bits of the bit mask */ unsigned int bits[32 / sizeof(unsigned int)]; }; -/** Encapsulates the hardware and software parameters of a PCM. +/** + * @brief Encapsulates the hardware and software parameters of a PCM. * @ingroup libtinyalsa-pcm */ struct pcm_config { @@ -209,8 +213,9 @@ struct pcm_config { unsigned int silence_threshold; }; -/** Enumeration of a PCM's hardware parameters. - * Each of these parameters is either a mask or an interval. +/** + * @brief Enumeration of a PCM's hardware parameters. + * @details Each of these parameters is either a mask or an interval. * @ingroup libtinyalsa-pcm */ enum pcm_param {
shelter: add the usage info of --addr Fixes:
@@ -32,18 +32,6 @@ git clone https://github.com/alibaba/inclavare-containers Please follow [enclave-tls README](https://github.com/alibaba/inclavare-containers/tree/master/enclave-tls) to build and install enclave-tls firstly. -### For EPID RA - -```shell -cd $WORKSPACE/inclavare-containers/shelter -make -``` - -### For DCAP RA - -1. Please refer to [this guide](https://github.com/intel/SGXDataCenterAttestationPrimitives/blob/master/README.md) to install DCAP. Note: If your platform is pre-product SGX platform (SBX), please follow this guide to resolve the quote verification problem on SBX platforms: https://github.com/alibaba/inclavare-containers/blob/master/hack/use-sbx-platform/README.md. -2. Please refer to [this guide](https://github.com/intel/SGXDataCenterAttestationPrimitives/tree/master/QuoteGeneration/pccs) to install and configure Intel PCCS service to make sure Intel PCCS to be luanched correctly. - ```shell cd $WORKSPACE/inclavare-containers/shelter make @@ -82,8 +70,7 @@ shelter help ```shell OPTIONS: - --ip tcp socket ip to connect inclavared - --port tcp socket port to connect inclavared + --addr specify tcp or unix socket address, e.g, '--addr=tcp://ip:port or --addr=unix://path' --log-level set the level of log output(debug, info, warn, error, fatal, off) --verifier set the type of quote verifier(nullquote, sgx_la or sgx_ecdsa) --tls set the type of tls wrapper(nulltls, wolfssl or wolfssl_sgx) @@ -95,7 +82,8 @@ You can set command line parameters to specify different configurations. For example: ```shell -shelter remoteattestation --ip 127.0.0.1 --port 1234 +shelter remoteattestation --addr=tcp://127.0.0.1:1234 +shelter remoteattestation --addr=unix:///run/enclave-tls/tls.sock shelter remoteattestation --tls wolfssl shelter remoteattestation --tls wolfssl_sgx shelter remoteattestation --verifier sgx_ecdsa
Adjust indentation in src/backend/optimizer/README. The previous indentation of optimizer functions was unclear; adjust the indentation dashes so that a deeper level of indentation indicates that the outer optimizer function calls the inner one. Author: Richard Guo, with additional change by me Discussion:
@@ -315,7 +315,7 @@ set up for recursive handling of subqueries preprocess target list for non-SELECT queries handle UNION/INTERSECT/EXCEPT, GROUP BY, HAVING, aggregates, ORDER BY, DISTINCT, LIMIT ---query_planner() +---query_planner() make list of base relations used in query split up the qual into restrictions (a=1) and joins (b=c) find qual clauses that enable merge and hash joins @@ -325,7 +325,7 @@ set up for recursive handling of subqueries find selectivity of columns used in joins make_rel_from_joinlist() hand off join subproblems to a plugin, GEQO, or standard_join_search() ------standard_join_search() +------standard_join_search() call join_search_one_level() for each level of join tree needed join_search_one_level(): For each joinrel of the prior level, do make_rels_by_clause_joins()
Fix double closed events instead of publish
@@ -253,7 +253,7 @@ request_send_err_callback(mqtt_client_p client, uint8_t status, void* arg) { client->evt.type = MQTT_EVT_SUBSCRIBE; } else if (status & MQTT_REQUEST_FLAG_UNSUBSCRIBE) { client->evt.type = MQTT_EVT_UNSUBSCRIBE; - } else if (status & MQTT_REQUEST_FLAG_SUBSCRIBE) { + } else { client->evt.type = MQTT_EVT_PUBLISH; }
docs: Update the porting guide The HowToAddnewBoard.md is updated for the following: > sidle_stack > _sint_heap_start > _sext_heap_start
@@ -211,3 +211,57 @@ This is moved to .config at executing configure.sh and used to build TizenRT. This is a build options set like setting of including path, ARM build options, linker script name and so on. There is the DOWNLOAD definition to support "make download xx" command too. +### Linker Variables + +Linker script has memory configuration information. +file path : *build/configs/<BOARD_NAME>/scripts/<SCRIPTS_NAME>.ld* + +In addition to the SECTION information, add the following variables as well to mark the following: +1. `_sbss`: Start of .bss section +2. `_ebss`: End+1 of .bss section +3. `_sidle_stack`: Start of idle stack +4. `__sint_heap_start`: Start of heap in internal RAM region +5. `__sext_heap_start`: Start of heap in external RAM region + +For example, + +1. The remaining RAM region after bss region can be set as idle thread stack and internal heap regions(`build/configs/sidk_s5jt200/scripts/ld_s5jt200_flash.script`): +``` + .bss : { + _sbss = ABSOLUTE(.); + *(.bss .bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + . = ALIGN(4); + _ebss = ABSOLUTE(.); + _sidle_stack = ABSOLUTE(.); + . = . + CONFIG_IDLETHREAD_STACKSIZE ; + /* Heap start address in internal RAM */ + _sint_heap_start = ABSOLUTE(.); + } > sram +``` +2. Idle thread stack and internal heap regions should be set at a different region (other than end of bss) as per the memory layout (`build/configs/rtl8720e/scripts/rlx8720e_img2.ld`): +``` + .ram_image2.bss (NOLOAD): + { + __bss_start__ = .; + *(.bss*) + *(COMMON) + __bss_end__ = .; + } > KM4_BD_RAM + + .psram_heap.start (NOLOAD): + { + /* Heap start address in external RAM */ + _sext_heap_start = ABSOLUTE(.); + } > KM4_BD_PSRAM + + /* Heap start address in internal RAM */ + _sint_heap_start = ABSOLUTE(ORIGIN(KM4_HEAP_EXT)); + _sidle_stack = ABSOLUTE(ORIGIN(KM4_MSP_RAM_NS) + LENGTH(KM4_MSP_RAM_NS)) - CONFIG_IDLETHREAD_STACKSIZE; +``` + +In addition to the above information, export the CONFIG_IDLETHREAD_STACKSIZE to the linker script using below statement in the board `Make.defs` for all configurations (`build/configs/sidk_s5jt200/hello/Make.defs`): +``` +LDFLAGS += --defsym=CONFIG_IDLETHREAD_STACKSIZE=$(CONFIG_IDLETHREAD_STACKSIZE) +```
Delay window display until content is ready
@@ -36,6 +36,7 @@ const createSplash = async () => { resizable: false, maximizable: false, fullscreenable: false, + show: false, webPreferences: { nodeIntegration: true, devTools: isDevMode @@ -45,6 +46,12 @@ const createSplash = async () => { splashWindow.setMenu(null); splashWindow.loadURL(`file://${__dirname}/windows/splash.html`); + splashWindow.webContents.on("did-finish-load", function() { + setTimeout(function() { + splashWindow.show(); + }, 40); + }); + splashWindow.on("closed", () => { splashWindow = null; }); @@ -66,6 +73,7 @@ const createWindow = async projectPath => { minHeight: 600, titleBarStyle: "hiddenInset", fullscreenable: false, + show: false, webPreferences: { nodeIntegration: true, webSecurity: false, @@ -86,6 +94,9 @@ const createWindow = async projectPath => { mainWindow.webContents.on("did-finish-load", function() { mainWindow.webContents.send("ping", "whoooooooh!"); mainWindow.webContents.send("open-project", projectPath); + setTimeout(function() { + mainWindow.show(); + }, 40); }); mainWindow.on("enter-full-screen", () => {
MeshShapes gets hits on all passed surfaces. Callback for each of them. Fixes crash due to MAX_CONTACTS being sent to dCollide as the number of dContacts available.
@@ -22,9 +22,10 @@ static void raycastCallback(void* data, dGeomID a, dGeomID b) { return; } - dContact contact; - if (dCollide(a, b, MAX_CONTACTS, &contact.geom, sizeof(dContact))) { - dContactGeom g = contact.geom; + dContact contact[MAX_CONTACTS]; + int count = dCollide(a, b, MAX_CONTACTS, &contact->geom, sizeof(dContact)); + for (int i = 0; i < count; i++) { + dContactGeom g = contact[i].geom; callback(shape, g.pos[0], g.pos[1], g.pos[2], g.normal[0], g.normal[1], g.normal[2], userdata); } }
Add RtlReplaceSystemDirectoryInPath
@@ -3821,6 +3821,19 @@ RtlGetExePath( #endif +#if (PHNT_VERSION >= PHNT_20H1) +// rev +NTSYSAPI +ULONG +NTAPI +RtlReplaceSystemDirectoryInPath( + _Inout_ PUNICODE_STRING Destination, + _In_ ULONG Machine, // IMAGE_FILE_MACHINE_I386 + _In_ ULONG TargetMachine, // IMAGE_FILE_MACHINE_TARGET_HOST + _In_ BOOLEAN IncludePathSeperator + ); +#endif + #if (PHNT_VERSION >= PHNT_REDSTONE2) // private
Update doxygen-like comments
/** * \brief Default system port implementation * - * According to selected port, stack will automatically include apropriate file + * According to selected port, stack will automatically include appropriate file * * Parameter can be a value of \ref ESP_SYS_PORTS choices */ * will try to allocate memory on aligned boundaries. * * \note Some CPUs such ARM Cortex-M0 dont't support unaligned memory access. - * This CPUs must have set correct memory alignment value. * * \note This value must be power of `2` */ /** * \brief Set number of retries for send data command. * - * Sometimes it can happen that `AT+SEND` command fails due to different problems. + * Sometimes it may happen that `AT+SEND` command fails due to different problems. * Trying to send the same data multiple times can raise chances for success. */ #ifndef ESP_CFG_MAX_SEND_RETRIES */ /** - * \brief Set global debug support. + * \brief Set global debug support + * * Possible values are \ref ESP_DBG_ON or \ref ESP_DBG_OFF * * \note Set to \ref ESP_DBG_OFF to globally disable all debugs /** * \brief Debugging output function * - * Called with format and optional parameters for printf style debug + * Called with format and optional parameters for printf-like debug */ #ifndef ESP_CFG_DBG_OUT #define ESP_CFG_DBG_OUT(fmt, ...) do { extern int printf( const char * format, ... ); printf(fmt, ## __VA_ARGS__); } while (0) * \brief Enables `1` or disables `0` manual `TCP` data receive from ESP device * * Normally ESP automatically sends received TCP data to host device - * in async way. When host device is slow or if there is memory constrain, + * in async mode. When host device is slow or if there is memory constrain, * it may happen that processing cannot handle all received data. * * When feature is enabled, ESP will notify host device about new data * hardware supports copy operation, it may implement its own * * Function prototype must be similar to: + * * \code{c} void * my_memcpy(void* dst, const void* src, size_t len); \endcode @@ -649,6 +650,7 @@ void * my_memcpy(void* dst, const void* src, size_t len); * \brief Memory set function declaration * * Function prototype must be similar to: + * * \code{c} void * my_memset(void* dst, int b, size_t len); \endcode
VERSION bump to version 2.0.89
@@ -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 88) +set(LIBYANG_MICRO_VERSION 89) set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION}) # set version of the library set(LIBYANG_MAJOR_SOVERSION 2)
Documented TX Power Config in Troubleshooting
@@ -80,3 +80,13 @@ to avoid accidental bonding between the halves. After completing these steps, pair the halves of the split keyboard together by resetting them at the same time. Most commonly, this is done by grounding the reset pins for each of your keyboard's microcontrollers or pressing the reset buttons at the same time. + +### Connectivity Issues ### + +Some users may experience poor connection from their keyboard to their host device, whether it be from a bad Bluetooth card, a metal enclosure on the keyboard or host, or distance to the host device. Increasing the transmit power of your board may solve this problem. To do this, simply enable the `CONFIG_BT_CTLR_TX_PWR_PLUS_8` configuration value in the `.conf` file of your user config directory as such: + +``` +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +``` + +On the `NRF52840`, the value `PLUS_8` can be set to any multiple of four between `MINUS_20` and `PLUS_8`. The default value for this config is `0`, but if you are having connection issues it is recommended to set it to `PLUS_8` because the power consumption difference is negligible.
Fix handle snapshot crash on 21H1
@@ -5521,7 +5521,7 @@ NTSTATUS PhEnumHandlesEx2( ULONG attempts = 0; bufferSize = 0x8000; - buffer = PhAllocate(bufferSize); + buffer = PhAllocateZero(bufferSize); status = NtQueryInformationProcess( ProcessHandle, @@ -5535,7 +5535,7 @@ NTSTATUS PhEnumHandlesEx2( { PhFree(buffer); bufferSize = returnLength; - buffer = PhAllocate(bufferSize); + buffer = PhAllocateZero(bufferSize); status = NtQueryInformationProcess( ProcessHandle, @@ -5552,6 +5552,8 @@ NTSTATUS PhEnumHandlesEx2( { // NOTE: This is needed to workaround minimal processes on Windows 10 // returning STATUS_SUCCESS with invalid handle data. (dmex) + // NOTE: 21H1 and above no longer set NumberOfHandles to zero before returning + // STATUS_SUCCESS so we first zero the entire buffer using PhAllocateZero. (dmex) if (buffer->NumberOfHandles == 0) { status = STATUS_UNSUCCESSFUL;
OpenCoreUefiAudio: Fix another potential assertion in audio code
@@ -374,10 +374,16 @@ OcLoadUefiAudioSupport ( } } + // + // NULL DevicePath means choose the first audio device available on the platform. + // + OcAudio = OcAudioInstallProtocols (FALSE); if (OcAudio == NULL) { DEBUG ((DEBUG_INFO, "OC: Cannot locate OcAudio protocol\n")); + if (DevicePath != NULL) { FreePool (DevicePath); + } return; }
replace readline with communicate
@@ -27,6 +27,7 @@ import multiprocessing from os import environ from multiprocessing.pool import ThreadPool from s2n_test_constants import * +from time import sleep PROTO_VERS_TO_S_CLIENT_ARG = { S2N_TLS10 : "-tls1", @@ -36,6 +37,15 @@ PROTO_VERS_TO_S_CLIENT_ARG = { S_CLIENT_SUCCESSFUL_OCSP="OCSP Response Status: successful" +def communicate_processes(*processes): + outs = [] + for p in processes: + p.kill() + out = p.communicate()[0].decode("utf-8").split('\n') + outs.append(out) + + return outs + def cleanup_processes(*processes): for p in processes: p.kill() @@ -102,7 +112,7 @@ def try_handshake(endpoint, port, cipher, ssl_version, server_cert=None, server_ s2nd = subprocess.Popen(s2nd_cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE) # Make sure it's running - s2nd.stdout.readline() + sleep(0.1) s_client_cmd = ["openssl", "s_client", PROTO_VERS_TO_S_CLIENT_ARG[ssl_version], "-connect", str(endpoint) + ":" + str(port)] @@ -169,19 +179,23 @@ def try_handshake(endpoint, port, cipher, ssl_version, server_cert=None, server_ # Write the cipher name from s2n s2nd.stdin.write((cipher + "\n").encode("utf-8")) s2nd.stdin.flush() + sleep(0.1) + outs = communicate_processes(s2nd, s_client) + c_out = outs[1] + if '' == c_out: + print ("No output from client PIPE, skip") + return 0 + found = 0 - for line in range(0, 512): - output = s_client.stdout.readline().decode("utf-8") + for line in range(0, len(c_out)): + output = c_out[line] if output.strip() == cipher: found = 1 break if found == 0: - cleanup_processes(s2nd, s_client) return -1 - cleanup_processes(s2nd, s_client) - return 0 def cert_path_to_str(cert_path):
vnet: On rx-mode set, return error for an actual error. In set_hw_interface_change_rx_mode(), when vnet_hw_if_set_rx_queue_mode() returns an error it actually returns success. This has been changed to return a clib_error_return() value. Type: fix
@@ -1534,8 +1534,13 @@ set_hw_interface_change_rx_mode (vnet_main_t * vnm, u32 hw_if_index, { int rv = vnet_hw_if_set_rx_queue_mode (vnm, queue_indices[i], mode); if (rv) + { + error = clib_error_return ( + 0, "unable to set rx-mode on interface %v queue-id %u.\n", + hw->name, queue_id); goto done; } + } done: if (queue_indices != hw->rx_queue_indices)