message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
MSVC cleanup
MSVC compiler can be used with Ninja as well. However, the current
CMake code doesn't account for it.
|
-set(VMA_LIBRARY_SOURCE_FILES
+set(CMAKE_DEBUG_POSTFIX d)
+set(CMAKE_RELWITHDEBINFO_POSTFIX rd)
+set(CMAKE_MINSIZEREL_POSTFIX s)
+
+add_library(VulkanMemoryAllocator
VmaUsage.cpp
VmaUsage.h
- "${PROJECT_SOURCE_DIR}/include/vk_mem_alloc.h"
+ ${PROJECT_SOURCE_DIR}/include/vk_mem_alloc.h
)
-# Visual Studio only debugger symbols
-if(WIN32 AND ${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
- set(VMA_LIBRARY_SOURCE_FILES ${VMA_LIBRARY_SOURCE_FILES} vk_mem_alloc.natvis)
+if (MSVC)
+ # Provides MSVC users nicer debugging support
+ target_sources(VulkanMemoryAllocator PRIVATE ${CMAKE_CURRENT_LIST_DIR}/vk_mem_alloc.natvis)
endif()
-set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_RELWITHDEBINFO_POSTFIX rd)
-set(CMAKE_MINSIZEREL_POSTFIX s)
-
-add_library(VulkanMemoryAllocator ${VMA_LIBRARY_SOURCE_FILES})
-
set_target_properties(
VulkanMemoryAllocator PROPERTIES
@@ -63,20 +61,19 @@ if(VMA_BUILD_SAMPLE)
add_executable(VmaSample ${VMA_SAMPLE_SOURCE_FILES})
add_dependencies(VmaSample VulkanMemoryAllocator VmaSampleShaders)
- # Visual Studio specific settings
- if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
+ if(MSVC)
# Use Unicode instead of multibyte set
add_compile_definitions(UNICODE _UNICODE)
- # Set VmaSample as startup project
- set_property(DIRECTORY "${PROJECT_SOURCE_DIR}" PROPERTY VS_STARTUP_PROJECT "VmaSample")
-
# Add C++ warnings and security checks
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive- /sdl /W3")
+ add_compile_options(/permissive- /sdl /W3)
# Enable multithreaded compiling
target_compile_options(VmaSample PRIVATE "/MP")
+ # Set VmaSample as startup project
+ set_property(DIRECTORY "${PROJECT_SOURCE_DIR}" PROPERTY VS_STARTUP_PROJECT "VmaSample")
+
# Set working directory for Visual Studio debugger
set_target_properties(
VmaSample
|
OcDevicepathLib: Get old DP node size in TrailedBooterDevicePath() and increase copy efficiency
|
@@ -388,18 +388,20 @@ TrailedBooterDevicePath (
// PciRoot(0x0)/Pci(...)/Pci(...)/Sata(...)/HD(...)/\com.apple.recovery.boot
//
- Size = GetDevicePathSize (DevicePath) + sizeof (CHAR16);
- NewDevicePath = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (Size);
+ Size = GetDevicePathSize (DevicePath);
+ NewDevicePath = (EFI_DEVICE_PATH_PROTOCOL *) AllocatePool (Size + sizeof (CHAR16));
if (NewDevicePath == NULL) {
//
// Allocation failure, just ignore.
//
return NULL;
}
-
+ //
+ // Strip the string termination and DP end node, which will get re-set
+ //
CopyMem (NewDevicePath, DevicePath, Size - sizeof (CHAR16) - END_DEVICE_PATH_LENGTH);
NewFilePath = (FILEPATH_DEVICE_PATH *) ((UINT8 *)DevicePathWalker - (UINT8 *)DevicePath + (UINT8 *)NewDevicePath);
- Size = DevicePathNodeLength (NewFilePath) + sizeof (CHAR16);
+ Size = DevicePathNodeLength (DevicePathWalker) + sizeof (CHAR16);
SetDevicePathNodeLength (NewFilePath, Size);
NewFilePath->PathName[Length] = L'\\';
NewFilePath->PathName[Length+1] = L'\0';
|
Squashed 'opae-libs/' changes from 2fa56e65..38c747d8
Merge pull request from OPAE/aravuri/fix_ver
opae-sdk: update opae release version to 2.0
git-subtree-dir: opae-libs
git-subtree-split:
|
cmake_minimum_required(VERSION 2.8.12)
project(opae-libs)
-set(OPAE_VERSION_MAJOR 1 CACHE STRING "OPAE major version" FORCE)
-set(OPAE_VERSION_MINOR 4 CACHE STRING "OPAE minor version" FORCE)
+set(OPAE_VERSION_MAJOR 2 CACHE STRING "OPAE major version" FORCE)
+set(OPAE_VERSION_MINOR 0 CACHE STRING "OPAE minor version" FORCE)
set(OPAE_VERSION_REVISION 0 CACHE STRING "OPAE revision version" FORCE)
set(OPAE_VERSION ${OPAE_VERSION_MAJOR}.${OPAE_VERSION_MINOR}.${OPAE_VERSION_REVISION}
CACHE STRING "OPAE version" FORCE)
|
cr50: move to prod RMA key
The new key ID is set to zero.
BRANCH=cr50, cr50-eve
TEST=verified that prod server properly responds to the challenge
generated by a CR50 running on Robo device.
|
@@ -352,13 +352,14 @@ enum nvmem_users {
#define CONFIG_RMA_AUTH
#define CONFIG_RNG
-/* Dummy values to be replaced with real ones. */
+/* Should be eventually injected into the image at build time. */
#define CONFIG_RMA_AUTH_SERVER_PUBLIC_KEY { \
- 0x03, 0xae, 0x2d, 0x2c, 0x06, 0x23, 0xe0, 0x73, \
- 0x0d, 0xd3, 0xb7, 0x92, 0xac, 0x54, 0xc5, 0xfd, \
- 0x7e, 0x9c, 0xf0, 0xa8, 0xeb, 0x7e, 0x2a, 0xb5, \
- 0xdb, 0xf4, 0x79, 0x5f, 0x8a, 0x0f, 0x28, 0x3f}
-#define CONFIG_RMA_AUTH_SERVER_KEY_ID 0x10
+ 0xe3, 0xe5, 0x66, 0xf3, 0x12, 0x25, 0x74, 0xba, \
+ 0xb3, 0x8f, 0x9f, 0x41, 0x80, 0x3b, 0x58, 0x9a, \
+ 0xb0, 0xdc, 0x71, 0x64, 0x1b, 0x6d, 0x22, 0x82, \
+ 0x9f, 0x22, 0x31, 0xb3, 0x56, 0x94, 0x8e, 0x13}
+
+#define CONFIG_RMA_AUTH_SERVER_KEY_ID 0
#define CONFIG_ENABLE_H1_ALERTS
|
debug: correct taskbt/taskbtn usage message
Correct taskbt/taskbtn cli command's usage message.
|
@@ -232,7 +232,7 @@ static void task_bt(char *buf, int32_t len, int32_t argc, char **argv)
task_id = (uint32_t)strtoul(argv[1], 0, 10);
break;
default:
- aos_cli_printf("task_bt <taskid>\r\n"
+ aos_cli_printf("taskbt <taskid>\r\n"
"taskid : task id\r\n");
return;
}
@@ -255,7 +255,7 @@ static void task_btn(char *buf, int32_t len, int32_t argc, char **argv)
if (argc == 2) {
debug_backtrace_task(argv[1], aos_cli_printf);
} else {
- aos_cli_printf("task_btn <taskname>\r\n");
+ aos_cli_printf("taskbtn <taskname>\r\n");
}
}
|
removes the option to set -l, -n, and -r (raft options)
|
@@ -90,7 +90,11 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.veb = c3n;
u3_Host.ops_u.kno_w = DefaultKernel;
- while ( (ch_i=getopt(argc, argv,"G:B:K:A:H:w:u:e:E:f:F:k:l:n:p:r:NabcdgqstvxPDRS")) != -1 ) {
+ u3_Host.ops_u.rop_s = 0;
+ u3_Host.ops_u.raf_c = 0;
+ u3_Host.ops_u.nam_c = 0;
+
+ while ( (ch_i=getopt(argc, argv,"G:B:K:A:H:w:u:e:E:f:F:k:p:NabcdgqstvxPDRS")) != -1 ) {
switch ( ch_i ) {
case 'B': {
u3_Host.ops_u.pil_c = strdup(optarg);
@@ -149,26 +153,12 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.key_c = strdup(optarg);
break;
}
- case 'l': {
- if ( c3n == _main_readw(optarg, 65536, &arg_w) ) {
- return c3n;
- } else u3_Host.ops_u.rop_s = arg_w;
- break;
- }
- case 'n': {
- u3_Host.ops_u.nam_c = strdup(optarg);
- break;
- }
case 'p': {
if ( c3n == _main_readw(optarg, 65536, &arg_w) ) {
return c3n;
} else u3_Host.ops_u.por_s = arg_w;
break;
}
- case 'r': {
- u3_Host.ops_u.raf_c = strdup(optarg);
- break;
- }
case 'R': {
u3_Host.ops_u.rep = c3y;
return c3y;
@@ -248,11 +238,6 @@ _main_getopt(c3_i argc, c3_c** argv)
return c3n;
}
- if ( u3_Host.ops_u.rop_s == 0 && u3_Host.ops_u.raf_c != 0 ) {
- fprintf(stderr, "The -r flag requires -l.\n");
- return c3n;
- }
-
if ( c3y == u3_Host.ops_u.bat ) {
u3_Host.ops_u.dem = c3y;
u3_Host.ops_u.nuu = c3y;
@@ -366,13 +351,10 @@ u3_ve_usage(c3_i argc, c3_c** argv)
"-g Set GC flag\n",
"-K stage Start at Hoon kernel version stage\n",
"-k keys Private key file\n",
- "-l port Initial peer port\n",
- "-n host Set unix hostname\n",
"-N Enable networking in fake mode (-F)\n",
"-p ames_port Set the ames port to bind to\n",
"-P Profiling\n",
"-q Quiet\n",
- "-r host Initial peer address\n",
"-R Report urbit build info\n",
"-s Pill URL from arvo git hash\n",
"-S Disable battery hashing\n",
|
[io] try to fix issue with fclib output
|
@@ -120,7 +120,7 @@ class FrictionContactTrace(FrictionContact):
w_backup = self.w().copy()
z_backup = self.z().copy()
SO = self.numericsSolverOptions()
-
+ fclib_written = False
if self.condition(SO) and has_fclib:
# problem = self.getNumericsProblemPtr()
@@ -158,11 +158,12 @@ class FrictionContactTrace(FrictionContact):
attrs.create('numberOfInvolvedDS',
self._nsds.topology().numberOfInvolvedDS(1))
+ fclib_written =True
info = self.solve()
- if self.condition(SO) and has_fclib:
+ if fclib_written:
solution = F.fclib_solution()
solution.u = self.w()
|
docs: update ftm docs
|
@@ -1620,7 +1620,7 @@ Current implementation of 802.11k includes support for beacon measurement report
Refer ESP-IDF example :idf_file:`examples/wifi/roaming/README.md` to set up and use these APIs. Example code only demonstrates how these APIs can be used, and the application should define its own algorithm and cases as required.
-.. only:: esp32s2 or esp32c3
+.. only:: SOC_WIFI_FTM_SUPPORT
Wi-Fi Location
-------------------------------
|
Update main.c
fixed display of AtomVM's exit value
modified forever-loop at the end of main to avoid avoid console messages like
task_wdt: Task watchdog got triggered. The following tasks did not reset the watchdog in time
messages
|
@@ -67,9 +67,17 @@ void app_main()
printf("Starting: %s...\n", startup_module_name);
printf("---\n");
context_execute_loop(ctx, mod, "start", 0);
- printf("Return value: %lx\n", (long) term_to_int32(ctx->x[0]));
-
- while(1);
+ term ret_value = ctx->x[0];
+ fprintf(stderr, "AtomVM finished with return value = ");
+ term_display(stderr, ret_value, ctx);
+ fprintf(stderr, "\n");
+
+ fprintf(stderr, "going to sleep forever..\n");
+ while(1) {
+ // avoid task_wdt: Task watchdog got triggered. The following tasks did not reset the watchdog in time
+ // ..
+ vTaskDelay(5000 / portTICK_PERIOD_MS);
+ }
}
const void *avm_partition(int *size)
|
[proxy] [test] t/50reverse-proxy-https.t replace wikipedia.org with localhost.examp1e.net because of connect errors
|
@@ -20,6 +20,14 @@ my $upstream = spawn_server(
},
);
+my $examp1e_server = spawn_h2o(<< "EOT");
+hosts:
+ default:
+ paths:
+ "/":
+ file.dir: @{[ DOC_ROOT ]}
+EOT
+
subtest "reverse-proxy" => sub {
my $server = spawn_h2o(<< "EOT");
hosts:
@@ -30,8 +38,9 @@ hosts:
"/no-verify":
proxy.reverse.url: https://127.0.0.1:$upstream_port
proxy.ssl.verify-peer: OFF
- "/wikipedia":
- proxy.reverse.url: https://en.wikipedia.org/wiki/Main_Page
+ "/examp1e":
+ proxy.reverse.url: https://localhost.examp1e.net:$examp1e_server->{tls_port}
+ proxy.ssl.verify-peer: OFF
EOT
run_with_curl($server, sub {
my ($proto, $port, $curl) = @_;
@@ -39,7 +48,7 @@ EOT
like $resp, qr{^HTTP/[^ ]* 502\s}is;
$resp = `$curl --silent --dump-header /dev/stderr --max-redirs 0 $proto://127.0.0.1:$port/no-verify/ 2>&1 > /dev/null`;
unlike $resp, qr{^HTTP/[^ ]* 502\s}is;
- $resp = `$curl --silent --dump-header /dev/stderr --max-redirs 0 $proto://127.0.0.1:$port/wikipedia/ 2>&1 > /dev/null`;
+ $resp = `$curl --silent --dump-header /dev/stderr --max-redirs 0 $proto://127.0.0.1:$port/examp1e/ 2>&1 > /dev/null`;
like $resp, qr{^HTTP/[^ ]* 200\s}is;
});
};
|
[bsp][stm32] add rt_hw_us_delay
|
@@ -86,6 +86,41 @@ void _Error_Handler(char *s, int num)
/* USER CODE END Error_Handler */
}
+/**
+ * This function will delay for some us.
+ *
+ * @param us the delay time of us
+ */
+void rt_hw_us_delay(rt_uint32_t us)
+{
+ rt_uint32_t ticks;
+ rt_uint32_t told, tnow, tcnt = 0;
+ rt_uint32_t reload = SysTick->LOAD;
+
+ ticks = us * reload / (1000000 / RT_TICK_PER_SECOND);
+ told = SysTick->VAL;
+ while (1)
+ {
+ tnow = SysTick->VAL;
+ if (tnow != told)
+ {
+ if (tnow < told)
+ {
+ tcnt += told - tnow;
+ }
+ else
+ {
+ tcnt += reload - tnow + told;
+ }
+ told = tnow;
+ if (tcnt >= ticks)
+ {
+ break;
+ }
+ }
+ }
+}
+
/**
* This function will initial STM32 board.
*/
|
Remove unused fields from `ProcConfig`
|
@@ -23,20 +23,12 @@ type startConfig struct {
type procConfig struct {
Procname string `mapstructure:"procname,omitempty" json:"procname,omitempty" yaml:"procname,omitempty"`
Arg string `mapstructure:"arg,omitempty" json:"arg,omitempty" yaml:"arg,omitempty"`
- Hostname string `mapstructure:"hostname,omitempty" json:"hostname,omitempty" yaml:"hostname,omitempty"`
- Username string `mapstructure:"username,omitempty" json:"username,omitempty" yaml:"username,omitempty"`
- Env string `mapstructure:"env,omitempty" json:"env,omitempty" yaml:"env,omitempty"`
- Ancestor string `mapstructure:"ancestor,omitempty" json:"ancestor,omitempty" yaml:"ancestor,omitempty"`
}
// allowProcConfig represents a allowed process configuration
type allowProcConfig struct {
Procname string `mapstructure:"procname,omitempty" json:"procname,omitempty" yaml:"procname,omitempty"`
Arg string `mapstructure:"arg,omitempty" json:"arg,omitempty" yaml:"arg,omitempty"`
- Hostname string `mapstructure:"hostname,omitempty" json:"hostname,omitempty" yaml:"hostname,omitempty"`
- Username string `mapstructure:"username,omitempty" json:"username,omitempty" yaml:"username,omitempty"`
- Env string `mapstructure:"env,omitempty" json:"env,omitempty" yaml:"env,omitempty"`
- Ancestor string `mapstructure:"ancestor,omitempty" json:"ancestor,omitempty" yaml:"ancestor,omitempty"`
Config libscope.ScopeConfig `mapstructure:"config" json:"config" yaml:"config"`
}
|
Remove dependencies to external libraries for the dcd driver
The core of tinyusb must be as independent as possible, we previously
relied on nuclei-sdk or the GD32VF103 firmware library for the synopsys
driver to work with the GD32VF103. Fortunatly we needed very few parts
from them so we implement them here.
|
#define EP_FIFO_SIZE_FS 1280
#elif CFG_TUSB_MCU == OPT_MCU_GD32VF103
-#define STM32F1_SYNOPSYS
-#include "gd32vf103.h"
-#include "nmsis_core.h"
-#include "core_feature_eclic.h"
#include "synopsys_common.h"
+
+// These numbers are the same for the whole GD32VF103 family.
+#define OTG_FS_IRQn 86
#define EP_MAX_FS 4
#define EP_FIFO_SIZE_FS 1280
-#define OTG_FS_IRQn USBFS_IRQn
-#define NVIC_EnableIRQ ECLIC_EnableIRQ
-#define NVIC_DisableIRQ ECLIC_DisableIRQ
+
+// The GD32VF103 is a RISC-V MCU, which implements the ECLIC Core-Local
+// Interrupt Controller by Nuclei. It is nearly API compatible to the
+// NVIC used by ARM MCUs.
+#define ECLIC_INTERRUPT_ENABLE_BASE 0xD2001001UL
+
+#define NVIC_EnableIRQ __eclic_enable_interrupt
+#define NVIC_DisableIRQ __eclic_disable_interrupt
+
+static inline void __eclic_enable_interrupt (uint32_t irq) {
+ *(volatile uint8_t*)(ECLIC_INTERRUPT_ENABLE_BASE + (irq * 4)) = 1;
+}
+
+static inline void __eclic_disable_interrupt (uint32_t irq){
+ *(volatile uint8_t*)(ECLIC_INTERRUPT_ENABLE_BASE + (irq * 4)) = 0;
+}
#else
#error "Unsupported MCUs"
|
Remove preinstall script from node port npm install in CMake environment (no guix).
|
@@ -33,7 +33,7 @@ source_group_by_path(${source_path} "\\\\.js$"
if(NOT OPTION_BUILD_GUIX)
add_custom_target(${target} ALL
- COMMAND npm install
+ COMMAND npm install --ignore-scripts
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
SOURCES ${sources}
)
|
fix r package build script
|
@@ -46,13 +46,13 @@ if %errorlevel% neq 0 exit /b %errorlevel%
copy README.md catboost
if %errorlevel% neq 0 exit /b %errorlevel%
-xcopy R catboost /S /E
+xcopy R catboost\R /S /E /I
if %errorlevel% neq 0 exit /b %errorlevel%
-xcopy inst catboost /S /E
+xcopy inst catboost\inst /S /E /I
if %errorlevel% neq 0 exit /b %errorlevel%
-xcopy man catboost /S /E
+xcopy man catboost\man /S /E /I
if %errorlevel% neq 0 exit /b %errorlevel%
-xcopy tests catboost /S /E
+xcopy tests catboost\tests /S /E /I
if %errorlevel% neq 0 exit /b %errorlevel%
mkdir catboost\inst\libs
@@ -62,3 +62,4 @@ if %errorlevel% neq 0 exit /b %errorlevel%
copy src\libcatboostr.dll catboost\inst\libs\x64
if %errorlevel% neq 0 exit /b %errorlevel%
7z -ttar a dummy catboost -so | 7z -si -tgzip a catboost-R-Windows.tgz
+if %errorlevel% neq 0 exit /b %errorlevel%
|
Sign zones with NSEC(3) TTL set to the minimum of the MINIMUM field of the SOA record and the TTL of the SOA itself
per draft-ietf-dnsop-nsec-ttl-01
|
@@ -815,17 +815,24 @@ ldns_dnssec_zone_create_nsecs(ldns_dnssec_zone *zone,
uint32_t nsec_ttl;
ldns_dnssec_rrsets *soa;
- /* the TTL of NSEC rrs should be set to the minimum TTL of
- * the zone SOA (RFC4035 Section 2.3)
+ /* The TTL value for any NSEC RR SHOULD be the same TTL value as the
+ * lesser of the MINIMUM field of the SOA record and the TTL of the SOA
+ * itself. This matches the definition of the TTL for negative
+ * responses in [RFC2308]. (draft-ietf-dnsop-nsec-ttl-01 update of
+ * RFC4035 Section 2.3)
*/
soa = ldns_dnssec_name_find_rrset(zone->soa, LDNS_RR_TYPE_SOA);
/* did the caller actually set it? if not,
* fall back to default ttl
*/
- if (soa && soa->rrs && soa->rrs->rr
- && (ldns_rr_rdf(soa->rrs->rr, 6) != NULL)) {
- nsec_ttl = ldns_rdf2native_int32(ldns_rr_rdf(soa->rrs->rr, 6));
+ if (soa && soa->rrs && soa->rrs->rr) {
+ ldns_rr *soa_rr = soa->rrs->rr;
+ ldns_rdf *min_rdf = ldns_rr_rdf(soa_rr, 6);
+
+ nsec_ttl = min_rdf == NULL
+ || ldns_rr_ttl(soa_rr) < ldns_rdf2native_int32(min_rdf)
+ ? ldns_rr_ttl(soa_rr) : ldns_rdf2native_int32(min_rdf);
} else {
nsec_ttl = LDNS_DEFAULT_TTL;
}
@@ -909,17 +916,24 @@ ldns_dnssec_zone_create_nsec3s_mkmap(ldns_dnssec_zone *zone,
return LDNS_STATUS_ERR;
}
- /* the TTL of NSEC rrs should be set to the minimum TTL of
- * the zone SOA (RFC4035 Section 2.3)
+ /* The TTL value for any NSEC RR SHOULD be the same TTL value as the
+ * lesser of the MINIMUM field of the SOA record and the TTL of the SOA
+ * itself. This matches the definition of the TTL for negative
+ * responses in [RFC2308]. (draft-ietf-dnsop-nsec-ttl-01 update of
+ * RFC4035 Section 2.3)
*/
soa = ldns_dnssec_name_find_rrset(zone->soa, LDNS_RR_TYPE_SOA);
/* did the caller actually set it? if not,
* fall back to default ttl
*/
- if (soa && soa->rrs && soa->rrs->rr
- && ldns_rr_rdf(soa->rrs->rr, 6) != NULL) {
- nsec_ttl = ldns_rdf2native_int32(ldns_rr_rdf(soa->rrs->rr, 6));
+ if (soa && soa->rrs && soa->rrs->rr) {
+ ldns_rr *soa_rr = soa->rrs->rr;
+ ldns_rdf *min_rdf = ldns_rr_rdf(soa_rr, 6);
+
+ nsec_ttl = min_rdf == NULL
+ || ldns_rr_ttl(soa_rr) < ldns_rdf2native_int32(min_rdf)
+ ? ldns_rr_ttl(soa_rr) : ldns_rdf2native_int32(min_rdf);
} else {
nsec_ttl = LDNS_DEFAULT_TTL;
}
|
added examples to help menu
|
@@ -1557,7 +1557,12 @@ printf("%s %s (C) %s ZeroBeat\n"
"--help : show this help\n"
"--version : show version\n"
"\n"
- "If hcxpsktool recovered your password, you should change it immediately!\n"
+ "if hcxpsktool recovered your password, you should change it immediately!\n"
+ "\n"
+ "examples:\n"
+ "hcxpsktool -i hashfile.hccapx | sort | uniq | hashcat -m 2500 hashfile.hccapx\n"
+ "hcxpsktool -z hashfile.16800 | sort | uniq | hashcat -m 16800 hashfile.16800\n"
+ "hcxpsktool -z hashfile.16800 | sort | uniq | john --stdin --format=wpapsk-opencl hashfile.16800\n"
"\n", eigenname, VERSION, VERSION_JAHR, eigenname);
exit(EXIT_SUCCESS);
}
|
Update 'Q' behavior
|
@@ -756,43 +756,46 @@ END_PHASE
BEGIN_DUAL_PHASE_0(query)
REALIZE_DUAL;
+ I32 data[3];
+ data[0] = 0; // x
+ data[1] = 0; // y
+ data[2] = 0; // len
+ if (IS_AWAKE && DUAL_IS_ACTIVE) {
+ data[0] = (I32)index_of(PEEK(0, -3));
+ data[1] = (I32)index_of(PEEK(0, -2));
+ data[2] = (I32)index_of(PEEK(0, -1));
+ STORE(data);
+ }
BEGIN_DUAL_PORTS
- PORT(0, -1, IN | HASTE);
- PORT(1, 0, OUT);
- END_PORTS
- if (IS_AWAKE) {
- Usz len = usz_clamp(index_of(PEEK(0, -1)), 0, 16) + 1;
- I32 len_data[1];
- len_data[0] = (I32)len;
- STORE(len_data);
- Usz max_x = x + len + 1;
- if (max_x > width)
- max_x = width;
- Mark* i = mbuffer + y * width + x + 1;
- Mark* e = mbuffer + y * width + max_x;
- while (i != e) {
- *i = (Mark)(*i | Mark_flag_lock);
- ++i;
+ PORT(0, -3, IN | HASTE); // x
+ PORT(0, -2, IN | HASTE); // y
+ PORT(0, -1, IN | HASTE); // len
+ I32 in_x = data[0] + 1;
+ I32 in_y = data[1];
+ I32 len = data[2];
+ I32 out_x = -len + 1;
+ // todo direct buffer manip
+ for (I32 i = 0; i < len; ++i) {
+ PORT(in_y, in_x + i, IN);
}
+ for (I32 i = 0; i < len; ++i) {
+ PORT(1, out_x + i, OUT);
}
+ END_PORTS
END_PHASE
BEGIN_DUAL_PHASE_1(query)
- I32 len_data[1];
- if (LOAD(len_data) && len_data[0] >= 1 && len_data[0] <= 17) {
- Usz len = (Usz)len_data[0];
- Usz max_x = x + len + 1;
- if (max_x >= width)
- max_x = width;
- Glyph const* i = gbuffer + y * width + x + 1;
- Glyph const* e = gbuffer + y * width + max_x;
- Usz count = 0;
- while (i != e) {
- if (*i != '.')
- ++count;
- ++i;
+ REALIZE_DUAL;
+ STOP_IF_DUAL_INACTIVE;
+ I32 data[3];
+ if (LOAD(data)) {
+ I32 in_x = data[0] + 1;
+ I32 in_y = data[1];
+ I32 len = data[2];
+ I32 out_x = -len + 1;
+ for (I32 i = 0; i < len; ++i) {
+ Glyph g = PEEK(in_y, in_x + i);
+ POKE(1, out_x + i, g);
}
- Glyph g = glyph_of(count % Glyphs_index_max);
- POKE(1, 0, g);
}
END_PHASE
|
Add project email to CoC
|
@@ -60,7 +60,7 @@ representative at an online or offline event.
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
-FIXME.
+[emailing the project team][email].
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
@@ -122,6 +122,7 @@ Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).
[homepage]: https://www.contributor-covenant.org
+[email]: mailto:jasonhall96686@gmail.com
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
|
OcBootManagementLib: Fix potential NULL dereferencing
|
@@ -1077,7 +1077,7 @@ InternalRegisterBootstrapBootOption (
DEBUG_INFO,
"OCB: %a existing option at Boot%04x, %a\n",
CurrOptionExists ? "Have" : "No",
- BootOrder[1],
+ BootOrder != NULL ? BootOrder[1] : 0,
CurrOptionValid ? "valid" : "invalid"
));
|
Fix handles tab showing 'Non-existent process' for newly created handles
|
@@ -333,7 +333,9 @@ PPH_STRING PhGetClientIdName(
}
else
{
- name = PhGetClientIdNameEx(ClientId, NULL);
+ // HACK
+ // Workaround race condition with newly created process handles showing as 'Non-existent process' -dmex
+ name = PhStdGetClientIdName(ClientId);
}
return name;
|
input_thread: use new collectos reference
|
@@ -121,7 +121,7 @@ static int input_collector_fd(flb_pipefd_t fd, struct flb_input_instance *ins)
struct flb_config *config = ins->config;
mk_list_foreach(head, &ins->collectors) {
- collector = mk_list_entry(head, struct flb_input_collector, _head_ins);
+ collector = mk_list_entry(head, struct flb_input_collector, _head);
if (collector->fd_event == fd) {
break;
}
@@ -675,7 +675,7 @@ int flb_input_thread_collectors_start(struct flb_input_instance *ins)
struct flb_input_collector *coll;
mk_list_foreach(head, &ins->collectors) {
- coll = mk_list_entry(head, struct flb_input_collector, _head_ins);
+ coll = mk_list_entry(head, struct flb_input_collector, _head);
ret = flb_input_collector_start(coll->id, ins);
if (ret < 0) {
return -1;
|
Clean up tick number presentation
|
@@ -296,9 +296,11 @@ void draw_ui_bar(WINDOW* win, int win_y, int win_x, const char* filename,
Usz tick_num) {
wmove(win, win_y, win_x);
wattrset(win, A_dim | Cdef_normal);
- wprintw(win, "%s tick ", filename);
- wattrset(win, A_normal | fg_bg(C_white, C_natural));
- wprintw(win, "%d", (int)tick_num);
+ wprintw(win, "%s ", filename);
+ wattrset(win, A_normal | Cdef_normal);
+ wprintw(win, "%6d", (int)tick_num);
+ wattrset(win, A_dim | Cdef_normal);
+ waddch(win, 'f');
wclrtoeol(win);
}
|
sysdeps/managarm: Add missing error handling to sys_poll
|
@@ -1050,6 +1050,9 @@ int sys_poll(struct pollfd *fds, nfds_t count, int timeout, int *num_events) {
managarm::posix::SvrResponse<MemoryAllocator> resp(getSysdepsAllocator());
resp.ParseFromArray(recv_resp.data(), recv_resp.length());
+ if(resp.error() == managarm::posix::Errors::ILLEGAL_ARGUMENTS) {
+ return EINVAL;
+ } else {
__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
__ensure(resp.events_size() == count);
@@ -1063,6 +1066,7 @@ int sys_poll(struct pollfd *fds, nfds_t count, int timeout, int *num_events) {
*num_events = m;
return 0;
}
+}
int sys_epoll_create(int flags, int *fd) {
__ensure(!(flags & ~(EPOLL_CLOEXEC)));
|
Fix SPV type conversion for vec
|
@@ -462,10 +462,10 @@ static spv_result spv_parse_push_constants(spv_context* spv, const uint32_t* op,
}
if (OP_CODE(type) == 22 && type[2] == 32) { // OpTypeFloat
- if (columnCount > 2 && columnCount < 4 && componentCount == columnCount) {
+ if (columnCount >= 2 && columnCount <= 4 && componentCount == columnCount) {
constant->type = SPV_MAT2 + columnCount - 2;
- } else if (columnCount == 1 && componentCount > 2 && componentCount < 4) {
- constant->type = SPV_F32x2 + columnCount - 2;
+ } else if (columnCount == 1 && componentCount >= 2 && componentCount <= 4) {
+ constant->type = SPV_F32x2 + componentCount - 2;
} else if (columnCount == 1 && componentCount == 1) {
constant->type = SPV_F32;
} else {
@@ -473,7 +473,7 @@ static spv_result spv_parse_push_constants(spv_context* spv, const uint32_t* op,
}
} else if (OP_CODE(type) == 21 && type[2] == 32) { // OpTypeInteger
if (type[3] > 0) { // signed
- if (columnCount == 1 && componentCount > 2 && componentCount < 4) {
+ if (columnCount == 1 && componentCount >= 2 && componentCount <= 4) {
constant->type = SPV_I32x2 + componentCount - 2;
} else if (columnCount == 1 && componentCount == 1) {
constant->type = SPV_I32;
@@ -481,7 +481,7 @@ static spv_result spv_parse_push_constants(spv_context* spv, const uint32_t* op,
return SPV_UNSUPPORTED_PUSH_CONSTANT_TYPE;
}
} else {
- if (columnCount == 1 && componentCount > 2 && componentCount < 4) {
+ if (columnCount == 1 && componentCount >= 2 && componentCount <= 4) {
constant->type = SPV_U32x2 + componentCount - 2;
} else if (columnCount == 1 && componentCount == 1) {
constant->type = SPV_U32;
|
interface/api: fix s3 calls for setting endpoint, keys
|
@@ -18,15 +18,15 @@ export default class S3Api extends BaseApi<StoreState> {
}
setEndpoint(endpoint: string) {
- this.s3Action({ setEndpoint: endpoint });
+ this.s3Action({ 'set-endpoint': endpoint });
}
setAccessKeyId(accessKeyId: string) {
- this.s3Action({ setAccessKeyId: accessKeyId });
+ this.s3Action({ 'set-access-key-id': accessKeyId });
}
setSecretAccessKey(secretAccessKey: string) {
- this.s3Action({ setSecretAccessKey: secretAccessKey });
+ this.s3Action({ 'set-secret-access-key': secretAccessKey });
}
private s3Action(data: any) {
|
Explicitly implement (map -> hoon map) and write simple qc tests.
|
@@ -16,6 +16,7 @@ import qualified DeriveNounTests
import qualified ArvoTests
import qualified AmesTests
import qualified BehnTests
+import qualified HoonMapSetTests
main :: IO ()
main = do
@@ -27,4 +28,5 @@ main = do
, AmesTests.tests
, LogTests.tests
, BehnTests.tests
+ , HoonMapSetTests.tests
]
|
OCLint: Disable check for Yan LR plugin
|
@@ -25,8 +25,7 @@ oclint -p "@PROJECT_BINARY_DIR@" -enable-global-analysis -enable-clang-static-an
"src/plugins/directoryvalue/"*.cpp \
"src/plugins/mini/mini.c" \
"src/plugins/yamlcpp/"*.cpp \
- "src/plugins/yamlsmith/"*.cpp \
- "src/plugins/yanlr/"*.cpp
+ "src/plugins/yamlsmith/"*.cpp
exit_if_fail "OCLint found problematic code"
end_script
|
Analysis workflow, fix spelling for Pod.
|
@@ -249,8 +249,9 @@ jobs:
export prepath=`pwd`
echo prepath=${prepath}
echo "curl cpanm"
- curl -L https://cpanmin.us/ -o cpanm
- perl cpanm POD::Usage
+ curl -L -k -s -S -o cpanm https://cpanmin.us/
+ echo "perl cpanm Pod::Usage"
+ perl cpanm Pod::Usage
mkdir openssl
echo "curl openssl"
curl -L -k -s -S -o openssl-1.1.1j.tar.gz https://www.openssl.org/source/openssl-1.1.1j.tar.gz
|
Working (hopefully) emscripten Travis config
|
@@ -14,7 +14,6 @@ before_install:
- docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash
script:
- - docker exec -it emscripten mkdir build.em
- - docker exec -it emscripten cd build.em
- - docker exec -it emscripten emcmake cmake .. -G "Unix Makefiles"
- - docker exec -it emscripten make
\ No newline at end of file
+ - mkdir build.em
+ - docker exec -it emscripten emcmake cmake -B build.em -G "Unix Makefiles"
+ - docker exec -it emscripten make -C build.em
\ No newline at end of file
|
csvstorage: add quotes on export if newline is found
|
@@ -632,8 +632,15 @@ static int csvWrite (KeySet * returned, Key * parentKey, Key * colAsParent, char
while ((tmp = ksNext (headerKs)) != NULL)
{
++colCounter;
+ if ((strchr (keyName (tmp), '\n') != NULL) && (keyName (tmp)[0] != '"'))
+ {
+ fprintf (fp, ";\"%s\"", keyName (tmp) + strlen (keyName (cur)) + 1);
+ }
+ else
+ {
fprintf (fp, ";%s", keyName (tmp) + strlen (keyName (cur)) + 1);
}
+ }
fprintf (fp, "\n");
if (columns == 0)
{
@@ -656,6 +663,10 @@ static int csvWrite (KeySet * returned, Key * parentKey, Key * colAsParent, char
{
fprintf (fp, "\"%s\"", keyString (toWrite));
}
+ else if ((strchr (keyString (toWrite), '\n') != NULL) && (keyString (toWrite)[0] != '"'))
+ {
+ fprintf (fp, "\"%s\"", keyString (toWrite));
+ }
else
{
fprintf (fp, "%s", keyString (toWrite));
|
remove 0x1BE check (breaks some vehicles)
|
@@ -29,7 +29,6 @@ AddrCheckStruct honda_rx_checks[] = {
{.msg = {{0x1A6, 0, 8}, {0x296, 0, 4}}, .check_checksum = true, .max_counter = 3U, .expected_timestep = 40000U},
{.msg = {{0x158, 0, 8}}, .check_checksum = true, .max_counter = 3U, .expected_timestep = 10000U},
{.msg = {{0x17C, 0, 8}}, .check_checksum = true, .max_counter = 3U, .expected_timestep = 10000U},
- {.msg = {{0x1BE, 0, 3}}, .check_checksum = true, .max_counter = 3U, .expected_timestep = 10000U},
};
const int HONDA_RX_CHECKS_LEN = sizeof(honda_rx_checks) / sizeof(honda_rx_checks[0]);
@@ -38,7 +37,6 @@ AddrCheckStruct honda_bh_rx_checks[] = {
{.msg = {{0x296, 1, 4}}, .check_checksum = true, .max_counter = 3U, .expected_timestep = 40000U},
{.msg = {{0x158, 1, 8}}, .check_checksum = true, .max_counter = 3U, .expected_timestep = 10000U},
{.msg = {{0x17C, 1, 8}}, .check_checksum = true, .max_counter = 3U, .expected_timestep = 10000U},
- {.msg = {{0x1BE, 1, 3}}, .check_checksum = true, .max_counter = 3U, .expected_timestep = 10000U},
};
const int HONDA_BH_RX_CHECKS_LEN = sizeof(honda_bh_rx_checks) / sizeof(honda_bh_rx_checks[0]);
|
gk110: Add not3a flag for LIMM form of logop instruction
|
@@ -1654,7 +1654,7 @@ static struct insn tabc[] = {
{ 0x1b80000000000000ull, 0xff80000000000000ull, N("quadon") },
{ 0x1c00000000000000ull, 0xff80000000000000ull, N("quadpop") },
- { 0x2000000000000000ull, 0xfc80000000000000ull, T(join), T(p), T(logop38), N("b32"), DST, SRC1, LIMM },
+ { 0x2000000000000000ull, 0xf880000000000000ull, T(join), T(p), T(logop38), N("b32"), DST, T(not3a), SRC1, LIMM },
{ 0x4000000000000000ull, 0xf180000000000000ull, T(join), T(p), N("add"), T(ftz3a), N("f32"), DST, T(neg3b), T(abs39), SRC1, LIMM },
{ 0x6000000000000000ull, 0xe000000000000003ull, N("fma"), T(p), T(ftz38), T(fmz39), T(sat3a), N("f32"), DST, T(acout37), T(neg3b), SRC1, LIMM, T(neg3c), DST },
{ 0xa000000000000000ull, 0xe000000000000000ull, T(join), T(p), N("add"), N("b32"), DST, T(acout37), SESTART, N("shl"), SRC1, SHCNL, SEEND, LIMM},
|
Add `jpm run` and `jpm rules`
|
@@ -818,6 +818,9 @@ Subcommands are:
test : run tests. Tests should be .janet files in the test/ directory relative to project.janet.
deps : install dependencies for the current project.
clear-cache : clear the git cache. Useful for updating dependencies.
+ run rule : run a rule. Can also run custom rules added via (phony "task" [deps...] ...)
+ or (rule "ouput.file" [deps...] ...).
+ rules : list rules available with run.
Keys are:
--modpath : The directory to install modules to. Defaults to $JANET_MODPATH, $JANET_PATH, or (dyn :syspath)
@@ -863,6 +866,12 @@ Flags are:
[]
(local-rule "install-deps"))
+(defn- list-rules
+ []
+ (import-rules "./project.janet")
+ (def ks (sort (seq [k :keys (dyn :rules)] k)))
+ (each k ks (print k)))
+
(def- subcommands
{"build" build
"clean" clean
@@ -871,6 +880,8 @@ Flags are:
"help" help
"deps" deps
"clear-cache" clear-cache
+ "run" local-rule
+ "rules" list-rules
"uninstall" uninstall-cmd})
(def- args (tuple/slice (dyn :args) 1))
|
sim: change `make_tlv` to dynamic instead of cfg
Use a runtime query of configuration instead of conditional compilation.
|
@@ -780,56 +780,35 @@ pub fn install_image(flashmap: &mut SimFlashMap, slots: &[SlotInfo], slot: usize
result
}
-#[cfg(feature = "sig-rsa")]
-#[cfg(feature = "enc-kw")]
fn make_tlv() -> TlvGen {
- TlvGen::new_rsa_kw()
+ if Caps::EcdsaP224.present() {
+ panic!("Ecdsa P224 not supported in Simulator");
}
-#[cfg(feature = "sig-rsa")]
-#[cfg(not(feature = "enc-rsa"))]
-#[cfg(not(feature = "enc-kw"))]
-fn make_tlv() -> TlvGen {
- TlvGen::new_rsa_pss()
-}
-
-#[cfg(feature = "sig-ecdsa")]
-#[cfg(feature = "enc-kw")]
-fn make_tlv() -> TlvGen {
+ if Caps::EncKw.present() {
+ if Caps::RSA2048.present() {
+ TlvGen::new_rsa_kw()
+ } else if Caps::EcdsaP256.present() {
TlvGen::new_ecdsa_kw()
+ } else {
+ TlvGen::new_enc_kw()
}
-
-#[cfg(feature = "sig-ecdsa")]
-#[cfg(not(feature = "enc-kw"))]
-fn make_tlv() -> TlvGen {
- TlvGen::new_ecdsa()
-}
-
-#[cfg(not(feature = "sig-rsa"))]
-#[cfg(feature = "enc-rsa")]
-fn make_tlv() -> TlvGen {
+ } else if Caps::EncRsa.present() {
+ if Caps::RSA2048.present() {
+ TlvGen::new_sig_enc_rsa()
+ } else {
TlvGen::new_enc_rsa()
}
-
-#[cfg(feature = "sig-rsa")]
-#[cfg(feature = "enc-rsa")]
-fn make_tlv() -> TlvGen {
- TlvGen::new_sig_enc_rsa()
+ } else {
+ // The non-encrypted configuration.
+ if Caps::RSA2048.present() {
+ TlvGen::new_rsa_pss()
+ } else if Caps::EcdsaP256.present() {
+ TlvGen::new_ecdsa()
+ } else {
+ TlvGen::new_hash_only()
}
-
-#[cfg(not(feature = "sig-rsa"))]
-#[cfg(not(feature = "sig-ecdsa"))]
-#[cfg(feature = "enc-kw")]
-fn make_tlv() -> TlvGen {
- TlvGen::new_enc_kw()
}
-
-#[cfg(not(feature = "sig-rsa"))]
-#[cfg(not(feature = "sig-ecdsa"))]
-#[cfg(not(feature = "enc-rsa"))]
-#[cfg(not(feature = "enc-kw"))]
-fn make_tlv() -> TlvGen {
- TlvGen::new_hash_only()
}
#[cfg(feature = "enc-rsa")]
|
TCPMV2: Followup on Revision addition
Addressing comments on
TEST="make runhosttests" and "make try_build_boards"
BRANCH=NONE
|
@@ -7122,8 +7122,10 @@ __maybe_unused static void pe_get_revision_entry(int port)
* Only USB PD partners with major revision 3.0 could potentially
* respond to Get_Revision.
*/
- if (prl_get_rev(port, TCPCI_MSG_SOP) != PD_REV30)
+ if (prl_get_rev(port, TCPCI_MSG_SOP) != PD_REV30) {
+ pe_set_ready_state(port);
return;
+ }
/* Send a Get_Revision message */
send_ctrl_msg(port, TCPCI_MSG_SOP, PD_CTRL_GET_REVISION);
@@ -7137,10 +7139,8 @@ __maybe_unused static void pe_get_revision_run(int port)
int ext;
enum pe_msg_check msg_check;
- if (prl_get_rev(port, TCPCI_MSG_SOP) != PD_REV30) {
- pe_set_ready_state(port);
+ if (prl_get_rev(port, TCPCI_MSG_SOP) != PD_REV30)
return;
- }
/* Check the state of the message sent */
msg_check = pe_sender_response_msg_run(port);
@@ -7157,6 +7157,14 @@ __maybe_unused static void pe_get_revision_run(int port)
/* Revision returned by partner */
pe[port].partner_rmdo =
*((struct rmdo *) rx_emsg[port].buf);
+ } else if (type != PD_CTRL_NOT_SUPPORTED) {
+ /*
+ * If the partner response with a message other than
+ * Revision or Not_Supported, there was an interrupt.
+ * Setting PE_FLAGS_MSG_RECEIVED to handle unexpected
+ * message.
+ */
+ PE_SET_FLAG(port, PE_FLAGS_MSG_RECEIVED);
}
/*
|
vppinfra: type prove vec_new and vec_resize
Some vector functions (e.g. vec_new) pass the vector pointer through
vec_resize. This turn the pointer from a real type into a void pointer.
Explicitly cast the pointer back to its original type to catch type
mismatches.
Type: improvement
|
@@ -117,7 +117,11 @@ void *vec_resize_allocate_memory (void *v,
*/
#define _vec_resize_numa(V,L,DB,HB,A,S) \
- _vec_resize_inline(V,L,DB,HB,clib_max((__alignof__((V)[0])),(A)),(S))
+({ \
+ __typeof__ ((V)) _V; \
+ _V = _vec_resize_inline(V,L,DB,HB,clib_max((__alignof__((V)[0])),(A)),(S)); \
+ _V; \
+})
#define _vec_resize(V,L,DB,HB,A) \
_vec_resize_numa(V,L,DB,HB,A,VEC_NUMA_UNSPECIFIED)
@@ -333,7 +337,7 @@ do { \
#define vec_new_ha(T,N,H,A) \
({ \
word _v(n) = (N); \
- _vec_resize ((T *) 0, _v(n), _v(n) * sizeof (T), (H), (A)); \
+ (T *)_vec_resize ((T *) 0, _v(n), _v(n) * sizeof (T), (H), (A)); \
})
/** \brief Create new vector of given type and length
|
VERSION bump to version 1.4.29
|
@@ -31,7 +31,7 @@ endif()
# micro version is changed with a set of small changes or bugfixes anywhere in the project.
set(SYSREPO_MAJOR_VERSION 1)
set(SYSREPO_MINOR_VERSION 4)
-set(SYSREPO_MICRO_VERSION 28)
+set(SYSREPO_MICRO_VERSION 29)
set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_MICRO_VERSION})
# Version of the library
|
firfilt/autotest: testing more configurations
|
@@ -57,6 +57,17 @@ void autotest_firfilt_config()
CONTEND_ISNULL(firfilt_crcf_create_notch(0, 0, 0));
CONTEND_ISNULL(firfilt_cccf_create_notch(0, 0, 0));
- // TODO: print, set scale, get scale
+ // create proper object and test configurations
+ firfilt_crcf q = firfilt_crcf_create_kaiser(11, 0.2f, 60.0f, 0.0f);
+
+ CONTEND_EQUALITY(LIQUID_OK, firfilt_crcf_print(q))
+
+ float scale = 7.0f;
+ CONTEND_EQUALITY(LIQUID_OK, firfilt_crcf_set_scale(q, 3.0f))
+ CONTEND_EQUALITY(LIQUID_OK, firfilt_crcf_get_scale(q, &scale))
+ CONTEND_EQUALITY(scale, 3.0f)
+ CONTEND_EQUALITY(firfilt_crcf_get_length(q), 11)
+
+ firfilt_crcf_destroy(q);
}
|
Add documentation for gpio-shutdown
|
@@ -320,6 +320,24 @@ Appropriate kernel modules will be also included in the image. By default the
GPIO pin for gpio-ir is set to 18 and the pin for gpio-ir-tx is 17. Both pins
can be easily changed by modifying variables `GPIO_IR` and `GPIO_IR_TX`.
+## Enable gpio-shutdown
+
+When using device tree kernels, set this variable to enable gpio-shutdown:
+
+ ENABLE_GPIO_SHUTDOWN = "1"
+
+This will add the corresponding device tree overlay to config.txt and include
+the gpio-keys kernel module in the image. If System V init is used, additional
+mapping is applied to bind the button event to shutdown command. Systemd init
+should handle the event out of the box.
+
+By default the feature uses gpio pin 3 (except RPi 1 Model B rev 1 enumerates
+the pin as gpio 1). This conflicts with the I2C bus. If you set `ENABLE_I2C`
+to `1` or enabled `PiTFT` support, or otherwise want to use another pin, use
+`GPIO_SHUTDOWN_PIN` to assign another pin. Example using gpio pin 25:
+
+ GPIO_SHUTDOWN_PIN = "25"
+
## Manual additions to config.txt
The `RPI_EXTRA_CONFIG` variable can be used to manually add additional lines to
|
set concurrency limit and ignore website changes for build
|
@@ -9,18 +9,26 @@ name: Build & Test
on:
# Run on pushes to any branch
push:
+ paths-ignore:
+ - 'website/**'
# Run on manually triggered workflow
workflow_dispatch:
# Run on PRs targeting the default branch or a release branches
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
+ paths-ignore:
+ - 'website/**'
branches:
- 'main'
- 'master'
- 'release/*'
-jobs:
+concurrency:
+ group: ${{ github.head_ref }}
+ # Cancel "in progress" workflows that are superceded with later commits
+ cancel-in-progress: true
+jobs:
# This is the first stage of the workflow where we do some initial setup.
info:
name: Get Build Info
|
sdl: video.go: Add missing Window flags starting from SDL 2.0.4
|
@@ -15,6 +15,14 @@ static void SDL_GL_GetDrawableSize(SDL_Window *window, int *w, int *h)
*w = 0;
*h = 0;
}
+
+#pragma message("SDL_WINDOW_ALLOW_HIGHDPI is not supported before SDL 2.0.1")
+#define SDL_WINDOW_ALLOW_HIGHDPI (0)
+#endif
+
+#if !(SDL_VERSION_ATLEAST(2,0,4))
+#pragma message("SDL_WINDOW_MOUSE_CAPTURE is not supported before SDL 2.0.4")
+#define SDL_WINDOW_MOUSE_CAPTURE (0)
#endif
#if !(SDL_VERSION_ATLEAST(2,0,5))
@@ -22,6 +30,26 @@ static void SDL_GL_GetDrawableSize(SDL_Window *window, int *w, int *h)
static void SDL_SetWindowResizable(SDL_Window *window, SDL_bool resizable)
{
}
+
+#pragma message("SDL_WINDOW_ALWAYS_ON_TOP is not supported before SDL 2.0.5")
+#define SDL_WINDOW_ALWAYS_ON_TOP (0)
+
+#pragma message("SDL_WINDOW_SKIP_TASKBAR is not supported before SDL 2.0.5")
+#define SDL_WINDOW_SKIP_TASKBAR (0)
+
+#pragma message("SDL_WINDOW_UTILITY is not supported before SDL 2.0.5")
+#define SDL_WINDOW_UTILITY (0)
+
+#pragma message("SDL_WINDOW_TOOLTIP is not supported before SDL 2.0.5")
+#define SDL_WINDOW_TOOLTIP (0)
+
+#pragma message("SDL_WINDOW_POPUP_MENU is not supported before SDL 2.0.5")
+#define SDL_WINDOW_POPUP_MENU (0)
+#endif
+
+#if !(SDL_VERSION_ATLEAST(2,0,6))
+#pragma message("SDL_WINDOW_VULKAN is not supported before SDL 2.0.6")
+#define SDL_WINDOW_VULKAN (0)
#endif
*/
import "C"
@@ -44,6 +72,13 @@ const (
WINDOW_FULLSCREEN_DESKTOP = C.SDL_WINDOW_FULLSCREEN_DESKTOP // fullscreen window at the current desktop resolution
WINDOW_FOREIGN = C.SDL_WINDOW_FOREIGN // window not created by SDL
WINDOW_ALLOW_HIGHDPI = C.SDL_WINDOW_ALLOW_HIGHDPI // window should be created in high-DPI mode if supported (>= SDL 2.0.1)
+ WINDOW_MOUSE_CAPTURE = C.SDL_WINDOW_MOUSE_CAPTURE // window has mouse captured (unrelated to INPUT_GRABBED, >= SDL 2.0.4)
+ WINDOW_ALWAYS_ON_TOP = C.SDL_WINDOW_ALWAYS_ON_TOP // window should always be above others (X11 only, >= SDL 2.0.5)
+ WINDOW_SKIP_TASKBAR = C.SDL_WINDOW_SKIP_TASKBAR // window should not be added to the taskbar (X11 only, >= SDL 2.0.5)
+ WINDOW_UTILITY = C.SDL_WINDOW_UTILITY // window should be treated as a utility window (X11 only, >= SDL 2.0.5)
+ WINDOW_TOOLTIP = C.SDL_WINDOW_TOOLTIP // window should be treated as a tooltip (X11 only, >= SDL 2.0.5)
+ WINDOW_POPUP_MENU = C.SDL_WINDOW_POPUP_MENU // window should be treated as a popup menu (X11 only, >= SDL 2.0.5)
+ WINDOW_VULKAN = C.SDL_WINDOW_VULKAN // window usable for Vulkan surface (>= SDL 2.0.6)
)
// An enumeration of window events.
|
Moving a method
|
@@ -1427,14 +1427,6 @@ static lv_res_t lv_cpicker_reset_hsv_if_double_clicked(lv_obj_t * cpicker,
return res;
}
-static void lv_cpicker_set_next_color_mode(lv_obj_t * cpicker,
- lv_cpicker_ext_t * ext)
-{
- ext->prev_hsv = ext->hsv;
- ext->color_mode = (ext->color_mode + 1) % 3;
- lv_cpicker_invalidate(cpicker, true);
-}
-
static lv_res_t lv_cpicker_set_hsv_percent(lv_obj_t * cpicker,
lv_cpicker_ext_t * ext,
float percent)
@@ -1483,6 +1475,14 @@ static lv_res_t lv_cpicker_set_hsv_percent(lv_obj_t * cpicker,
return res;
}
+static void lv_cpicker_set_next_color_mode(lv_obj_t * cpicker,
+ lv_cpicker_ext_t * ext)
+{
+ ext->prev_hsv = ext->hsv;
+ ext->color_mode = (ext->color_mode + 1) % 3;
+ lv_cpicker_invalidate(cpicker, true);
+}
+
static void lv_cpicker_invalidate_disc(lv_disp_t * disp, lv_style_t * style,
lv_cpicker_ext_t * ext,
|
remove svn refs, improve clarity
|
Contributing
============
-This is a short contributing guide on the VisIt_ project's use of
-`Sphinx <http://www.sphinx-doc.org/en/stable/tutorial.html>`_ for
-documentation.
-
-You can check out the Sphinx manual with::
-
- svn co svn+ssh://<USERNAME>@edison.nersc.gov/project/projectdirs/visit/svn/visit/trunk/docs/SphynxDocs
-
-If you have `Sphinx <http://www.sphinx-doc.org/en/stable/tutorial.html>`_ You can
-build the html manual locally using the command::
+This is a short contributing guide on the VisIt_ project's use of `Sphinx <http://www.sphinx-doc.org/en/stable/tutorial.html>`_ for documentation.
+All of VisIt_'s documentation is found in ``<root>/src/doc`` where ``<root>`` is the top of the git repository.
+There are sub-directories there for the major sub-sections of the manual including the GUI, the Python CLI, the developer's manual and more.
+If your build is configured to build the manual, you can use the command ``make manuals`` to build the manual locally in the ``build`` directory.
+Otherwise, if you have `Sphinx <http://www.sphinx-doc.org/en/stable/tutorial.html>`_, you can try manually building locally in the ``src`` directory using the command::
+ cd src/doc
sphinx-build -b html . _build -a
-You can then browse the root of the manual by pointing your browser to
-:file:`./_build/index.html`. The ``-a`` forces a re-build of everything.
+The ``-a`` forces a re-build of everything.
Remove it when you are constantly revising and rebuilding.
+You can then browse the root of the manual by pointing your browser to :file:`./_build/index.html`.
-Your changes to any ``.rst`` files in :file:`visit/src/doc` will go live
-`here <https://visit-sphinx-github-user-manual.readthedocs.io/en/develop/>`_
-soon after you push them. If `RTD <https://readthedocs.org>`_ resources are
-busy, a rebuild of the docs may take as long as 15 minutes. If you are working
-on a branch and want to see your branch's docs rendered *and* you yourself do
-not have access to the RTD account that controls this, you may ask another
-developer who does to *activate* your branch there. Once the branch is merged,
-it should be *deactivated* on RTD.
+Changes to any ``.rst`` files in :file:`<root>/src/doc` will go live `here <https://visit-sphinx-github-user-manual.readthedocs.io/en/develop/>`_ soon after they are merged to the ``develop`` branch.
+If `ReadTheDocs (RTD) <https://readthedocs.org>`_ resources are busy, a rebuild of the docs may take as long as 15 minutes.
+If want to see your branch's changes on ReadTheDocs before it is merged, the branch must be *activated* on ReadTheDocs.
+If you yourself do not have access to the ReadTheDocs account, you may ask another developer who does to *activate* your branch there.
+If the branch is *activated* on ReadTheDocs, once it is merged, it should be *deactivated*.
Quick Reference
---------------
|
ssl: add a zero time macro
|
/* Macro representing the most distant future time */
# define OSSL_TIME_INFINITY (~(OSSL_TIME)0)
+/* Macro that's guaranteed to be now or before */
+# define OSSL_TIME_IMMEDIATE 0
+
/*
* Internal type defining a time.
* The time datum is Unix's 1970 and at nanosecond precision, this gives
|
Replace diffing library. .
Note: mandatory check (NEED_CHECK) was skipped
|
@@ -127,8 +127,8 @@ ALLOW .* -> vendor/github.com/prometheus/common
# ZooKeeper client
ALLOW .* -> vendor/github.com/samuel/go-zookeeper
-# text diffing and patching
-ALLOW .* -> vendor/github.com/sergi/go-diff
+# Test diffing.
+ALLOW .* -> vendor/github.com/pmezard/go-difflib
# statsd client library
ALLOW .* -> vendor/github.com/smira/go-statsd
|
Restore yaml to previous value(2)
|
@@ -6,34 +6,27 @@ environment:
- platform: x86
configuration: Debug
OPENSSLDIR: C:\OpenSSL-v11-Win32
- OPENSSL64DIR: C:\OpenSSL-v11-Win64
- platform: x64
configuration: Debug
- OPENSSLDIR: C:\OpenSSL-v11-Win32
OPENSSL64DIR: C:\OpenSSL-v11-Win64
- platform: x86
configuration: Release
OPENSSLDIR: C:\OpenSSL-v11-Win32
- OPENSSL64DIR: C:\OpenSSL-v11-Win64
- platform: x64
configuration: Release
- OPENSSLDIR: C:\OpenSSL-v11-Win32
OPENSSL64DIR: C:\OpenSSL-v11-Win64
-# matrix:
- # allow_failures:
+matrix:
+ allow_failures:
# For some reason linking picoquicdemo.lib fails with
# cifra.lib(chash.obj) : error LNK2001: unresolved external symbol __CheckForDebuggerJustMyCode [C:\projects\picoquic\picoquicfirst\picoquicfirst.vcxproj]
- #- platform: x64
- # configuration: Debug
- # OPENSSL64DIR: C:\OpenSSL-v11-Win64
+ - platform: x64
+ configuration: Debug
+ OPENSSL64DIR: C:\OpenSSL-v11-Win64
build:
parallel: true
project: picoquic.sln
-#build_script:
- # - ps: ci\build_picoquic.ps1
-
before_build:
- ps: ci\build_picotls.ps1
|
Fix for memory leak in source 1 games
|
@@ -82,12 +82,13 @@ void imgui_create(void *ctx)
{
if (inited)
return;
- inited = true;
if (!ctx)
return;
+ imgui_shutdown();
imgui_init();
+ inited = true;
gladLoadGL();
@@ -154,10 +155,9 @@ void imgui_shutdown()
void imgui_set_context(void *ctx)
{
- if (!ctx) {
- imgui_shutdown();
+ if (!ctx)
return;
- }
+
#ifndef NDEBUG
std::cerr << __func__ << ": " << ctx << std::endl;
#endif
|
js: app: use wss:// when connecting via https
Some browsers require a websocket connection to an encrypted server
be made using the "wss://" uri.
This patch checks to see if the protocol is https, and sets a default
protocol of "wss://" if this is the case.
|
@@ -81,7 +81,7 @@ window.GoAccess = window.GoAccess || {
setWebSocket: function (wsConn) {
var host = null, host = wsConn.url ? wsConn.url : window.location.hostname ? window.location.hostname : "localhost";
var str = /^(wss?:\/\/)?[^\/]+:[0-9]{1,5}\//.test(host + "/") ? host : String(host + ':' + wsConn.port);
- str = !/^wss?:\/\//i.test(str) ? 'ws://' + str : str;
+ str = !/^wss?:\/\//i.test(str) ? (window.location.protocol === "https:" ? 'wss://' : 'ws://') + str : str;
var socket = new WebSocket(str);
socket.onopen = function (event) {
|
Adds an invalidation watch file
|
@@ -161,6 +161,12 @@ typedef struct clap_preset_provider {
// Destroys the preset provider
void(CLAP_ABI *destroy)(const struct clap_preset_provider *provider);
+ // Retrives the path to a watch file.
+ // Whenever the given file is "touched", then the indexer shall invalidate all the data.
+ bool(CLAP_ABI *invalidation_watch_file)(const struct clap_preset_provider *provider,
+ char *watch_file_path,
+ uint32_t watch_file_path_capacity);
+
// returns the number of locations
uint32_t(CLAP_ABI *locations_count)(const struct clap_preset_provider *provider);
|
libcupsfilters: In the PPD generator really give priority to Apple Raster against PDF
|
@@ -1951,7 +1951,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */
formatfound = 1;
is_pdf = 1;
} else if (cupsArrayFind(pdl_list, "application/pdf")) {
- cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 100 -\"\n");
+ cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 200 -\"\n");
manual_copies = 0;
formatfound = 1;
is_pdf = 1;
@@ -2030,7 +2030,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */
if ((current_res = ippResolutionListToArray(attr)) != NULL &&
joinResolutionArrays(&common_res, ¤t_res, &common_def,
¤t_def)) {
- cupsFilePuts(fp, "*cupsFilter2: \"application/PCLm application/PCLm 200 -\"\n");
+ cupsFilePuts(fp, "*cupsFilter2: \"application/PCLm application/PCLm 300 -\"\n");
if (formatfound == 0) manual_copies = 1;
formatfound = 1;
is_pclm = 1;
@@ -2049,7 +2049,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */
/* We put a high cost factor here as if a printer supports also
another format, like PWG or Apple Raster, we prefer it, as some
PCL-XL printers have bugs in their PCL-XL interpreters */
- cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/vnd.hp-pclxl 300 gstopxl\"\n");
+ cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/vnd.hp-pclxl 400 gstopxl\"\n");
if (formatfound == 0) manual_copies = 1;
formatfound = 1;
}
@@ -2058,7 +2058,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */
/* We put a high cost factor here as if a printer supports also
another format, like PWG or Apple Raster, we prefer it, as many
PostScript printers have bugs in their PostScript interpreters */
- cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-postscript application/postscript 500 -\"\n");
+ cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-postscript application/postscript 600 -\"\n");
if (formatfound == 0) manual_copies = 0;
formatfound = 1;
}
@@ -2067,7 +2067,7 @@ ppdCreateFromIPP2(char *buffer, /* I - Filename buffer */
another format, like PWG or Apple Raster, we prefer it, as there
are some printers, like HP inkjets which report to accept PCL
but do not support PCL 5c/e or PCL-XL */
- cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx\"\n");
+ cupsFilePrintf(fp, "*cupsFilter2: \"application/vnd.cups-raster application/vnd.hp-pcl 800 rastertopclx\"\n");
if (formatfound == 0) manual_copies = 1;
formatfound = 1;
}
|
update ya tool arc
allow nonempty dirs for mounting
explicitly keep reference to the session object
Note: mandatory check (NEED_CHECK) was skipped
|
},
"arc": {
"formula": {
- "sandbox_id": [393725412],
+ "sandbox_id": [397068943],
"match": "arc"
},
"executable": {
|
debian: rules: include HTTP Server and out_kafka
|
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/td-agent-bit/ -DCMAKE_INSTALL_SYSCONFDIR=/etc/ -DFLB_ALL=ON -DFLB_TD=1 -DFLB_WITHOUT_EXAMPLES=On
+ dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/td-agent-bit/ -DCMAKE_INSTALL_SYSCONFDIR=/etc/ -DFLB_ALL=ON -DFLB_TD=1 -DFLB_WITHOUT_EXAMPLES=On -DFLB_HTTP_SERVER=On -DFLB_OUT_KAFKA=On
|
Memory leak in BUFR clone
|
@@ -379,6 +379,7 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
{
long length = 0;
int i, err = 0;
+ grib_handle* hclone = NULL;
grib_accessor* a = NULL;
grib_accessors_list* al = NULL;
if (grib_get_long(h, "totalLength", &length) != GRIB_SUCCESS)
@@ -422,7 +423,8 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
new_handle = grib_handle_new_from_message(0, buffer, size);
Assert(new_handle);
/* Replace handle with the new one which has only one subset */
- h = new_handle; /*TODO: possible leak!*/
+ h = new_handle;
+ hclone = h2; /* to be deleted later */
}
}
else {
@@ -539,6 +541,7 @@ int grib_tool_new_handle_action(grib_runtime_options* options, grib_handle* h)
}
}
+ grib_handle_delete(hclone);
return 0;
}
|
Factor out xterm code to read ints for console size.
|
@@ -173,35 +173,27 @@ static void xterm_destructor(struct TCOD_Context* __restrict self) {
xterm_cleanup();
}
-static void xterm_handle_input_escape() {
- if (getchar() != '[')
- return;
- char rows_buf[16] = "";
- char cols_buf[16] = "";
- for (int i = 0; i < 15; i++) {
+static int read_terminated_int(char term, int def) {
+ char buf[16] = "";
+ for (size_t i = 0; i < sizeof(buf) - 1; i++) {
int ch = getchar();
- if (ch == ';') {
- rows_buf[i] = '\0';
+ if (ch == term) {
+ buf[i] = '\0';
break;
}
if (!isdigit(ch)) {
- return;
+ return def;
}
- rows_buf[i] = ch;
+ buf[i] = ch;
}
- for (int j = 0; j < 15; j++) {
- int ch = getchar();
- if (ch == 'R') {
- cols_buf[j] = '\0';
- break;
+ return atoi(buf);
}
- if (!isdigit(ch)) {
+
+static void xterm_handle_input_escape() {
+ if (getchar() != '[')
return;
- }
- cols_buf[j] = ch;
- }
- g_got_rows = atoi(rows_buf);
- g_got_columns = atoi(cols_buf);
+ g_got_rows = read_terminated_int(';', 0);
+ g_got_columns = read_terminated_int('R', 0);
g_got_size_timestamp = SDL_GetTicks();
}
|
Test two colons in the document name in a doctype is rejected
|
@@ -7039,6 +7039,17 @@ START_TEST(test_ns_invalid_doctype)
}
END_TEST
+START_TEST(test_ns_double_colon_doctype)
+{
+ const char *text =
+ "<!DOCTYPE foo:a:doc [ <!ENTITY bar 'baz' ]>\n"
+ "<foo:a:doc>&bar;</foo:a:doc>";
+
+ expect_failure(text, XML_ERROR_SYNTAX,
+ "Double colon in document name not faulted");
+}
+END_TEST
+
/* Control variable; the number of times duff_allocator() will successfully allocate */
#define ALLOC_ALWAYS_SUCCEED (-1)
#define REALLOC_ALWAYS_SUCCEED (-1)
@@ -11768,6 +11779,7 @@ make_suite(void)
tcase_add_test(tc_namespace, test_ns_utf16_element_leafname);
tcase_add_test(tc_namespace, test_ns_utf16_doctype);
tcase_add_test(tc_namespace, test_ns_invalid_doctype);
+ tcase_add_test(tc_namespace, test_ns_double_colon_doctype);
suite_add_tcase(s, tc_misc);
tcase_add_checked_fixture(tc_misc, NULL, basic_teardown);
|
dev-tools/numpy: bump down to v1.15.4
|
@@ -22,7 +22,7 @@ Requires: openblas-%{compiler_family}%{PROJ_DELIM}
%define pname numpy
Name: %{python_prefix}-%{pname}-%{compiler_family}%{PROJ_DELIM}
-Version: 1.18.2
+Version: 1.15.4
Release: 1%{?dist}
Url: https://github.com/numpy/numpy
Summary: NumPy array processing for numbers, strings, records and objects
|
input: use calloc to allocate coroutines.
|
@@ -389,7 +389,7 @@ struct flb_coro *flb_input_coro_create(struct flb_input_instance *ins,
}
/* Setup thread specific data */
- in_coro = (struct flb_input_coro *) flb_malloc(sizeof(struct flb_input_coro));
+ in_coro = (struct flb_input_coro *) flb_calloc(1, sizeof(struct flb_input_coro));
if (!in_coro) {
flb_errno();
return NULL;
|
Add description before running the demo
|
@@ -10,3 +10,16 @@ The smart contract used by the demo and its ABI JSON file are placed in:
|\<SDKRoot\>/demo/demo_platone/demo_contract/StoreRead.sol |\<SDKRoot\>/demo/demo_platone/demo_contract/StoreRead.json |PlatONE demo |
|\<SDKRoot\>/demo/demo_fiscobcos/demo_contract/HelloWorld.sol |\<SDKRoot\>/demo/demo_fiscobcos/demo_contract/HelloWorld.json |FISCO-BCOS demo |
+Before running Ethereum's Demo, you need to install the Ethereum node simulator ganache, as well as the Ethereum smart contract compilation deployment tool truffle, could visit this website: https://truffleframework.com .
+
+Ganache has a ganache-cli version of the command line interface, and a Ganache version of the graphical interface. The ganache-cli of the command line interface and the Ganache 1.x version of the graphical interface will not be saved. If the process of ganache-cli or Ganache 1.x is terminated, the deployed contract will be lost. The command truffle migrate - reset Redeploy the contract, the address of the redeployed contract may change. The Ganache 2.x version of the graphical interface can create a Workspace save state. After closing and reopening the Workspace next time, the deployed contract still does not need to be redeployed.
+In addition to using the ganache simulator, you can also use the Ethereum test network such as Ropsten (you need to apply for a free test token).
+
+Before running the PlatON Demo, the PlatON node need to be installed. The specific process can be referred to this website: https://platon.network/ .
+
+Before running the PlatONE Demo, you need to install the PlatONE node, as well as smart contract compilation and deployment tools,could visit this website: https://platone.wxblockchain.com .
+
+Before running the FISCO-BCOS Demo, you need to install the FISCO-BCOS node and contract deployment.
+FISCO-BCOS source code and installation and deployment steps can visit this website: https://fisco-bcos-documentation.readthedocs.io
+
+After completing the node (or simulator) deployment, you need to follow the instructions on the relevant websites to deploy the Demo smart contract. After the smart contract is successfully deployed, the contract address will be generated.
\ No newline at end of file
|
implemented sanity check for pmk
|
#include "common.c"
/*===========================================================================*/
-void hex2bin(const char *str, uint8_t *bytes, size_t blen)
+int hex2bin(const char *str, uint8_t *bytes, size_t blen)
{
+size_t c;
uint8_t pos;
uint8_t idx0;
uint8_t idx1;
@@ -35,6 +36,18 @@ const uint8_t hashmap[] =
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // hijklmno
};
+for(c = 0; c < blen; c++)
+ {
+ if(str[c] < '0')
+ return FALSE;
+ if(str[c] > 'f')
+ return FALSE;
+ if((str[c] > '9') && (str[c] < 'A'))
+ return FALSE;
+ if((str[c] > 'F') && (str[c] < 'a'))
+ return FALSE;
+ }
+
bzero(bytes, blen);
for (pos = 0; ((pos < (blen*2)) && (pos < strlen(str))); pos += 2)
{
@@ -42,7 +55,7 @@ for (pos = 0; ((pos < (blen*2)) && (pos < strlen(str))); pos += 2)
idx1 = ((uint8_t)str[pos+1] & 0x1F) ^ 0x10;
bytes[pos/2] = (uint8_t)(hashmap[idx0] << 4) | hashmap[idx1];
};
-return;
+return TRUE;
}
/*===========================================================================*/
char *base64(const unsigned char *input, int len)
@@ -80,7 +93,6 @@ int main(int argc, char *argv[])
int auswahl;
int essidlen = 0;
int pmklen = 0;
-
char *eigenname = NULL;
char *eigenpfadname = NULL;
char *pmkname = NULL;
@@ -116,7 +128,11 @@ while ((auswahl = getopt(argc, argv, "e:p:h")) != -1)
fprintf(stderr, "error wrong plainmasterkey len)\n");
exit(EXIT_FAILURE);
}
- hex2bin(pmkname, pmkstr, 64);
+ if(hex2bin(pmkname, pmkstr, 64) != TRUE)
+ {
+ fprintf(stderr, "error wrong plainmasterkey\n");
+ exit(EXIT_FAILURE);
+ }
break;
case 'h':
|
Fix USB job termination logic.
|
@@ -112,6 +112,7 @@ _papplPrinterRunUSB(
char buffer[8192]; // Print data buffer
ssize_t bytes; // Bytes in buffer
time_t status_time = 0; // Last port status update
+ time_t device_time = 0; // Last time moving data...
printer->usb_active = enable_usb_printer(printer, ifaces);
@@ -158,6 +159,8 @@ _papplPrinterRunUSB(
}
else if (count > 0)
{
+ papplLogPrinter(printer, PAPPL_LOGLEVEL_DEBUG, "USB poll returned %d, revents=[%d %d %d %d].", count, data[0].revents, data[1].revents, data[2].revents, data[3].revents);
+
if (data[0].revents)
{
if (!device)
@@ -178,6 +181,7 @@ _papplPrinterRunUSB(
// Start looking for back-channel data and port status
status_time = 0;
+ device_time = time(NULL);
data[0].events = POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM;
}
@@ -207,6 +211,8 @@ _papplPrinterRunUSB(
{
if ((bytes = read(data[0].fd, buffer, sizeof(buffer))) > 0)
{
+ device_time = time(NULL);
+
papplLogPrinter(printer, PAPPL_LOGLEVEL_DEBUG, "Read %d bytes from USB port.", (int)bytes);
if (printer->usb_cb)
{
@@ -234,11 +240,11 @@ _papplPrinterRunUSB(
device = NULL;
}
}
-
- if (data[0].revents & POLLWRNORM)
+ else if (data[0].revents & POLLWRNORM)
{
if ((bytes = papplDeviceRead(device, buffer, sizeof(buffer))) > 0)
{
+ device_time = time(NULL);
papplLogPrinter(printer, PAPPL_LOGLEVEL_DEBUG, "Read %d bytes from printer.", (int)bytes);
if (write(data[0].fd, buffer, (size_t)bytes) < 0)
papplLogPrinter(printer, PAPPL_LOGLEVEL_ERROR, "Unable to write %d bytes to host: %s", (int)bytes, strerror(errno));
@@ -294,8 +300,11 @@ _papplPrinterRunUSB(
}
else
{
- // No new data...
- if (device)
+ // No new data, sleep 1ms to prevent excessive CPU usage...
+ usleep(1000);
+ }
+
+ if (device && (time(NULL) - device_time) > 5)
{
// Finish talking to the printer...
papplLogPrinter(printer, PAPPL_LOGLEVEL_INFO, "Finishing USB print job.");
@@ -305,10 +314,6 @@ _papplPrinterRunUSB(
// Stop doing back-channel data
data[0].events = POLLIN | POLLRDNORM;
}
-
- // Sleep 1ms to prevent excessive CPU usage...
- usleep(1000);
- }
}
if (device)
|
include:endian.h add openbsd style
|
# define le64toh(n) (n)
# endif
#endif
+
+/* OpenBSD style */
+
+#define swap16 __swap_uint16
+#define swap32 __swap_uint32
+#define swap64 __swap_uint64
+
+#define betoh16 be16toh
+#define letoh16 le16toh
+#define betoh32 be32toh
+#define letoh32 le32toh
+
+#ifdef CONFIG_HAVE_LONG_LONG
+#define betoh64 be64toh
+#define letoh64 le64toh
+#endif
+
#endif /* __INCLUDE_ENDIAN_H */
|
Use `rb_scan_args` to check args
If we pass `"11"` to 3rd argument of `rb_scan_args`,
`rb_scan_args` raises `ArgumentError` when `argc` is not
1 nor 2.
This commit changes to raise `ArgumentError` if `argc > 2`.
|
@@ -487,9 +487,7 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
struct _ParseInfo pi;
VALUE args[1];
- if (argc < 1) {
- rb_raise(rb_eArgError, "Wrong number of arguments to parse.");
- }
+ rb_scan_args(argc, argv, "11", NULL, NULL);
parse_info_init(&pi);
oj_set_compat_callbacks(&pi);
// TBD
|
handle_accept(): fix NULL-dereference of client
|
@@ -2125,7 +2125,9 @@ handle_accept (int listener, WSServer * server) {
if (newfd == -1)
return;
- client = ws_get_client_from_list (newfd, &server->colist);
+ if (!(client = ws_get_client_from_list (newfd, &server->colist)))
+ return;
+
if (newfd > FD_SETSIZE - 1) {
LOG (("Too busy: %d %s.\n", newfd, client->remote_ip));
|
Support RSA Opaque PK keys in ssl_server2
|
@@ -2562,7 +2562,8 @@ int main( int argc, char *argv[] )
#if defined(MBEDTLS_USE_PSA_CRYPTO)
if( opt.key_opaque != 0 )
{
- if ( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY )
+ if ( mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_ECKEY ||
+ mbedtls_pk_get_type( &pkey ) == MBEDTLS_PK_RSA )
{
if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey, &key_slot,
PSA_ALG_ANY_HASH ) ) != 0 )
@@ -2573,7 +2574,8 @@ int main( int argc, char *argv[] )
}
}
- if ( mbedtls_pk_get_type( &pkey2 ) == MBEDTLS_PK_ECKEY )
+ if ( mbedtls_pk_get_type( &pkey2 ) == MBEDTLS_PK_ECKEY ||
+ mbedtls_pk_get_type( &pkey2 ) == MBEDTLS_PK_RSA )
{
if( ( ret = mbedtls_pk_wrap_as_opaque( &pkey2, &key_slot2,
PSA_ALG_ANY_HASH ) ) != 0 )
|
doc: Fix documentation of EVP_EncryptUpdate().
The documentation was off by one for the length this function could return.
|
@@ -210,10 +210,15 @@ specified.
EVP_EncryptUpdate() encrypts B<inl> bytes from the buffer B<in> and
writes the encrypted version to B<out>. This function can be called
multiple times to encrypt successive blocks of data. The amount
-of data written depends on the block alignment of the encrypted data:
-as a result the amount of data written may be anything from zero bytes
-to (inl + cipher_block_size - 1) so B<out> should contain sufficient
-room. The actual number of bytes written is placed in B<outl>. It also
+of data written depends on the block alignment of the encrypted data.
+For most ciphers and modes, the amount of data written can be anything
+from zero bytes to (inl + cipher_block_size - 1) bytes.
+For wrap cipher modes, the amount of data written can be anything
+from zero bytes to (inl + cipher_block_size) bytes.
+For stream ciphers, the amount of data written can be anything from zero
+bytes to inl bytes.
+Thus, B<out> should contain sufficient room for the operation being performed.
+The actual number of bytes written is placed in B<outl>. It also
checks if B<in> and B<out> are partially overlapping, and if they are
0 is returned to indicate failure.
|
hw/npu2: Show name of opencapi error interrupts
Add the name of which error interrupt is received.
|
@@ -403,6 +403,7 @@ static void npu2_err_interrupt(struct irq_source *is, uint32_t isn)
{
struct npu2 *p = is->data;
uint32_t idx = isn - p->base_lsi;
+ char *irq_name;
int brick;
switch (idx) {
@@ -413,8 +414,10 @@ static void npu2_err_interrupt(struct irq_source *is, uint32_t isn)
case 27 ... 34:
/* opencapi only */
brick = 2 + ((idx - 27) % 4);
- prlog(PR_ERR, "NPU[%d] error interrupt for brick %d\n",
- p->chip_id, brick);
+ irq_name = npu2_ipi_name(is, isn);
+ prlog(PR_ERR, "NPU[%d] received error interrupt '%s'\n",
+ p->chip_id, irq_name);
+ free(irq_name);
show_all_regs(p, brick);
opal_update_pending_evt(OPAL_EVENT_PCI_ERROR,
OPAL_EVENT_PCI_ERROR);
|
BugID:17513592:modify the judgment of component macro
|
@@ -54,14 +54,10 @@ ifeq ($(AOS_COMP_KV), 1)
$(NAME)_SOURCES += kv.c
endif
-ifeq ($(AOS_COMP_MBMASTER),1)
+ifeq ($(AOS_COMP_MBMASTER),y)
$(NAME)_SOURCES += mbmaster.c
endif
-ifeq ($(AOS_COMP_PWRMGMT),1)
-$(NAME)_SOURCES += pwrmgmt.c
-endif
-
ifeq ($(AOS_COMP_CLI),1)
$(NAME)_SOURCES += cli.c
endif
|
nrf52832: stop generating the map file
The mapfile is only used by Cooja and MSPSim
in Contiki-NG nowadays.
|
@@ -139,7 +139,6 @@ CFLAGS += -ggdb
CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
# keep every function in separate section. This will allow linker to dump unused functions
-LDFLAGS += -Xlinker -Map=$(CONTIKI_NG_PROJECT_MAP)
LDFLAGS += -mabi=aapcs -L $(TEMPLATE_PATH)
LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
# let linker to dump unused sections
|
autotest: removing circular make dependency with autotest.o
|
@@ -1309,18 +1309,7 @@ autotest_include.h : scripts/autoscript $(autotest_sources) $(include_headers)
# header' so we need to explicity tell it to compile as a c source file with
# the '-x c' flag
autotest_obj = $(patsubst %.c,%.o,$(autotest_sources))
-$(autotest_obj) : %.o : %.c $(include_headers) autotest/autotest.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
-
-# additional autotest objects
-$(autotest_extra_obj) : %.o : %.c $(include_headers)
-
-# supporting objects
-autotest_lib := autotest/autotest.o
-autotest_headers = $(patsubst $.o,%.h,$(autotest_lib))
-
-# compile the autotest internal library functions without linking
-$(autotest_lib) : %.o : %.c $(autotest_headers)
+$(autotest_obj) $(autotest_extra_obj) autotest/autotest.o : %.o : %.c $(include_headers) autotest/autotest.h
$(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@
# compile the autotest program without linking
@@ -1329,7 +1318,7 @@ $(autotest_prog).o : autotest/xautotest.c autotest/autotest.h autotest_include.h
# link the autotest program with the objects
# NOTE: linked libraries must come _after_ the target program
-$(autotest_prog): $(autotest_prog).o $(autotest_obj) $(autotest_extra_obj) $(autotest_lib) ${ARCHIVE_LIB}
+$(autotest_prog): $(autotest_prog).o $(autotest_obj) $(autotest_extra_obj) autotest/autotest.o ${ARCHIVE_LIB}
$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
# run the autotest program
@@ -1344,7 +1333,7 @@ clean-check:
$(RM) autotest_include.h $(autotest_prog).o $(autotest_prog)
$(RM) $(autotest_obj)
$(RM) $(autotest_extra_obj)
- $(RM) $(autotest_lib)
+ $(RM) autotest/autotest.o
$(RM) autotest.json
##
|
Let device fast polling continue a few secs after permit join disabled
|
#include <QElapsedTimer>
#include <QTimer>
#include <deconz/dbg_trace.h>
+#include <deconz/timeref.h>
#include "event.h"
#include "resource.h"
#include "device_tick.h"
@@ -42,6 +43,7 @@ class DeviceTickPrivate
public:
DT_StateHandler stateHandler = DT_StateInit;
std::vector<JoinDevice> joinDevices;
+ deCONZ::SteadyTimeRef joinDisabledTime;
DeviceTick *q = nullptr;
QTimer *timer = nullptr;
size_t devIter = 0;
@@ -227,7 +229,7 @@ static void DT_StateJoin(DeviceTickPrivate *d, const Event &event)
{
if (event.what() == REventPermitjoinDisabled)
{
- DT_SetState(d, DT_StateIdle);
+ d->joinDisabledTime = deCONZ::steadyTimeRef();
}
else if (event.what() == REventDeviceAnnounce)
{
@@ -238,11 +240,20 @@ static void DT_StateJoin(DeviceTickPrivate *d, const Event &event)
{
if (event.what() == REventStateTimeout)
{
+ if (deCONZ::isValid(d->joinDisabledTime) &&
+ deCONZ::TimeSeconds{20} < (deCONZ::steadyTimeRef() - d->joinDisabledTime))
+ {
+ // leave state after delay to let fast polling finish even then permit join is disabled again
+ DT_SetState(d, DT_StateIdle);
+ return;
+ }
+
DT_PollNextJoiningDevice(d);
DT_StartTimer(d, TICK_INTERVAL_JOIN);
}
else if (event.what() == REventStateEnter)
{
+ d->joinDisabledTime = {};
DT_StartTimer(d, TICK_INTERVAL_JOIN);
}
else if (event.what() == REventStateLeave)
|
Fix Clay %next revision
adapted from commit
|
?~ u.ver
$(xiq t.xiq, ..wake (blub-all q.i.xiq ~))
$(xiq t.xiq, xaq [i.xiq(q.p u.ver) xaq])
- =+ var=(aver mun(q [%ud let.dom]))
+ =/ muc mun(q [%ud let.dom]) :: current mood
+ =+ var=(aver muc)
?~ var
- ~& [%oh-noes mood=mun letdom=let.dom]
+ ~& [%oh-noes old=mun mood=muc letdom=let.dom]
$(xiq t.xiq)
?~ u.var
- $(xiq t.xiq, ..wake (blab-all q.i.xiq mun %& %null [%atom %n ~] ~))
+ $(xiq t.xiq, ..wake (blab-all q.i.xiq muc %& %null [%atom %n ~] ~))
?: (equivalent-data:ze u.q.p.i.xiq u.u.var)
$(xiq t.xiq, xaq [i.xiq xaq])
- $(xiq t.xiq, ..wake (blab-all q.i.xiq mun u.u.var))
+ $(xiq t.xiq, ..wake (blab-all q.i.xiq muc u.u.var))
::
$many
=+ mot=`moat`q.p.i.xiq
|
io-libs/adios: fix python variable in summary
|
@@ -76,12 +76,12 @@ routines in the host code (either Fortran or C) can transparently change
how they process the data.
%package -n %{python_prefix}-%{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
-Summary: Bindings for %{python_flavor} to adios
+Summary: Bindings for %{python_prefix} to adios
Group: %{PROJ_NAME}/io-libs
BuildRequires: %{python_prefix}-numpy-%{compiler_family}%{PROJ_DELIM}
Requires: %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} = %{version}-%{release}
%description -n %{python_prefix}-%{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
-This package includes the %{python_flavor} API to provide a
+This package includes the %{python_prefix} API to provide a
helpful interface to Adios through Python
%prep
|
make errors: use the new util/ck_errf.pl options
|
@@ -760,11 +760,13 @@ generate_fuzz_oids:
# Set to -force to force a rebuild
ERROR_REBUILD=
errors:
- ( cd $(SRCDIR); $(PERL) util/ck_errf.pl -strict */*.c */*/*.c )
- ( b=`pwd`; cd $(SRCDIR); \
+ ( b=`pwd`; set -e; cd $(SRCDIR); \
+ $(PERL) util/ck_errf.pl -strict -internal; \
$(PERL) -I$$b util/mkerr.pl $(ERROR_REBUILD) -internal )
- ( b=`pwd`; cd $(SRCDIR)/engines; \
+ ( b=`pwd`; set -e; cd $(SRCDIR)/engines; \
for E in *.ec ; do \
+ $(PERL) ../util/ck_errf.pl -strict \
+ -conf $$E `basename $$E .ec`.c; \
$(PERL) -I$$b ../util/mkerr.pl $(ERROR_REBUILD) -static \
-conf $$E `basename $$E .ec`.c ; \
done )
|
Add test component: component_test_psa_crypto_config_reference_hash_use_psa
|
@@ -2110,6 +2110,34 @@ component_test_psa_crypto_config_accel_hash_use_psa () {
fi
}
+component_test_psa_crypto_config_reference_hash_use_psa() {
+ msg "test: MBEDTLS_PSA_CRYPTO_CONFIG without accelerated hash and USE_PSA"
+ # start with full
+ scripts/config.py full
+ # use PSA config and disable driver-less algs as in the component
+ scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG
+ scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_STREAM_CIPHER
+ scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_ECB_NO_PADDING
+ # disable options as in the component
+ # (no need to disable whole modules, we'll just skip their test suite)
+ scripts/config.py unset MBEDTLS_ECDSA_DETERMINISTIC
+ scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_DETERMINISTIC_ECDSA
+
+ msg "test: MBEDTLS_PSA_CRYPTO_CONFIG without accelerated hash and USE_PSA"
+ make test
+
+ # hidden option: when running outcome-analysis.sh, we can skip this
+ if [ "${SKIP_SSL_OPT_COMPAT_SH-unset}" = "unset" ]; then
+ msg "test: ssl-opt.sh, MBEDTLS_PSA_CRYPTO_CONFIG without accelerated hash and USE_PSA"
+ tests/ssl-opt.sh
+
+ msg "test: compat.sh, MBEDTLS_PSA_CRYPTO_CONFIG without accelerated hash and USE_PSA"
+ tests/compat.sh
+ else
+ echo "skip ssl-opt.sh and compat.sh"
+ fi
+}
+
component_test_psa_crypto_config_accel_cipher () {
msg "test: MBEDTLS_PSA_CRYPTO_CONFIG with accelerated cipher"
|
imrpoved help
|
@@ -2111,6 +2111,7 @@ fprintf(stdout, "%s %s (C) %s ZeroBeat\n"
"-o <file> : output PMKID/EAPOL hash file\n"
"-E <file> : output ESSID list (autohex enabled)\n"
"-L <file> : output ESSID list (unfiltered and unsorted)\n"
+ " usefull in combination with hashcat -a9 option\n"
"-d : download https://standards-oui.ieee.org/oui.txt\n"
" and save to ~/.hcxtools/oui.txt\n"
" internet connection required\n"
|
board/esp32_devkit: Fix Makefile issue.
Object partition.o isn't removed via "make clean",
Set DEVPATH,VPATH in Makefile to fix this issue.
|
############################################################################
-include $(TOPDIR)/Make.defs
-
+DEPPATH = --dep-path .
SCRIPTDIR = $(TOPDIR)$(DELIM)..$(DELIM)build$(DELIM)configs$(DELIM)$(CONFIG_ESP32_DEVKIT_TYPE)$(DELIM)scripts
CONFIGFILE = $(TOPDIR)$(DELIM)include$(DELIM)tinyara$(DELIM)config.h
ASRCS =
CSRCS = esp32_boot.c esp32_bringup.c esp32_led.c
-CSRCS += ../../common/partitions.c
+CSRCS += partitions.c
ifeq ($(CONFIG_LIB_BOARDCTL),y)
CSRCS += esp32_appinit.c
@@ -116,4 +116,6 @@ $(SCRIPTOUT): $(SCRIPTIN) $(CONFIGFILE)
context: $(SCRIPTOUT)
+VPATH += ../../common
+DEPPATH += --dep-path ../../common
-include Make.dep
|
If all versions of a proto are disabled, disabled the proto as well
For example, 'no-dtls1 no-dtls1_2' will imply 'no-dtls'
|
@@ -472,6 +472,8 @@ my @disable_cascades = (
"dgram" => [ "dtls", "sctp" ],
"sock" => [ "dgram" ],
"dtls" => [ @dtls ],
+ sub { 0 == scalar grep { !$disabled{$_} } @dtls }
+ => [ "dtls" ],
# SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA
"md5" => [ "ssl", "tls1", "tls1_1", "dtls1" ],
@@ -492,6 +494,8 @@ my @disable_cascades = (
"dtls1", "dtls1_2" ],
"tls" => [ @tls ],
+ sub { 0 == scalar grep { !$disabled{$_} } @tls }
+ => [ "tls" ],
# SRP and HEARTBEATS require TLSEXT
"tlsext" => [ "srp", "heartbeats" ],
|
Fix message type for current limit
|
@@ -340,6 +340,7 @@ void Convert_JsonToMsg(service_t *service, uint16_t id, luos_type_t type, const
{
current_t current = ElectricOD_CurrentFrom_A(json_getReal(item));
ElectricOD_CurrentToMsg(¤t, msg);
+ msg->header.cmd = CURRENT_LIMIT;
Luos_SendMsg(service, msg);
}
// target Rotation speed
|
dtls: shorter log module name for aligned log output
|
#include <stdarg.h>
/* Log configuration */
-#define LOG_MODULE "dtls-support"
+#define LOG_MODULE "dtls"
#define LOG_LEVEL LOG_LEVEL_DTLS
#include "dtls-log.h"
#include "coap-log.h"
|
Changelog note for PR#155.
Merge PR#155 from Rober Edmonds: contrib/libunbound.pc.in: Fixes
to Libs/Requires for crypto library dependencies.
|
+27 January 2020: Wouter
+ - Merge PR#155 from Rober Edmonds: contrib/libunbound.pc.in: Fixes
+ to Libs/Requires for crypto library dependencies.
+
23 January 2020: Wouter
- Merge PR#150 from Frzk: Systemd unit without chroot. It add
contrib/unbound_nochroot.service.in, a systemd file for use with
|
py/runtime: Remove unnecessary break statements from switch.
|
@@ -413,7 +413,6 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
// use standard precision
return MP_OBJ_NEW_SMALL_INT(lhs_val * rhs_val);
}
- break;
}
case MP_BINARY_OP_FLOOR_DIVIDE:
case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE:
@@ -488,10 +487,10 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
return MP_OBJ_FROM_PTR(tuple);
}
- case MP_BINARY_OP_LESS: return mp_obj_new_bool(lhs_val < rhs_val); break;
- case MP_BINARY_OP_MORE: return mp_obj_new_bool(lhs_val > rhs_val); break;
- case MP_BINARY_OP_LESS_EQUAL: return mp_obj_new_bool(lhs_val <= rhs_val); break;
- case MP_BINARY_OP_MORE_EQUAL: return mp_obj_new_bool(lhs_val >= rhs_val); break;
+ case MP_BINARY_OP_LESS: return mp_obj_new_bool(lhs_val < rhs_val);
+ case MP_BINARY_OP_MORE: return mp_obj_new_bool(lhs_val > rhs_val);
+ case MP_BINARY_OP_LESS_EQUAL: return mp_obj_new_bool(lhs_val <= rhs_val);
+ case MP_BINARY_OP_MORE_EQUAL: return mp_obj_new_bool(lhs_val >= rhs_val);
default:
goto unsupported_op;
|
flash: cleanup
|
@@ -32,19 +32,18 @@ void flash_hard_coded_pid_identifier(void) {
}
void flash_save(void) {
-
fmc_unlock();
fmc_erase();
- unsigned long addresscount = 0;
+ uint32_t addr = 0;
- fmc_write(addresscount++, FMC_HEADER);
+ fmc_write(addr++, FMC_HEADER);
- fmc_write_float(addresscount++, initial_pid_identifier);
+ fmc_write_float(addr++, initial_pid_identifier);
- fmc_write_float(addresscount++, accelcal[0]);
- fmc_write_float(addresscount++, accelcal[1]);
- fmc_write_float(addresscount++, accelcal[2]);
+ fmc_write_float(addr++, accelcal[0]);
+ fmc_write_float(addr++, accelcal[1]);
+ fmc_write_float(addr++, accelcal[2]);
#ifdef RX_BAYANG_PROTOCOL_TELEMETRY_AUTOBIND
// autobind info
@@ -124,6 +123,7 @@ void flash_save(void) {
}
}
#endif
+
{
uint8_t buffer[PROFILE_FLASH_SIZE];
memset(buffer, 0, PROFILE_FLASH_SIZE);
@@ -143,16 +143,18 @@ void flash_save(void) {
}
void flash_load(void) {
-
- unsigned long addresscount = 0;
// check if saved data is present
- if (FMC_HEADER == fmc_read(addresscount++) && FMC_HEADER == fmc_read(256 + (PROFILE_FLASH_SIZE / 8))) {
+ uint32_t addr = 0;
+ if (FMC_HEADER != fmc_read(addr++) || FMC_HEADER != fmc_read(256 + (PROFILE_FLASH_SIZE / 8))) {
+ // Flash was empty, load defaults?
+ return;
+ }
- float saved_pid_identifier = fmc_read_float(addresscount++);
+ float saved_pid_identifier = fmc_read_float(addr++);
- accelcal[0] = fmc_read_float(addresscount++);
- accelcal[1] = fmc_read_float(addresscount++);
- accelcal[2] = fmc_read_float(addresscount++);
+ accelcal[0] = fmc_read_float(addr++);
+ accelcal[1] = fmc_read_float(addr++);
+ accelcal[2] = fmc_read_float(addr++);
#ifdef RX_BAYANG_PROTOCOL_TELEMETRY_AUTOBIND
extern char rfchannel[4];
@@ -201,7 +203,6 @@ void flash_load(void) {
} else {
rx_serial_protocol = fmc_read(50);
}
-
#endif
#ifdef SWITCHABLE_FEATURE_1
@@ -245,8 +246,4 @@ void flash_load(void) {
profile.pid = default_profile.pid;
}
}
-
- } else {
- // Flash was empty, load defaults?
- }
}
|
20-test_enc_more.t: Replace deprecated -ciphers option with -list
[extended tests]
|
@@ -30,14 +30,14 @@ my $ciphersstatus = undef;
my @ciphers =
grep(! /wrap|^$|^[^-]/,
(map { split /\s+/ }
- run(app([$cmd, "enc", "-ciphers"]),
+ run(app([$cmd, "enc", "-list"]),
capture => 1, statusvar => \$ciphersstatus)));
plan tests => 2 + scalar @ciphers;
SKIP: {
skip "Problems getting ciphers...", 1 + scalar(@ciphers)
- unless ok($ciphersstatus, "Running 'openssl enc -ciphers'");
+ unless ok($ciphersstatus, "Running 'openssl enc -list'");
unless (ok(copy($testsrc, $plaintext), "Copying $testsrc to $plaintext")) {
diag($!);
skip "Not initialized, skipping...", scalar(@ciphers);
|
Debug is even less chatty
|
#define no_core_debug(M, ...) fprintf(stderr, "%11.11s@%4d [NO-CORE ] " M "", SHORTEN(__SHORTFILENAME__, 13), __LINE__, ##__VA_ARGS__)
#else
// no filename/line number printout
- #define lcore_debug(M, ...) fprintf(stderr, "CORE" T4LIT(%2d,core) "@" T4LIT(%d,socket) " " M "", (int)(rte_lcore_id()), rte_lcore_to_socket_id(rte_lcore_id()), ##__VA_ARGS__)
- #define no_core_debug(M, ...) fprintf(stderr, "NO-CORE " M "", ##__VA_ARGS__)
+ #define lcore_debug(M, ...) fprintf(stderr, T4LIT(%2d,core) "@" T4LIT(%d,socket) " " M "", (int)(rte_lcore_id()), rte_lcore_to_socket_id(rte_lcore_id()), ##__VA_ARGS__)
+ #define no_core_debug(M, ...) fprintf(stderr, "---- " M "", ##__VA_ARGS__)
#endif
|
Add missing reboot includes
|
#include <QFile>
#include <QProcess>
#include <queue>
+#ifdef ARCH_ARM
+ #include <unistd.h>
+ #include <sys/reboot.h>
+#endif
#include "colorspace.h"
#include "de_web_plugin.h"
#include "de_web_plugin_private.h"
|
mousestate, fix poll
output value as soon as you hit poll (regression from 0.3)
|
* for mouse pointer for mode 1, now basing off of given coords by the current
* canvas. also now rewrote gui.c to defer calculations to the c code here in interests
* of multiple object independence, just use gui.c to send proper coords over
+
+ * 2020 - Fixed 'reset'/'zero'/'poll' messages, resolved conflicts with 2 objects in
+ * different modes.
*/
typedef struct _mousestate
@@ -199,16 +202,19 @@ static void mousestate_objwin(t_mousestate *x, int argc, t_atom * argv){
static void mousestate_bang(t_mousestate *x)
{
- int mode = x->x_mode;
- if(mode == 0 || mode == 1) hammergui_getscreen();
- else if (mode == 2) hammergui_getscreenfocused();
x->x_bang = 1;
+ int mode = x->x_mode;
+ if(mode == 0 || mode == 1)
+ hammergui_getscreen();
+ else if (mode == 2)
+ hammergui_getscreenfocused();
}
static void mousestate_poll(t_mousestate *x)
{
- hammergui_startpolling((t_pd *)x, 3);
x->x_ispolling = 1;
+ hammergui_startpolling((t_pd *)x, 3);
+ mousestate_bang(x);
}
|
jenkins: fix docu paths
|
@@ -753,15 +753,16 @@ def buildDoc() {
remoteDirectory: 'api/latest'
),
sshTransfer(
- sourceFiles: 'build/doc/man/*',
+ sourceFiles: 'build/doc/html/*',
removePrefix: 'build/doc/',
remoteDirectory: 'api/latest'
),
sshTransfer(
- sourceFiles: 'doc/help/*.html',
- removePrefix: 'doc/help/',
- remoteDirectory: 'help'
+ sourceFiles: 'build/doc/man/*',
+ removePrefix: 'build/doc/',
+ remoteDirectory: 'api/latest'
),
+ // TODO: API doc not built anymore
sshTransfer(
sourceFiles: 'build/API_DOC/*',
removePrefix: 'build/API_DOC/'
|
Fix iss 606 by changing pc to m value
|
@@ -158,17 +158,17 @@ ccl_physical_constants ccl_constants = {
/**
* Mpc to meters (from PDG 2013)
*/
- 3.08567758149E+22,
+ 3.08567758149136727891E+22,
/**
* pc to meters (from PDG 2013)
*/
- 3.08567758149E+16,
+ 3.08567758149136727891E+16,
/**
* Rho critical in units of M_sun/h / (Mpc/h)^3
*/
- ((3*100*100)/(8*M_PI*6.67408e-11)) * (1000*1000*3.08567758149E+22/1.9884754153381438E+30),
+ ((3*100*100)/(8*M_PI*6.67408e-11)) * (1000*1000*3.08567758149136727891E+22/1.9884754153381438E+30),
/**
* Boltzmann constant in units of J/K
|
Fix issue with Ethereum byte padding logic
|
::
++ pad-to-multiple
|= [wat=tape mof=@ud wer=?(%left %right)]
+ ^- tape
=+ len=(lent wat)
+ ?: =(len mof) wat
=+ tad=(reap (sub mof (mod len mof)) '0')
%- weld
?:(?=(%left wer) [tad wat] [wat tad])
|
multimap: Check if map slot is empty before creating new one
|
@@ -1055,10 +1055,11 @@ int vm_createSharedMap(ptr_t start, ptr_t stop, unsigned int attr, int no)
if (--no < 0)
return -EINVAL;
- if (stop <= start || start & (SIZE_PAGE - 1) || stop & (SIZE_PAGE - 1)) {
- map_common.maps[no] = NULL;
+ if (map_common.maps[no] != NULL)
+ return -EEXIST;
+
+ if (stop <= start || start & (SIZE_PAGE - 1) || stop & (SIZE_PAGE - 1))
return -EINVAL;
- }
if (no >= sizeof(map_common.maps) / sizeof(map_common.maps[0]) ||
map_common.maps[no] != NULL)
|
tools: Add ULP utils for ARMEL
|
"size": 8249059,
"url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20190801/binutils-esp32ulp-linux-amd64-2.28.51-esp-20190801.tar.gz"
},
+ "linux-armel": {
+ "sha256": "c95fcf89231bee16f48c0a50dd8d8f4404bc95f956b5482f69dac68363ffc444",
+ "size": 8033832,
+ "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20190801/binutils-esp32ulp-linux-armel-2.28.51-esp-20190801.tar.gz"
+ },
"macos": {
"sha256": "04f812bf410ae6bef438c53ff4f4a33f34884d9072ae5815814b208ab408a9a4",
"size": 8871878,
"size": 8253802,
"url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20190801/binutils-esp32s2ulp-linux-amd64-2.28.51-esp-20190801.tar.gz"
},
+ "linux-armel": {
+ "sha256": "6f9d07f9e4f4040f7520beb432ed789515e19cf005fb756748d2ca5ad7eb8f04",
+ "size": 8045256,
+ "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20190801/binutils-esp32s2ulp-linux-armel-2.28.51-esp-20190801.tar.gz"
+ },
"macos": {
"sha256": "b180a5ed3b7b5aa4503f26e5bd562d8b0f4b55f24a2ca04942804fd88b4d91b5",
"size": 8877256,
|
jenkins: catch more abort exceptions
|
@@ -1434,7 +1434,8 @@ def detectInterruption(Closure c) {
}
} catch (hudson.AbortException ae) {
// this ambiguous condition means during a shell step, user probably aborted
- if (ae.getMessage().contains('script returned exit code 143')) {
+ if (ae.getMessage().contains('script returned exit code 143') ||
+ ae.getMessage().contains('Queue task was cancelled')) {
throw new UserInterruptedException(ae)
} else {
throw ae
|
[bsps] fix bsp/stm32f10x/bxcan.c inline bug
|
#endif
#ifdef RT_USING_CAN
-#ifdef __CC_ARM
-#define inline __inline
-#endif
#ifndef STM32F10X_CL
#define BX_CAN_FMRNUMBER 14
#define BX_CAN2_FMRSTART 7
@@ -401,7 +398,7 @@ static void bxcan2_hw_init(void)
NVIC_Init(&NVIC_InitStructure);
}
#endif
-static inline rt_err_t bxcan_enter_init(CAN_TypeDef *pcan)
+rt_inline rt_err_t bxcan_enter_init(CAN_TypeDef *pcan)
{
uint32_t wait_ack = 0x00000000;
@@ -417,7 +414,7 @@ static inline rt_err_t bxcan_enter_init(CAN_TypeDef *pcan)
}
return RT_EOK;
}
-static inline rt_err_t bxcan_exit_init(CAN_TypeDef *pcan)
+rt_inline rt_err_t bxcan_exit_init(CAN_TypeDef *pcan)
{
uint32_t wait_ack = 0x00000000;
|
Add DuckDuckGo and MSNBot browsers to the crawlers list.
|
@@ -188,6 +188,8 @@ static const char *browsers[][2] = {
{"Python", "Crawlers"},
{"LinkedIn", "Crawlers"},
{"Microsoft-WebDAV", "Crawlers"},
+ {"DuckDuckGo-Favicons-Bot", "Crawlers"},
+ {"bingbot", "Crawlers"},
/* Podcast fetchers */
{"Downcast", "Podcasts"},
|
landscape clock: render sun+moon after night
|
@@ -258,6 +258,17 @@ class Clock extends React.Component {
'#FF611E'
);
+ // Night
+ degArc(
+ ctx,
+ ctr,
+ ctr,
+ ctr / 2,
+ state.night,
+ state.nightEnd,
+ 'rgb(26, 26, 26)'
+ );
+
if (
radToDeg(this.angle) > splitArc(state.sunriseEnd, state.nightEnd)
&& radToDeg(this.angle) < splitArc(state.sunset, state.night)
@@ -308,16 +319,6 @@ class Clock extends React.Component {
);
}
- // Night
- degArc(
- ctx,
- ctr,
- ctr,
- ctr / 2,
- state.night,
- state.nightEnd,
- 'rgb(26, 26, 26)'
- );
// Outer borders
circleOutline(
|
OCB: Add ommitted 'tab back to picker' VO prompts to builtin picker
|
@@ -220,6 +220,7 @@ VOID
UpdateTabContext (
IN BOOLEAN IsEntering,
IN OC_BOOT_CONTEXT *BootContext,
+ IN OC_BOOT_ENTRY **BootEntries,
IN TAB_CONTEXT TabContext,
IN INTN ChosenEntry,
IN CHAR16 OldEntryCursor,
@@ -243,6 +244,17 @@ UpdateTabContext (
Code[0] = IsEntering ? OldEntryCursor : L' ';
gST->ConOut->OutputString (gST->ConOut, Code);
}
+
+ if (IsEntering) {
+ if (ChosenEntry >= 0) {
+ OcPlayAudioFile (BootContext->PickerContext, OcVoiceOverAudioFileSelected, FALSE);
+ OcPlayAudioEntry (BootContext->PickerContext, BootEntries[ChosenEntry]);
+ } else {
+ //
+ // TODO: Sound for tabbing back to picker if no entry selected (cannot currently happen)
+ //
+ }
+ }
} else if (TabContext == TAB_SHUTDOWN || TabContext == TAB_RESTART) {
if (TabContext == TAB_SHUTDOWN) {
gST->ConOut->SetCursorPosition (gST->ConOut, ShutdownColumn, ShutdownRestartRow);
@@ -252,23 +264,23 @@ UpdateTabContext (
Code[0] = IsEntering ? L'[' : '|';
gST->ConOut->OutputString (gST->ConOut, Code);
-
if (TabContext == TAB_SHUTDOWN) {
+ gST->ConOut->OutputString (gST->ConOut, L"Shutdown");
+ } else {
+ gST->ConOut->OutputString (gST->ConOut, L"Restart");
+ }
+ Code[0] = IsEntering ? L']' : '|';
+ gST->ConOut->OutputString (gST->ConOut, Code);
+
if (IsEntering) {
+ if (TabContext == TAB_SHUTDOWN) {
OcPlayAudioFile (BootContext->PickerContext, OcVoiceOverAudioFileSelected, FALSE);
OcPlayAudioFile (BootContext->PickerContext, OcVoiceOverAudioFileShutDown, FALSE);
- }
- gST->ConOut->OutputString (gST->ConOut, L"Shutdown");
} else {
- if (IsEntering) {
OcPlayAudioFile (BootContext->PickerContext, OcVoiceOverAudioFileSelected, FALSE);
OcPlayAudioFile (BootContext->PickerContext, OcVoiceOverAudioFileRestart, FALSE);
}
- gST->ConOut->OutputString (gST->ConOut, L"Restart");
}
-
- Code[0] = IsEntering ? L']' : '|';
- gST->ConOut->OutputString (gST->ConOut, Code);
}
#if defined(BUILTIN_DEMONSTRATE_TYPING)
else if (TabContext == TAB_TYPING_DEMO) {
@@ -549,6 +561,7 @@ OcShowSimpleBootMenu (
UpdateTabContext (
FALSE,
BootContext,
+ BootEntries,
TabContext,
ChosenEntry,
OldEntryCursor,
@@ -585,6 +598,7 @@ OcShowSimpleBootMenu (
UpdateTabContext (
TRUE,
BootContext,
+ BootEntries,
TabContext,
ChosenEntry,
OldEntryCursor,
|
Update BUFR latest master version key
|
@@ -12,7 +12,7 @@ transient missingValue=999999 : hidden;
# This gets updated twice a year by WMO.
# See http://www.wmo.int/pages/prog/www/WMOCodes/WMO306_vI2/LatestVERSION/LatestVERSION.html
-constant masterTablesVersionNumberLatest = 29;
+constant masterTablesVersionNumberLatest = 30;
#negative value=not used
transient inputDelayedDescriptorReplicationFactor={-1} : hidden;
|
VERSION bump to version 5.6.22
|
@@ -54,7 +54,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_
# with backward compatible change and micro version is connected with any internal change of the library.
set(SYSREPO_MAJOR_SOVERSION 5)
set(SYSREPO_MINOR_SOVERSION 6)
-set(SYSREPO_MICRO_SOVERSION 21)
+set(SYSREPO_MICRO_SOVERSION 22)
set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION})
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
|
repleace fopen to filestream_open 2
|
@@ -187,7 +187,7 @@ printf("lcmd:ready\n");
printf("lcmd:open\n");
if ( filestream_gets (fp, CMDFILE , 512) != NULL )
res=1;
- fclose (fp);
+ filestream_close (fp);
}
return res;
@@ -275,7 +275,7 @@ static bool read_m3u(const char *file)
}
}
- fclose(f);
+ filestream_close(f);
return (disk_images != 0);
}
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.