message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
Launch kb driver and tty during bootstrap | #include <kernel/interrupts/interrupts.h>
//kernel drivers
+#include <kernel/drivers/kb/kb.h>
#include <kernel/drivers/pit/pit.h>
#include <kernel/drivers/serial/serial.h>
#include <kernel/drivers/text_mode/text_mode.h>
@@ -77,7 +78,44 @@ static void awm_init() {
char* argv[] = {program_name, ptr, NULL};
elf_load_file(program_name, fp, argv);
- while (1) {}
+ panic("noreturn");
+}
+
+static void cat() {
+ const char* program_name = "cat";
+
+ FILE* fp = initrd_fopen(program_name, "rb");
+ char* argv[] = {program_name, "test-file.txt", NULL};
+ elf_load_file(program_name, fp, argv);
+ panic("noreturn");
+}
+
+static void window() {
+ const char* program_name = "window";
+
+ FILE* fp = initrd_fopen(program_name, "rb");
+ char* argv[] = {program_name, NULL};
+ elf_load_file(program_name, fp, argv);
+ panic("noreturn");
+}
+
+static void tty_init() {
+ const char* program_name = "tty";
+ FILE* fp = initrd_fopen(program_name, "rb");
+ char* argv[] = {program_name, NULL};
+ elf_load_file(program_name, fp, argv);
+ panic("noreturn");
+ uint8_t scancode = inb(0x60);
+}
+
+static void acker() {
+ while (true) {
+ //sleep(1000);
+ sleep(20);
+ char scancode = 'a';
+ amc_message_t* amc_msg = amc_message_construct__from_core(STDOUT, &scancode, 1);
+ amc_message_send("com.user.window", amc_msg);
+ }
}
uint32_t initial_esp = 0;
@@ -115,8 +153,14 @@ void kernel_main(struct multiboot_info* mboot_ptr, uint32_t initial_stack) {
// Now that multitasking / program loading is available,
// launch external services and drivers
- kb_init();
+ task_spawn(kb_init);
task_spawn(awm_init);
+ task_spawn(tty_init);
+
+ sleep(1000);
+ //task_spawn(cat);
+ //task_spawn(acker);
+ task_spawn(window);
// Bootstrapping complete - kill this process
printf("[t = %d] Bootstrap task [PID %d] will exit\n", time(), getpid());
|
[flang-339906] Fix Makefile to skip Makefile.defs because test needsaux object generated BEFORE main is compiled | @@ -9,4 +9,21 @@ FLANG = flang
OMP_BIN = $(AOMP)/bin/$(FLANG)
CC = $(OMP_BIN) $(VERBOSE)
-include ../Makefile.rules
+# Skip Makefile.defs, because test needs aux object generated before main binary
+TESTSRC_AUX_OBJ = matrix.o
+all: $(TESTNAME)
+
+$(TESTSRC_AUX_OBJ) : $(TESTSRC_AUX)
+ $(SETENV) $(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) $(OMP_FLAGS) $^ -o $@
+
+$(TESTNAME) : $(TESTSRC_MAIN) $(TESTSRC_AUX_OBJ)
+ $(SETENV) $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(OMP_FLAGS) $^ -o $@
+
+run: $(TESTNAME)
+ $(RUNENV) $(RUNPROF) ./$(TESTNAME) 2>&1 | tee [email protected]
+
+clean:
+ rm -f $(TESTNAME) $(TESTSRC_AUX_OBJ) *.i *.ii *.bc *.lk a.out-* *.ll *.s *.o *.log *.mod verify_output *.stb *.ilm *.cmod *.cmdx $(TESTNAME)_og11
+
+clean_log:
+ rm -f *.log
|
Fix theme header subclass callback | @@ -1865,7 +1865,7 @@ LRESULT CALLBACK PhpThemeWindowHeaderSubclassProc(
break;
case WM_CONTEXTMENU:
{
- LRESULT result = DefSubclassProc(WindowHandle, uMsg, wParam, lParam);
+ LRESULT result = CallWindowProc(oldWndProc, WindowHandle, uMsg, wParam, lParam);
InvalidateRect(WindowHandle, NULL, TRUE);
|
rename global sockets | // Next time to do DHT maintenance
static time_t g_dht_maintenance = 0;
-static int s4 = -1;
-static int s6 = -1;
+static int g_dht_socket4 = -1;
+static int g_dht_socket6 = -1;
void dht_lock_init( void ) {
#ifdef PTHREAD
@@ -284,15 +284,15 @@ void kad_setup( void ) {
//gconf->dht_addr
if( gconf->af == AF_INET ) {
- s4 = net_bind( "KAD", gconf->dht_addr, gconf->dht_port, gconf->dht_ifname, IPPROTO_UDP, AF_INET );
- net_add_handler( s4, &dht_handler );
+ g_dht_socket4 = net_bind( "KAD", gconf->dht_addr, gconf->dht_port, gconf->dht_ifname, IPPROTO_UDP, AF_INET );
+ net_add_handler( g_dht_socket4, &dht_handler );
} else {
- s6 = net_bind( "KAD", gconf->dht_addr, gconf->dht_port, gconf->dht_ifname, IPPROTO_UDP, AF_INET6 );
- net_add_handler( s6, &dht_handler );
+ g_dht_socket6 = net_bind( "KAD", gconf->dht_addr, gconf->dht_port, gconf->dht_ifname, IPPROTO_UDP, AF_INET6 );
+ net_add_handler( g_dht_socket6, &dht_handler );
}
// Init the DHT. Also set the sockets into non-blocking mode.
- if( dht_init( s4, s6, node_id, (uint8_t*) "KN\0\0") < 0 ) {
+ if( dht_init( g_dht_socket4, g_dht_socket6, node_id, (uint8_t*) "KN\0\0") < 0 ) {
log_err( "KAD: Failed to initialize the DHT." );
exit( 1 );
}
|
Removes and modifies tests
Removes and modifies tests for
mbedtls_rsa_rsaes_oaep_encrypt. | @@ -129,31 +129,25 @@ void rsa_invalid_param( )
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
mbedtls_rsa_rsaes_oaep_encrypt( NULL, NULL, NULL,
- valid_mode,
- buf, sizeof( buf ),
- sizeof( buf ), buf,
- buf ) );
- TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
- mbedtls_rsa_rsaes_oaep_encrypt( &ctx, NULL, NULL,
- invalid_mode,
+ MBEDTLS_RSA_PUBLIC,
buf, sizeof( buf ),
sizeof( buf ), buf,
buf ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
mbedtls_rsa_rsaes_oaep_encrypt( &ctx, NULL, NULL,
- valid_mode,
+ MBEDTLS_RSA_PUBLIC,
NULL, sizeof( buf ),
sizeof( buf ), buf,
buf ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
mbedtls_rsa_rsaes_oaep_encrypt( &ctx, NULL, NULL,
- valid_mode,
+ MBEDTLS_RSA_PUBLIC,
buf, sizeof( buf ),
sizeof( buf ), NULL,
buf ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
mbedtls_rsa_rsaes_oaep_encrypt( &ctx, NULL, NULL,
- valid_mode,
+ MBEDTLS_RSA_PUBLIC,
buf, sizeof( buf ),
sizeof( buf ), buf,
NULL ) );
|
newline if puts with no params | @@ -385,9 +385,13 @@ static void c_p(mrb_vm *vm, mrb_value v[], int argc)
static void c_puts(mrb_vm *vm, mrb_value v[], int argc)
{
int i;
+ if( argc ){
for( i = 1; i <= argc; i++ ) {
if( mrbc_puts_sub( &v[i] ) == 0 ) console_putchar('\n');
}
+ } else {
+ console_putchar('\n');
+ }
}
|
reorganised selection of flags for compilers in configure.ac | @@ -66,23 +66,29 @@ AC_SUBST(LIBCURRENT)
AC_SUBST(LIBREVISION)
AC_SUBST(LIBAGE)
+AC_LANG([C])
AC_PROG_CC_C99
-AC_PROG_CXX
-
AS_IF([test "$GCC" = yes],
[AX_APPEND_COMPILE_FLAGS([-Wall], [CFLAGS])
-
dnl Be careful about adding the -fexceptions option; some versions of
dnl GCC don't support it and it causes extra warnings that are only
dnl distracting; avoid.
AX_APPEND_COMPILE_FLAGS([-fexceptions], [CFLAGS])
+ AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes], [CFLAGS])])
- AS_IF([test "x$CXXFLAGS" = x],
- [AS_VAR_COPY(CXXFLAGS, CFLAGS)])
+AC_LANG_PUSH([C++])
+AC_PROG_CXX
+AS_IF([test "$GCC" = yes],
+ [AX_APPEND_COMPILE_FLAGS([-Wall], [CXXFLAGS])
+ dnl Be careful about adding the -fexceptions option; some versions of
+ dnl GCC don't support it and it causes extra warnings that are only
+ dnl distracting; avoid.
+ AX_APPEND_COMPILE_FLAGS([-fexceptions], [CXXFLAGS])
+ AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing], [CXXFLAGS])])
+AC_LANG_POP([C++])
- AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes], [CFLAGS])
- AS_VAR_APPEND(CXXFLAGS, " -fno-strict-aliasing")
- AS_VAR_APPEND(LDFLAGS, " -fno-strict-aliasing")])
+AS_IF([test "$GCC" = yes],
+ [AS_VAR_APPEND(LDFLAGS, " -fno-strict-aliasing")])
AC_MSG_CHECKING(whether compiler supports visibility)
AS_VAR_COPY(OLDCFLAGS,CFLAGS)
|
slight cleanup of | @@ -785,7 +785,9 @@ static mi_page_t* mi_huge_page_alloc(mi_heap_t* heap, size_t size) {
}
-static mi_page_t *_mi_find_page(mi_heap_t* heap, size_t size) mi_attr_noexcept {
+// Allocate a page
+// Note: in debug mode the size includes MI_PADDING_SIZE and might have overflowed.
+static mi_page_t* mi_find_page(mi_heap_t* heap, size_t size) mi_attr_noexcept {
// huge allocation?
const size_t req_size = size - MI_PADDING_SIZE; // correct for padding_size in case of an overflow on `size`
if (mi_unlikely(req_size > (MI_LARGE_OBJ_SIZE_MAX - MI_PADDING_SIZE) )) {
@@ -797,11 +799,12 @@ static mi_page_t *_mi_find_page(mi_heap_t* heap, size_t size) mi_attr_noexcept {
return mi_huge_page_alloc(heap,size);
}
}
-
+ else {
// otherwise find a page with free blocks in our size segregated queues
mi_assert_internal(size >= MI_PADDING_SIZE);
return mi_find_free_page(heap, size);
}
+}
// Generic allocation routine if the fast path (`alloc.c:mi_page_malloc`) does not succeed.
// Note: in debug mode the size includes MI_PADDING_SIZE and might have overflowed.
@@ -822,10 +825,11 @@ void* _mi_malloc_generic(mi_heap_t* heap, size_t size) mi_attr_noexcept
// free delayed frees from other threads
_mi_heap_delayed_free(heap);
- mi_page_t* page = _mi_find_page(heap, size);
- if (mi_unlikely(page == NULL)) { // out of memory, try to collect and retry allocation
+ // find (or allocate) a page of the right size
+ mi_page_t* page = mi_find_page(heap, size);
+ if (mi_unlikely(page == NULL)) { // first time out of memory, try to collect and retry the allocation once more
mi_heap_collect(heap, true /* force */);
- page = _mi_find_page(heap, size);
+ page = mi_find_page(heap, size);
}
if (mi_unlikely(page == NULL)) { // out of memory
|
replace libretro-common 42 | @@ -196,15 +196,6 @@ else ifeq ($(platform), rpi3)
PLATFORM_DEFINES += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -ffast-math
PLATFORM_DEFINES += -DARM
-# Lightweight PS3 Homebrew SDK
-else ifeq ($(platform), psl1ght)
- TARGET := $(TARGET_NAME)_libretro_$(platform).a
- CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
- CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT)
- AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
- PLATFORM_DEFINES := -D__CELLOS_LV2__
- STATIC_LINKING = 1
-
# Windows MSVC 2003 Xbox 1
else ifeq ($(platform), xbox1_msvc2003)
TARGET := $(TARGET_NAME)_libretro_xdk1.lib
|
Fix the error handling in ERR_get_state:
Ignoring the return code of ossl_init_thread_start created a memory leak. | @@ -642,7 +642,7 @@ const char *ERR_reason_error_string(unsigned long e)
void err_delete_thread_state(void)
{
- ERR_STATE *state = ERR_get_state();
+ ERR_STATE *state = CRYPTO_THREAD_get_local(&err_thread_local);
if (state == NULL)
return;
@@ -682,14 +682,14 @@ ERR_STATE *ERR_get_state(void)
if (state == NULL)
return NULL;
- if (!CRYPTO_THREAD_set_local(&err_thread_local, state)) {
+ if (!ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE)
+ || !CRYPTO_THREAD_set_local(&err_thread_local, state)) {
ERR_STATE_free(state);
return NULL;
}
/* Ignore failures from these */
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
- ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE);
}
return state;
|
Always Validate Retry Token
Updates the server side retry token logic to always validate the token if present. This is required because the client validates the server eventually sends the correct transport parameter in return; and we only do that if we validate the token. | @@ -895,16 +895,6 @@ QuicBindingQueueStatelessReset(
QUIC_DBG_ASSERT(!Binding->Exclusive);
QUIC_DBG_ASSERT(!((QUIC_SHORT_HEADER_V1*)Datagram->Buffer)->IsLongHeader);
- //
- // We don't respond to long header packets because the peer generally
- // doesn't even have the stateless reset token yet. We don't respond to
- // small short header packets because it could cause an infinite loop.
- //
- const QUIC_SHORT_HEADER_V1* Header = (QUIC_SHORT_HEADER_V1*)Datagram->Buffer;
- if (Header->IsLongHeader) {
- return FALSE; // No packet drop log, because it was already logged in QuicBindingShouldCreateConnection.
- }
-
if (Datagram->BufferLength <= QUIC_MIN_STATELESS_RESET_PACKET_LENGTH) {
QuicPacketLogDrop(Binding, QuicDataPathRecvDatagramToRecvPacket(Datagram),
"Packet too short for stateless reset");
@@ -989,9 +979,12 @@ QuicBindingPreprocessPacket(
return TRUE;
}
+//
+// Returns TRUE if the retry token was successfully decrypted and validated.
+//
_IRQL_requires_max_(DISPATCH_LEVEL)
BOOLEAN
-QuicBindingProcessRetryToken(
+QuicBindingValidateRetryToken(
_In_ const QUIC_BINDING* const Binding,
_In_ const QUIC_RECV_PACKET* const Packet,
_In_ uint16_t TokenLength,
@@ -1025,6 +1018,10 @@ QuicBindingProcessRetryToken(
return TRUE;
}
+//
+// Returns TRUE if we should respond to the connection attempt with a Retry
+// packet.
+//
_IRQL_requires_max_(DISPATCH_LEVEL)
BOOLEAN
QuicBindingShouldRetryConnection(
@@ -1037,31 +1034,29 @@ QuicBindingShouldRetryConnection(
)
{
//
- // The function is only called once QuicBindingShouldCreateConnection has
- // already returned TRUE. It checks to see if the binding currently has too
- // many connections in the handshake state already. If so, it requests the
- // client to retry its connection attempt to prove source address ownership.
+ // This is only called once we've determined we can create a new connection.
+ // If there is a token, it validates the token. If there is no token, then
+ // the function checks to see if the binding currently has too many
+ // connections in the handshake state already. If so, it requests the client
+ // to retry its connection attempt to prove source address ownership.
//
- uint64_t CurrentMemoryLimit =
- (MsQuicLib.Settings.RetryMemoryLimit * QuicTotalMemory) / UINT16_MAX;
-
- if (MsQuicLib.CurrentHandshakeMemoryUsage < CurrentMemoryLimit) {
- return FALSE;
- }
-
- if (TokenLength == 0) {
- return TRUE;
- }
-
- if (!QuicBindingProcessRetryToken(Binding, Packet, TokenLength, Token)) {
+ if (TokenLength != 0) {
+ //
+ // Must always validate the token when provided by the client.
+ //
+ if (QuicBindingValidateRetryToken(Binding, Packet, TokenLength, Token)) {
+ Packet->ValidToken = TRUE;
+ } else {
*DropPacket = TRUE;
+ }
return FALSE;
}
- Packet->ValidToken = TRUE;
+ uint64_t CurrentMemoryLimit =
+ (MsQuicLib.Settings.RetryMemoryLimit * QuicTotalMemory) / UINT16_MAX;
- return FALSE;
+ return MsQuicLib.CurrentHandshakeMemoryUsage > CurrentMemoryLimit;
}
_IRQL_requires_max_(DISPATCH_LEVEL)
|
Fix IAS processing for multi resource sensors
Pick only the sensor which has a IAS cluster in the finger print. | @@ -108,6 +108,11 @@ void DeRestPluginPrivate::handleIasZoneClusterIndication(const deCONZ::ApsDataIn
continue;
}
+ if (!s.fingerPrint().hasInCluster(IAS_ZONE_CLUSTER_ID) && !s.fingerPrint().hasInCluster(IAS_WD_CLUSTER_ID))
+ {
+ continue;
+ }
+
if (s.type() != QLatin1String("ZHAAlarm") &&
s.type() != QLatin1String("ZHACarbonMonoxide") &&
s.type() != QLatin1String("ZHAFire") &&
|
Fix compilation errors when LCACHE is disabled.
JerryScript-DCO-1.0-Signed-off-by: Slavey Karadzhov | @@ -127,6 +127,8 @@ ecma_lcache_insert (ecma_object_t *object_p, /**< object */
entry_p->prop_p = prop_p;
ecma_set_property_lcached (entry_p->prop_p, true);
+#else /* CONFIG_ECMA_LCACHE_DISABLE */
+ JERRY_UNUSED (name_cp);
#endif /* !CONFIG_ECMA_LCACHE_DISABLE */
} /* ecma_lcache_insert */
@@ -266,6 +268,8 @@ ecma_lcache_invalidate (ecma_object_t *object_p, /**< object */
/* The property must be present. */
JERRY_UNREACHABLE ();
+#else /* CONFIG_ECMA_LCACHE_DISABLE */
+ JERRY_UNUSED (name_cp);
#endif /* !CONFIG_ECMA_LCACHE_DISABLE */
} /* ecma_lcache_invalidate */
|
libbpf-tools: update filetop for libbpf 1.0
Switch to libbpf 1.0 mode and adapt libbpf API usage accordingly. | @@ -256,11 +256,7 @@ int main(int argc, char **argv)
if (err)
return err;
- err = bump_memlock_rlimit();
- if (err) {
- warn("failed to increase rlimit: %d\n", err);
- return 1;
- }
+ libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
obj = filetop_bpf__open();
if (!obj) {
|
nat44: make nat44-ed-hairpin-src follow arc
It defaults to using interface-output as the next node. If other
output features are enabled on the ip4-output arc, they get skipped.
That makes me sad. | @@ -826,7 +826,7 @@ snat_hairpin_src_fn_inline (vlib_main_t * vm,
b0 = vlib_get_buffer (vm, bi0);
sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
- next0 = SNAT_HAIRPIN_SRC_NEXT_INTERFACE_OUTPUT;
+ vnet_feature_next (&next0, b0);
/* *INDENT-OFF* */
pool_foreach (i, sm->output_feature_interfaces,
|
added another TODO for optimization potential | @@ -87,6 +87,7 @@ int init_buffer_and_device(Sound_samples *sound_samples,
}
/* Allocating active audio buffer location*/
+ //TODO: Allocate one huge active audio buffer with length of the maximum of all audio buffer, instead of one active buffer for each audio
sound_samples->active_audio_buf_array = PUSH_LT(sound_samples->lt, nth_calloc(sound_samples->samples_count, sizeof(uint8_t*)), free);
if (sound_samples->active_audio_buf_array == NULL) {
log_fail("Failed to allocate memory for active audio buffer pointer array\n");
|
Fix Linux OneBranch Builds | @@ -459,6 +459,7 @@ if ($IsLinux) {
sudo apt-get install -y cmake
sudo apt-get install -y build-essential
sudo apt-get install -y liblttng-ust-dev
+ sudo apt-get install -y libssl-dev
# only used for the codecheck CI run:
sudo apt-get install -y cppcheck clang-tidy
# used for packaging
|
update readme_en
fix issue | -# BoAT-X Framework for China Mobile YanFei-CUIot-MZ-6 Integration Guideline
+# BoAT-X Framework for China Unicom YanFei-CUIot-MZ-6 Integration Guideline
## About This Guideline
|
STM32 blinky tutorial update
Because support of STM32 is located in mynewt-core, no external repos are necessary. | @@ -49,45 +49,6 @@ re-use that project.
**Note:** Don't forget to change into the ``myproj`` directory.
-Import External STM32F3 Library support
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The STM32F303 support for Mynewt lives in an external repository. It's
-necessary to add another repository to the project. To do this, edit the
-file ``project.yml`` in the root directory of your project ``myproj``
-
-This requires two changes to this file.
-
-1. You must define the properties of the external repository that you
- want to add
-2. You must include the repository in your project.
-
-Edit the file ``project.yml`` with your favorite editor and add the
-following repository details in the file (after the core repository).
-This gives newt the information to contact the repository and extract
-its contents. In this case, the repository is on github in the
-``runtimeco`` collection. Its name is ``mynewt-stm32f3`` and we will
-accept any version up to the latest. You can look at the contents
-`here <https://github.com/runtimeco/mynewt_stm32f3>`__.
-
-::
-
- repository.mynewt_stm32f3:
- type: github
- vers: 0-latest
- user: runtimeco
- repo: mynewt_stm32f3
-
-In the same file, add the following highlighted line to the
-``project.repositories`` variable. This tells newt to download the
-repository contents into your project.
-
-::
-
- project.repositories:
- - apache-mynewt-core
- - mynewt_stm32f3
-
Install dependencies
~~~~~~~~~~~~~~~~~~~~
@@ -121,23 +82,23 @@ the bootloader which allows you to upgrade your mynewt applications.
$ newt target create stmf3_blinky
$ newt target set stmf3_blinky build_profile=optimized
- $ newt target set stmf3_blinky bsp=@mynewt_stm32f3/hw/bsp/stm32f3discovery
+ $ newt target set stmf3_blinky bsp=@apache-mynewt-core/hw/bsp/stm32f3discovery
$ newt target set stmf3_blinky app=apps/blinky
$ newt target create stmf3_boot
- $ newt target set stmf3_boot app=@apache-mynewt-core/apps/boot
- $ newt target set stmf3_boot bsp=@mynewt_stm32f3/hw/bsp/stm32f3discovery
+ $ newt target set stmf3_boot app=@mcuboot/boot/mynewt
+ $ newt target set stmf3_boot bsp=@apache-mynewt-core/hw/bsp/stm32f3discovery
$ newt target set stmf3_boot build_profile=optimized
$ newt target show
targets/stmf3_blinky
app=apps/blinky
- bsp=@mynewt_stm32f3/hw/bsp/stm32f3discovery
+ bsp=@apache-mynewt-core/hw/bsp/stm32f3discovery
build_profile=optimized
targets/stmf3_boot
- app=apps/boot
- bsp=@mynewt_stm32f3/hw/bsp/stm32f3discovery
+ app=@mcuboot/boot/mynewt
+ bsp=@apache-mynewt-core/hw/bsp/stm32f3discovery
build_profile=optimized
Build the target executables
|
defining lv_group_remove_all_objs
`lv_group_remove_all_objs` is a function for removing all objects from a group and making it free of objects. | @@ -193,6 +193,28 @@ void lv_group_remove_obj(lv_obj_t * obj)
}
}
+/**
+ * remove all objects from a group
+ * @param group pointer to a group
+ */
+void lv_group_remove_all_objs(lv_group_t * group)
+{
+ /*Defocus the the currently focused object*/
+ if(group->obj_focus != NULL) {
+ (*group->obj_focus)->signal_cb(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL);
+ lv_obj_invalidate(*group->obj_focus);
+ group->obj_focus = NULL;
+ }
+
+ /*Remove the objects from the group*/
+ lv_obj_t ** obj;
+ LV_LL_READ(group->obj_ll, obj) {
+ (*obj)->group_p = NULL;
+ }
+
+ lv_ll_clear(&(group->obj_ll));
+}
+
/**
* Focus on an object (defocus the current)
* @param obj pointer to an object to focus on
|
test-suite: bump singularity centos altarch repo to v7.5.1804 | @@ -32,7 +32,7 @@ if [ "x$DISTRO_FAMILY" == "xCentOS" -o "x$DISTRO_FAMILY" == "xRHEL" ];then
local version="$(rpm -q --queryformat='%{VERSION}\n' singularity-ohpc)"
export DISTRO=centos
export BOOTSTRAP_DEF=/opt/ohpc/pub/doc/contrib/singularity-ohpc-$version/examples/${DISTRO}/Singularity
- export ALTARCH_MIRROR=http://mirror.centos.org/altarch/7.4.1708/os/aarch64/
+ export ALTARCH_MIRROR=http://mirror.centos.org/altarch/7.5.1804/os/aarch64/
else
export DISTRO=opensuse
export BOOTSTRAP_DEF=/opt/ohpc/pub/doc/contrib/singularity-ohpc/examples/${DISTRO}/Singularity
|
Use mbedtls_mpi_core_sub_int() in mbedtls_mpi_sub_abs() | @@ -968,17 +968,15 @@ int mbedtls_mpi_sub_abs( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi
carry = mbedtls_mpi_core_sub( X->p, A->p, B->p, n );
if( carry != 0 )
{
- /* Propagate the carry to the first nonzero limb of X. */
- for( ; n < X->n && X->p[n] == 0; n++ )
- --X->p[n];
- /* If we ran out of space for the carry, it means that the result
- * is negative. */
- if( n == X->n )
+ /* Propagate the carry through the rest of X. */
+ carry = mbedtls_mpi_core_sub_int( X->p + n, X->p + n, carry, X->n - n );
+
+ /* If we have further carry/borrow, the result is negative. */
+ if( carry != 0 )
{
ret = MBEDTLS_ERR_MPI_NEGATIVE_VALUE;
goto cleanup;
}
- --X->p[n];
}
/* X should always be positive as a result of unsigned subtractions. */
|
add 0.75 alpha to spinner | +from ImageProcess import imageproc
from ImageProcess.PrepareFrames.YImage import YImage
spinnercircle = "spinner-circle"
@@ -15,5 +16,5 @@ def prepare_spinner(scale):
n = [spinnercircle, spinnerbackground, spinnerbottom, spinnerspin, spinnermetre, spinnerapproachcircle,
spinnertop]
for img in n:
- spinner_images[img] = YImage(img, scale).img
+ spinner_images[img] = imageproc.newalpha(YImage(img, scale).img, 0.75)
return spinner_images
|
nvhw/xf: Fix alpha passthru with light material diffuse. | @@ -912,7 +912,6 @@ struct pgraph_celsius_lt_in {
uint32_t ed[3];
uint32_t col0[3];
uint32_t col1[3];
- uint32_t alpha;
};
struct pgraph_celsius_lt_res {
@@ -1005,11 +1004,7 @@ void pgraph_celsius_lt_full(struct pgraph_celsius_lt_res *res, struct pgraph_cel
}
pgraph_celsius_lt_vmov(res->col1, ltctx[0x2c]);
- if (!lm_d) {
res->alpha = ltc3[0xb];
- } else {
- res->alpha = in->alpha;
- }
}
}
@@ -1018,6 +1013,7 @@ void pgraph_celsius_xfrm(struct pgraph_state *state, int idx) {
uint32_t mode_b = state->celsius_xf_misc_b;
bool bypass = extr(mode_a, 28, 1);
bool light = extr(mode_b, 29, 1);
+ bool lm_d = extr(mode_a, 23, 1);
uint32_t opos[4];
uint32_t otxc[2][4];
@@ -1062,7 +1058,6 @@ void pgraph_celsius_xfrm(struct pgraph_state *state, int idx) {
lti.col1[0] = pgraph_celsius_convert_light_v(icol[1][0]);
lti.col1[1] = pgraph_celsius_convert_light_v(icol[1][1]);
lti.col1[2] = pgraph_celsius_convert_light_v(icol[1][2]);
- lti.alpha = pgraph_celsius_convert_light_v(icol[0][3]);
pgraph_celsius_lt_full(<, <i, state);
ocol[0][0] = lt.col0[0];
ocol[0][1] = lt.col0[1];
@@ -1070,7 +1065,7 @@ void pgraph_celsius_xfrm(struct pgraph_state *state, int idx) {
ocol[1][0] = lt.col1[0];
ocol[1][1] = lt.col1[1];
ocol[1][2] = lt.col1[2];
- if (light) {
+ if (light && !lm_d) {
ocol[0][3] = lt.alpha;
} else {
ocol[0][3] = icol[0][3];
|
readme: Add missing `public` in example. | @@ -13,7 +13,7 @@ Lily is a programming language focused on expressiveness and type safety.
```
scoped enum Color { Black, Blue, Cyan, Green, Magenta, Red, White, Yellow }
-class Terminal(var @foreground: Color, width_str: String)
+class Terminal(public var @foreground: Color, width_str: String)
{
public var @width = width_str.parse_i().unwrap_or(80)
|
Device: forward events via signal to enqueueEvent() | @@ -702,6 +702,8 @@ Device::Device(DeviceKey key, QObject *parent) :
Resource(RDevices),
m_deviceKey(key)
{
+ Q_ASSERT(parent);
+ connect(this, SIGNAL(eventNotify(Event)), parent, SLOT(enqueueEvent(Event)));
addItem(DataTypeBool, RStateReachable);
addItem(DataTypeUInt64, RAttrExtAddress);
addItem(DataTypeUInt16, RAttrNwkAddress);
|
CRYPTO_gcm128_decrypt: fix mac or tag calculation
The incorrect code is in #ifdef branch that is normally
not compiled in. | @@ -1359,8 +1359,8 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
else
ctx->Yi.d[3] = ctr;
for (i = 0; i < 16 / sizeof(size_t); ++i) {
- size_t c = in[i];
- out[i] = c ^ ctx->EKi.t[i];
+ size_t c = in_t[i];
+ out_t[i] = c ^ ctx->EKi.t[i];
ctx->Xi.t[i] ^= c;
}
GCM_MUL(ctx);
|
ACRN:DM: Add pointer check before use the erst
The event ring segment table pointer may be NULL when get the address
from guest, add pointer check before use it.
Acked-by: Wang, Yu1 | @@ -1817,6 +1817,11 @@ pci_xhci_insert_event(struct pci_xhci_vdev *xdev,
int erdp_idx;
rts = &xdev->rtsregs;
+ if (&rts->erstba_p == NULL) {
+ UPRINTF(LFTL, "Invalid Event Ring Segment Table base address!\r\n");
+ return -EINVAL;
+ }
+
erdp = rts->intrreg.erdp & ~0xF;
erst = &rts->erstba_p[rts->er_enq_seg];
erdp_idx = (erdp - erst->qwRingSegBase) / sizeof(struct xhci_trb);
|
Update find_mkl.lua | @@ -39,13 +39,12 @@ function main(opt)
-- init search paths
local paths = {
- "$(env ONEAPI_ROOT)\\mkl\\latest",
- "$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{09085019-08A5-40A0-B0E8-570C171997A0};InstallLocation)\\mkl\\latest"
+ "$(env ONEAPI_ROOT)\\mkl\\latest"
}
-- find library
local result = {links = {}, linkdirs = {}, includedirs = {}}
- local linkinfo = find_library("mkl_core", paths, {suffixes = "lib\\" .. rdir})
+ local linkinfo = find_library("mkl_core", paths, {suffixes = path.join("lib", rdir)})
if not linkinfo then
-- not found?
return
|
vell: Update fan table version 7
BRANCH=none
TEST=Thermal team verified thermal policy is expected.
Tested-by: Devin Lu | @@ -37,27 +37,27 @@ struct fan_step {
static const struct fan_step fan_table[] = {
{
/* level 0 */
- .on = { 48, 62, 48, 50, -1 },
+ .on = { 47, 62, 48, 50, -1 },
.off = { 99, 99, 99, 99, -1 },
.rpm = { 0 },
},
{
/* level 1 */
- .on = { 50, 62, 50, 52, -1 },
- .off = { 47, 99, 47, 49, -1 },
- .rpm = { 3200 },
+ .on = { 49, 62, 50, 52, -1 },
+ .off = { 46, 99, 47, 49, -1 },
+ .rpm = { 3100 },
},
{
/* level 2 */
- .on = { 53, 62, 53, 54, -1 },
- .off = { 49, 99, 49, 51, -1 },
- .rpm = { 4050 },
+ .on = { 51, 62, 53, 54, -1 },
+ .off = { 48, 99, 49, 51, -1 },
+ .rpm = { 3750 },
},
{
/* level 3 */
.on = { 100, 100, 100, 100, -1 },
- .off = { 51, 60, 51, 52, -1 },
- .rpm = { 5800 },
+ .off = { 50, 60, 51, 52, -1 },
+ .rpm = { 5100 },
},
};
|
fixed sprite corruption, second attempt :) | @@ -231,7 +231,6 @@ static void processSelectCanvasMouse(Sprite* sprite, s32 x, s32 y)
{
tic_rect rect = {x, y, CANVAS_SIZE, CANVAS_SIZE};
const s32 Size = CANVAS_SIZE / sprite->size;
- bool endDrag = false;
if(checkMousePos(&rect))
{
@@ -266,16 +265,13 @@ static void processSelectCanvasMouse(Sprite* sprite, s32 x, s32 y)
sprite->select.rect = (tic_rect){sprite->select.start.x, sprite->select.start.y, 1, 1};
}
}
- else endDrag = sprite->select.drag;
- }
- else endDrag = sprite->select.drag;
-
- if(endDrag)
+ else if(sprite->select.drag)
{
copySelection(sprite);
sprite->select.drag = false;
}
}
+}
static void floodFill(Sprite* sprite, s32 l, s32 t, s32 r, s32 b, s32 x, s32 y, u8 color, u8 fill)
{
@@ -1565,6 +1561,8 @@ static void processKeyboard(Sprite* sprite)
else
{
if(hasCanvasSelection(sprite))
+ {
+ if(!sprite->select.drag)
{
if(keyWasPressed(tic_key_up)) upCanvas(sprite);
else if(keyWasPressed(tic_key_down)) downCanvas(sprite);
@@ -1572,6 +1570,7 @@ static void processKeyboard(Sprite* sprite)
else if(keyWasPressed(tic_key_right)) rightCanvas(sprite);
else if(keyWasPressed(tic_key_delete)) deleteCanvas(sprite);
}
+ }
else
{
if(keyWasPressed(tic_key_up)) upSprite(sprite);
|
travis: use clang 10 instead of clang 9 | @@ -31,19 +31,19 @@ jobs:
- gcc-9
- g++-9
- - name: "clang-9"
- compiler: clang-9
+ - name: "clang-10"
+ compiler: clang-10
env:
- - C_COMPILER=clang-9
- - CXX_COMPILER=clang++-9
+ - C_COMPILER=clang-10
+ - CXX_COMPILER=clang++-10
- COMPILER_FLAGS='-fsanitize=address,undefined'
addons:
apt:
sources:
- - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
+ - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
packages:
- - clang-9
+ - clang-10
- name: "gcc-8 x86"
arch: amd64
|
put C linkage macros correctly around everything in libpluto.h | @@ -236,9 +236,6 @@ __isl_give isl_union_map *pluto_schedule(isl_union_set *domains,
PlutoOptions *options);
int pluto_schedule_osl(osl_scop_p scop, PlutoOptions *options_l);
-#if defined(__cplusplus)
-}
-#endif
/*
* Structure to hold Remapping information
@@ -277,4 +274,8 @@ Free the string stored in schedules_str_buffer_ptr
*/
void pluto_schedules_strbuf_free(char *schedules_str_buffer);
+#if defined(__cplusplus)
+}
+#endif
+
#endif
|
Fix rsync include list removed from test.pl in
This caused the include list to be ignored and all files to be rsync'd, which worked but took a much longer. | @@ -580,7 +580,8 @@ eval
# Copy the repo
executeTest(
- "git -C ${strBackRestBase} ls-files -c --others --exclude-standard | rsync -rtW --delete --exclude=test/result" .
+ "git -C ${strBackRestBase} ls-files -c --others --exclude-standard |" .
+ " rsync -rtW --delete --files-from=- --exclude=test/result" .
# This option is not supported on MacOS. The eventual plan is to remove the need for it.
(trim(`uname`) ne 'Darwin' ? ' --ignore-missing-args' : '') .
" ${strBackRestBase}/ ${strRepoCachePath}");
|
build: stop trying to build py2 versions of vpp_papi
Python2 was EOL's in Jan 2020.
RHEL6 was EOL'd in Nov 2020.
Type: fix | %endif
%define _vpp_install_dir install-%{_vpp_tag}-native
-# Failsafe backport of Python2-macros for RHEL <= 6
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%{!?python_version: %global python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")}
-%{!?__python2: %global __python2 %{__python}}
-%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}}
-%{!?python2_sitearch: %global python2_sitearch %{python_sitearch}}
-%{!?python2_version: %global python2_version %{python_version}}
-
-%{!?python2_minor_version: %define python2_minor_version %(%{__python} -c "import sys ; print sys.version[2:3]")}
-
%{?systemd_requires}
@@ -136,15 +125,6 @@ Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
%description api-lua
This package contains the lua bindings for the vpp api
-%package api-python
-Summary: VPP api python bindings
-Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, libffi-devel
-Requires: python-setuptools
-
-%description api-python
-This package contains the python bindings for the vpp api
-
%package api-python3
Summary: VPP api python3 bindings
Group: Development/Libraries
@@ -188,7 +168,6 @@ groupadd -f -r vpp
make bootstrap AESNI=n
make -C build-root PLATFORM=vpp AESNI=n TAG=%{_vpp_tag} install-packages
%endif
-cd %{_mu_build_dir}/../src/vpp-api/python && %py2_build
cd %{_mu_build_dir}/../src/vpp-api/python && %py3_build
cd %{_mu_build_dir}/../extras/selinux && make -f %{_datadir}/selinux/devel/Makefile
@@ -245,7 +224,6 @@ do
done
# Python bindings
-cd %{_mu_build_dir}/../src/vpp-api/python && %py2_install
cd %{_mu_build_dir}/../src/vpp-api/python && %py3_install
# SELinux Policy
@@ -399,10 +377,6 @@ fi
%defattr(644,root,root,644)
/usr/share/doc/vpp/examples/lua
-%files api-python
-%defattr(644,root,root,755)
-%{python2_sitelib}/vpp_*
-
%files api-python3
%defattr(644,root,root,755)
%{python3_sitelib}/vpp_*
|
Fix (i)vec3 std140; | @@ -1322,7 +1322,7 @@ Shader* lovrShaderCreate(const char* vertexSource, const char* fragmentSource) {
} else if (uniform.type == UNIFORM_MATRIX) {
uniform.size = values[matrixStride] * uniform.components;
} else {
- uniform.size = uniform.components > 1 ? 16 : 4;
+ uniform.size = 4 * (uniform.components == 3 ? 4 : uniform.components);
}
vec_push(&storageBlocks->data[values[blockIndex]].uniforms, uniform);
}
@@ -1365,7 +1365,7 @@ Shader* lovrShaderCreate(const char* vertexSource, const char* fragmentSource) {
glGetActiveUniformsiv(program, 1, &i, GL_UNIFORM_MATRIX_STRIDE, &matrixStride);
uniform.size = uniform.components * matrixStride;
} else {
- uniform.size = uniform.components > 1 ? 16 : 4;
+ uniform.size = 4 * (uniform.components == 3 ? 4 : uniform.components);
}
vec_push(&block->uniforms, uniform);
continue;
|
test core callbacks | @@ -60,16 +60,16 @@ static void test_cluster(void) {
}
int main(void) {
- // facil_core_callback_add(FIO_CALL_BEFORE_FORK, perform_callback,
- // "Before fork");
- // facil_core_callback_add(FIO_CALL_AFTER_FORK, perform_callback, "After
- // fork"); facil_core_callback_add(FIO_CALL_IN_CHILD, perform_callback,
- // "Just the child");
- // facil_core_callback_add(FIO_CALL_ON_START, perform_callback, "Starting
- // up"); facil_core_callback_add(FIO_CALL_ON_SHUTDOWN, perform_callback,
- // "Shutting down");
- // facil_core_callback_add(FIO_CALL_ON_FINISH, perform_callback, "Done.");
- // facil_core_callback_add(FIO_CALL_ON_IDLE, perform_callback, "idling.");
+ facil_core_callback_add(FIO_CALL_BEFORE_FORK, perform_callback,
+ "Before fork");
+ facil_core_callback_add(FIO_CALL_AFTER_FORK, perform_callback, "After fork ");
+ facil_core_callback_add(FIO_CALL_IN_CHILD, perform_callback,
+ "Just the child");
+ facil_core_callback_add(FIO_CALL_ON_START, perform_callback, "Starting up ");
+ facil_core_callback_add(FIO_CALL_ON_SHUTDOWN, perform_callback,
+ "Shutting down");
+ facil_core_callback_add(FIO_CALL_ON_FINISH, perform_callback, "Done.");
+ facil_core_callback_add(FIO_CALL_ON_IDLE, perform_callback, "idling.");
facil_cluster_set_handler(7, handle_cluster_test);
|
WIP add cache test for non-backend keys | #include <stdlib.h>
#include <string.h>
+#include <kdb.h>
#include <kdbconfig.h>
#include <tests_plugin.h>
@@ -35,6 +36,32 @@ static void test_basics (void)
PLUGIN_CLOSE ();
}
+static void test_cacheNonBackendKeys (void)
+{
+ KeySet * conf = ksNew (0, KS_END);
+
+ Key * key = keyNew ("user/tests/cache", KEY_END);
+ KDB * handle = kdbOpen (key);
+
+ // the key should be in the keyset, but should not be cached
+ Key * doNotCache = keyNew ("user/tests/cache/somekey", KEY_END);
+ kdbGet (handle, conf, key);
+ Key * result = ksLookupByName (conf, "user/tests/cache/somekey", 0);
+ succeed_if (result != 0, "key is missing from keyset");
+
+ // the cached key should not have been persisted, so it is not in the fresh keyset
+ KeySet * freshConf = ksNew (0, KS_END);
+ kdbGet (handle, freshConf, key);
+ Key * freshResult = ksLookupByName (freshConf, "user/tests/cache/somekey", 0);
+ succeed_if (freshResult == 0, "key was persisted/cached, even though it was not committed");
+ ksDel (freshConf);
+
+ keyDel (doNotCache);
+ keyDel (key);
+ ksDel (conf);
+ kdbClose (handle, 0);
+}
+
int main (int argc, char ** argv)
{
@@ -44,6 +71,7 @@ int main (int argc, char ** argv)
init (argc, argv);
test_basics ();
+ test_cacheNonBackendKeys ();
print_result ("testmod_cache");
|
Renamed struct field | @@ -618,7 +618,7 @@ LIBXSMM_EXTERN_C typedef struct LIBXSMM_RETARGETABLE libxsmm_meltw_cvtfp32bf16_p
LIBXSMM_EXTERN_C typedef struct LIBXSMM_RETARGETABLE libxsmm_meltw_cvtfp32bf16_act_param {
const void* in_ptr; /* input pointer */
void* out_ptr; /* output pointer */
- void* relumask_ptr; /* output pointer for relu mask in case relu is fused into the convert */
+ void* actstore_ptr; /* output pointer for relu mask in case relu is fused into the convert */
} libxsmm_meltw_cvtfp32bf16_act_param;
/** argument struct for matrix-eltwise: reduce */
|
Add redis-cli hints to ACL DRYRUN, COMMAND GETKEYS, COMMAND GETKEYSANDFLAGS
Better redis-cli hints for commands that take other commands as arguments.
```
command getkeysandflags hello [protover [AUTH username password]]
acl dryrun user hello [protover [AUTH username password]]
``` | @@ -943,7 +943,7 @@ static void completionCallback(const char *buf, linenoiseCompletions *lc) {
static char *hintsCallback(const char *buf, int *color, int *bold) {
if (!pref.hints) return NULL;
- int i, rawargc, argc, buflen = strlen(buf), matchlen = 0;
+ int i, rawargc, argc, buflen = strlen(buf), matchlen = 0, shift = 0;
sds *rawargv, *argv = sdssplitargs(buf,&argc);
int endspace = buflen && isspace(buf[buflen-1]);
helpEntry *entry = NULL;
@@ -954,6 +954,16 @@ static char *hintsCallback(const char *buf, int *color, int *bold) {
return NULL;
}
+ if (argc > 3 && (!strcasecmp(argv[0], "acl") && !strcasecmp(argv[1], "dryrun"))) {
+ shift = 3;
+ } else if (argc > 2 && (!strcasecmp(argv[0], "command") &&
+ (!strcasecmp(argv[1], "getkeys") || !strcasecmp(argv[1], "getkeysandflags"))))
+ {
+ shift = 2;
+ }
+ argc -= shift;
+ argv += shift;
+
/* Search longest matching prefix command */
for (i = 0; i < helpEntriesLen; i++) {
if (!(helpEntries[i].type & CLI_HELP_COMMAND)) continue;
@@ -973,7 +983,7 @@ static char *hintsCallback(const char *buf, int *color, int *bold) {
}
sdsfreesplitres(rawargv,rawargc);
}
- sdsfreesplitres(argv,argc);
+ sdsfreesplitres(argv - shift,argc + shift);
if (entry) {
*color = 90;
|
static_http: Typo in short_help.
Type: fix. | @@ -1303,7 +1303,7 @@ http_static_server_create_command_fn (vlib_main_t * vm,
VLIB_CLI_COMMAND (http_static_server_create_command, static) =
{
.path = "http static server",
- .short_help = "http static server www-root <path> [prealloc-fios <nn>]\n"
+ .short_help = "http static server www-root <path> [prealloc-fifos <nn>]\n"
"[private-segment-size <nnMG>] [fifo-size <nbytes>] [uri <uri>]\n",
.function = http_static_server_create_command_fn,
};
|
MPLS: tunnel delete crash | @@ -245,6 +245,12 @@ mpls_tunnel_stack (adj_index_t ai)
if (NULL == mt)
return;
+ if (FIB_NODE_INDEX_INVALID == mt->mt_path_list)
+ {
+ adj_nbr_midchain_unstack(ai);
+ return;
+ }
+
/*
* while we're stacking the adj, remove the tunnel from the child list
* of the path list. this breaks a circular dependency of walk updates
|
media: Fix errata in SpeechDetector::init
These errata make SpeechDetector not be init | @@ -70,7 +70,7 @@ bool SpeechDetectorImpl::initKeywordDetect(uint32_t samprate, uint8_t channels)
mKeywordDetector = std::make_shared<HardwareKeywordDetector>(card, device);
result = change_stream_in_device(card, device);
- if (result == AUDIO_MANAGER_SUCCESS && result != AUDIO_MANAGER_DEVICE_ALREADY_IN_USE) {
+ if (result != AUDIO_MANAGER_SUCCESS && result != AUDIO_MANAGER_DEVICE_ALREADY_IN_USE) {
meddbg("change_stream_in_device failed: %d\n", result);
mKeywordDetector = nullptr;
return false;
@@ -98,7 +98,7 @@ bool SpeechDetectorImpl::initEndPointDetect(uint32_t samprate, uint8_t channels)
mEndPointDetector = std::make_shared<HardwareEndPointDetector>(card, device);
result = change_stream_in_device(card, device);
- if (result == AUDIO_MANAGER_SUCCESS && result != AUDIO_MANAGER_DEVICE_ALREADY_IN_USE) {
+ if (result != AUDIO_MANAGER_SUCCESS && result != AUDIO_MANAGER_DEVICE_ALREADY_IN_USE) {
meddbg("change_stream_in_device failed: %d\n", result);
mEndPointDetector = nullptr;
return false;
|
Moving second command to its own line | @@ -539,7 +539,9 @@ Hostssl testdb all 192.168.0.0/16 cert map=gpuser
<li>The program generates a key that is passphrase-protected; it does not accept a
passphrase that is less than four characters long. To remove the passphrase (and you
must if you want automatic start-up of the server), run the following
- command:<codeblock>openssl rsa -in privkey.pem -out server.key rm privkey.pem</codeblock></li>
+ command:
+ <codeblock>openssl rsa -in privkey.pem -out server.key
+rm privkey.pem</codeblock></li>
<li>Enter the old passphrase to unlock the existing key. Then run the following
command:<codeblock>openssl req -x509 -in server.req -text -key server.key -out server.crt</codeblock><p>This
turns the certificate into a self-signed certificate and copies the key and
|
modhubs/EV3Brick: Add Port Enum
In the 2.0 API, ports are accessed through the hub, not the parameters module. | #include <pbio/port.h>
#include <pbio/button.h>
+#include "modparameters.h"
+
#include "pberror.h"
#include "pbobj.h"
@@ -32,6 +34,7 @@ EV3Brick class tables
*/
STATIC const mp_rom_map_elem_t hubs_EV3Brick_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_buttons), MP_ROM_PTR(&pb_module_buttons) },
+ { MP_ROM_QSTR(MP_QSTR_Port), MP_ROM_PTR(&pb_enum_type_Port) },
{ MP_ROM_QSTR(MP_QSTR_light), MP_ROM_PTR(&pb_module_colorlight) },
{ MP_ROM_QSTR(MP_QSTR_battery), MP_ROM_PTR(&pb_module_battery) },
};
|
Use ctx2 instead ctx.
CLA: trivial | @@ -1958,7 +1958,7 @@ int s_server_main(int argc, char *argv[])
BIO_printf(bio_s_out, "Setting secondary ctx parameters\n");
if (sdebug)
- ssl_ctx_security_debug(ctx, sdebug);
+ ssl_ctx_security_debug(ctx2, sdebug);
if (session_id_prefix) {
if (strlen(session_id_prefix) >= 32)
|
net_help: Rename EVP_MAC_set_ctx_params to EVP_MAC_CTX_set_params
This fixes build with OpenSSL 3.0.0 Alpha 5.
EVP_MAC_set_ctx_params got renamed back to EVP_MAC_CTX_set_params
in | @@ -1478,7 +1478,7 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
params[1] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
"sha256", 0);
params[2] = OSSL_PARAM_construct_end();
- EVP_MAC_set_ctx_params(hmac_ctx, params);
+ EVP_MAC_CTX_set_params(hmac_ctx, params);
#elif !defined(HMAC_INIT_EX_RETURNS_VOID)
if (HMAC_Init_ex(hmac_ctx, ticket_keys->hmac_key, 32, digest, NULL) != 1) {
verbose(VERB_CLIENT, "HMAC_Init_ex failed");
@@ -1509,7 +1509,7 @@ int tls_session_ticket_key_cb(SSL *ATTR_UNUSED(sslctx), unsigned char* key_name,
params[1] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
"sha256", 0);
params[2] = OSSL_PARAM_construct_end();
- EVP_MAC_set_ctx_params(hmac_ctx, params);
+ EVP_MAC_CTX_set_params(hmac_ctx, params);
#elif !defined(HMAC_INIT_EX_RETURNS_VOID)
if (HMAC_Init_ex(hmac_ctx, key->hmac_key, 32, digest, NULL) != 1) {
verbose(VERB_CLIENT, "HMAC_Init_ex failed");
|
engine: dispath: use proper task api name | @@ -84,7 +84,7 @@ int flb_engine_dispatch_retry(struct flb_task_retry *retry,
return -1;
}
- flb_task_add_thread(co, task);
+ flb_task_add_coro(task, co);
flb_coro_resume(co);
return 0;
|
dev-tools/numpy: bump to v19.0 | @@ -22,7 +22,7 @@ Requires: openblas-%{compiler_family}%{PROJ_DELIM}
%define pname numpy
Name: %{python_prefix}-%{pname}-%{compiler_family}%{PROJ_DELIM}
-Version: 1.17.4
+Version: 1.19.0
Release: 1%{?dist}
Url: https://github.com/numpy/numpy
Summary: NumPy array processing for numbers, strings, records and objects
|
doc: remove required | @@ -718,18 +718,6 @@ status = implemented
usedby/pluign = spec
description = Requires the key to be present. See also spec plugin README.
-[required]
-type = range
-usedby/plugin = required
-status = unclear
-description = See required plugin.
-
-[mandatory]
-type = boolean
-usedby/plugin = required
-status = unclear
-description = In process of being replaced in favor of require.
-
#
# Error and Warnings
#
|
fix: _json_composite_get() didn't actually search for key in a branch | @@ -948,31 +948,20 @@ json_get_root(json_item_t *item)
return item;
}
-static json_item_t*
-_json_composite_get(const char *key, json_item_t *item)
-{
- if (!IS_COMPOSITE(item)) return NULL;
-
- json_item_t *iter = item;
- do {
- iter = json_iter_next(iter);
- if (STREQ(iter->key, key)) return iter;
- } while (iter);
-
- return NULL;
-}
-
/* get item branch with given key */
json_item_t*
json_get_branch(json_item_t *item, const char *key)
{
ASSERT_S(IS_COMPOSITE(item), "Not a composite");
-
if (NULL == key) return NULL;
/* search for entry with given key at item's comp,
and retrieve found or not found(NULL) item */
- return _json_composite_get(key, item);
+ for (size_t i=0; i < item->comp->num_branch; ++i) {
+ if (STREQ(item->comp->branch[i]->key, key))
+ return item->comp->branch[i];
+ }
+ return NULL;
}
json_item_t*
@@ -1008,7 +997,7 @@ json_get_parent(const json_item_t *item){
json_item_t*
json_get_byindex(const json_item_t *item, const size_t index)
{
- ASSERT_S(IS_COMPOSITE(item), "Note a composite");
+ ASSERT_S(IS_COMPOSITE(item), "Not a composite");
return (index < item->comp->num_branch) ? item->comp->branch[index] : NULL;
}
@@ -1017,8 +1006,13 @@ json_get_index(const json_item_t *item, const char *key)
{
ASSERT_S(IS_COMPOSITE(item), "Not a composite");
- json_item_t *lookup_item = _json_composite_get(key, (json_item_t*)item);
-
+ json_item_t *lookup_item = NULL;
+ for (size_t i=0; i < item->comp->num_branch; ++i) {
+ if (STREQ(item->comp->branch[i]->key, key)) {
+ lookup_item = item->comp->branch[i];
+ break;
+ }
+ }
if (NULL == lookup_item) return -1;
/* @todo currently this is O(n), a possible alternative
|
docs: fix error message | @@ -204,7 +204,7 @@ void run(client *client, const uint64_t guild_id, params *params, channel::dati
return;
}
if (!orka_str_below_threshold(params->topic, 1024)) {
- D_PUTS("Missing channel name (params.name)");
+ D_PUTS("'params.topic' exceeds threshold of 1024");
return;
}
#if 0
|
More specific "Symbol name too long" error messages
Identifiers, {interpolations} and \<macroArgs> are distinct | @@ -753,7 +753,7 @@ static uint32_t readBracketedMacroArgNum(void)
}
if (i == sizeof(symName)) {
- warning(WARNING_LONG_STR, "Symbol name too long\n");
+ warning(WARNING_LONG_STR, "Bracketed symbol name too long\n");
i--;
}
symName[i] = '\0';
@@ -1396,7 +1396,7 @@ static char const *readInterpolation(unsigned int depth)
}
if (i == sizeof(symName)) {
- warning(WARNING_LONG_STR, "Symbol name too long\n");
+ warning(WARNING_LONG_STR, "Interpolated symbol name too long\n");
i--;
}
symName[i] = '\0';
|
Substitute old DOC++ references with Doxygen | @@ -122,11 +122,11 @@ Dependency | Description
------------|-------------------------------------------------------------
libpthread | The header and library are installed as part of the glibc-devel package (or equivalent).
-Additionally, the documentation for the SDK can be auto-generated from the upnp.h header file using DOC++, a documentation system for C, C++, IDL, and Java\*. DOC++ generates the documentation in HTML or TeX format. Using some additional tools, the TeX output can be converted into a PDF file. To generate the documentation these tools are required:
+Additionally, the documentation for the SDK can be auto-generated from the upnp.h header file using Doxygen, a documentation system for C, C++, IDL, and Java\*. Doxygen generates the documentation in HTML or TeX format. Using some additional tools, the TeX output can be converted into a PDF file. To generate the documentation these tools are required:
Package | Description
----------|--------------------------------------------------------------
-DOC++ | The homepage for DOC++ is <http://docpp.sourceforge.net>. The current version as of this release of the SDK is version 3.4.9. DOC++ is the only requirement for generating the HTML documentation.
+Doxygen | The homepage for Doxygen is <https://www.doxygen.nl/index.html>. The current version as of this release of the SDK is version 3.4.9. Doxygen is the only requirement for generating the HTML documentation.
LaTeX/TeX | To generate the PDF documentation, LaTeX and TeX tools are necessary. The tetex and tetex-latex packages provide these tools.
dvips | dvips converts the DVI file produced by LaTeX into a PostScript\* file. The tetex-dvips package provides this tool.
ps2pdf | The final step to making the PDF is converting the PostStript\* into Portable Document Format. The ghostscript package provides this tool.
|
Don't do the final key_share checks if we are in an HRR | @@ -1058,6 +1058,10 @@ static int final_key_share(SSL *s, unsigned int context, int sent, int *al)
if (!SSL_IS_TLS13(s))
return 1;
+ /* Nothing to do for key_share in an HRR */
+ if ((context & SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST) != 0)
+ return 1;
+
/*
* If
* we are a client
|
Automatically apply mbedtls patches.
Automatically updates mbedtls and patches it on Linux
if necessary.
Tested-by: IoTivity Jenkins
Tested-by: Kishen Maloor | @@ -27,6 +27,7 @@ DTLS= aes.c aesni.c arc4.c asn1parse.c asn1write.c base64.c \
DTLSFLAGS=-I../../deps/mbedtls/include -D__OC_RANDOM
CBOR=../../deps/tinycbor/src/cborencoder.c ../../deps/tinycbor/src/cborencoder_close_container_checked.c ../../deps/tinycbor/src/cborparser.c# ../../deps/tinycbor/src/cbortojson.c ../../deps/tinycbor/src/cborpretty.c ../../deps/tinycbor/src/cborparser_dup_string.c
+MBEDTLS_DIR := ../../deps/mbedtls
SRC_COMMON=$(wildcard ../../util/*.c) ${CBOR}
SRC=$(wildcard ../../messaging/coap/*.c ../../api/*.c ../../port/linux/*.c)
@@ -65,6 +66,7 @@ endif
ifeq ($(SECURE),1)
SRC += oc_acl.c oc_cred.c oc_doxm.c oc_pstat.c oc_dtls.c oc_svr.c oc_store.c
+ MBEDTLS_PATCH_FILE := $(MBEDTLS_DIR)/patched.txt
ifeq ($(DYNAMIC),1)
SRC_COMMON += ${DTLS}
SRC += oc_obt.c
@@ -92,7 +94,7 @@ CONSTRAINED_LIBS = libiotivity-constrained-server.a libiotivity-constrained-clie
PC = iotivity-constrained-client.pc iotivity-constrained-server.pc \
iotivity-constrained-client-server.pc
-all: $(CONSTRAINED_LIBS) $(SAMPLES) $(PC)
+all: $(MBEDTLS_PATCH_FILE) $(CONSTRAINED_LIBS) $(SAMPLES) $(PC)
.PHONY: clean
@@ -205,11 +207,22 @@ iotivity-constrained-client-server.pc: iotivity-constrained-client-server.pc.in
-e 's,@libdir@,$(libdir),' \
-e 's,@includedir@,$(includedir),'
+ifeq ($(SECURE),1)
+$(MBEDTLS_PATCH_FILE):
+ git submodule update --init && \
+ cd $(MBEDTLS_DIR) && \
+ git clean -fdx . && \
+ git reset --hard && \
+ patch -r - -s -N -p1 < ../../patches/mbedtls_ocf_patch_1 && \
+ patch -r - -s -N -p1 < ../../patches/mbedtls_iotivity_constrained_patch_2 && \
+ echo patches applied > $(MBEDTLS_PATCH_FILE)
+endif
+
clean:
rm -rf obj $(PC) $(CONSTRAINED_LIBS)
cleanall: clean
- rm -rf ${all} $(SAMPLES) $(TESTS) ${OBT} ${SAMPLES_CREDS}
+ rm -rf ${all} $(SAMPLES) $(TESTS) ${OBT} ${SAMPLES_CREDS} $(MBEDTLS_PATCH_FILE)
install: $(SAMPLES) $(PC) $(CONSTRAINED_LIBS)
$(INSTALL) -d $(bindir)
|
size change warn only if not LFS | @@ -214,15 +214,17 @@ def copy_currents_from_html_pages(prefix, filelist, datetag, prompt, test_type):
urllib.urlretrieve("%s/%s/pascal_trunk_%s/c_%s"%(prefix,datetag,mode,f),
filename=target_file)
# Do some simple sanity checks on the resulting file
+ isLFS = False
if test_type == 'png' and imghdr.what(target_file) != 'png':
with open(target_file) as f:
if 'https://git-lfs.' in f.readline():
f.readline()
cursize = f.readline().strip().split(' ')[1]
+ isLFS = True
else:
print("Warning: file \"%s\" is not PNG (nor LFS) format!"%target_file)
newsize = os.stat(target_file).st_size
- if newsize < (1-0.25)*cursize or newsize > (1+0.25)*cursize:
+ if not isLFS and (newsize < (1-0.25)*cursize or newsize > (1+0.25)*cursize):
print("Warning: dramatic change in size of file (old=%d/new=%d)\"%s\"!"%(cursize,newsize,target_file))
#
|
comment to explain it. | @@ -1158,6 +1158,10 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
verbose(VERB_QUERY, "request has exceeded the maximum number"
" of query restarts with %d", iq->query_restart_count);
if(iq->response) {
+ /* return the partial CNAME loop, i.e. with the
+ * actual packet in iq->response cleared of RRsets,
+ * the stored prepend RRsets contain the loop contents
+ * with duplicates removed */
iq->state = FINISHED_STATE;
return 1;
}
|
[tools]: add menconfig silent mode | @@ -954,20 +954,31 @@ static void conf_save(void)
static int handle_exit(void)
{
- int res;
+ int res = 0;
save_and_exit = 1;
reset_subtitle();
dialog_clear();
if (conf_get_changed())
+ {
+ if (silent)
+ {
+ /* save change */
+ res = 0;
+ }
+ else
+ {
res = dialog_yesno(NULL,
_("Do you wish to save your new configuration?\n"
"(Press <ESC><ESC> to continue kernel configuration.)"),
6, 60);
+ }
+
+ }
else
res = -1;
- end_dialog(saved_x, saved_y);
+ if (!silent) end_dialog(saved_x, saved_y);
switch (res) {
case 0:
@@ -1038,6 +1049,18 @@ int main(int ac, char **av)
set_config_filename(conf_get_configname());
conf_set_message_callback(conf_message_callback);
+
+ if (ac > 2 && strcmp(av[2], "-n") == 0)
+ {
+ fprintf(stderr, N_("Debug mode,don't display menuconfig window.\n"));
+ silent = 1;
+ /* Silence conf_read() until the real callback is set up */
+ conf_set_message_callback(NULL);
+ av++;
+ res = handle_exit();
+ return 1;
+ }
+
do {
conf(&rootmenu, NULL);
res = handle_exit();
|
website: small dev restructure
so that IDEAS is in getting started | "ref": "devgettingstarted",
"dev-comment": "Here we have some important documentation files for users that want start to develop with Elektra.",
"children": [
+ {
+ "name": "Ideas",
+ "type": "staticfile",
+ "options": {
+ "path": "doc/IDEAS.md"
+ }
+ },
+ {
+ "name": "Contributing",
+ "type": "staticfile",
+ "options": {
+ "path": ".github/CONTRIBUTING.md"
+ }
+ },
{
"name": "Coding",
"type": "staticfile",
}
]
},
- {
- "name": "GSoC",
- "type": "staticlist",
- "ref": "devgsoc",
- "dev-comment": "If you want to contribute to Elektra.",
- "children": [
- {
- "name": "GSoC",
- "type": "staticfile",
- "options": {
- "path": "doc/IDEAS.md"
- }
- },
- {
- "name": "Contributing",
- "type": "staticfile",
- "options": {
- "path": ".github/CONTRIBUTING.md"
- }
- }
- ]
- },
{
"name": "Examples",
"type": "listfiles",
|
Fix module list image coherency view | @@ -1066,10 +1066,13 @@ BOOLEAN NTAPI PhpModuleTreeNewCallback(
break;
}
+ if (!PhShouldShowModuleCoherency(moduleItem, FALSE))
+ {
if (moduleItem->ImageCoherencyStatus != STATUS_SUCCESS)
{
PhMoveReference(&node->ImageCoherencyText, PhGetStatusMessage(moduleItem->ImageCoherencyStatus, 0));
getCellText->Text = PhGetStringRef(node->ImageCoherencyText);
+ }
break;
}
|
\OHPC -> \OHPC{} for latex macro | \subsection{Integration Test Suite} \label{appendix:test_suite}
-This appendix details the installation and use of the \OHPC validation test
-suite. Each \OHPC component is equipped with a set of scripts and applications
+This appendix details the installation and use of the \OHPC{} validation test
+suite. Each \OHPC{} component is equipped with a set of scripts and applications
to test the integration of these components in a Jenkins CI
-environment. To facilitate local customization and extension of \OHPC, we
+environment. To facilitate local customization and extension of \OHPC{}, we
provide these tests in a standalone RPM.
\begin{lstlisting}
@@ -11,7 +11,7 @@ provide these tests in a standalone RPM.
\end{lstlisting}
The RPM creates a user called ohpc-test, and inside that user's home directory
-are directories representing the functional areas of \OHPC. GNU
+are directories representing the functional areas of \OHPC{}. GNU
autotools-based configuration files control the building of the tests, and the
BATS framework is used to execute them and collect results.
@@ -61,7 +61,7 @@ Libraries:
...
\end{lstlisting}
-Many \OHPC components exist in multiple flavors to support multiple compiler
+Many \OHPC{} components exist in multiple flavors to support multiple compiler
and MPI runtime permutations, and the test suite takes this in to account by
iterating through these combinations by default. If \texttt{make check} is executed
from the root test directory, all versions of a library will be exercised.
|
Don't delete the doc/html directories when cleaning
The doc/html sub-dirs get created by Configure. Therefore they should
not be cleaned away by "nmake clean". Otherwise the following sequence
fails:
perl Configure VC-WIN64A
nmake clean
nmake
nmake install
Fixes | @@ -462,10 +462,10 @@ libclean:
-del /Q /F $(LIBS) libcrypto.* libssl.* ossl_static.pdb
clean: libclean
- -rd /Q /S $(HTMLDOCS1_BLDDIRS)
- -rd /Q /S $(HTMLDOCS3_BLDDIRS)
- -rd /Q /S $(HTMLDOCS5_BLDDIRS)
- -rd /Q /S $(HTMLDOCS7_BLDDIRS)
+ {- join("\n\t", map { "-del /Q /F $_" } @HTMLDOCS1) || "\@rem" -}
+ {- join("\n\t", map { "-del /Q /F $_" } @HTMLDOCS3) || "\@rem" -}
+ {- join("\n\t", map { "-del /Q /F $_" } @HTMLDOCS5) || "\@rem" -}
+ {- join("\n\t", map { "-del /Q /F $_" } @HTMLDOCS7) || "\@rem" -}
{- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) || "\@rem" -}
{- join("\n\t", map { "-del /Q /F $_" } @MODULES) || "\@rem" -}
{- join("\n\t", map { "-del /Q /F $_" } @SCRIPTS) || "\@rem" -}
|
[tools] update eclipse project after dist. | @@ -176,7 +176,8 @@ def bs_update_ide_project(bsp_root, rtt_root, rttide = None):
'iar':('iar', 'iar'),
'vs':('msvc', 'cl'),
'vs2012':('msvc', 'cl'),
- 'cdk':('gcc', 'gcc')}
+ 'cdk':('gcc', 'gcc'),
+ 'eclipse':('eclipse', 'gcc')}
else:
item = 'eclipse --project-name=' + rttide['project_name']
tgt_dict = {item:('gcc', 'gcc')}
|
pill: include %prep task in desk install props
Primes the blob store, making initial sync faster. | %- ~(gas by *(map path (each page lobe:clay)))
(turn hav |=([=path =page] [path &+page]))
[/c/sync [%park des &+yuki *rang:clay]]
- =| hav=(list [path page])
+ (file-pages bas sal)
+::
+++ file-pages
+ |= [bas=path sal=(list spur)]
+ =| hav=(list [path page:clay])
|- ^+ hav
?~ sal ~
=. hav $(sal t.sal)
?~ all hav
$(all t.all, hav ^$(tyl [p.i.all tyl]))
::
+::TODO include %prep task in solid and brass?
++ solid
:: sys: root path to boot system, `/~me/[desk]/now/sys`
:: dez: secondary desks and their root paths
+$ tier ?(%pre-userspace %post-userspace)
::
++ install
- |= [as=desk =beak]
+ |= [as=desk =beak pri=(map lobe:clay blob:clay)]
^- prop
:^ %prop %install %post-userspace
::TODO will exclude non-:directories files, such as /changelog/txt
:~ (file-ovum as (en-beam beak /))
- ::
+ [/c/inflate/[as] [%prep pri]]
[/d/install/[as] [%seat as]]
==
--
|
`is_plat` to `target:is_plat` | @@ -489,7 +489,7 @@ function get_builtinmodulemapflag(target)
if builtinmodulemapflag == nil then
local compinst = target:compiler("cxx")
if compinst:has_flags("-fbuiltin-module-map", "cxxflags", {flagskey = "clang_builtin_module_map"}) then
- if is_plat("windows", "mingw") then
+ if target:is_plat("windows", "mingw") then
builtinmodulemapflag = ""
else
builtinmodulemapflag = "-fbuiltin-module-map"
|
Check if there are constants at all | @@ -225,7 +225,9 @@ d_m3OpDef (Entry)
while (numLocals--) // it seems locals need to init to zero (at least for optimized Wasm code) TODO: see if this is still true.
* (stack++) = 0;
+ if (function->constants) {
memcpy (stack, function->constants, function->numConstants * sizeof (u64));
+ }
m3ret_t r = nextOp ();
|
cache: don't use initialParent | @@ -1246,7 +1246,7 @@ int kdbGet (KDB * handle, KeySet * ks, Key * parentKey)
keySetName (parentKey, keyName (initialParent));
cache = ksNew (0, KS_END);
- cacheParent = keyDup (mountGetMountpoint (handle, keyName (initialParent)), KEY_CP_ALL);
+ cacheParent = keyDup (mountGetMountpoint (handle, keyName (parentKey)), KEY_CP_ALL);
if (cacheParent == NULL)
{
cacheParent = keyNew ("default:/", KEY_VALUE, "default", KEY_END);
|
core/test/run-msg: Add callback function test
Test callback function
Add test case to test OPAL_PARTIAL return value
Add test for OPAL_PARAMETER return value | @@ -63,7 +63,7 @@ void opal_update_pending_evt(uint64_t evt_mask, uint64_t evt_values)
static long magic = 8097883813087437089UL;
static void callback(void *data, int status)
{
- assert(status == OPAL_SUCCESS);
+ assert((status == OPAL_SUCCESS || status == OPAL_PARTIAL));
assert(*(uint64_t *)data == magic);
}
@@ -140,6 +140,23 @@ int main(void)
assert(list_count(&msg_pending_list) == --npending);
assert(list_count(&msg_free_list) == nfree);
+ /* Return OPAL_PARTIAL to callback */
+ r = opal_queue_msg(0, &magic, callback, 0, 1, 2, 3, 4, 5, 6, 7, 0xBADDA7A);
+ assert(r == 0);
+
+ assert(list_count(&msg_pending_list) == ++npending);
+ assert(list_count(&msg_free_list) == nfree);
+
+ r = opal_get_msg(m_ptr, sizeof(m));
+ assert(r == OPAL_PARTIAL);
+
+ assert(list_count(&msg_pending_list) == --npending);
+ assert(list_count(&msg_free_list) == nfree);
+
+ /* return OPAL_PARAMETER */
+ r = _opal_queue_msg(0, NULL, NULL, OPAL_MSG_SIZE, m_ptr);
+ assert(r == OPAL_PARAMETER);
+
assert(m.params[0] == 0);
assert(m.params[1] == 1);
assert(m.params[2] == 2);
|
py/modarray: Rename module to "uarray".
For consistency with other modules of native Pycopy API (ustruct, etc.). | #if MICROPY_PY_ARRAY
STATIC const mp_rom_map_elem_t mp_module_array_globals_table[] = {
- { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_array) },
+ { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uarray) },
{ MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_type_array) },
};
@@ -40,6 +40,6 @@ const mp_obj_module_t mp_module_array = {
.globals = (mp_obj_dict_t*)&mp_module_array_globals,
};
-MP_REGISTER_MODULE(MP_QSTR_array, mp_module_array, MICROPY_PY_ARRAY);
+MP_REGISTER_MODULE(MP_QSTR_uarray, mp_module_array, MICROPY_PY_ARRAY);
#endif
|
Fixing make clean | @@ -128,7 +128,7 @@ clean:
@find . -depth -name '.#*' -exec rm -rf '{}' \; -print
clean_config: clean
- @$(RM) $(snap_env)
@$(RM) $(snap_config)
@$(RM) $(snap_config_sh)
@$(RM) $(snap_config_cflags)
+ @$(RM) $(snap_env_sh)
|
dpdk: fix mac address length was wrong
Type: fix | @@ -81,7 +81,7 @@ dpdk_set_mac_address (vnet_hw_interface_t * hi,
else
{
vec_reset_length (xd->default_mac_address);
- vec_add (xd->default_mac_address, address, sizeof (address));
+ vec_add (xd->default_mac_address, address, sizeof (mac_address_t));
return NULL;
}
}
|
Store sensor database after config.on = null fix | @@ -800,6 +800,7 @@ void Sensor::jsonToConfig(const QString &json)
if (rid.suffix == RConfigOn)
{
map[key] = true; // default value
+ setNeedSaveDatabase(true);
}
else
{
|
Set no fusion test name | ---
-name: "CITests"
+name: "CITestsNoFusion"
on:
push:
@@ -11,7 +11,7 @@ on:
jobs:
citests:
- name: CI-Tests
+ name: CI-Tests-No-Fusion
runs-on: ubuntu-latest
steps:
|
power/mt817x.c: Format with clang-format
BRANCH=none
TEST=none | @@ -387,8 +387,7 @@ static void mtk_lid_event(void)
/* Override the panel backlight enable signal from SoC,
* force the backlight off on lid close.
*/
- bl_override = lid_is_open() ?
- MTK_BACKLIGHT_CONTROL_BY_SOC :
+ bl_override = lid_is_open() ? MTK_BACKLIGHT_CONTROL_BY_SOC :
MTK_BACKLIGHT_FORCE_OFF;
mtk_backlight_override(bl_override);
@@ -539,7 +538,8 @@ static int check_for_power_on_event(void)
CPRINTS("system is on, but EC_RESET_FLAG_AP_OFF is on");
return POWER_ON_CANCEL;
} else {
- CPRINTS("system is on, thus clear " "auto_power_on");
+ CPRINTS("system is on, thus clear "
+ "auto_power_on");
/* no need to arrange another power on */
auto_power_on = 0;
return POWER_ON_BY_IN_POWER_GOOD;
@@ -819,6 +819,4 @@ static int command_power(int argc, char **argv)
return EC_SUCCESS;
}
-DECLARE_CONSOLE_COMMAND(power, command_power,
- "on/off",
- "Turn AP power on/off");
+DECLARE_CONSOLE_COMMAND(power, command_power, "on/off", "Turn AP power on/off");
|
Fixed env variable for windows | -websocketd --passenv HOME --port 8080 survive-cli --record-stdout --record-cal-imu --no-record-imu $args
+websocketd --passenv LOCALAPPDATA --port 8080 survive-cli --record-stdout --record-cal-imu --no-record-imu $args
|
Remove simcycles parameter, which is no longer supported
[ci skip] | @@ -32,7 +32,6 @@ def run_cosimulation_test(source_file, *unused):
verilator_args = [
test_harness.VSIM_PATH,
'+trace',
- '+simcycles=2000000',
'+memdumpfile=' + VERILATOR_MEM_DUMP,
'+memdumpbase=800000',
'+memdumplen=400000',
|
Modify the color conversion
Round number instead truncate at RGB24_TO_VDPCOLOR | * \param color
* RGB 24 bits color
*/
-#define RGB24_TO_VDPCOLOR(color) (((color >> ((2 * 8) + 4)) & VDPPALETTE_REDMASK) | ((color >> ((1 * 4) + 4)) & VDPPALETTE_GREENMASK) | ((color << 4) & VDPPALETTE_BLUEMASK))
+#define RGB24_TO_VDPCOLOR(color) ((((color + 0x100000) >> ((2 * 8) + 4)) & VDPPALETTE_REDMASK) | (((color + 0x1000) >> ((1 * 4) + 4)) & VDPPALETTE_GREENMASK) | (((color + 0x10) << 4) & VDPPALETTE_BLUEMASK))
/**
|
http_test.c: Fix minor Coverity issue CID | @@ -142,7 +142,8 @@ static int test_http_url_ok(const char *url, int exp_ssl, const char *exp_host,
int exp_num, num, ssl;
int res;
- TEST_int_eq(sscanf(exp_port, "%d", &exp_num), 1);
+ if (!TEST_int_eq(sscanf(exp_port, "%d", &exp_num), 1))
+ return 0;
res = TEST_true(OSSL_HTTP_parse_url(url, &ssl, &user, &host, &port, &num,
&path, &query, &frag))
&& TEST_str_eq(host, exp_host)
|
Handle NumPad events when NumLock is disabled
PR <https://github.com/Genymobile/scrcpy/pull/1188>
Fixes <https://github.com/Genymobile/scrcpy/issues/1048> | @@ -94,6 +94,23 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
MAP(SDLK_UP, AKEYCODE_DPAD_UP);
}
+ if (!(mod & (KMOD_NUM | KMOD_SHIFT))) {
+ // Handle Numpad events when Num Lock is disabled
+ // If SHIFT is pressed, a text event will be sent instead
+ switch(from) {
+ MAP(SDLK_KP_0, AKEYCODE_INSERT);
+ MAP(SDLK_KP_1, AKEYCODE_MOVE_END);
+ MAP(SDLK_KP_2, AKEYCODE_DPAD_DOWN);
+ MAP(SDLK_KP_3, AKEYCODE_PAGE_DOWN);
+ MAP(SDLK_KP_4, AKEYCODE_DPAD_LEFT);
+ MAP(SDLK_KP_6, AKEYCODE_DPAD_RIGHT);
+ MAP(SDLK_KP_7, AKEYCODE_MOVE_HOME);
+ MAP(SDLK_KP_8, AKEYCODE_DPAD_UP);
+ MAP(SDLK_KP_9, AKEYCODE_PAGE_UP);
+ MAP(SDLK_KP_PERIOD, AKEYCODE_FORWARD_DEL);
+ }
+ }
+
if (prefer_text) {
// do not forward alpha and space key events
return false;
|
netbench: nits | @@ -8,6 +8,9 @@ extern "C" {
#include <sys/mman.h>
}
+#include "util.h"
+#include "synthetic_worker.h"
+
#include <algorithm>
#include <cmath>
#include <cstdlib>
@@ -16,8 +19,6 @@ extern "C" {
#include <random>
#include <tuple>
-#include "synthetic_worker.h"
-
namespace {
void *memcpy_ermsb(void *dst, const void *src, size_t n) {
@@ -25,17 +26,6 @@ void *memcpy_ermsb(void *dst, const void *src, size_t n) {
return dst;
}
-std::vector<std::string> split(const std::string &text, char sep) {
- std::vector<std::string> tokens;
- std::string::size_type start = 0, end = 0;
- while ((end = text.find(sep, start)) != std::string::npos) {
- tokens.push_back(text.substr(start, end - start));
- start = end + 1;
- }
- tokens.push_back(text.substr(start));
- return tokens;
-}
-
inline void clflush(volatile void *p) { asm volatile("clflush (%0)" ::"r"(p)); }
// Store data (indicated by the param c) to the cache line using the
|
Fix a signed/unsiged warning.
This shows up in the userland stack on some platforms.
Thanks to Felix Weinrank for reporting this as | #ifdef __FreeBSD__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 326829 2017-12-13 17:11:57Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 332269 2018-04-08 11:37:00Z tuexen $");
#endif
#include <netinet/sctp_os.h>
@@ -2753,7 +2753,7 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset,
diff = now;
timevalsub(&diff, &time_expires);
#endif
- if (diff.tv_sec > UINT32_MAX / 1000000) {
+ if ((uint32_t)diff.tv_sec > UINT32_MAX / 1000000) {
staleness = UINT32_MAX;
} else {
staleness = diff.tv_sec * 1000000;
|
stream reuse, move log_assert to the correct location. | @@ -1044,8 +1044,8 @@ decommission_pending_tcp(struct outside_network* outnet,
if(outnet->tcp_free != pend) {
pend->next_free = outnet->tcp_free;
outnet->tcp_free = pend;
- }
log_assert(outnet->tcp_free->next_free != outnet->tcp_free);
+ }
if(pend->reuse.node.key) {
/* needs unlink from the reuse tree to get deleted */
reuse_tcp_remove_tree_list(outnet, &pend->reuse);
|
parallel-libs/boost: bump to v1.77.0 | %define pname boost
Summary: Boost free peer-reviewed portable C++ source libraries
Name: %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
-Version: 1.75.0
+Version: 1.77.0
-%define version_exp 1_75_0
+%define version_exp 1_77_0
Release: 1%{?dist}
License: BSL-1.0
|
notifications: fix post url | @@ -193,8 +193,7 @@ function getNodeUrl(
}
return graphUrl;
} else if( mod === 'post') {
- const [last, ...rest] = idx.reverse();
- return `/~landscape${groupPath}/feed/${rest.join('/')}?post=${last}`;
+ return `/~landscape${groupPath}/feed${index}`;
}
return '';
}
|
[simulator] improve Kconfig structure
add Onboard Peripheral Drivers menu | @@ -24,13 +24,15 @@ config SOC_SIMULATOR
select RT_USING_USER_MAIN
default y
+menu "Onboard Peripheral Drivers"
+
config RT_USING_DFS_WINSHAREDIR
- bool "Enable shared file system between windows"
+ bool "Enable shared file system between Windows"
select RT_USING_POSIX_FS
default n
-config BSP_USING_SAL_WINSOCK
- bool "Enable Windows socket (winsock) with SAL"
+ config BSP_USING_SOCKET
+ bool "Enable BSD Socket"
select RT_USING_POSIX_FS
select RT_USING_POSIX_SOCKET
select SAL_USING_WINSOCK
@@ -55,3 +57,5 @@ if BSP_USING_LVGL
int "LCD height"
default 480
endif
+
+endmenu
|
Fix no-early-skip without breaking early-skip | @@ -1713,9 +1713,9 @@ static void search_pu_inter(encoder_state_t * const state,
lcu->rec.y + y_local * LCU_WIDTH + x_local, LCU_WIDTH,
lcu->ref.y + y_local * LCU_WIDTH + x_local, LCU_WIDTH);
bits += no_skip_flag;
+ merge->cost[merge->size] += bits * info->state->lambda_sqrt;
}
// Add cost of coding the merge index
- merge->cost[merge->size] += bits * info->state->lambda_sqrt;
merge->bits[merge->size] = bits;
merge->keys[merge->size] = merge->size;
@@ -2127,9 +2127,8 @@ void kvz_cu_cost_inter_rd2(encoder_state_t * const state,
else {
// If we have no coeffs after quant we already have the cost calculated
*inter_cost = no_cbf_cost;
- if(cur_cu->merged && cur_cu->part_size == SIZE_2Nx2N) {
+ cur_cu->cbf = 0;
*inter_bitcost = no_cbf_bits;
- }
return;
}
@@ -2143,7 +2142,6 @@ void kvz_cu_cost_inter_rd2(encoder_state_t * const state,
if (cur_cu->merged && cur_cu->part_size == SIZE_2Nx2N) {
cur_cu->skipped = 1;
}
- kvz_inter_recon_cu(state, lcu, x, y, CU_WIDTH_FROM_DEPTH(depth), true, reconstruct_chroma);
*inter_cost = no_cbf_cost;
*inter_bitcost = no_cbf_bits;
@@ -2234,6 +2232,8 @@ void kvz_search_cu_inter(encoder_state_t * const state,
cu_info_t *cur_pu = LCU_GET_CU_AT_PX(lcu, x_local, y_local);
*cur_pu = *best_inter_pu;
+ kvz_inter_recon_cu(state, lcu, x, y, CU_WIDTH_FROM_DEPTH(depth),
+ true, state->encoder_control->chroma_format != KVZ_CSP_400);
if (*inter_cost < MAX_DOUBLE && cur_pu->inter.mv_dir & 1) {
assert(fracmv_within_tile(&info, cur_pu->inter.mv[0][0], cur_pu->inter.mv[0][1]));
|
Adding `extern "C"` to edc.h for inclusion into C++ programs | #ifndef LIBSBP_EDC_H
#define LIBSBP_EDC_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "common.h"
u16 crc16_ccitt(const u8 *buf, u32 len, u16 crc);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* LIBSBP_EDC_H */
|
vere: fix typo in secp reco jet
ecdsa-raw-recover had an erroneous jet. This commit fixes the critical
error so that the jet returns the right result according to the secp
secp256k1 spec, although it still does not match the hoon. The hoon is
subtly wrong, and will be addressed in a future commit. | @@ -207,7 +207,7 @@ u3qe_reco(u3_atom has,
ret = secp256k1_ecdsa_recover(ctx_u, /* IN: context */
& puk_u, /* OUT: pub key */
& sig_u, /* IN: signature */
- (const c3_y *) & has); /* IN: message has */
+ has_y); /* IN: message has */
if (1 != ret) {
u3l_log("\rsecp jet: crypto package error\n");
|
[core] separate func to reset FILE_CHUNK | @@ -78,12 +78,10 @@ static chunk *chunk_init(size_t sz) {
return c;
}
-static void chunk_reset(chunk *c) {
+static void chunk_reset_file_chunk(chunk *c) {
if (c->file.is_temp && !buffer_string_is_empty(c->mem)) {
unlink(c->mem->ptr);
}
- buffer_string_set_length(c->mem, 0);
-
if (c->file.fd != -1) {
close(c->file.fd);
c->file.fd = -1;
@@ -96,12 +94,17 @@ static void chunk_reset(chunk *c) {
c->file.mmap.length = 0;
c->file.is_temp = 0;
c->type = MEM_CHUNK;
+}
+
+static void chunk_reset(chunk *c) {
+ if (c->type == FILE_CHUNK) chunk_reset_file_chunk(c);
+
+ buffer_string_set_length(c->mem, 0);
c->offset = 0;
- c->next = NULL;
}
static void chunk_free(chunk *c) {
- chunk_reset(c);
+ if (c->type == FILE_CHUNK) chunk_reset_file_chunk(c);
buffer_free(c->mem);
free(c);
}
|
scheduler/ipp.c: Change job state to IPP_JOB_HELD when job is restarted with appropriate job-held-until attribute. | @@ -9374,6 +9374,9 @@ restart_job(cupsd_client_t *con, /* I - Client connection */
"Restarted by \"%s\" with job-hold-until=%s.",
username, attr->values[0].string.text);
cupsdSetJobHoldUntil(job, attr->values[0].string.text, 0);
+ cupsdSetJobState(job, IPP_JOB_HELD, CUPSD_JOB_DEFAULT,
+ "Job restarted by user with job-hold-until=%s",
+ attr->values[0].string.text);
cupsdAddEvent(CUPSD_EVENT_JOB_CONFIG_CHANGED | CUPSD_EVENT_JOB_STATE,
NULL, job, "Job restarted by user with job-hold-until=%s",
|
Support signedAndEnveloped content in PKCS7_decrypt() | @@ -481,7 +481,8 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
return 0;
}
- if (!PKCS7_type_is_enveloped(p7)) {
+ if (!PKCS7_type_is_enveloped(p7)
+ && !PKCS7_type_is_signedAndEnveloped(p7)) {
ERR_raise(ERR_LIB_PKCS7, PKCS7_R_WRONG_CONTENT_TYPE);
return 0;
}
|
input: chunk: if no tag is set, use default instance name | @@ -267,6 +267,15 @@ int flb_input_chunk_append_raw(struct flb_input_instance *in,
return -1;
}
+ /*
+ * Some callers might not set a custom tag, on that case just inherit
+ * the instance name.
+ */
+ if (!tag) {
+ tag = in->name;
+ tag_len = strlen(in->name);
+ }
+
/*
* Get a target input chunk, can be one with remaining space available
* or a new one.
|
enable mass erase for g0, worksforme | @@ -1997,7 +1997,6 @@ int stlink_erase_flash_page(stlink_t *sl, stm32_addr_t flashaddr)
int stlink_erase_flash_mass(stlink_t *sl) {
/* TODO: User MER bit to mass-erase G0, G4, WB series. */
if (sl->flash_type == STLINK_FLASH_TYPE_L0 ||
- sl->flash_type == STLINK_FLASH_TYPE_G0 ||
sl->flash_type == STLINK_FLASH_TYPE_WB) {
/* erase each page */
int i = 0, num_pages = (int) sl->flash_size/sl->flash_pgsz;
|
osThreadState for joinable threads clearified. | @@ -20,7 +20,7 @@ Threads can be in the following states:
\ref ThreadStates "BLOCKED", the next \ref ThreadStates "READY" thread with the highest priority becomes the \ref ThreadStates "RUNNING" thread.
- \b BLOCKED: Threads that are blocked either delayed, waiting for an event to occur or suspended are in the \ref ThreadStates "BLOCKED"
state.
- - \b TERMINATED: When \ref osThreadTerminate is called, threads are \ref ThreadStates "TERMINATED" with resources not yet released.
+ - \b TERMINATED: When \ref osThreadTerminate is called, threads are \ref ThreadStates "TERMINATED" with resources not yet released (applies to \ref joinable_threads "joinable threads).
- \b INACTIVE: Threads that are not created or have been terminated with all resources released are in the \ref ThreadStates "INACTIVE" state.
\image html "ThreadStatus.png" "Thread State and State Transitions"
@@ -214,7 +214,7 @@ State of a thread as retrieved by \ref osThreadGetState. In case \b osThreadGetS
will return \c osThreadError, otherwise it returns the thread state.
\var osThreadState_t::osThreadInactive
-\details The thread is created but not actively used, or has been terminated.
+\details The thread is created but not actively used, or has been terminated (returned for static control block allocation, when memory pools are used \ref osThreadError is returned as the control block is no longer valid)
\var osThreadState_t::osThreadReady
\details The thread is ready for execution but not currently running.
@@ -226,10 +226,10 @@ will return \c osThreadError, otherwise it returns the thread state.
\details The thread is currently blocked (delayed, waiting for an event or suspended).
\var osThreadState_t::osThreadTerminated
-\details The thread is terminated and all its resources are freed.
+\details The thread is terminated and all its resources are not yet freed (applies to \ref joinable_threads "joinable threads).
\var osThreadState_t::osThreadError
-\details The thread thread has raised an error condition and cannot be scheduled.
+\details The thread does not exist (has raised an error condition) and cannot be scheduled.
*/
/*=======0=========1=========2=========3=========4=========5=========6=========7=========8=========9=========0=========1====*/
|
SOVERSION bump to version 2.3.3 | @@ -63,7 +63,7 @@ set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_
# set version of the library
set(LIBYANG_MAJOR_SOVERSION 2)
set(LIBYANG_MINOR_SOVERSION 3)
-set(LIBYANG_MICRO_SOVERSION 2)
+set(LIBYANG_MICRO_SOVERSION 3)
set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION})
set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION})
|
Run |mass in CI | @@ -82,6 +82,13 @@ Promise.resolve(urbit)
.then(actions.test)
.then(actions.testCores)
.then(actions.testRenderers)
+.then(function(){
+ return urbit.line("|mass")
+ .then(function(){
+ return urbit.expectEcho("%ran-mass")
+ .then(function(){ return urbit.resetListeners(); })
+ })
+})
.then(function(){
return rePill(urbit);
})
|
zephyr: driver: bmi160: add CONFIG_ACCELGYRO_BMI160
The config option was missing and is needed by the
accelgyro_bmi_common.c.
BRANCH=none
TEST=zmake testall | #endif
/* sensors */
+#undef CONFIG_ACCELGYRO_BMI160
+#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI160
+#define CONFIG_ACCELGYRO_BMI160
+#endif
+
#undef CONFIG_ACCELGYRO_BMI260
#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI260
#define CONFIG_ACCELGYRO_BMI260
|
Document and clean up animation bind logic. | @@ -21305,6 +21305,10 @@ void damage_recursive(entity *target)
void adjust_bind(entity *e)
{
+ #define ADJUST_BIND_SET_ANIM_RESETABLE 1
+
+ e_animations target_animation;
+
// If there is no binding
// target, just get out.
if(!e->binding.ent)
@@ -21312,11 +21316,26 @@ void adjust_bind(entity *e)
return;
}
+ // Animation match flag in use?
if(e->binding.animation_match)
{
- if(e->animnum != e->binding.ent->animnum)
+ // Did user select a bind animation? If
+ // not we use the bind target's current
+ // animation.
+ target_animation = e->binding.animation_id;
+
+ if(target_animation != ANI_NONE)
{
- if(!validanim(e, e->binding.ent->animnum))
+ target_animation = e->binding.ent->animnum;
+ }
+
+ // Are we using the target animation?
+ if(e->animnum != target_animation)
+ {
+ // If we don't have the target animation
+ // and animation kill flag is set, then
+ // we kill ourselves and exit the function.
+ if(!validanim(e, target_animation))
{
// Don't have the animation? Kill ourself.
if(e->binding.animation_match & BINDING_ANI_ANIMATION_KILL)
@@ -21326,7 +21345,10 @@ void adjust_bind(entity *e)
e->binding.ent = NULL;
return;
}
- ent_set_anim(e, e->binding.ent->animnum, 1);
+
+ // Made it this far, we must have the target
+ // animation, so let's apply it.
+ ent_set_anim(e, target_animation, ADJUST_BIND_SET_ANIM_RESETABLE);
}
if(e->animpos != e->binding.ent->animpos && e->binding.animation_match & BINDING_ANI_FRAME_MATCH)
|
admin/mrsh: typo | @@ -69,7 +69,7 @@ rsh compatability package for mrcp/mrlogin/mrsh
make
%install
-DESTDIR="$%{buildroot}" make install
+DESTDIR="%{buildroot}" make install
ln -sf in.mrlogind %{buildroot}%{_sbindir}/in.rlogind
ln -sf in.mrshd %{buildroot}%{_sbindir}/in.rshd
|
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.