message
stringlengths
6
474
diff
stringlengths
8
5.22k
zephyr: tcpci emulator: add explicit label property The TCPCI emulator and tests currently require the label property. Override the deprecated attribute from the base.yaml. BRANCH=none TEST=./twister --clobber
description: Common TCPCI properties -include: base.yaml +# TODO(b/239165779): Reduce or remove the usage of label properties +include: + - name: base.yaml + property-blocklist: + - label properties: alert_gpio: @@ -12,3 +16,6 @@ properties: required: false description: Reference to Alert# GPIO. + label: + type: string + required: false
pipe: use FLB_PIPE_WOULDBLOCK() to detect EAGAIN portably Previously we tried to detect EAGAIN by checking errno. This works fine on Unix, but does not work for Windows. In order to be portable, we need to use FLB_PIPE_WOULDBLOCK() here.
@@ -131,7 +131,7 @@ ssize_t flb_pipe_read_all(int fd, void *buf, size_t count) do { bytes = flb_pipe_r(fd, (char *) buf + total, count - total); if (bytes == -1) { - if (errno == EAGAIN) { + if (FLB_PIPE_WOULDBLOCK()) { /* * This could happen, since this function goal is not to * return until all data have been read, just sleep a little @@ -162,7 +162,7 @@ ssize_t flb_pipe_write_all(int fd, void *buf, size_t count) do { bytes = flb_pipe_w(fd, (const char *) buf + total, count - total); if (bytes == -1) { - if (errno == EAGAIN) { + if (FLB_PIPE_WOULDBLOCK()) { /* * This could happen, since this function goal is not to * return until all data have been read, just sleep a little
Fix `SyntaxWarning` in Matplotlib
@@ -2198,7 +2198,7 @@ def matshow(A, fignum=None, **kwargs): """ A = np.asanyarray(A) - if fignum is False or fignum is 0: + if fignum == False or fignum == 0: ax = gca() else: # Extract actual aspect ratio of array and make appropriately sized figure
OcTimerLib: Make TSC frequency debug print at verbose level
@@ -124,7 +124,7 @@ RecalculateTSC ( } } - DEBUG ((DEBUG_INFO, "TscFrequency %lld\n", mPerformanceCounterFrequency)); + DEBUG ((DEBUG_VERBOSE, "TscFrequency %lld\n", mPerformanceCounterFrequency)); return mPerformanceCounterFrequency; }
timing_load_creds: Add timersub macro for platforms where it is missing Fixes
# include <openssl/bio.h> # include "internal/e_os.h" +# ifndef timersub +/* struct timeval * subtraction; a must be greater than or equal to b */ +# define timersub(a, b, res) \ + do { \ + (res)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + if ((a)->tv_usec < (b)->tv_usec) { \ + (res)->tv_usec = (a)->tv_usec + 1000000 - (b)->tv_usec); \ + --(res)->tv_sec; \ + } else { \ + (res)->tv_usec = (a)->tv_usec - (b)->tv_usec); \ + } \ + } while(0) +# endif + static char *prog; static void readx509(const char *contents, int size)
show soft keyboard when when screen touched or mode switched to console/code
@@ -978,6 +978,13 @@ void resumeRunMode() studio.mode = TIC_RUN_MODE; } +static void showSoftKeyboard() +{ + if(SDL_HasScreenKeyboardSupport()) + if(studio.mode == TIC_CONSOLE_MODE || studio.mode == TIC_CODE_MODE) + SDL_StartTextInput(); +} + void setStudioMode(EditorMode mode) { if(mode != studio.mode) @@ -1014,6 +1021,8 @@ void setStudioMode(EditorMode mode) } studio.mode = mode; + + showSoftKeyboard(); } } @@ -1978,9 +1987,7 @@ SDL_Event* pollEvent() } break; case SDL_FINGERUP: - if(SDL_HasScreenKeyboardSupport() && !SDL_IsTextInputActive()) - if(studio.mode == TIC_CONSOLE_MODE || studio.mode == TIC_CODE_MODE) - SDL_StartTextInput(); + showSoftKeyboard(); break; case SDL_QUIT: exitStudio();
Fix speed sm2 bug Should create PKEY CTX with EVP_PKEY_SM2; each job should have its own sm2_pkey; loopargs[i].sigsize should be set after EVP_DigestSign().
@@ -1283,12 +1283,14 @@ static int SM2_sign_loop(void *args) unsigned char *buf = tempargs->buf; EVP_MD_CTX **sm2ctx = tempargs->sm2_ctx; unsigned char *sm2sig = tempargs->buf2; - size_t sm2sigsize = tempargs->sigsize; - const size_t max_size = tempargs->sigsize; + size_t sm2sigsize; int ret, count; EVP_PKEY **sm2_pkey = tempargs->sm2_pkey; + const size_t max_size = EVP_PKEY_size(sm2_pkey[testnum]); for (count = 0; COND(sm2_c[testnum][0]); count++) { + sm2sigsize = max_size; + if (!EVP_DigestSignInit(sm2ctx[testnum], NULL, EVP_sm3(), NULL, sm2_pkey[testnum])) { BIO_printf(bio_err, "SM2 init sign failure\n"); @@ -1306,7 +1308,6 @@ static int SM2_sign_loop(void *args) } /* update the latest returned size and always use the fixed buffer size */ tempargs->sigsize = sm2sigsize; - sm2sigsize = max_size; } return count; @@ -3567,8 +3568,9 @@ int speed_main(int argc, char **argv) || loopargs[i].sm2_vfy_ctx[testnum] == NULL) break; - /* SM2 keys are generated as normal EC keys with a special curve */ - st = !((pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL)) == NULL + sm2_pkey = NULL; + + st = !((pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_SM2, NULL)) == NULL || EVP_PKEY_keygen_init(pctx) <= 0 || EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx, sm2_curves[testnum].nid) <= 0 @@ -3615,11 +3617,9 @@ int speed_main(int argc, char **argv) op_count = 1; } else { for (i = 0; i < loopargs_len; i++) { - size_t sm2_sigsize = loopargs[i].sigsize; - /* Perform SM2 signature test */ st = EVP_DigestSign(loopargs[i].sm2_ctx[testnum], - loopargs[i].buf2, &sm2_sigsize, + loopargs[i].buf2, &loopargs[i].sigsize, loopargs[i].buf, 20); if (st == 0) break;
Set FIFO size to at least 4 packets
@@ -33,6 +33,8 @@ void StreamChannel::Setup(StreamConfig conf) pktLost = 0; int bufferLength = config.bufferLength == 0 ? 1024*4*1024 : config.bufferLength; int pktSize = config.format != StreamConfig::FMT_INT12 ? samples16InPkt : samples12InPkt; + if (bufferLength < 4*pktSize) //set FIFO to at least 4 packets + bufferLength = 4*pktSize; if (!fifo) fifo = new RingFIFO(); fifo->Resize(pktSize, bufferLength/pktSize);
Fix nuget packaging script for Win10-managed package
@@ -4,17 +4,7 @@ REM TODO: add Debug flavor to the build set ProjectName=Microsoft.Applications.Telemetry.Windows set NuGetFolder=%CD% -cd ../.. -set SolutionDir=%CD% - -set /p PackageVersion=<version.txt -REM This path is managed by Visual Studio nuget package NuGet.CommandLine -REM Make sure it's installed before running this batch file! -set PATH=%CD%\packages\NuGet.CommandLine.3.4.3\tools;%PATH% - -set OUTDIR=%CD%\..\..\dist\aria-windows-sdk -set NativeSDKFolder=%OUTDIR%\%PackageVersion% -echo NativeSDKFolder=%NativeSDKFolder% +set NativeSDKFolder=%OUTDIR% cd %NuGetFolder% del /s *.pri *.lib *.winmd *.dll *.obj *.pdb *.exp *.iobj *.ipdb *.bsc
[BSP] Add device ops for audio driver
@@ -274,6 +274,18 @@ static rt_err_t codec_control(rt_device_t dev, int cmd, void *args) return result; } +#ifdef RT_USING_DEVICE_OPS +const static struct rt_device_ops codec_ops = +{ + codec_init, + codec_open, + codec_close, + codec_read, + codec_write, + codec_control +}; +#endif + int audio_hw_init(void) { struct audio_device *codec = &audio_device_drive; @@ -282,12 +294,16 @@ int audio_hw_init(void) codec->parent.rx_indicate = RT_NULL; codec->parent.tx_complete = RT_NULL; +#ifdef RT_USING_DEVICE_OPS + codec->parent.ops = &codec_ops; +#else codec->parent.init = codec_init; codec->parent.open = codec_open; codec->parent.close = codec_close; codec->parent.read = codec_read; codec->parent.write = codec_write; codec->parent.control = codec_control; +#endif codec->parent.user_data = RT_NULL;
vtx: wait for ready in send_data
@@ -40,6 +40,10 @@ bool serial_vtx_wait_for_ready() { } void serial_vtx_send_data(uint8_t *data, uint32_t size) { + if (!serial_vtx_wait_for_ready()) { + return; + } + vtx_transfer_done = 0; LL_USART_ClearFlag_RXNE(USART.channel);
use one sentence to describe the advantage of Orca and move the design/implementation to the relavent section: contribution section
# Orca: a bot framework for Discord etc. -## Design +It provides an easy to use, easy to deploy, easy to debug way to build +reliable Discord bots. -The primary design goals are: - -- easy to use for the end users: we use multi-threading and - synchronous IO to support concurrency so you only need to focus on - the logic. We carefully craft the library to use computing - resources efficiently so performance should never be an issue. - -- easy to reason about the code: we use the most native data structures, - the simplest algorithms, and intuitive interfaces. - -- easy to debug (networking and logic) errors: extensive assertion - and logging facilities. - -- superior reliability - -## Implementation - -Orca is implemented primarily in plain C, but we also use C++'s -namespace to organize symbols so we could establish 1-1 mappings -between Orca APIs and supported REST APIs. - -Establishing these 1-1 mappings has two purposes: - -1. Reduce the need of documenting every Orca API - -2. Reduce our user's cognitive burden of having to read both Orca API -documenation and supported REST API documentations. - -Orca is implemented in two parts: All the functions that do the heavy -lifting are implemented in plain C code. The functions that can be -mapped to REST APIs are wrapped in C++'s namespace to establish the -1-1 mappings. - -Orca's implemnetation has minimum external dependencies to make bot -deployment deadly simple. ## Build #### Install dependencies: @@ -77,9 +43,48 @@ Close the Terminal that bot-echo is running or type "Ctrl-C" to kill it. Instructions on how to make a ping-pong bot is found [here](/docs/BUILDING_A_BOT.md). + ## Participate in discussions and get tech support Join our discord server: https://discord.gg/2jfycwXVM3 ## Contributions are welcome! Check our development [Roadmap](docs/ROADMAP.md) and [Coding Guidelines](docs/CODING_GUIDELINES.md) to get started + +### Design + +The primary design goals are: + +- easy to use for the end users: we use multi-threading and + synchronous IO to support concurrency so you only need to focus on + the logic. We carefully craft the library to use computing + resources efficiently so performance should never be an issue. + +- easy to reason about the code: we use the most native data structures, + the simplest algorithms, and intuitive interfaces. + +- easy to debug (networking and logic) errors: extensive assertion + and logging facilities. + +- superior reliability + +### Implementation + +Orca is implemented primarily in plain C, but we also use C++'s +namespace to organize symbols so we could establish 1-1 mappings +between Orca APIs and supported REST APIs. + +Establishing these 1-1 mappings has two purposes: + +1. Reduce the need of documenting every Orca API + +2. Reduce our user's cognitive burden of having to read both Orca API +documenation and supported REST API documentations. + +Orca is implemented in two parts: All the functions that do the heavy +lifting are implemented in plain C code. The functions that can be +mapped to REST APIs are wrapped in C++'s namespace to establish the +1-1 mappings. + +Orca's implemnetation has minimum external dependencies to make bot +deployment deadly simple.
we distinguish between three types of hcxdumptool cpang files: signed, older version of hcxdumptool or edited by third party tool (in this case the custom pcapng block was removed by third pyty tool)
@@ -543,7 +543,7 @@ void printcapstatus(char *pcaptype, char *pcapinname, int version_major, int ver int p; static char *hcxsignedinfo = "(signed)"; -static char *hcxunsignedinfo = "(not signed - old version)"; +static char *hcxunsignedinfo = "(not signed: old version or edited)"; static char mintimestring[32]; static char maxtimestring[32];
Clarify that input buffer is read-only
@@ -47,6 +47,7 @@ typedef struct clap_process { // Audio buffers, they must have the same count as specified // by clap_plugin_audio_ports->get_count(). // The index maps to clap_plugin_audio_ports->get_info(). + // Input buffer and its contents are read-only. const clap_audio_buffer_t *audio_inputs; clap_audio_buffer_t *audio_outputs; uint32_t audio_inputs_count;
Add SceUsbdForUser NIDs
@@ -5056,6 +5056,34 @@ modules: ksceSblACMgrIsGameProgram: 0x1298C647 ksceSblACMgrIsNonGameProgram: 0x6C5AB07F ksceSblACMgrIsDevelopmentMode: 0xE87D1777 + SceUsbd: + nid: 0x3525FE7A + libraries: + SceUsbdForUser: + kernel: false + nid: 0xC3AEAB67 + functions: + sceUsbdReceiveEvent: 0x16FEE05D + sceUsbdRegisterCompositeLdd: 0x2A7C0263 + sceUsbdGetDeviceList: 0x2DE0239E + sceUsbdUnregisterLdd: 0x473692CC + sceUsbdOpenDefaultPipe: 0x4A26DDCC + sceUsbdEnd: 0x5736A150 + sceUsbdIsochTransferData: 0x594D82FD + sceUsbdRegisterLdd: 0x6AD28166 + sceUsbdGetDeviceSpeed: 0x6C5AACD0 + sceUsbdTransferData: 0x716048C1 + sceUsbdInit: 0x77D58B31 + sceUsbdGetIsochTransferStatus: 0xA0A2C826 + sceUsbdClosePipe: 0xAA3AF5D5 + sceUsbdGetDescriptor: 0xAE671F22 + sceUsbdGetDescriptorSize: 0xB357AC81 + sceUsbdGetDeviceLocation: 0xC54F9D11 + sceUsbdAttachCompositeLdd: 0xCA8F2F59 + sceUsbdGetTransferStatus: 0xCDF5B6E0 + sceUsbdResetDevice: 0xDEB3BE59 + sceUsbdAttach: 0xEACEAE86 + sceUsbdOpenPipe: 0xF94521A6 SceUsbSerial: nid: 0xF8D9930F libraries:
TCPMv2: Use atomic operations for DPM requests Avoid race conditions between host commands and the PE state machine. TEST=make buildall BRANCH=none
* These macros SET, CLEAR, and CHECK, a DPM (Device Policy Manager) * Request. The Requests are listed in usb_pe_sm.h. */ -#define PE_SET_DPM_REQUEST(port, req) (pe[port].dpm_request |= (req)) -#define PE_CLR_DPM_REQUEST(port, req) (pe[port].dpm_request &= ~(req)) +#define PE_SET_DPM_REQUEST(port, req) atomic_or(&pe[port].dpm_request, (req)) +#define PE_CLR_DPM_REQUEST(port, req) atomic_clear(&pe[port].dpm_request, (req)) #define PE_CHK_DPM_REQUEST(port, req) (pe[port].dpm_request & (req)) /*
IP updated for Rancher
@@ -19,7 +19,7 @@ pipeline: secrets: [ email_username, email_password, email_port, email_host, email_recipients ] rancher: image: peloton/drone-rancher - url: http://91.121.49.115:8080 + url: http://rancher.datafari.com:8080 service: datafarice docker_image: datafari/ce_build start_first: false
build: fix ./configure help Type: make
@@ -21,7 +21,7 @@ OPTIONS: --help, -h This help --build-dir, -b Build directory --install-dir, -i Install directory - --type, -t Build type (release, debug, ... ) + --build-type, -t Build type (release, debug, ...) --wipe, -w Wipe whole repo (except startup.* files) __EOF__ }
build: Document checksum
@@ -511,6 +511,9 @@ def imageId(image) { } def checksum(file) { + // Used to identify if a Dockerfile changed + // Collissions result in not rebuilding the Docker image even though it + // changed. return sh(returnStdout: true, script: "cat $file | sha256sum | dd bs=1 count=8 status=none") .trim()
clang-format and add documentation to bcc_elf.h
@@ -32,17 +32,27 @@ struct bcc_elf_usdt { const char *arg_fmt; }; +// Binary module path, bcc_elf_usdt struct, payload typedef void (*bcc_elf_probecb)(const char *, const struct bcc_elf_usdt *, void *); - // Symbol name, start address, length, payload +// Callback returning a negative value indicates to stop the iteration typedef int (*bcc_elf_symcb)(const char *, uint64_t, uint64_t, void *); +// Segment virtual address, memory size, file offset, payload +// Callback returns a negative value indicates to stop the iteration +typedef int (*bcc_elf_load_sectioncb)(uint64_t, uint64_t, uint64_t, void *); +// Iterate over all USDT probes noted in a binary module +// Returns -1 on error, and 0 on success int bcc_elf_foreach_usdt(const char *path, bcc_elf_probecb callback, void *payload); int bcc_elf_loadaddr(const char *path, uint64_t *address); -int bcc_elf_foreach_sym(const char *path, bcc_elf_symcb callback, - void *option, void *payload); +// Iterate over symbol table of a binary module +// Parameter "option" points to a bcc_symbol_option struct to indicate wheather +// and how to use debuginfo file, and what types of symbols to load. +// Returns -1 on error, and 0 on success or stopped by callback +int bcc_elf_foreach_sym(const char *path, bcc_elf_symcb callback, void *option, + void *payload); int bcc_elf_get_type(const char *path); int bcc_elf_is_shared_obj(const char *path);
Check NUM_THREADS when waiting for mandelbrot to end (was hardcoded to 4 threads) [ci skip]
@@ -95,6 +95,6 @@ int main() // Wait for other threads, because returning from main will kill all of them. __sync_fetch_and_add(&stop_count, 1); - while (stop_count != 4) + while (stop_count != NUM_THREADS) ; }
wren/compiler: Store value in the correct token.
@@ -717,7 +717,7 @@ static void makeNumber(Parser* parser) { errno = 0; - parser->current.value = NUM_VAL(strtod(parser->tokenStart, NULL)); + parser->next.value = NUM_VAL(strtod(parser->tokenStart, NULL)); if (errno == ERANGE) {
py/modbuiltins: Typo fix in comment.
@@ -79,7 +79,7 @@ STATIC mp_obj_t mp_builtin___build_class__(size_t n_args, const mp_obj_t *args) meta_args[2] = class_locals; // dict of members mp_obj_t new_class = mp_call_function_n_kw(meta, 3, 0, meta_args); - // store into cell if neede + // store into cell if needed if (cell != mp_const_none) { mp_obj_cell_set(cell, new_class); }
Fix: Minor change in Libc FixedMath "ub16mulub16" function implementation Fix in ub16mulub16() of fixedmath, It's "uint32_t m2i = ((uint32_t)m1 >> 16);" It should be "uint32_t m2i = ((uint32_t)m2 >> 16);"
@@ -167,7 +167,7 @@ ub16_t ub16mulub16(ub16_t m1, ub16_t m2) */ uint32_t m1i = ((uint32_t)m1 >> 16); - uint32_t m2i = ((uint32_t)m1 >> 16); + uint32_t m2i = ((uint32_t)m2 >> 16); uint32_t m1f = ((uint32_t)m1 & 0x0000ffff); uint32_t m2f = ((uint32_t)m2 & 0x0000ffff);
OnlineChecks: Fix hybrid-anaysis maximum upload size
@@ -246,8 +246,8 @@ NTSTATUS HashFileAndResetPosition( ); } - NtSetInformationThread(NtCurrentThread(), ThreadBasePriority, &priority, sizeof(LONG)); - NtSetInformationThread(NtCurrentThread(), ThreadIoPriority, &ioPriority, sizeof(IO_PRIORITY_HINT)); + PhSetThreadBasePriority(NtCurrentThread(), priority); + PhSetThreadIoPriority(NtCurrentThread(), ioPriority); return status; } @@ -970,6 +970,17 @@ NTSTATUS UploadCheckThreadStart( goto CleanupExit; } } + else if ( + context->Service == MENUITEM_HYBRIDANALYSIS_UPLOAD || + context->Service == MENUITEM_HYBRIDANALYSIS_UPLOAD_SERVICE + ) + { + if (fileSize64.QuadPart > 128 * 1024 * 1024) // 128 MB + { + RaiseUploadError(context, L"The file is too large (over 128 MB)", ERROR_FILE_TOO_LARGE); + goto CleanupExit; + } + } else { if (fileSize64.QuadPart > 20 * 1024 * 1024) // 20 MB
VCL: remove bogus ASSERT().
@@ -2336,8 +2336,6 @@ vppcom_session_accept (uint32_t listen_session_index, vppcom_endpt_t * ep, clib_fifo_sub1 (vcm->client_session_index_fifo, client_session_index); rv = vppcom_session_at_index (client_session_index, &client_session); ASSERT (rv == VPPCOM_OK); - ASSERT (client_session->peer_addr.is_ip4 == - listen_session->lcl_addr.is_ip4); client_session->is_nonblocking = (flags & O_NONBLOCK) ? 1 : 0; if (VPPCOM_DEBUG > 0)
pybricks.pupdevices.Remote: Implement timeout. Replace hardcoded value by user argument.
#include <pbio/button.h> +#include <pybricks/util_mp/pb_obj_helper.h> #include <pybricks/util_mp/pb_kwarg_helper.h> #include <pybricks/common.h> @@ -60,7 +61,7 @@ static void handle_notification(pbdrv_bluetooth_connection_t connection, const u } } -STATIC void pb_remote_init(void) { +STATIC void pb_remote_connect(mp_int_t timeout) { pb_remote_t *remote = &pb_remote_singleton; memset(remote, 0, sizeof(*remote)); @@ -72,7 +73,8 @@ STATIC void pb_remote_init(void) { nlr_buf_t nlr; if (nlr_push(&nlr) == 0) { - for (mp_int_t start = mp_hal_ticks_ms(); mp_hal_ticks_ms() - start < 10000;) { + mp_int_t start = mp_hal_ticks_ms(); + while (timeout == -1 || mp_hal_ticks_ms() - start < timeout) { MICROPY_EVENT_POLL_HOOK if (remote->task.status == PBIO_SUCCESS) { nlr_pop(); @@ -383,7 +385,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe } } -STATIC void pb_remote_init(void) { +STATIC void pb_remote_connect(mp_int_t timeout) { pb_remote_t *remote = &pb_remote_singleton; if (remote->con_state != CON_STATE_NONE) { @@ -406,7 +408,8 @@ STATIC void pb_remote_init(void) { nlr_buf_t nlr; if (nlr_push(&nlr) == 0) { - for (mp_int_t start = mp_hal_ticks_ms(); mp_hal_ticks_ms() - start < 10000;) { + mp_int_t start = mp_hal_ticks_ms(); + while (timeout == -1 || mp_hal_ticks_ms() - start < timeout) { MICROPY_EVENT_POLL_HOOK if (remote->con_state == CON_STATE_CONNECTED) { nlr_pop(); @@ -507,10 +510,11 @@ STATIC mp_obj_t pb_type_pupdevices_Remote_make_new(const mp_obj_type_t *type, si pb_type_pupdevices_Remote_obj_t *self = m_new_obj(pb_type_pupdevices_Remote_obj_t); self->base.type = (mp_obj_type_t *)type; + // TODO (void)address_in; - (void)timeout_in; - pb_remote_init(); + mp_int_t timeout = timeout_in == mp_const_none? -1 : pb_obj_get_positive_int(timeout_in); + pb_remote_connect(timeout); self->buttons = pb_type_Keypad_obj_new(PBIO_ARRAY_SIZE(remote_buttons), remote_buttons, remote_button_is_pressed); return MP_OBJ_FROM_PTR(self);
Use python highlighting instead for starlark snippets
@@ -12,7 +12,7 @@ different location if you wish, but you the file must be make available to Note, this imports version `0.8.0` - you may need to update the version and the sha256 hash. -```shell +```python # libcbor http_archive( name = "libcbor", @@ -32,7 +32,7 @@ is used in two passes: to create the Makefiles, and then to invoke Make to build the `libcbor.a` static library. `libcbor.a` and the `.h` files are then made available for other packages to use. -```shell +```python genrule( name = "cbor_cmake", srcs = glob(["**"]), @@ -69,7 +69,7 @@ cc_import( The `libcbor.BUILD` file must be make available to the top-level `WORKSPACE` file: -```shell +```python exports_files(["libcbor.BUILD"])) ``` @@ -77,7 +77,7 @@ exports_files(["libcbor.BUILD"])) Add libcbor dependency to your package's `BUILD` file like so: -```shell +```python cc_library( name = "...", srcs = [ ... ],
Correct Philips vendor name based on mac address, if it was wrongly set
@@ -1116,9 +1116,15 @@ void DeRestPluginPrivate::addLightNode(const deCONZ::Node *node) lightNode.setNeedSaveDatabase(true); } - if (lightNode.name().isEmpty()) + const quint64 philipsMacPrefix = 0x0017880000000000ULL; + + if ((node->address().ext() & philipsMacPrefix) == philipsMacPrefix) { - lightNode.setName(QString("Light %1").arg(lightNode.id())); + if (lightNode.manufacturer() != QLatin1String("Philips")) + { // correct vendor name, was atmel, de sometimes + lightNode.setManufacturerName(QLatin1String("Philips")); + lightNode.setNeedSaveDatabase(true); + } } if (!lightNode.name().isEmpty())
fixed issue with node pick after zone pick with highlighting on
@@ -439,6 +439,10 @@ VisWinQuery::QueryIsValid(const VisualCueInfo *vqPoint, const VisualCueInfo *vqL // Now passing in a highlight color to the pick actor's // AddLine method. // +// Matt Larsen, Mon Jan 22 11:11:11 PST 2018 +// Correcting error where zone pick highlighing information +// leaked over to the next node pick +// // **************************************************************************** void @@ -463,8 +467,8 @@ VisWinQuery::Pick(const VisualCueInfo *vq) pp->SetAttachmentPoint(pt[0], pt[1], distance); } - pp->UseGlyph(vq->GetGlyphType() != ""); - + bool useGlyph = vq->GetGlyphType() != ""; + pp->UseGlyph(useGlyph); pp->SetDesignator(vq->GetLabel()); double fg[3]; @@ -478,7 +482,7 @@ VisWinQuery::Pick(const VisualCueInfo *vq) if(numPoints > 1 && (numPoints % 2 == 0)) linesExist = true; const int numLines = numPoints / 2; - if(linesExist) + if(linesExist && !useGlyph) { for(int i = 0; i < numLines; ++i) {
mem: on realloc do not check zero size
@@ -88,13 +88,6 @@ void *flb_realloc(void *ptr, const size_t size) { void *aux; - if (size == 0) { - if (ptr) { - free(ptr); - } - return NULL; - } - aux = realloc(ptr, size); if (flb_unlikely(!aux && size)) { return NULL;
build and run as separate steps
@@ -13,8 +13,11 @@ jobs: displayName: Pull previous image continueOnError: true workingDirectory: ./test/testContainers/ - - script: docker-compose -f docker-compose.yml -f azure/docker-compose.override.azure.yml up --build ${{ parameters.containerName }} - displayName: Build image and run tests + - script: docker-compose -f docker-compose.yml -f azure/docker-compose.override.azure.yml build ${{ parameters.containerName }} + displayName: Build image + workingDirectory: ./test/testContainers/ + - script: docker-compose -f docker-compose.yml -f azure/docker-compose.override.azure.yml run ${{ parameters.containerName }} + displayName: Run tests workingDirectory: ./test/testContainers/ - task: CopyFiles@2 condition: always()
Remove redundant value assignemnt to olen.
@@ -438,7 +438,7 @@ void gcm_update_output_buffer_too_small( int cipher_id, int mode, { mbedtls_gcm_context ctx; uint8_t *output = NULL; - size_t olen; + size_t olen = 0; size_t output_len = input->len - 1; mbedtls_gcm_init( &ctx ); @@ -446,7 +446,6 @@ void gcm_update_output_buffer_too_small( int cipher_id, int mode, TEST_EQUAL( 0, mbedtls_gcm_starts( &ctx, mode, iv->x, iv->len ) ); ASSERT_ALLOC( output, output_len ); - olen = 0xdeadbeef; TEST_EQUAL( MBEDTLS_ERR_GCM_BUFFER_TOO_SMALL, mbedtls_gcm_update( &ctx, input->x, input->len, output, output_len, &olen ) ); exit:
AKM defined means KDV=0 (Ke Descriptor Version)
@@ -572,14 +572,14 @@ if(eapolnccount == 0) printf("EAPOL ANONCE error corrections (NC)......: not detected\n"); if(rcgapmax > 0) printf("REPLAYCOUNT gap (measured maximum).......: %" PRIu64 "\n", rcgapmax); } -if(eapolm1count > 0) printf("EAPOL M1 messages........................: %ld\n", eapolm1count); -if(eapolm1kdv0count > 0) printf("EAPOL M1 messages (AKM defined)..........: %ld\n", eapolm1kdv0count); -if(eapolm2count > 0) printf("EAPOL M2 messages........................: %ld\n", eapolm2count); -if(eapolm2kdv0count > 0) printf("EAPOL M2 messages (AKM defined)..........: %ld\n", eapolm2kdv0count); -if(eapolm3count > 0) printf("EAPOL M3 messages........................: %ld\n", eapolm3count); -if(eapolm3kdv0count > 0) printf("EAPOL M3 messages (AKM defined)..........: %ld\n", eapolm3kdv0count); -if(eapolm4count > 0) printf("EAPOL M4 messages........................: %ld\n", eapolm4count); -if(eapolm4kdv0count > 0) printf("EAPOL M4 messages (AKM defined)..........: %ld\n", eapolm4kdv0count); +if(eapolm1count > 0) printf("EAPOL M1 messages (total)................: %ld\n", eapolm1count); +if(eapolm1kdv0count > 0) printf("EAPOL M1 messages (KDV:0 AKM defined)....: %ld\n", eapolm1kdv0count); +if(eapolm2count > 0) printf("EAPOL M2 messages (total)................: %ld\n", eapolm2count); +if(eapolm2kdv0count > 0) printf("EAPOL M2 messages (KDV:0 AKM defined)....: %ld\n", eapolm2kdv0count); +if(eapolm3count > 0) printf("EAPOL M3 messages (total)................: %ld\n", eapolm3count); +if(eapolm3kdv0count > 0) printf("EAPOL M3 messages (KDV:0 AKM defined)....: %ld\n", eapolm3kdv0count); +if(eapolm4count > 0) printf("EAPOL M4 messages (total)................: %ld\n", eapolm4count); +if(eapolm4kdv0count > 0) printf("EAPOL M4 messages (KDV:0 AKM defined)....: %ld\n", eapolm4kdv0count); if(eapolmpcount > 0) printf("EAPOL pairs (total)......................: %ld\n", eapolmpcount); if(zeroedeapolpmkcount > 0) printf("EAPOL (over zeroed PMK)..................: %ld\n", zeroedeapolpmkcount); if(eapolmpbestcount > 0) printf("EAPOL pairs (best).......................: %ld\n", eapolmpbestcount);
Add Polygon to CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - Provide network ticker to plugins (especialy helpful for Paraswap plugin) +- Polygon variant ## [1.9.10](https://github.com/ledgerhq/app-ethereum/compare/1.9.9...1.9.10) - 2021-10-08
Added titlebar dragging Dragging the title bar sideways will allow you to reorder the clients with the mouse. If you move the mouse off of the bar, it will revert to the old mouse movement behavior.
@@ -2909,10 +2909,11 @@ resizeborder(const Arg *arg) { void dragmouse(const Arg *arg) { - int x, y, starty, startx, dragging, isactive, sinit; + int x, y, starty, startx, dragging, tabdragging, isactive, sinit; starty = 100; sinit = 0; dragging = 0; + tabdragging = 0; XEvent ev; Time lasttime = 0; @@ -2980,8 +2981,12 @@ dragmouse(const Arg *arg) if ((abs((starty - ev.xmotion.y_root) * (starty - ev.xmotion.y_root)) + abs((startx - ev.xmotion.x_root) * - (startx - ev.xmotion.x_root))) > 4069) + (startx - ev.xmotion.x_root))) > 4069) { dragging = 1; + if (barheight ? ev.xmotion.y_root < barheight : ev.xmotion.y_root < 12) { + tabdragging = 1; + } + } if (starty > 10 && ev.xmotion.y_root == 0 && c->isfloating) dragging = 1; @@ -2989,6 +2994,59 @@ dragmouse(const Arg *arg) } } while (ev.type != ButtonRelease && !dragging); + if (tabdragging) { + int prev_slot = -1; + int switched = 0; + int tempanim = animated; + animated = 0; + do { + XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); + switch(ev.type) { + case ConfigureRequest: + case Expose: + case MapRequest: + handler[ev.type](&ev); + break; + case MotionNotify: + if ((ev.xmotion.time - lasttime) <= (1000 / 60)) + continue; + lasttime = ev.xmotion.time; + if (barheight ? ev.xmotion.y_root >= barheight : ev.xmotion.y_root >= 12) { + tabdragging = 0; + break; + } + int x = ev.xmotion.x_root; + int left = selmon->mx + tagwidth + startmenusize; + int right = left + selmon->btw; + if (x < left || x > right) { + tabdragging = 0; + break; + } + int slot = (x - left) * selmon->bt / selmon->btw; + if (slot != prev_slot) { + switched = 1; + prev_slot = slot; + detach(c); + int i = 0; + // walk to slot # + Client **tc = &selmon->clients; + while (*tc && i < slot) { + tc = &(*tc)->next; + i++; + } + c->next = *tc; + *tc = c; + arrange(selmon); + } + break; + case ButtonRelease: + dragging = 0; + tabdragging = switched; + } + } while (dragging && tabdragging); + animated = tempanim; + } + if (dragging) { if (!c->isfloating) { c->sfy = selmon->my + bh; @@ -3012,7 +3070,8 @@ dragmouse(const Arg *arg) forcewarp(c); movemouse(NULL); - } else { + } + if (!dragging && !tabdragging) { if (isactive) hide(tempc); }
harden _active_vmm_map_to_phys
@@ -182,16 +182,28 @@ void vmm_map_page_to_frame(page_t* page, uint32_t frame_addr) { } static void _active_vmm_map_virt_to_phys(vmm_pdir_t* dir, uint32_t page_addr, uint32_t frame_addr, uint16_t flags) { + vmm_pdir_t* active_pdir = vmm_active_pdir(); + if (dir != active_pdir) { + panic("incorrect pdir passed to _active_vmm_map_virt_to_phys"); + } + // Make sure that both addresses are page-aligned. unsigned long pdindex = (unsigned long)page_addr >> 22; unsigned long ptindex = (unsigned long)page_addr >> 12 & 0x03FF; unsigned long * pd = (unsigned long *)0xFFFFF000; - // Here you need to check whether the PD entry is present. - // When it is not present, you need to create a new empty PT and - // adjust the PDE accordingly. + //if the page table didn't already exist, alloc one if (!(pd[pdindex])) { - pd[pdindex] = pmm_alloc() | 0x07; //present, rw, us + uint32_t new_table_frame = pmm_alloc(); + pd[pdindex] = new_table_frame | 0x07; //present, rw, us + //consistency check! + //make sure the above worked as we expect + //remove page table flags before checking + uint32_t dir_frame = dir->tablesPhysical[pdindex] & ~0xFFF; + if (dir_frame != new_table_frame) { + printf("dir 0x%08x arr 0x%08x\n eq %d", dir_frame, new_table_frame, (int)dir_frame==new_table_frame); + panic("dir->tablesPhysical wasn't updated after assigning page table pointer"); + } } unsigned long * pt = ((unsigned long *)0xFFC00000) + (0x400 * pdindex);
Another Win32 typo.
@@ -246,7 +246,7 @@ pthread_msec(struct timespec *ts) // I - Time value gettimeofday(&curtime, NULL); - return (1000 * (ts->tv_sec - curtime->tv_sec) + (ts->tv_nsec / 1000 - curtime->tv_usec) / 1000); + return (1000 * (ts->tv_sec - curtime.tv_sec) + (ts->tv_nsec / 1000 - curtime.tv_usec) / 1000); }
Update LuceneMatchVersion to 6.6.1
that you fully re-index after changing this setting as it can affect both how text is indexed and queried. --> - <luceneMatchVersion>5.5.3</luceneMatchVersion> + <luceneMatchVersion>6.6.1</luceneMatchVersion> <!-- TODO : change the hardcoded path add property.name=value in API Collections create --> <lib dir="${lib.path}lib/extraction"/>
chat: default value for OverlaySigil visbility
@@ -15,7 +15,7 @@ type OverlaySigilProps = ColProps & { }; interface OverlaySigilState { - visible: boolean; + visible: boolean | false; space: { top: number | 'auto'; bottom: number | 'auto';
lv_objx_templ: formatting
@@ -33,8 +33,7 @@ extern "C" { * TYPEDEFS **********************/ /*Data of template*/ -typedef struct -{ +typedef struct { lv_ANCESTOR_ext_t ANCESTOR; /*Ext. of ancestor*/ /*New data for this type */ }lv_templ_ext_t;
reverted to %lu
@@ -101,10 +101,10 @@ static int elektraMemoryvalueConvertToByteString (Key * key, kdb_unsigned_long_l normalizedMemVal = ret * formatFactor; // convert back to string - const int n = snprintf (NULL, 0, "%llu", normalizedMemVal); + const int n = snprintf (NULL, 0, "%lu", normalizedMemVal); char buf[n + 1]; - snprintf (buf, n + 1, "%llu", normalizedMemVal); + snprintf (buf, n + 1, "%lu", normalizedMemVal); keySetString (key, buf); return 0;
An extra twist to the test-case
@@ -39,9 +39,9 @@ control egress(inout headers hdr, in psa_egress_input_metadata_t istd, inout psa_egress_output_metadata_t ostd) { - action action1(bit<32> data) { hdr.dummy.addr1 = data; } + action action1(bit<32> data) { hdr.dummy.addr1 = data + 32w1; } action action2() {meta.addr1 = 0x12345678; } - action action3(bit<32> data) {hdr.dummy.addr1 = data; } + action action3(bit<32> data) { hdr.dummy.addr1 = data + 32w1; } action action4() {meta.addr1 = 0x12345678; } table t1 { @@ -73,8 +73,6 @@ control egress(inout headers hdr, if (hdr.dummy.version==1 || hdr.dummy.version==3) { hdr.dummy.addr1 = meta.addr1; } - - hdr.dummy.addr1 = hdr.dummy.addr1 + 32w1; } }
Fix Soapy hasIQbalance to true
@@ -223,7 +223,7 @@ std::complex<double> SoapyLMS7::getDCOffset(const int direction, const size_t ch bool SoapyLMS7::hasIQBalance(const int /*direction*/, const size_t /*channel*/) const { - return false; + return true; } void SoapyLMS7::setIQBalance(const int direction, const size_t channel, const std::complex<double> &balance)
fix: remove UA_IDLE as it should never be set by user
@@ -44,8 +44,7 @@ https://en.wikipedia.org/wiki/List_of_HTTP_status_codes */ #define UA_MAX_URL_LEN 512 + 1 typedef enum { - UA_IDLE = 0, // haven't performed yet - UA_SUCCESS, // continue after succesfull request + UA_SUCCESS = 1, // continue after succesfull request UA_FAILURE, // continue after failed request UA_RETRY, // retry connection UA_ABORT // abort after failed request
doc: terminology cleanup in DM params Replace SOS or Service OS with Service VM Replace UOS or User OS with User VM Clean up some of the grammar
@@ -67,11 +67,11 @@ Here are descriptions for each of these ``acrn-dm`` command line parameters: peripherals from SoC. (The ``-i`` and ``-l`` parameters are only available on a platform with IOC.) - IOC DM opens ``/dev/ptmx`` device to create a peer PTY devices, IOC DM uses - these to communicate with UART DM since UART DM needs a TTY capable device - as its backend. + IOC DM opens the ``/dev/ptmx`` device to create peer PTY devices. IOC DM uses + these devices to communicate with UART DM since UART DM needs a TTY capable + device as its backend. - The device model configuration command syntax for IOC mediator is:: + The Device Model configuration command syntax for IOC mediator is:: -i,[ioc_channel_path],[wakeup_reason] -l,[lpc_port],[ioc_channel_path] @@ -79,7 +79,7 @@ Here are descriptions for each of these ``acrn-dm`` command line parameters: - ``ioc_channel_path`` is an absolute path for communication between IOC mediator and UART DM. - ``lpc_port`` is com1 or com2. IOC mediator needs one unassigned lpc - port for data transfer between User OS and Service OS. + port for data transfer between the User VM and Service VM. - ``wakeup_reason`` is IOC mediator boot reason, where each bit represents one wakeup reason. @@ -226,18 +226,18 @@ Here are descriptions for each of these ``acrn-dm`` command line parameters: ---- ``--vsbl <vsbl_file_path>`` - Virtual Slim bootloader (vSBL) is the virtual bootloader supporting booting + Virtual Slim Bootloader (vSBL) is the virtual bootloader supporting booting of the User VM on the ACRN hypervisor platform. The vSBL design is derived from Slim Bootloader, which follows a staged design approach that provides hardware initialization and launching a payload that provides the boot logic. - The vSBL image is installed on the Service OS root filesystem by the - service-os bundle, in ``/usr/share/acrn/bios/``. In the current design, - the vSBL supports booting Android guest OS or Linux guest OS using the same - vSBL image. For Android VM, the vSBL will load and verify trusty OS first, - and trusty OS will then load and verify Android OS according to Android OS - verification mechanism. + The vSBL image is installed on the Service VM root filesystem by the Service + VM OS bundle in ``/usr/share/acrn/bios/``. In the current design, the vSBL + supports booting an Android guest OS or Linux guest OS using the same vSBL + image. For an Android VM, the vSBL will load and verify the trusty OS first, + and the trusty OS will then load and verify the Android OS according to the + Android OS verification mechanism. .. note:: vSBL is currently only supported on Apollo Lake processors. @@ -414,12 +414,12 @@ Here are descriptions for each of these ``acrn-dm`` command line parameters: ---- ``--pm_by_vuart [pty|tty],<node_path>`` - This option is used to set a user OS power management by virtual UART. + This option is used to set User VM power management by virtual UART. With acrn-dm UART emulation and hypervisor UART emulation and configure, - service OS can communicate with user OS through virtual UART. By this - option, service OS can notify user OS to shutdown itself by vUART. + the Service VM can communicate with the User VM through virtual UART. By this + option, the Service VM can notify the User VM to shut down itself by vUART. - It must work with `--pm_notify_channel` and PCI UART setting (lpc and -l). + It must work with ``--pm_notify_channel`` and PCI UART setting (lpc and -l). Example::
declare mit license
/* - * Demonstration of how we might port the Python h2olog to C++. - * Compile with: "g++ -o h2olog -I/usr/include/bcc/compat h2olog.cc -lbcc" + * Copyright (c) 2019-2020 Fastly, Inc., Toru Maesaka, Goro Fuji + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. */ #include <inttypes.h>
Changing default ChibiOS repo from the _official_ GitHub mirror to our own mirror
@@ -9,7 +9,7 @@ ExternalProject_Add( ChibiOS PREFIX ChibiOS SOURCE_DIR ${CMAKE_BINARY_DIR}/ChibiOS_Source - GIT_REPOSITORY https://github.com/ChibiOS/ChibiOS/ + GIT_REPOSITORY https://github.com/nanoframework/ChibiOS GIT_TAG ${CHIBIOS_GIT_TAG} # target specified branch GIT_SHALLOW 1 # download only the tip of the branch, not the complete history TIMEOUT 10
setup bindings properly
@@ -1703,6 +1703,10 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso sensor->modelId().startsWith(QLatin1String("TH-")) || sensor->modelId().startsWith(QLatin1String("SMOK_")) || sensor->modelId().startsWith(QLatin1String("WATER_")) || + // Konke + sensor->modelId() == QLatin1String("3AFE140103020000") || + sensor->modelId() == QLatin1String("3AFE130104020015") || + sensor->modelId() == QLatin1String("3AFE14010402000D") || // Nimbus sensor->modelId().startsWith(QLatin1String("FLS-NB")) || // SmartThings
Add mutex assertions
@@ -64,6 +64,7 @@ video_buffer_destroy(struct video_buffer *vb) { static void video_buffer_swap_frames(struct video_buffer *vb) { + sc_mutex_assert(&vb->mutex); AVFrame *tmp = vb->decoding_frame; vb->decoding_frame = vb->rendering_frame; vb->rendering_frame = tmp; @@ -92,6 +93,7 @@ video_buffer_offer_decoded_frame(struct video_buffer *vb, const AVFrame * video_buffer_consume_rendered_frame(struct video_buffer *vb) { + sc_mutex_assert(&vb->mutex); assert(!vb->rendering_frame_consumed); vb->rendering_frame_consumed = true; fps_counter_add_rendered_frame(vb->fps_counter);
esp: Fix Isochronous transfers On ESP32-S2/S3 ISO transfers must be configured for even or odd frame. Closes
@@ -59,6 +59,7 @@ typedef struct { uint16_t queued_len; uint16_t max_size; bool short_packet; + uint8_t interval; } xfer_ctl_t; static const char *TAG = "TUSB:DCD"; @@ -267,6 +268,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const *desc_edpt) xfer_ctl_t *xfer = XFER_CTL_BASE(epnum, dir); xfer->max_size = tu_edpt_packet_size(desc_edpt); + xfer->interval = desc_edpt->bInterval; if (dir == TUSB_DIR_OUT) { out_ep[epnum].doepctl |= USB_USBACTEP1_M | @@ -379,6 +381,13 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_t to USB0.in_ep_reg[epnum].dieptsiz = (num_packets << USB_D_PKTCNT0_S) | total_bytes; USB0.in_ep_reg[epnum].diepctl |= USB_D_EPENA1_M | USB_D_CNAK1_M; // Enable | CNAK + // For ISO endpoint with interval=1 set correct DATA0/DATA1 bit for next frame + if ((USB0.in_ep_reg[epnum].diepctl & USB_D_EPTYPE0_M) == (1 << USB_D_EPTYPE1_S) && xfer->interval == 1) { + // Take odd/even bit from frame counter. + uint32_t const odd_frame_now = (USB0.dsts & (1u << USB_SOFFN_S)); + USB0.in_ep_reg[epnum].diepctl |= (odd_frame_now ? USB_DI_SETD0PID1 : USB_DI_SETD1PID1); + } + // Enable fifo empty interrupt only if there are something to put in the fifo. if(total_bytes != 0) { USB0.dtknqr4_fifoemptymsk |= (1 << epnum); @@ -387,6 +396,13 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_t to // Each complete packet for OUT xfers triggers XFRC. USB0.out_ep_reg[epnum].doeptsiz |= USB_PKTCNT0_M | ((xfer->max_size & USB_XFERSIZE0_V) << USB_XFERSIZE0_S); USB0.out_ep_reg[epnum].doepctl |= USB_EPENA0_M | USB_CNAK0_M; + + // For ISO endpoint with interval=1 set correct DATA0/DATA1 bit for next frame + if ((USB0.out_ep_reg[epnum].doepctl & USB_D_EPTYPE0_M) == (1 << USB_D_EPTYPE1_S) && xfer->interval == 1) { + // Take odd/even bit from frame counter. + uint32_t const odd_frame_now = (USB0.dsts & (1u << USB_SOFFN_S)); + USB0.out_ep_reg[epnum].doepctl |= (odd_frame_now ? USB_DO_SETD0PID1 : USB_DO_SETD1PID1); + } } return true; }
rtnlinv.c: fix ENLIVE dims Somewhere, the dimension logic was messed up...
@@ -248,12 +248,12 @@ int main_rtnlinv(int argc, char* argv[argc]) long img_output1_dims[DIMS]; md_select_dims(DIMS, ~TIME_FLAG, img_output1_dims, img_output_dims); - if (!combine) { + if (combine) { // The conventional img-dimensions contain only one map. // The 'output' dimensions might contain multiple maps (ENLIVE) - img_output_dims[MAPS_DIM] = nmaps; - img_output1_dims[MAPS_DIM] = nmaps; + img_output_dims[MAPS_DIM] = 1; + img_output1_dims[MAPS_DIM] = 1; } complex float* img_output = create_cfl(img_file, DIMS, img_output_dims);
CLEANUP: adjust SET_DELETE_NO_MERGE code tag.
@@ -2081,7 +2081,8 @@ static uint32_t do_set_elem_delete_fast(set_meta_info *info, const uint32_t coun } return fcnt; } -#else +#endif + static uint32_t do_set_elem_delete(set_meta_info *info, const uint32_t count, enum elem_delete_cause cause) { @@ -2095,7 +2096,6 @@ static uint32_t do_set_elem_delete(set_meta_info *info, const uint32_t count, } return fcnt; } -#endif static ENGINE_ERROR_CODE do_set_elem_get(set_meta_info *info, const uint32_t count, const bool delete, set_elem_item **elem_array, uint32_t *elem_count)
use task variable for mpi profiles
@@ -14,11 +14,12 @@ rm=$RESOURCE_MANAGER NODES=2 TASKS=8 ARGS=8 +MAX_THREADS=`./get_max_threads` +LAST_THREAD_INDEX=`echo "$TAU_TEST_MAX_THREADS -1" | bc` +LAST_TASK_INDEX=`echo "$TASKS -1" | bc` export TAU_TRACE=0 TAU_CALLPATH=0 TAU_PROFILE=1 TAU_METRICS=GET_TIME_OF_DAY:PAPI_L1_DCM:PAPI_LD_INS unset OMP_NUM_THREADS -export TAU_TEST_MAX_THREADS=`./get_max_threads` -export TAU_TEST_LAST_THREAD_INDEX=`echo "$TAU_TEST_MAX_THREADS -1" | bc` @test "[libs/TAU] MPI C binary runs under resource manager ($rm/$LMOD_FAMILY_COMPILER/$LMOD_FAMILY_MPI)" { @@ -29,7 +30,7 @@ export TAU_TEST_LAST_THREAD_INDEX=`echo "$TAU_TEST_MAX_THREADS -1" | bc` run_mpi_binary "tau_exec ./C_mpi_test" $ARGS $NODES $TASKS assert_success - ls MULTI__GET_TIME_OF_DAY/profile.7.0.0 + ls MULTI__GET_TIME_OF_DAY/profile.$LAST_TASK_INDEX.0.0 assert_success rm -rf MULTI__* @@ -43,7 +44,7 @@ export TAU_TEST_LAST_THREAD_INDEX=`echo "$TAU_TEST_MAX_THREADS -1" | bc` run_mpi_binary ./run_CXX_mpi_test.sh $ARGS $NODES $TASKS assert_success - ls MULTI__PAPI_LD_INS/profile.7.0.0 + ls MULTI__PAPI_LD_INS/profile.$LAST_TASK_INDEX.0.0 assert_success rm -rf MULTI__* @@ -57,7 +58,7 @@ export TAU_TEST_LAST_THREAD_INDEX=`echo "$TAU_TEST_MAX_THREADS -1" | bc` run_serial_binary ./run_C_omp_test.sh assert_success - ls MULTI__PAPI_L1_DCM/profile.0.0.$TAU_TEST_LAST_THREAD_INDEX + ls MULTI__PAPI_L1_DCM/profile.0.0.$LAST_THREAD_INDEX assert_success rm -rf MULTI__*
babblesim: Add command line arg to specify bdaddr This allows to set public bdaddr using -A or --bdaddr command line option. Accepted formats are both XX:XX:XX:XX:XX:XX and 0xXXXXXXXXXXXX.
#include "bs_dynargs.h" #include "bs_cmd_line_typical.h" #include "NRF_HWLowL.h" +#include "controller/ble_ll.h" static bs_args_struct_t *args_struct; static struct nrf52_bsim_args_t arg; @@ -36,6 +37,28 @@ static void cmd_nosim_found(char *argv, int offset) hwll_set_nosim(true); } +static void cmd_bdaddr_found(char *argv, int offset) +{ + union { + uint64_t u64; + uint8_t u8[8]; + } bdaddr; + char *endptr; + + if (sscanf(&argv[offset], "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", + &bdaddr.u8[5], &bdaddr.u8[4], &bdaddr.u8[3], &bdaddr.u8[2], + &bdaddr.u8[1], &bdaddr.u8[0]) < 6) { + bdaddr.u64 = strtoull(&argv[offset], &endptr, 0); + if (*endptr) { + return; + } + + bdaddr.u64 = htole64(bdaddr.u64); + } + + ble_ll_set_public_addr(bdaddr.u8); +} + static void print_no_sim_warning(void) { bs_trace_warning("Neither simulation id or the device number " @@ -70,6 +93,9 @@ void nrfbsim_register_args(void) * destination, callback, * description */ + { false, false , false, + "A", "bdaddr", 's', + NULL, cmd_bdaddr_found, "Device public address"}, {false, false, true, "nosim", "", 'b', (void *)&nosim, cmd_nosim_found,
Fix field name initialization in kmt mongo mode.
@@ -4617,11 +4617,11 @@ main(int argc, char **argv) fieldnamew_max = snprintf(NULL, 0, fieldname_fmt, fieldcount); fieldnamew_max = roundup(fieldnamew_max + 1, 8); - fieldnamev = aligned_alloc(128, (fieldcount_max + 1) * fieldnamew_max); + fieldnamev = aligned_alloc(128, (fieldcount + 1) * fieldnamew_max); if (!fieldnamev) abort(); - for (i = 0; i < fieldcount_max; ++i) { + for (i = 0; i < fieldcount; ++i) { int n; n = snprintf(fieldnamev + fieldnamew_max * i, fieldnamew_max, fieldname_fmt, i);
Cellular fix in 3GPP power saving logic. Correction to the logic in the internal function uCellPrivateSetDeepSleepState() - add a !
@@ -987,7 +987,7 @@ void uCellPrivateSetDeepSleepState(uCellPrivateInstance_t *pInstance) // deep sleep URC was received), then we don't need to do anything. if ((pInstance->deepSleepState != U_CELL_PRIVATE_DEEP_SLEEP_STATE_ASLEEP) && (pInstance->deepSleepState != U_CELL_PRIVATE_DEEP_SLEEP_STATE_PROTOCOL_STACK_ASLEEP)) { - if (U_CELL_PRIVATE_HAS(pInstance->pModule, + if (!U_CELL_PRIVATE_HAS(pInstance->pModule, U_CELL_PRIVATE_FEATURE_3GPP_POWER_SAVING)) { // If 3GPP power saving is not supported then deep sleep is plainly unavailable pInstance->deepSleepState = U_CELL_PRIVATE_DEEP_SLEEP_STATE_UNAVAILABLE;
board/gumboz/board.h: Format with clang-format BRANCH=none TEST=none
#define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL - - /* GPIO mapping from board specific name to EC common name. */ #define CONFIG_BATTERY_PRESENT_GPIO GPIO_EC_BATT_PRES_ODL #define CONFIG_SCI_GPIO GPIO_EC_FCH_SCI_ODL /* This I2C moved. Temporarily detect and support the V0 HW. */ extern int I2C_PORT_BATTERY; -enum adc_channel { - ADC_TEMP_SENSOR_CHARGER, - ADC_TEMP_SENSOR_SOC, - ADC_CH_COUNT -}; +enum adc_channel { ADC_TEMP_SENSOR_CHARGER, ADC_TEMP_SENSOR_SOC, ADC_CH_COUNT }; enum battery_type { BATTERY_SIMPLO_COS, @@ -95,20 +89,11 @@ enum battery_type { BATTERY_TYPE_COUNT, }; -enum pwm_channel { - PWM_CH_KBLIGHT = 0, - PWM_CH_COUNT -}; +enum pwm_channel { PWM_CH_KBLIGHT = 0, PWM_CH_COUNT }; -enum ioex_port { - IOEX_C0_NCT3807 = 0, - IOEX_C1_NCT3807, - IOEX_PORT_COUNT -}; +enum ioex_port { IOEX_C0_NCT3807 = 0, IOEX_C1_NCT3807, IOEX_PORT_COUNT }; -#define PORT_TO_HPD(port) ((port == 0) \ - ? GPIO_USB3_C0_DP2_HPD \ - : GPIO_DP1_HPD) +#define PORT_TO_HPD(port) ((port == 0) ? GPIO_USB3_C0_DP2_HPD : GPIO_DP1_HPD) enum temp_sensor_id { TEMP_SENSOR_CHARGER = 0, @@ -117,17 +102,9 @@ enum temp_sensor_id { TEMP_SENSOR_COUNT }; -enum usba_port { - USBA_PORT_A0 = 0, - USBA_PORT_A1, - USBA_PORT_COUNT -}; +enum usba_port { USBA_PORT_A0 = 0, USBA_PORT_A1, USBA_PORT_COUNT }; -enum usbc_port { - USBC_PORT_C0 = 0, - USBC_PORT_C1, - USBC_PORT_COUNT -}; +enum usbc_port { USBC_PORT_C0 = 0, USBC_PORT_C1, USBC_PORT_COUNT }; /***************************************************************************** * CBI EC FW Configuration
Fix case, add another function
@@ -114,6 +114,7 @@ functions: 0x14061ADD0: ConvertLogMessageIdToCharaLogKind 0x1406F66A0: ExecuteCommand 0x1408DC200: CreateSelectYesno + 0x140A81860: GetBeastTribeAllowance 0x140A91500: EventFramework_GetSingleton 0x140A91510: EventFramework_ctor 0x140A91CD0: EventFramework_dtor @@ -272,7 +273,7 @@ classes: funcs: 0x140789110: SetCharacterName 0x14078CA30: Initialize - 0x14078A6f0: GetBeastTribeRank + 0x14078A6F0: GetBeastTribeRank 0x14078A770: GetBeastTribeCurrentRep 0x14078A7B0: GetBeastTribeNeededRep 0x1407F2BF0: ctor
parallel-libs/trilinos: # # [ohpc] please include (github issue #) at end of commit message if appropriate # bump trillinos to v12.12.1
# Base package name %define pname trilinos %define PNAME %(echo %{pname} | tr [a-z] [A-Z]) -%define ver_exp 12-10-1 +%define ver_exp 12-12-1 Name: %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} Version: 12.12.1
TIS doesn't like ChannelID being zero
@@ -57,7 +57,7 @@ long ret_code(long code) { return code; } -#define EXTRACT_DID(CID) (CID & 0xFFFF) +#define EXTRACT_DID(CID) ((CID & 0xFFFF) - 1) #define EXTRACT_CID(CID) ((CID >> 16) & 0xFFFF) long check_valid_DeviceID(unsigned long DeviceID) { @@ -68,7 +68,7 @@ long check_valid_DeviceID(unsigned long DeviceID) { } long check_valid_ChannelID(unsigned long ChannelID) { - uint16_t dev_id = EXTRACT_DID(ChannelID);; + uint16_t dev_id = EXTRACT_DID(ChannelID); uint16_t con_id = EXTRACT_CID(ChannelID); if (pandas.size() <= dev_id || pandas[dev_id] == nullptr) @@ -117,7 +117,7 @@ PANDAJ2534DLL_API long PTAPI PassThruOpen(void *pName, unsigned long *pDevice panda_index = pandas.size()-1; } - *pDeviceID = panda_index; + *pDeviceID = panda_index + 1; // TIS doesn't like it when ID == 0 return ret_code(STATUS_NOERROR); } PANDAJ2534DLL_API long PTAPI PassThruClose(unsigned long DeviceID) {
out_http: fix config map for 'uri' field
@@ -361,7 +361,7 @@ static struct flb_config_map config_map[] = { }, { FLB_CONFIG_MAP_STR, "uri", NULL, - 0, FLB_FALSE, FLB_TRUE, offsetof(struct flb_out_http, uri), + 0, FLB_TRUE, offsetof(struct flb_out_http, uri), NULL, },
open ext lib as default
@@ -178,9 +178,10 @@ namespace SLua Lua_SLua_ByteArray.reg (L); Helper.reg(L); LuaValueType.reg(L); + if ((flag & LuaSvrFlag.LSF_EXTLIB)!=0) { LuaDLL.luaS_openextlibs (L); - LuaSocketMini.reg (L); + } if((flag & LuaSvrFlag.LSF_3RDDLL)!=0) Lua3rdDLL.open(L); @@ -211,7 +212,7 @@ namespace SLua } } - public void init(Action<int> tick,Action complete,LuaSvrFlag flag=LuaSvrFlag.LSF_BASIC) + public void init(Action<int> tick,Action complete,LuaSvrFlag flag=LuaSvrFlag.LSF_BASIC|LuaSvrFlag.LSF_EXTLIB) { #if !SLUA_STANDALONE if (lgo == null
circular_buffer: use atomic block
#include "circular_buffer.h" +#include "drv_interrupt.h" + uint32_t circular_buffer_free(circular_buffer_t *c) { + ATOMIC_BLOCK(MAX_PRIORITY) { if (c->head >= c->tail) { return (c->size - c->head) + c->tail; } return (c->tail - c->head); } + return 0; +} uint8_t circular_buffer_write(circular_buffer_t *c, uint8_t data) { - uint32_t next = c->head + 1; - if (next >= c->size) - next = 0; - + ATOMIC_BLOCK(MAX_PRIORITY) { + const uint32_t next = (c->head + 1) % c->size; if (next == c->tail) return 0; @@ -19,48 +22,54 @@ uint8_t circular_buffer_write(circular_buffer_t *c, uint8_t data) { c->head = next; return 1; } + return 0; +} uint32_t circular_buffer_write_multi(circular_buffer_t *c, const uint8_t *data, const uint32_t len) { for (uint32_t i = 0; i < len; i++) { - uint32_t next = (c->head + 1) % c->size; - + ATOMIC_BLOCK(MAX_PRIORITY) { + const uint32_t next = (c->head + 1) % c->size; if (next == c->tail) return i; c->buffer[c->head] = data[i]; c->head = next; } + } return len; } uint32_t circular_buffer_available(circular_buffer_t *c) { + ATOMIC_BLOCK(MAX_PRIORITY) { if (c->head >= c->tail) { return c->head - c->tail; } return c->size + c->head - c->tail; } + return 0; +} uint8_t circular_buffer_read(circular_buffer_t *c, uint8_t *data) { + ATOMIC_BLOCK(MAX_PRIORITY) { if (c->head == c->tail) return 0; - uint32_t next = c->tail + 1; - if (next >= c->size) - next = 0; - *data = c->buffer[c->tail]; - c->tail = next; + c->tail = (c->tail + 1) % c->size; return 1; } + return 0; +} uint32_t circular_buffer_read_multi(circular_buffer_t *c, uint8_t *data, const uint32_t len) { for (uint32_t i = 0; i < len; i++) { + ATOMIC_BLOCK(MAX_PRIORITY) { if (c->head == c->tail) return i; - uint32_t next = (c->tail + 1) % c->size; data[i] = c->buffer[c->tail]; - c->tail = next; + c->tail = (c->tail + 1) % c->size; + } } return len; }
Add missing header typedef from previous commit
@@ -294,6 +294,11 @@ NTSTATUS PhSipQueryProcessorPerformanceDistribution( _Out_ PVOID *Buffer ); +NTSTATUS PhSipQueryProcessorLogicalInformation( + _Out_ PVOID *Buffer, + _Out_ PULONG BufferLength + ); + // Memory section BOOLEAN PhSipMemorySectionCallback(
cmake: Trim IDF_VER to fit a 32-bit field
@@ -223,11 +223,13 @@ endfunction() function(idf_get_git_revision) git_describe(IDF_VER_GIT "${IDF_PATH}") if(EXISTS "${IDF_PATH}/version.txt") - file(STRINGS "${IDF_PATH}/version.txt" IDF_VER) + file(STRINGS "${IDF_PATH}/version.txt" IDF_VER_T) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${IDF_PATH}/version.txt") else() - set(IDF_VER ${IDF_VER_GIT}) + set(IDF_VER_T ${IDF_VER_GIT}) endif() + # cut IDF_VER to required 32 characters. + string(SUBSTRING "${IDF_VER_T}" 0 31 IDF_VER) message(STATUS "IDF_VER: ${IDF_VER}") add_definitions(-DIDF_VER=\"${IDF_VER}\") git_submodule_check("${IDF_PATH}")
added authentication over ethernet
@@ -663,6 +663,41 @@ hcxwriteneccount++; return; } /*===========================================================================*/ +uint8_t geteapkeyint(eap_t *eap) +{ +uint16_t keyinfo; +int eapkey = 0; + +keyinfo = (((eap->keyinfo & 0xff) << 8) | (eap->keyinfo >> 8)); +if (keyinfo & WPA_KEY_INFO_ACK) + { + if(keyinfo & WPA_KEY_INFO_INSTALL) + { + /* handshake 3 */ + eapkey = 3; + } + else + { + /* handshake 1 */ + eapkey = 1; + } + } +else + { + if(keyinfo & WPA_KEY_INFO_SECURE) + { + /* handshake 4 */ + eapkey = 4; + } + else + { + /* handshake 2 */ + eapkey = 2; + } + } +return eapkey; +} +/*===========================================================================*/ uint8_t geteapkey(uint8_t *eapdata) { eap_t *eap; @@ -1146,7 +1181,6 @@ int udpportd = 0; int c, c1; int llctype; - uint8_t meshflag = false; uint8_t eap3flag = false; @@ -1416,7 +1450,6 @@ while((pcapstatus = pcap_next_ex(pcapin, &pkh, &packet)) != -2) udpportd = htobe16(udph->port_destination); if((udpports == 1812) || (udpportd == 1812)) radiusflag = true; - continue; } } @@ -1451,6 +1484,19 @@ while((pcapstatus = pcap_next_ex(pcapin, &pkh, &packet)) != -2) continue; } } + else if(llctype == LLC_TYPE_AUTH) + { + eap = (eap_t*)(packet +ETHER_SIZE); + if(eap->type == 3) + { + if((geteapkeyint(eap) == 1) || (geteapkeyint(eap) == 3)) + addeapol(pkh->ts.tv_sec, pkh->ts.tv_usec, eth->addr1.addr, eth->addr2.addr, eap); + else if((geteapkeyint(eap) == 2) || (geteapkeyint(eap) == 4)) + addeapol(pkh->ts.tv_sec, pkh->ts.tv_usec, eth->addr2.addr, eth->addr1.addr, eap); + } + continue; + } + continue; }
Vertcoin fix
"hash": "sha256d" }, "headerHasher": { - "hash": "lyra2rev3" + "hash": "verthash" }, "blockHasher": { "hash": "reverse",
[agx] Conversion methods for RectU32
@@ -651,6 +651,15 @@ impl Display for Rect { } } +impl From<RectU32> for Rect { + fn from(rect: RectU32) -> Self { + Self { + origin: Point::from(rect.origin), + size: Size::from(&rect.size), + } + } +} + #[derive(PartialEq)] struct TileSegment<'a> { viewport_frame: Rect, @@ -1043,6 +1052,10 @@ impl RectU32 { size: SizeU32::from(rect.size), } } + + pub fn zero() -> Self { + Self::from(Rect::zero()) + } } /*
Do not skip call to MarkBufferDirtyHint for temp tables. In markDirty() seems oversight in commit to avoid calling MarkBufferDirtyHint() for temp tables. Previous patch used relation->rd_istemp before calling XLogSaveBufferForHint() in MarkBufferDirtyHint() that was unnecessary given it already checks for BM_PERMANENT. So, call now MarkBufferDirtyHint() unconditionally.
@@ -91,8 +91,10 @@ markDirty(Buffer buffer, Relation relation, HeapTupleHeader tuple, bool isXmin) if (!gp_disable_tuple_hints) { - /* GPDB_91_MERGE_FIXME: what is the rationale of not dirtying local buffers? */ - if (relation->rd_rel->relpersistence != RELPERSISTENCE_TEMP) + /* + * Based on BM_PERMANENT it decides if should xlog for temp tables or + * not. So, can safely call it for any buffer. + */ MarkBufferDirtyHint(buffer); return; }
Poll control fix ZCL sequence is 0
@@ -140,7 +140,6 @@ bool DeRestPluginPrivate::checkPollControlClusterTask(Sensor *sensor) if (item->toNumber() & R_PENDING_SET_LONG_POLL_INTERVAL) { deCONZ::ApsDataRequest apsReq; - deCONZ::ZclFrame zclFrame; // ZDP Header apsReq.dstAddress() = sensor->address(); @@ -153,7 +152,7 @@ bool DeRestPluginPrivate::checkPollControlClusterTask(Sensor *sensor) apsReq.setTxOptions(deCONZ::ApsTxAcknowledgedTransmission); deCONZ::ZclFrame outZclFrame; - outZclFrame.setSequenceNumber(zclFrame.sequenceNumber()); + outZclFrame.setSequenceNumber(static_cast<quint8>(QDateTime::currentMSecsSinceEpoch())); outZclFrame.setCommandId(0x02); // set long poll interval outZclFrame.setFrameControl(deCONZ::ZclFCClusterCommand | deCONZ::ZclFCDirectionClientToServer);
Ensure Python dependencies are up-to-date in the GitHub workflow
@@ -21,7 +21,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.x" + python-version: "3.10.5" - name: Install dependencies run: | @@ -45,14 +45,14 @@ jobs: uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: - python-version: "3.x" + python-version: "3.10.5" - name: Set up Node uses: actions/setup-node@v2 with: - node-version: "14" + node-version: '14' - name: Install dependencies run: npm install -g [email protected] @@ -72,9 +72,9 @@ jobs: uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: - python-version: "3.x" + python-version: "3.10.5" - name: Install dependencies run: |
odissey: do not free msg during route
@@ -182,7 +182,7 @@ od_router(void *arg) if (route == NULL) { msg_route->status = OD_RERROR_NOT_FOUND; machine_queue_put(msg_route->response, msg); - continue; + break; } /* ensure route client_max limit */ @@ -195,7 +195,7 @@ od_router(void *arg) route->scheme->client_max); msg_route->status = OD_RERROR_LIMIT; machine_queue_put(msg_route->response, msg); - continue; + break; } /* add client to route client pool */ @@ -204,7 +204,7 @@ od_router(void *arg) msg_route->status = OD_ROK; machine_queue_put(msg_route->response, msg); - continue; + break; } case OD_MROUTER_ATTACH: @@ -219,7 +219,7 @@ od_router(void *arg) machine_queue_put(msg_attach->response, msg); break; } - continue; + break; } case OD_MROUTER_DETACH: @@ -303,14 +303,12 @@ od_router(void *arg) else msg_cancel->status = OD_ROK; machine_queue_put(msg_cancel->response, msg); - continue; + break; } default: assert(0); break; } - - machine_msg_free(msg); } } @@ -375,6 +373,7 @@ od_router_do(od_client_t *client, od_msg_t msg_type, int wait_for_response) msg = machine_queue_get(response, UINT32_MAX); if (msg == NULL) { /* todo: */ + abort(); machine_queue_free(response); return OD_RERROR; }
[core] fix segfault if tempdirs fill up (fixes (thx wolfram) x-ref: "lighttpd segfault if /var/tmp is full"
@@ -741,7 +741,7 @@ static void chunkqueue_remove_empty_chunks(chunkqueue *cq) { chunkqueue_remove_finished_chunks(cq); if (chunkqueue_is_empty(cq)) return; - for (c = cq->first; c->next; c = c->next) { + for (c = cq->first; c && c->next; c = c->next) { if (0 == chunk_remaining_length(c->next)) { chunk *empty = c->next; c->next = empty->next;
feat(timer): add `lv_timer_get_user_data`
@@ -172,6 +172,16 @@ uint8_t lv_timer_get_idle(void); */ lv_timer_t * lv_timer_get_next(lv_timer_t * timer); +/** + * Get the user_data passed when the timer was created + * @param timer pointer to the lv_timer + * @return pointer to the user_data + */ +static inline void * lv_timer_get_user_data(lv_timer_t * timer) +{ + return timer->user_data; +} + /********************** * MACROS **********************/
Remove obsolete detail in README Now that scrcpy-server.jar is found in the same directory as the scrcpy executable, using SCRCPY_SERVER_PATH is not particularly useful on Windows anymore
@@ -331,8 +331,8 @@ To use a specific _adb_ binary, configure its path in the environment variable ADB=/path/to/adb scrcpy -To override the path of the `scrcpy-server.jar` file (it can be [useful] on -Windows), configure its path in `SCRCPY_SERVER_PATH`. +To override the path of the `scrcpy-server.jar` file, configure its path in +`SCRCPY_SERVER_PATH`. [useful]: https://github.com/Genymobile/scrcpy/issues/278#issuecomment-429330345
To make it less surprising and confusing, leave a message on configdata.pm This message will ONLY be visible in OpenSSL 1.1.1, it will not show in 1.1.1a or any other release or update.
@@ -2554,6 +2554,17 @@ my %builders = ( $builders{$builder}->($builder_platform, @builder_opts); +# Show a note on the use of configdata.pm, but ONLY for release 1.1.1 +# (i.e. this message disappears with the following update, 1.1.1a) +print <<"EOF" if ($config{version_num} =~ m|^0x1010100.L$|); + +NOTE: Starting with OpenSSL 1.1.1, 'Configure' doesn't display all the disabled +options or the "make variables" with their values. Instead, you must use +'configdata.pm' as a script to get a display of the configuration data. For +help, please do this: + + perl configdata.pm --help +EOF print <<"EOF" if ($disabled{threads} eq "unavailable"); The library could not be configured for supporting multi-threaded
GITHUB.WORKSPACE not GITHUB_WORKSPACE
@@ -40,7 +40,7 @@ jobs: -DBUILD_TESTING=ON -DDOWNLOAD_AND_BUILD_DEPS=ON -DUPNP_ENABLE_OPEN_SSL=ON - -DCMAKE_INSTALL_PREFIX=${{ GITHUB_WORKSPACE }}/test-install + -DCMAKE_INSTALL_PREFIX=${{ GITHUB.WORKSPACE }}/test-install ${{ env.cmake_extra_flags }} - name: Build run: cmake --build build --config ${{matrix.conf}} @@ -72,7 +72,7 @@ jobs: -DCMAKE_BUILD_TYPE=${{ matrix.conf }} -DBUILD_TESTING=ON -DDOWNLOAD_AND_BUILD_DEPS=ON - -DCMAKE_INSTALL_PREFIX=${{ GITHUB_WORKSPACE }}/test-install + -DCMAKE_INSTALL_PREFIX=${{ GITHUB.WORKSPACE }}/test-install ${{ env.cmake_extra_flags }} - name: Build run: cmake --build build --config ${{ matrix.conf }} @@ -127,7 +127,7 @@ jobs: -DCMAKE_BUILD_TYPE=${{ matrix.conf }} -DBUILD_TESTING=ON -DDOWNLOAD_AND_BUILD_DEPS=ON - -DCMAKE_INSTALL_PREFIX=${{ GITHUB_WORKSPACE }}/test-install + -DCMAKE_INSTALL_PREFIX=${{ GITHUB.WORKSPACE }}/test-install ${{ env.cmake_extra_flags }} - name: Build run: cmake --build build --config ${{matrix.conf}}
variable name change/triggering rebuid
@@ -44,8 +44,8 @@ def test_power_mu_sigma_sigma8norm(tf): def test_import_isitgr(): "Test simple imports" import isitgr - boltzmann = import_item('isitgr') - assert isitgr == boltzmann + boltzmann_t = import_item('isitgr') + assert isitgr == boltzmann_t @pytest.mark.parametrize('tf', [ 'boltzmann_class', 'boltzmann_camb', 'boltzmann_isitgr'])
doc CHANGE highlight important information
@@ -84,8 +84,8 @@ Specifically, _startup_, _running_, _candidate_, and _operational_ datastores ar to the definitions. Following is a brief description and purpose of each datastore. _Startup_ datastore is the only persistent datastore. It includes the configuration of devices at time of their boot. -This configuration is copied into _running_ when the first Sysrepo connection (shared memory) is created after -system boot. +This configuration is __copied__ into _running_ when the first Sysrepo connection (shared memory) is created __after +system boot__. _Running_ datastore holds the current system configuration. This datastore is edited when a configuration change occured and a device should reconfigure itself. It does not persist across reboots. If desired, it can be copied
workaround SDCC issue:
@@ -135,8 +135,9 @@ void LoadPlayerSpritePalette(UINT16 index) { } UBYTE LoadSprite(UINT16 index, UBYTE sprite_offset) { - UBYTE bank, sprite_frames, size, load_size; - UBYTE* data_ptr; + UBYTE sprite_frames, size, load_size; + static UBYTE bank; + static UBYTE* data_ptr; PUSH_BANK(DATA_PTRS_BANK); bank = sprite_bank_ptrs[index].bank; @@ -160,8 +161,9 @@ UBYTE LoadSprite(UINT16 index, UBYTE sprite_offset) { } void LoadScene(UINT16 index) { - UBYTE bank, i, k; - UBYTE* data_ptr; + UBYTE i, k; + static UBYTE bank; + static UBYTE* data_ptr; PUSH_BANK(DATA_PTRS_BANK); bank = scene_bank_ptrs[index].bank;
Remove dependency to jacoco
@@ -3080,7 +3080,7 @@ module JTEST: _JAVA_PLACEHOLDER { # TODO: if <needs_sonar> DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8) - DEPENDS(devtools/junit-runner devtools/jacoco-agent) + DEPENDS(devtools/junit-runner) PEERDIR(build/platform/java/jacoco-agent) JAVA_TEST() @@ -3114,7 +3114,6 @@ module JUNIT5: _JAVA_PLACEHOLDER { SET(MODULE_TYPE JUNIT5) PEERDIR(devtools/junit5-runner) PEERDIR(build/platform/java/jacoco-agent) - DEPENDS(devtools/jacoco-agent) JAVA_TEST() }
Change default CCAL value to match other devices
@@ -1354,7 +1354,7 @@ int LMS7_Device::Init() {0x002D, 0x0641}, {0x0086, 0x4101}, {0x0087, 0x5555}, {0x0088, 0x0525}, {0x0089, 0x1078}, {0x008B, 0x218C}, {0x008C, 0x267B}, {0x00A6, 0x000F}, {0x00A9, 0x8000}, {0x00AC, 0x2000}, {0x0108, 0x318C}, {0x0109, 0x57C1}, - {0x010A, 0x154C}, {0x010B, 0x0001}, {0x010C, 0x8865}, {0x010D, 0x011A}, + {0x010A, 0x1F4C}, {0x010B, 0x0001}, {0x010C, 0x8865}, {0x010D, 0x011A}, {0x010E, 0x0000}, {0x010F, 0x3142}, {0x0110, 0x2B14}, {0x0111, 0x0000}, {0x0112, 0x000C}, {0x0113, 0x03C2}, {0x0114, 0x01F0}, {0x0115, 0x000D}, {0x0118, 0x418C}, {0x0119, 0x5292}, {0x011A, 0x3001}, {0x011C, 0x8941},
removes unused args -I (galaxy) and -l (raft port)
@@ -78,7 +78,7 @@ _main_getopt(c3_i argc, c3_c** argv) u3_Host.ops_u.rep = c3n; u3_Host.ops_u.kno_w = DefaultKernel; - while ( (ch_i=getopt(argc, argv,"s:B:I:w:t:f:k:l:p:LSabcdgmqvxFPDR")) != -1 ) { + while ( (ch_i=getopt(argc, argv,"s:B:w:t:f:k:p:LSabcdgqvxFPDR")) != -1 ) { switch ( ch_i ) { case 'B': { u3_Host.ops_u.pil_c = strdup(optarg);
correct stack frame table keys in debug/stack doc doc for debug/stack listed :column and :line as keys in the frame table. But doframe actually sets :source-column and :source-line.
@@ -340,9 +340,9 @@ JANET_CORE_FN(cfun_debug_stack, "stack frame is the first table in the array, and the bottom-most stack frame " "is the last value. Each stack frame contains some of the following attributes:\n\n" "* :c - true if the stack frame is a c function invocation\n\n" - "* :column - the current source column of the stack frame\n\n" + "* :source-column - the current source column of the stack frame\n\n" "* :function - the function that the stack frame represents\n\n" - "* :line - the current source line of the stack frame\n\n" + "* :source-line - the current source line of the stack frame\n\n" "* :name - the human-friendly name of the function\n\n" "* :pc - integer indicating the location of the program counter\n\n" "* :source - string with the file path or other identifier for the source code\n\n"
api: revert the changes to atexit for shared memory client introduced the change into the shared memory atexit, which breaks IPSec tests in some environments. Type: fix Fixes:
@@ -1029,7 +1029,7 @@ vl_api_client_index_to_input_queue (u32 index) static clib_error_t * setup_memclnt_exit (vlib_main_t * vm) { - atexit (vl_unmap_shmem_client); + atexit (vl_unmap_shmem); return 0; }
BugID:19137880:change the config name
@@ -34,12 +34,12 @@ ifeq ($(AOS_SENSOR_INT_ENABLE),y) GLOBAL_DEFINES += SENSOR_INT_ENABLE endif -ifeq ($(AOS_SENSOR_IO_I2C_ENABLE),y) +ifeq ($(AOS_SENSOR_I2C_ENABLE),y) GLOBAL_DEFINES += UDATA_MEMS GLOBAL_DEFINES += SENSOR_I2C_ENABLE endif -ifeq ($(AOS_SENSOR_IO_SPI_ENABLE),y) +ifeq ($(AOS_SENSOR_SPI_ENABLE),y) GLOBAL_DEFINES += UDATA_MEMS GLOBAL_DEFINES += SENSOR_SPI_ENABLE endif @@ -59,4 +59,3 @@ endif GLOBAL_INCLUDES += ./include GLOBAL_DEFINES += AOS_SENSOR include $(SOURCE_ROOT)/drivers/sensor/drv.mk -
Add crypto functions to ssmgr.h
@@ -42,6 +42,19 @@ int ksceSblAimgrGetConsoleId(SceConsoleId *cid); int ksceSblAimgrGetOpenPsId(SceOpenPsId *open_psid); int ksceSblAimgrGetPscode(ScePsCode *pscode); +int ksceSblDmac5AesCbcDec(const void *src, void *dst, int size, const void *key, int key_size, void *iv, int mask_enable); +int ksceSblDmac5AesCbcEnc(const void *src, void *dst, int size, const void *key, int key_size, void *iv, int mask_enable); +int ksceSblSsMgrAesCtrDecrypt(const void *src, void *dst, int size, const void *key, int key_size, void *iv, int mask_enable); + +#define ksceSblDmac5AesCtrDec ksceSblSsMgrAesCtrDecrypt + +typedef struct ScePortabilityData { // size is 0x24 + SceSize msg_size; // max size is 0x20 + uint8_t msg[0x20]; +} ScePortabilityData; + +int ksceSblSsDecryptWithPortability(SceUInt32 key_type, void *iv, ScePortabilityData *src, ScePortabilityData *dst); + #ifdef __cplusplus } #endif
Use hard coded /usr/include only on ARM platform
@@ -8,13 +8,11 @@ DEFINES += DECONZ_DLLSPEC=Q_DECL_IMPORT unix:contains(QMAKE_HOST.arch, armv6l) { DEFINES += ARCH_ARM ARCH_ARMV6 + INCLUDEPATH += /usr/include } unix:contains(QMAKE_HOST.arch, armv7l) { DEFINES += ARCH_ARM ARCH_ARMV7 -} - -unix:contains(QMAKE_HOST.arch, armv7l) { - DEFINES += ARCH_ARM ARCH_ARMV7 + INCLUDEPATH += /usr/include } QMAKE_CXXFLAGS += -Wno-attributes \ @@ -49,8 +47,6 @@ QT += network INCLUDEPATH += ../.. \ ../../common -unix:INCLUDEPATH += /usr/include - GIT_COMMIT = $$system("git rev-list HEAD --max-count=1") # Version Major.Minor.Build
mesh: Fixes duplicated close callback When PB-GATT Procedure timeout, func bt_mesh_pb_gatt_close will also dumplicated with link_closed() this is port of
@@ -50,10 +50,6 @@ static void protocol_timeout(struct ble_npl_event *work) BT_DBG("Protocol timeout"); - if (link.conn_handle) { - bt_mesh_pb_gatt_close(link.conn_handle); - } - reset_state(); cb->link_closed(&pb_gatt, link.cb_data,
Make download reference a link
@@ -63,9 +63,10 @@ options ranging from 0.89 bits/pixel up to 8 bits/pixel. # Prebuilt binaries -Prebuilt release build binaries for 64-bit Linux, macOS, and Windows are -available in the GitHub Releases page. Note currently, no 2.x series binaries -are available. +Prebuilt release build binaries of `astcenc` for 64-bit Linux, macOS, and +Windows are available in the +[GitHub Releases page](https://github.com/ARM-software/astc-encoder/releases). +Note that currently no 2.x series pre-built binaries are available. # Getting started
Fix EXTRA_C_FLAGS duplication on Windows
@@ -1275,7 +1275,6 @@ class GnuCompiler(Compiler): emit('OBJECT_SUF', '$OBJ_SUF%s.o' % self.cross_suffix) emit('GCC_COMPILE_FLAGS', '$EXTRA_C_FLAGS -c -o ${output;suf=${OBJECT_SUF}:SRC}', '${input:SRC} ${pre=-I:INCLUDE}') - emit('EXTRA_C_FLAGS') emit('EXTRA_COVERAGE_OUTPUT', '${output;noauto;hide;suf=${OBJ_SUF}%s.gcno:SRC}' % self.cross_suffix) emit('YNDEXER_OUTPUT_FILE', '${output;noauto;suf=${OBJ_SUF}%s.ydx.pb2:SRC}' % self.cross_suffix) # should be the last output @@ -1921,7 +1920,6 @@ class MSVCCompiler(MSVC, Compiler): emit('CFLAGS_DEBUG', flags_debug) emit('CFLAGS_RELEASE', flags_release) emit('MASMFLAGS', '') - emit('EXTRA_C_FLAGS', '') emit('DEBUG_INFO_FLAGS', debug_info_flags) if self.build.is_release: @@ -1943,8 +1941,6 @@ class MSVCCompiler(MSVC, Compiler): append('CFLAGS', '/DY_UCRT_INCLUDE="%s"' % ucrt_include) append('CFLAGS', '/DY_MSVC_INCLUDE="%s"' % vc_include) - append('CFLAGS', '$EXTRA_C_FLAGS') - emit_big(''' when ($NO_OPTIMIZE == "yes") {{ OPTIMIZE = {no_opt}
stop moons pretending to be planets. enables moon booting
=+ myr=(clan:title our) ?: ?=($pawn myr) [[%base %talk] [%base %dojo] ~] - ?: ?=($earl myr) - [[%home %dojo] ~] [[%home %talk] [%home %dojo] ~] :: ++ deft-fish :: default connects |= our/ship %- ~(gas in *(set gill:gall)) ^- (list gill:gall) - ?: ?=($earl (clan:title our)) - [[(sein:title our) %talk] [our %dojo] ~] [[our %talk] [our %dojo] ~] :: ++ drum-make :: initial part
Fix test script not failing when only crashes occur
@@ -236,7 +236,7 @@ $FailXmlText = @" "@ # Global state for tracking if any crashes occurred. -$AnyProcessCrashes = $false +$global:CrashedProcessCount = 0 # Path to the WER registry key used for collecting dumps. $WerDumpRegPath = "HKLM:\Software\Microsoft\Windows\Windows Error Reporting\LocalDumps\$TestExeName" @@ -587,7 +587,7 @@ function Wait-TestCase($TestCase) { } if ($ProcessCrashed) { - $AnyProcessCrashes = $true; + $global:CrashedProcessCount++ } if ($IsolationMode -eq "Batch") { @@ -861,12 +861,14 @@ try { # Print out the results. Log "$($TestCount) test(s) run." - if ($KeepOutputOnSuccess -or ($TestsFailed -ne 0) -or $AnyProcessCrashes) { + if ($KeepOutputOnSuccess -or ($TestsFailed -ne 0) -or ($global:CrashedProcessCount -ne 0)) { Log "Output can be found in $($LogDir)" if ($ErrorsAsWarnings) { Write-Warning "$($TestsFailed) test(s) failed." + Write-Warning "$($TestsFailed) test(s) failed, $($global:CrashedProcessCount) test(s) crashed." } else { - Write-Error "$($TestsFailed) test(s) failed." + Write-Error "$($TestsFailed) test(s) failed, $($global:CrashedProcessCount) test(s) crashed." + $LastExitCode = 1 } } elseif ($AZP -and $TestCount -eq 0) { Write-Error "Failed to run any tests."
[build.sh] Fix distro name parsing if it doesn't have double quotes
@@ -21,7 +21,7 @@ for os_release in ${OS_RELEASE_FILES[@]} ; do if [[ ! -e "${os_release}" ]]; then continue fi - DISTRO=$(sed -rn 's/^NAME="(.+)"/\1/p' ${os_release}) + DISTRO=$(sed -rn 's/^NAME=(.+)/\1/p' ${os_release} | sed 's/"//g') done dependencies() {
test: Add test_008Contract_0007SetAndGetIntArrayContractFuction
@@ -401,6 +401,43 @@ START_TEST(test_008Contract_0006SetAndGetAddressContractFuction) } END_TEST +START_TEST(test_008Contract_0007SetAndGetIntArrayContractFuction) +{ + BoatEthTx tx_ctx; + BoatEthWallet *rtnVal; + BCHAR *result_str; + BOAT_RESULT result; + BSINT32 bs[10]; + BUINT32 i; + BoatFieldVariable parse_result = {NULL, 0}; + BoatEthWalletConfig walletConfig = get_ethereum_wallet_settings(); + + /* 1. execute unit test */ + rtnVal = BoatEthWalletInit(&walletConfig, sizeof(BoatEthWalletConfig)); + ck_assert_ptr_ne(rtnVal, NULL); + + result = BoatEthTxInit(rtnVal, &tx_ctx, BOAT_TRUE, NULL, + "0x333333", + (BCHAR *)TEST_CONTRACT_ADDRESS); + ck_assert_int_eq(result, BOAT_SUCCESS); + + for (i = 0; i < 10; i++) + { + ba[i] = 0 - i; + } + + result_str = TestABIContract_setIntArray(&tx_ctx, bs, 10); + ck_assert_ptr_ne(rtnVal, NULL); + + result_str = TestABIContract_getIntArray(&tx_ctx); + ck_assert_ptr_ne(rtnVal, NULL); + result = BoatEthParseRpcResponseStringResult(result_str, &parse_result); + ck_assert_int_eq(result, BOAT_SUCCESS); + + BoatLog(BOAT_LOG_NORMAL, "readListByIndex returns: %s", parse_result.field_ptr); +} +END_TEST + Suite *make_general_suite(void) { /* Create Suite */ @@ -430,6 +467,8 @@ Suite *make_general_suite(void) tcase_add_test(tc_general_api, test_008Contract_0004SetAndGetStringContractFuction); tcase_add_test(tc_general_api, test_008Contract_0005SetAndGetBytesContractFuction); tcase_add_test(tc_general_api, test_008Contract_0006SetAndGetAddressContractFuction); + tcase_add_test(tc_general_api, test_008Contract_0007SetAndGetIntArrayContractFuction); + return s_general; } \ No newline at end of file
python: add error check to Python_AppendToSysPath, do not pass nullptr to logger
@@ -81,7 +81,10 @@ static int Python_AppendToSysPath (const char * path) PyObject * sysPath = PySys_GetObject ((char *) "path"); PyObject * pyPath = PyUnicode_FromString (path); - PyList_Append (sysPath, pyPath); + if (PyList_Append (sysPath, pyPath) == -1) + { + return 0; + } Py_DECREF (pyPath); return 1; } @@ -265,6 +268,10 @@ int PYTHON_PLUGIN_FUNCTION (Open) (ckdb::Plugin * handle, ckdb::Key * errorKey) const char * mname = keyString (ksLookupByName (elektraPluginGetConfig (handle), "/python/path", 0)); if (!Python_AppendToSysPath (mname)) { + if (!mname) + { + mname = "<nullptr>"; + } ELEKTRA_SET_INSTALLATION_ERRORF (errorKey, "Unable to extend sys.path with user-defined /python/path '%s'", mname); goto error; } @@ -291,6 +298,10 @@ int PYTHON_PLUGIN_FUNCTION (Open) (ckdb::Plugin * handle, ckdb::Key * errorKey) const char * dname = dirname (tmpScript); if (!Python_AppendToSysPath (dname)) { + if (!dname) + { + dname = "<nullptr>"; + } ELEKTRA_SET_INSTALLATION_ERRORF (errorKey, "Unable to extend sys.path with script dirname '%s'", dname); elektraFree (tmpScript); goto error;
stm32: stop mpy script with button
@@ -167,6 +167,9 @@ static void run_user_program(uint32_t len, uint8_t *buf) { // Convert buf to raw code and do m_free(buf) in the process mp_raw_code_t *raw_code = mp_raw_code_load(&reader); + // Allow script to be stopped with hub button + mp_hal_set_interrupt_char(3); + nlr_buf_t nlr; if (nlr_push(&nlr) == 0) { mp_obj_t module_fun = mp_make_function_from_raw_code(raw_code, MP_OBJ_NULL, MP_OBJ_NULL); @@ -176,6 +179,9 @@ static void run_user_program(uint32_t len, uint8_t *buf) { // nlr_jump(nlr.ret_val); mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val); } + + // Reset interrupt + mp_hal_set_interrupt_char(-1); } // callback for when stop button is pressed
horadric update (299266638)
}, "horadric":{ "formula": { - "sandbox_id": 299204033, + "sandbox_id": 299266638, "match": "horadric" }, "executable": {
Use 3.5-SNAPSHOT to get compatibility module fix
@@ -60,7 +60,7 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test => new Group(test.name, Seq(test), SubProcess(options)) } toSeq -val chiselVersion = "3.5.0" +val chiselVersion = "3.5-SNAPSHOT" lazy val chiselSettings = Seq( libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chiselVersion),