message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
ci, test: temporary increase IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP limit | */
#ifndef IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP
-#define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP 250
+#define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP 300 // TODO: IDF-5178
#endif
#ifndef IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP_PSRAM
#define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP_PSRAM 300
|
apps/pkeyutl.c: call ERR_print_errors() on all errors, including Signature Verification Failure | @@ -307,12 +307,10 @@ int pkeyutl_main(int argc, char **argv)
mctx, digestname, libctx, app_get0_propq());
if (ctx == NULL) {
BIO_printf(bio_err, "%s: Error initializing context\n", prog);
- ERR_print_errors(bio_err);
goto end;
}
if (peerkey != NULL && !setup_peer(ctx, peerform, peerkey, e)) {
BIO_printf(bio_err, "%s: Error setting up peer key\n", prog);
- ERR_print_errors(bio_err);
goto end;
}
if (pkeyopts != NULL) {
@@ -325,7 +323,6 @@ int pkeyutl_main(int argc, char **argv)
if (pkey_ctrl_string(ctx, opt) <= 0) {
BIO_printf(bio_err, "%s: Can't set parameter \"%s\":\n",
prog, opt);
- ERR_print_errors(bio_err);
goto end;
}
}
@@ -492,14 +489,13 @@ int pkeyutl_main(int argc, char **argv)
} else {
BIO_puts(bio_err, "Key derivation failed\n");
}
- ERR_print_errors(bio_err);
goto end;
}
ret = 0;
if (asn1parse) {
if (!ASN1_parse_dump(out, buf_out, buf_outlen, 1, -1))
- ERR_print_errors(bio_err);
+ ERR_print_errors(bio_err); /* but still return success */
} else if (hexdump) {
BIO_dump(out, (char *)buf_out, buf_outlen);
} else {
@@ -507,6 +503,8 @@ int pkeyutl_main(int argc, char **argv)
}
end:
+ if (ret != 0)
+ ERR_print_errors(bio_err);
EVP_MD_CTX_free(mctx);
EVP_PKEY_CTX_free(ctx);
EVP_MD_free(md);
@@ -671,15 +669,12 @@ static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file,
peer = load_pubkey(file, peerform, 0, NULL, engine, "peer key");
if (peer == NULL) {
BIO_printf(bio_err, "Error reading peer key %s\n", file);
- ERR_print_errors(bio_err);
return 0;
}
- ret = EVP_PKEY_derive_set_peer(ctx, peer);
+ ret = EVP_PKEY_derive_set_peer(ctx, peer) > 0;
EVP_PKEY_free(peer);
- if (ret <= 0)
- ERR_print_errors(bio_err);
return ret;
}
|
provisioning/warewulf-provision: refactor httpd.conf patch for non 'make dist' source | ---- warewulf-provision-3.7/configure 2017-02-22 13:14:14.000000000 -0800
-+++ warewulf-provision-3.7.patch/configure 2017-02-22 13:14:58.000000000 -0800
-@@ -2423,7 +2423,10 @@
+--- a/configure.ac 2018-07-11 13:56:05.000000000 -0700
++++ b/configure.ac 2018-07-11 15:07:55.000000000 -0700
+@@ -37,6 +37,9 @@
+ AC_MSG_CHECKING([for Debian based system])
+ AM_CONDITIONAL(ISDEB, [test -f /etc/debian_version])
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Debian based system" >&5
- $as_echo_n "checking for Debian based system... " >&6; }
-- if test -f /etc/debian_version; then
-+if test -f /etc/debian_version; then
-+ ISDEB_TRUE=
-+ ISDEB_FALSE='#'
-+elif test -f /etc/SuSE-release; then
- ISDEB_TRUE=
- ISDEB_FALSE='#'
- else
++AC_MSG_CHECKING([for SUSE based system])
++AM_CONDITIONAL(ISSUSE, [test -f /etc/SuSE-release])
++
+ AC_PATH_PROG(PERLBIN, perl)
+ if test -z "$PERLBIN"; then
+ AC_MSG_ERROR([perl not found])
+--- a/etc/Makefile.am 2018-07-11 13:56:05.000000000 -0700
++++ b/etc/Makefile.am 2018-07-11 15:08:27.000000000 -0700
+@@ -6,7 +6,8 @@
+ # Check for Debian
+ if ISDEB
+ httpdir = $(sysconfdir)/apache2/conf.d/
+-else
++else if ISSUSE
++httpdir = $(sysconfdir)/apache2/conf.d/
+ # Assume RHEL Layout
+ httpdir = $(sysconfdir)/httpd/conf.d/
+ endif
|
Use -nameopt utf8 by default | @@ -197,7 +197,7 @@ int set_nameopt(const char *arg)
unsigned long get_nameopt(void)
{
- return (nmflag_set) ? nmflag : XN_FLAG_ONELINE;
+ return (nmflag_set) ? nmflag : XN_FLAG_SEP_CPLUS_SPC | ASN1_STRFLGS_UTF8_CONVERT;
}
void dump_cert_text(BIO *out, X509 *x)
|
bump nagios-plugins to v2.2.1 | %global _hardened_build 1
Name: %{pname}%{PROJ_DELIM}
-Version: 2.2.0
+Version: 2.2.1
Release: 1%{?dist}
Summary: Host/service/network monitoring program plugins for Nagios
DocDir: %{OHPC_PUB}/doc/contrib
|
Remove packed argument on detection structure avoiding memory missalignement | @@ -27,7 +27,7 @@ typedef enum
RELEASE
} expected_detection_t;
-typedef struct __attribute__((__packed__))
+typedef struct
{
branch_t keepline; /*!< last keepline status on PTP lines . */
unsigned char detected_vm; /*!< Virtual Module number. */
|
Fix lv_canvas_set_buffer doc
Lines in canvas buffers are byte aligned so buffers might request larger size and contain unused bits.
The previous documented calc method would often result in a buffer size smaller than what was expected by LVGL, leading to memory corruption and program crash. | @@ -60,7 +60,7 @@ lv_obj_t * lv_canvas_create(lv_obj_t * par, const lv_obj_t * copy);
/**
* Set a buffer for the canvas.
* @param buf a buffer where the content of the canvas will be.
- * The required size is (lv_img_color_format_get_px_size(cf) * w * h) / 8)
+ * The required size is (lv_img_color_format_get_px_size(cf) * w) / 8 * h)
* It can be allocated with `lv_mem_alloc()` or
* it can be statically allocated array (e.g. static lv_color_t buf[100*50]) or
* it can be an address in RAM or external SRAM
|
Just int for bool | @@ -1896,7 +1896,7 @@ static uint64_t conn_get_cwnd(ngtcp2_conn *conn) {
* conn_cwnd_is_zero returns nonzero if the number of bytes the local
* endpoint can sent at this time is zero.
*/
-static uint64_t conn_cwnd_is_zero(ngtcp2_conn *conn) {
+static int conn_cwnd_is_zero(ngtcp2_conn *conn) {
uint64_t bytes_in_flight = conn->cstat.bytes_in_flight;
uint64_t cwnd = conn_get_cwnd(conn);
|
Doc: document the tie-breaking behavior of the round() function.
Back-patch to v13; the table layout in older branches is unfriendly
to adding such details.
Laurenz Albe
Discussion: | @@ -1568,7 +1568,10 @@ repeat('Pg', 4) <returnvalue>PgPgPgPg</returnvalue>
<returnvalue>double precision</returnvalue>
</para>
<para>
- Rounds to nearest integer
+ Rounds to nearest integer. For <type>numeric</type>, ties are
+ broken by rounding away from zero. For <type>double precision</type>,
+ the tie-breaking behavior is platform dependent, but
+ <quote>round to nearest even</quote> is the most common rule.
</para>
<para>
<literal>round(42.4)</literal>
@@ -1583,7 +1586,7 @@ repeat('Pg', 4) <returnvalue>PgPgPgPg</returnvalue>
</para>
<para>
Rounds <parameter>v</parameter> to <parameter>s</parameter> decimal
- places
+ places. Ties are broken by rounding away from zero.
</para>
<para>
<literal>round(42.4382, 2)</literal>
|
Ensure index is compared against the actual value. | @@ -281,7 +281,7 @@ parse_browser_token (char ***list, char *line, int n)
/* value */
val = line + (idx + 1);
idx = strspn (val, "\t");
- if (strlen (line) == idx)
+ if (strlen (val) == idx)
FATAL ("Malformed browser category at line: %d", n);
val = val + idx;
val = trim_str (val);
|
Add f16c to the version string | /** @brief The version header. */
static const char *astcenc_copyright_string =
-R"(astcenc v%s, %u-bit %s%s
+R"(astcenc v%s, %u-bit %s%s%s
Copyright 2011-%s Arm Limited, all rights reserved
)";
@@ -595,9 +595,15 @@ void astcenc_print_header()
const char* pcnttype = "";
#endif
+#if (ASTCENC_F16C == 1)
+ const char* f16ctype = "+f16c";
+#else
+ const char* f16ctype = "";
+#endif
+
unsigned int bits = (int)(sizeof(void*) * 8);
printf(astcenc_copyright_string,
- VERSION_STRING, bits, simdtype, pcnttype, YEAR_STRING);
+ VERSION_STRING, bits, simdtype, pcnttype, f16ctype, YEAR_STRING);
}
/* See header for documentation. */
|
Installation with yay | @@ -18,12 +18,10 @@ cd instantWM
./build.sh
```
-Or install from AUR:
+Alternatively, install from AUR:
```
-git clone https://aur.archlinux.org/instantwm.git
-cd instantwm
-makepkg -si
+yay -S instantwm
```
You can use this to get access to new features early.
|
fs: procfs: Skip to register for meminfo if the name is NULL
Summary:
This commit skips to register for meminfo if the name is NULL
Impact:
None
Testing:
Tested with sabre-6quad:netknsh (umm_heap will be updated later) | @@ -578,6 +578,11 @@ static int meminfo_stat(FAR const char *relpath, FAR struct stat *buf)
void procfs_register_meminfo(FAR struct procfs_meminfo_entry_s *entry)
{
+ if (NULL == entry->name)
+ {
+ return;
+ }
+
entry->next = g_procfs_meminfo;
g_procfs_meminfo = entry;
}
|
[swaylock] Install pam module | +sysconfdir = get_option('sysconfdir')
+
executable(
'swaylock', [
'main.c',
@@ -21,3 +23,8 @@ executable(
link_with: [lib_sway_common, lib_sway_client],
install: true
)
+
+install_data(
+ 'pam/swaylock',
+ install_dir: sysconfdir + '/pam.d/'
+)
|
docs:update wifi sci subcarrier index docs | @@ -1747,6 +1747,18 @@ All of the information in the table can be found in the structure wifi_csi_info_
- If first_word_invalid field of wifi_csi_info_t is true, it means that the first four bytes of CSI data is invalid due to a hardware limitation in {IDF_TARGET_NAME}.
- More information like RSSI, noise floor of RF, receiving time and antenna is in the rx_ctrl field.
+When imaginary part and real part data of sub-carrier are used, please refer to the table below.
+
++----------------+-------------------+------------------------------+-------------------------+
+| PHY standard | Sub-carrier range | Pilot sub-carrier | Sub-carrier(total/data) |
++================+===================+==============================+=========================+
+| 802.11a/g | -26 to +26 | -21, -7, +7, +21 | 52 total, 48 usable |
++----------------+-------------------+------------------------------+-------------------------+
+| 802.11n, 20MHz | -28 to +28 | -21, -7, +7, +21 | 56 total, 52 usable |
++----------------+-------------------+------------------------------+-------------------------+
+| 802.11n, 40MHz | -57 to +57 | -53, -25, -11, +11, +25, +53 | 114 total, 108 usable |
++----------------+-------------------+------------------------------+-------------------------+
+
.. note::
- For STBC packet, CSI is provided for every space-time stream without CSD (cyclic shift delay). As each cyclic shift on the additional chains shall be -200 ns, only the CSD angle of first space-time stream is recorded in sub-carrier 0 of HT-LTF and STBC-HT-LTF for there is no channel frequency response in sub-carrier 0. CSD[10:0] is 11 bits, ranging from -pi to pi.
|
admin/nhc: fix src url | @@ -23,7 +23,7 @@ Release: 1%{?dist}
License: US Dept. of Energy (BSD-like)
Group: %{PROJ_NAME}/admin
URL: https://github.com/mej/nhc/
-Source0: https://github.com/mej/nhc/archive/%{version}.tar.gz#%{pname}-%{version}.tar.gz
+Source0: https://github.com/mej/nhc/archive/%{version}.tar.gz#/%{pname}-%{version}.tar.gz
Source1: OHPC_macros
Requires: bash
BuildRequires: automake autoconf
|
Fix comment typo for strLower(). | @@ -165,7 +165,7 @@ String *strFirstUpper(String *this);
// Lower-case the first letter
String *strFirstLower(String *this);
-// Upper-case entire string
+// Lower-case entire string
String *strLower(String *this);
// Return the path part of a string (i.e. everything before the last / or "" if there is no /)
|
k1om: remove fpu_save and fpu_resore functions as they are in handled else where now | @@ -111,21 +111,6 @@ static inline void fpu_init(void)
__asm volatile ("fninit");
}
-static inline void fpu_save(struct registers_fpu_x86_64 *fpustate)
-{
- uint8_t *regs = fpustate->registers;
- regs += 16 - ((uintptr_t)regs % 16);
-
- __asm volatile("fxsaveq %0" : "=m" (*regs));
-}
-
-static inline void fpu_restore(struct registers_fpu_x86_64 *fpustate)
-{
- uint8_t *regs = fpustate->registers;
- regs += 16 - ((uintptr_t)regs % 16);
-
- __asm volatile ("fxrstorq %0" :: "m" (*regs));
-}
#if 0
|
esp_http_server example tests : updated advanced_tests as per API changes | @@ -12,6 +12,11 @@ static const char *TAG="TESTS";
int pre_start_mem, post_stop_mem, post_stop_min_mem;
bool basic_sanity = true;
+struct async_resp_arg {
+ httpd_handle_t hd;
+ int fd;
+};
+
/********************* Basic Handlers Start *******************/
esp_err_t hello_get_handler(httpd_req_t *req)
@@ -157,11 +162,13 @@ esp_err_t leftover_data_post_handler(httpd_req_t *req)
return ESP_OK;
}
-int httpd_default_send(int sockfd, const char *buf, unsigned buf_len, int flags);
+int httpd_default_send(httpd_handle_t hd, int sockfd, const char *buf, unsigned buf_len, int flags);
void generate_async_resp(void *arg)
{
char buf[250];
- int fd = (int )arg;
+ struct async_resp_arg *resp_arg = (struct async_resp_arg *)arg;
+ httpd_handle_t hd = resp_arg->hd;
+ int fd = resp_arg->fd;
#define HTTPD_HDR_STR "HTTP/1.1 200 OK\r\n" \
"Content-Type: text/html\r\n" \
"Content-Length: %d\r\n"
@@ -171,11 +178,12 @@ void generate_async_resp(void *arg)
snprintf(buf, sizeof(buf), HTTPD_HDR_STR,
strlen(STR));
- httpd_default_send(fd, buf, strlen(buf), 0);
+ httpd_default_send(hd, fd, buf, strlen(buf), 0);
/* Space for sending additional headers based on set_header */
- httpd_default_send(fd, "\r\n", strlen("\r\n"), 0);
- httpd_default_send(fd, STR, strlen(STR), 0);
+ httpd_default_send(hd, fd, "\r\n", strlen("\r\n"), 0);
+ httpd_default_send(hd, fd, STR, strlen(STR), 0);
#undef STR
+ free(arg);
}
esp_err_t async_get_handler(httpd_req_t *req)
@@ -185,12 +193,15 @@ esp_err_t async_get_handler(httpd_req_t *req)
/* Also register a HTTPD Work which sends the same data on the same
* socket again
*/
- int fd = httpd_req_to_sockfd(req);
- if (fd < 0) {
+ struct async_resp_arg *resp_arg = malloc(sizeof(struct async_resp_arg));
+ resp_arg->hd = req->handle;
+ resp_arg->fd = httpd_req_to_sockfd(req);
+ if (resp_arg->fd < 0) {
return ESP_FAIL;
}
- ESP_LOGI(TAG, "Queuing work fd : %d", fd);
- httpd_queue_work(req->handle, generate_async_resp, (void *)fd);
+
+ ESP_LOGI(TAG, "Queuing work fd : %d", resp_arg->fd);
+ httpd_queue_work(req->handle, generate_async_resp, resp_arg);
return ESP_OK;
#undef STR
}
|
out_es: add support for IPv6 | @@ -42,7 +42,7 @@ struct flb_elasticsearch *flb_es_conf_create(struct flb_output_instance *ins,
struct flb_config *config)
{
- int io_type;
+ int io_flags = 0;
char *tmp;
struct flb_uri *uri = ins->host.uri;
struct flb_uri_field *f_index = NULL;
@@ -75,17 +75,21 @@ struct flb_elasticsearch *flb_es_conf_create(struct flb_output_instance *ins,
/* use TLS ? */
if (ins->use_tls == FLB_TRUE) {
- io_type = FLB_IO_TLS;
+ io_flags = FLB_IO_TLS;
}
else {
- io_type = FLB_IO_TCP;
+ io_flags = FLB_IO_TCP;
+ }
+
+ if (ins->host.ipv6 == FLB_TRUE) {
+ io_flags |= FLB_IO_IPV6;
}
/* Prepare an upstream handler */
upstream = flb_upstream_create(config,
ins->host.name,
ins->host.port,
- io_type,
+ io_flags,
&ins->tls);
if (!upstream) {
flb_error("[out_es] cannot create Upstream context");
|
Fix attribute mapping in tinyspline.i. | // Generate getter and setter.
#ifndef SWIGD
%include <attribute.i>
-%attribute(tinyspline::BSpline, size_t, deg, deg);
-%attribute(tinyspline::BSpline, size_t, order, order);
-%attribute(tinyspline::BSpline, size_t, dim, dim);
-%attribute(tinyspline::BSpline, size_t, nCtrlp, nCtrlp);
-%attribute(tinyspline::BSpline, size_t, nKnots, nKnots);
-%attributeval(tinyspline::BSpline, std::vector<tinyspline::real>, ctrlp, ctrlp, setCtrlp);
-%attributeval(tinyspline::BSpline, std::vector<tinyspline::real>, knots, knots, setKnots);
-%attribute(tinyspline::DeBoorNet, tinyspline::real, u, u);
-%attribute(tinyspline::DeBoorNet, size_t, k, k);
-%attribute(tinyspline::DeBoorNet, size_t, s, s);
-%attribute(tinyspline::DeBoorNet, size_t, h, h);
-%attribute(tinyspline::DeBoorNet, size_t, dim, dim);
-%attribute(tinyspline::DeBoorNet, size_t, nPoints, nPoints);
-%attributeval(tinyspline::DeBoorNet, std::vector<tinyspline::real>, points, points);
-%attributeval(tinyspline::DeBoorNet, std::vector<tinyspline::real>, result, result);
+%attribute(tinyspline::BSpline,
+ size_t,
+ degree,
+ degree);
+%attribute(tinyspline::BSpline,
+ size_t,
+ order,
+ order);
+%attribute(tinyspline::BSpline,
+ size_t,
+ dimension,
+ dimension);
+%attributeval(tinyspline::BSpline,
+ std::vector<tinyspline::real>,
+ controlPoints,
+ controlPoints,
+ setControlPoints);
+%attributeval(tinyspline::BSpline,
+ std::vector<tinyspline::real>,
+ knots,
+ knots,
+ setKnots);
+%attribute(tinyspline::DeBoorNet,
+ tinyspline::real,
+ knot,
+ knot);
+%attribute(tinyspline::DeBoorNet,
+ size_t,
+ index,
+ index);
+%attribute(tinyspline::DeBoorNet,
+ size_t,
+ multiplicity,
+ multiplicity);
+%attribute(tinyspline::DeBoorNet,
+ size_t,
+ numInsertions,
+ numInsertions);
+%attribute(tinyspline::DeBoorNet,
+ size_t,
+ dimension,
+ dimension);
+%attributeval(tinyspline::DeBoorNet,
+ std::vector<tinyspline::real>,
+ points,
+ points);
+%attributeval(tinyspline::DeBoorNet,
+ std::vector<tinyspline::real>,
+ result,
+ result);
#endif
// Make strings directly accessible in target language.
|
QUIC: Add TODO for CCM support | @@ -1201,6 +1201,8 @@ int ossl_quic_renegotiate_check(SSL *ssl, int initok)
/*
* This is the subset of TLS1.3 ciphers which can be used with QUIC and which we
* actually support.
+ *
+ * TODO(QUIC): CCM support
*/
static SSL_CIPHER tls13_quic_ciphers[] = {
{
|
[mod_webdav] fix startup crash w/ multiple conds (fixes
(thx flynn)
x-ref:
"lighttpd 1.4.54 segfaults on start in mod_webdav" | @@ -1275,8 +1275,8 @@ SERVER_FUNC(mod_webdav_worker_init)
* across a fork() system call into the child process.
*/
plugin_data * const p = (plugin_data *)p_d;
- plugin_config *s = p->config_storage[0];
- for (int n_context = p->nconfig+1; --n_context; ++s) {
+ for (int i = 0; i < p->nconfig; ++i) {
+ plugin_config *s = p->config_storage[i];
if (!buffer_is_empty(s->sqlite_db_name)
&& mod_webdav_sqlite3_prep(s->sql, s->sqlite_db_name, srv->errh)
== HANDLER_ERROR)
|
use an example UUID to define H2O_UUID_STR_RFC4122_LEN
sited from "Appendix B. Sample Output of utest" | /*
* size of a UUID string representation.
*/
-#define H2O_UUID_STR_RFC4122_LEN 36
+#define H2O_UUID_STR_RFC4122_LEN (sizeof("7d444840-9dc0-11d1-b245-5ffdce74fad2") - 1)
/**
* generates and sets a UUIDv4 to buf, which must have an enough size, H2O_UUID_STR_RFC4122_LEN + 1.
|
Fix detection management when an detector module is not alone on the node. | @@ -100,6 +100,18 @@ char* alias_from_id(uint16_t id){
return -1;
}
+int bigest_id(){
+ int max_id = 0;
+ for(int i = 0; i<last_route_table_entry; i++) {
+ if (route_table[i].mode == MODULE){
+ if (route_table[i].id > max_id) {
+ max_id = route_table[i].id;
+ }
+ }
+ }
+ return max_id;
+}
+
// check if the module is a sensor or not
uint8_t is_sensor(module_type_t type) {
if((type == ANGLE_MOD) ||
@@ -226,19 +238,21 @@ void detect_modules(module_t* module) {
// Then, asks for introduction for every found modules.
int try = 0;
- while ((last_module < nb_mod) && (try < nb_mod)){
+ int last_id = bigest_id();
+ while ((last_id < nb_mod) && (try < nb_mod)){
intro_msg.header.cmd = IDENTIFY_CMD;
intro_msg.header.target_mode = IDACK;
intro_msg.header.size = 0;
// Target next unknown module (the first one of the next node)
- intro_msg.header.target = last_module+1;
+ intro_msg.header.target = last_id+1;
try++;
// Ask to introduce and wait for a reply
if (!wait_route_table(module, &intro_msg)) {
// We don't get the answer
- nb_mod = last_module;
+ nb_mod = last_id;
break;
}
+ last_id = bigest_id();
}
for (int id = 1; id<=nb_mod; id++) {
int computed_id = id_from_alias(alias_from_id(id));
|
Fixed broken test from reordering of temp variables | @@ -350,10 +350,10 @@ test("should walk all scene events to build list of used variables", () => {
for(let i=0; i<100; i++) {
output.push(String(i));
}
- output.push("109");
- output.push("110");
output.push("T0");
output.push("T1");
+ output.push("109");
+ output.push("110");
expect(precompiledVariables).toEqual(output);
});
|
platform/debug: disable hbridge and tacho
These are currently not implemented | #define PBDRV_CONFIG_LAST_IO_PORT PBIO_PORT_1
#define PBDRV_CONFIG_NUM_IO_PORT (1)
+#define PBDRV_CONFIG_HBRIDGE (0)
+#define PBDRV_CONFIG_TACHO (0)
+
#define PBDRV_CONFIG_SYS_CLOCK_RATE 48000000
#endif // _PBDRVCONFIG_H_
|
Fix erlang gpio:attach_interrupt/2 function spec
attach_interrupt/2 expects the second argument to be a trigger not
an input/output direction. | @@ -128,9 +128,9 @@ digital_write(_GPIONum, _Level) ->
digital_read(_GPIONum) ->
throw(nif_error).
--spec attach_interrupt(GPIONum :: pin(), Mode :: direction()) -> ok | error.
-attach_interrupt(GPIONum, Mode) ->
- set_int(start(), GPIONum, Mode).
+-spec attach_interrupt(GPIONum :: pin(), Trigger :: trigger()) -> ok | error.
+attach_interrupt(GPIONum, Trigger) ->
+ set_int(start(), GPIONum, Trigger).
-spec detach_interrupt(GPIONum :: pin()) -> ok | error.
detach_interrupt(GPIONum) ->
|
Fix emote event issue since develop was merged | @@ -823,7 +823,7 @@ void Script_ActorSetCollisions_b() {
*/
void Script_ActorSetEmote_b() {
unsigned char* emote_ptr;
- UBYTE palette = actors[script_actor].palette_index;
+ UBYTE palette = actors[main_script_ctx.script_actor].palette_index;
emote_sprite = SpritePoolNext();
emote_timer = 1;
main_script_ctx.script_update_fn = ScriptUpdate_Emote;
|
nat: free port_bitmap | @@ -742,6 +742,7 @@ int snat_add_address (snat_main_t *sm, ip4_address_t *addr, u32 vrf_id,
#define _(N, i, n, s) \
clib_bitmap_alloc (ap->busy_##n##_port_bitmap, 65535); \
ap->busy_##n##_ports = 0; \
+ ap->busy_##n##_ports_per_thread = 0;\
vec_validate_init_empty (ap->busy_##n##_ports_per_thread, tm->n_vlib_mains - 1, 0);
foreach_snat_protocol
#undef _
@@ -1607,6 +1608,12 @@ snat_del_address (snat_main_t *sm, ip4_address_t addr, u8 delete_sm,
}
}
+#define _(N, i, n, s) \
+ clib_bitmap_free (a->busy_##n##_port_bitmap); \
+ vec_free (a->busy_##n##_ports_per_thread);
+ foreach_snat_protocol
+#undef _
+
if (twice_nat)
{
vec_del1 (sm->twice_nat_addresses, i);
|
oic; remove coap observers registered for closing BLE connection. | #include "oic/messaging/coap/coap.h"
#include "oic/port/oc_connectivity.h"
#include "oic/port/mynewt/ble.h"
+#include "messaging/coap/observe.h"
#include "host/ble_hs.h"
#include "services/gap/ble_svc_gap.h"
#include "services/gatt/ble_svc_gatt.h"
@@ -345,6 +346,8 @@ oc_ble_coap_conn_del(uint16_t conn_handle)
struct os_mbuf_pkthdr *pkt;
struct os_mbuf *m;
struct oc_endpoint_ble *oe_ble;
+ struct oc_endpoint oe;
+ int i;
OC_LOG(DEBUG, "oc_gatt endconn %x\n", conn_handle);
STAILQ_FOREACH(pkt, &oc_ble_reass_q, omp_next) {
@@ -356,6 +359,19 @@ oc_ble_coap_conn_del(uint16_t conn_handle)
break;
}
}
+
+ /*
+ * Remove CoAP observers (if any) registered for this connection.
+ */
+ memset(&oe, 0, sizeof(oe));
+ oe_ble = (struct oc_endpoint_ble *)&oe;
+ oe_ble->ep.oe_type = oc_gatt_transport_id;
+ oe_ble->ep.oe_flags = 0;
+ oe_ble->conn_handle = conn_handle;
+ for (i = 0; i < OC_BLE_SRV_CNT; i++) {
+ oe_ble->srv_idx = i;
+ coap_remove_observer_by_client(&oe);
+ }
}
int
|
Fix a typo in a variable name
There was a typo in a variable name causing the build to fail when mem-stats was turned on.
JerryScript-DCO-1.0-Signed-off-by: Daniel Balla | @@ -319,7 +319,7 @@ jerry_debugger_process_message (uint8_t *recv_buffer_p, /**< pointer the the rec
}
#ifdef JMEM_STATS
- jmem_stats_free_byte_code_bytes (((size_t) bytecode_p->size) << JMEM_ALIGNMENT_LOG);
+ jmem_stats_free_byte_code_bytes (((size_t) byte_code_free_p->size) << JMEM_ALIGNMENT_LOG);
#endif /* JMEM_STATS */
jmem_heap_free_block (byte_code_free_p,
|
Add missing static function qualifier | @@ -551,7 +551,7 @@ static int try_quantize_alpha_delta(
return 1;
}
-int try_quantize_luminance_alpha_delta(
+static int try_quantize_luminance_alpha_delta(
float4 color0,
float4 color1,
int output[8],
|
Fix invalid PhLoadLibraryAsImageResource flags for Win8 | @@ -7939,7 +7939,7 @@ NTSTATUS PhLoadLibraryAsImageResource(
NULL,
&imageBaseSize,
ViewShare,
- WindowsVersion < WINDOWS_8 ? 0 : MEM_MAPPED,
+ WindowsVersion < WINDOWS_10 ? 0 : MEM_MAPPED,
PAGE_READONLY
);
|
Fix bug in arena relocation logic when a reloc entry points to the same buffer being relocated. | @@ -238,17 +238,20 @@ int yr_arena2_allocate_memory(
if (new_data == NULL)
return ERROR_INSUFFICIENT_MEMORY;
- // TODO(vmalvarez): remove
- //assert(new_size == arena->initial_buffer_size || new_data == b->data);
-
YR_RELOC2* reloc = arena->reloc_list_head;
while (reloc != NULL)
{
+ // If the reloc entry is for the same buffer that is being relocated,
+ // the base pointer that we use to access the buffer must be new_data,
+ // as arena->buffers[reloc->buffer_id].data which is the same than
+ // b->data can't be accessed anymore after the call to yr_realloc.
+ void* base = buffer_id == reloc->buffer_id ?
+ new_data : arena->buffers[reloc->buffer_id].data;
+
// reloc_address holds the address inside the buffer where the pointer
// to be relocated resides.
- void** reloc_address = (void**)(
- arena->buffers[reloc->buffer_id].data + reloc->offset);
+ void** reloc_address = (void**)(base + reloc->offset);
// reloc_target is the value of the relocatable pointer.
void* reloc_target = *reloc_address;
|
Fix the build on 10.13. Missing LDFLAGS for OpenSSL from brew. | @@ -32,7 +32,8 @@ case $host_os in
darwin*) CFLAGS="$CFLAGS -I/opt/local/include"
# Starting with Mac OS X 10.11 (El Capitan) the OpenSSL headers
# are in /usr/local/opt/openssl/include
- CFLAGS="$CFLAGS -I/usr/local/opt/openssl/include" ;;
+ CFLAGS="$CFLAGS -I/usr/local/opt/openssl/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" ;;
esac
AC_C_BIGENDIAN
|
Testing: move lengthy test to extra set | @@ -102,7 +102,6 @@ if( HAVE_BUILD_TOOLS )
grib_grid_unstructured
grib_grid_lambert_conformal
grib_grid_polar_stereographic
- grib_grid_space_view
grib_g1monthlydate
grib_g1fcperiod)
@@ -113,6 +112,7 @@ if( HAVE_BUILD_TOOLS )
grib_complex
grib_double_cmp
grib_change_packing
+ grib_grid_space_view
bufr_dump_data
bufr_dump_descriptors
bufr_dump_subset
|
nss: remove debug output | @@ -46,18 +46,13 @@ static void nss_client_handler(int rc, int clientsock)
goto finish;
}
-printf("nss lookup: %s\n", &req.name[0]);
-
search = kad_lookup(&req.name[0]);
if (search == NULL) {
- printf("no search found\n");
goto finish;
}
-printf("found search; request.af: %s\n", str_af(req.af));
-
af = req.af;
count = 0;
@@ -87,9 +82,6 @@ printf("found search; request.af: %s\n", str_af(req.af));
res.af = af;
res.count = count;
-printf("found results; response.af: %s, count: %d\n", str_af(res.af), count);
-
-
finish:
write(clientsock, &res, sizeof(res));
|
[core] typo in trace | @@ -1460,7 +1460,7 @@ int config_parse_cmd(server *srv, config_t *context, const char *cmd) {
}
if (0 != wstatus) {
log_error_write(srv, __FILE__, __LINE__, "SSsd",
- "commaned \"", cmd, "\" exited non-zero:", WEXITSTATUS(wstatus));
+ "command \"", cmd, "\" exited non-zero:", WEXITSTATUS(wstatus));
ret = -1;
}
|
stats: check epoch in python vpp_stats ls
The VPP Stats Python binding was missing checking epoch.
Resulting it would not pick up changes in the directory.
Type: fix | @@ -280,6 +280,9 @@ class VPPStats():
if not isinstance(patterns, list):
patterns = [patterns]
regex = [re.compile(i) for i in patterns]
+ if self.last_epoch != self.epoch:
+ self.refresh()
+
return [k for k, v in self.directory.items()
if any(re.match(pattern, k) for pattern in regex)]
|
link: archive graph on migration | :_ this(state *state-1)
=/ orm orm:graph-store
|^ ^- (list card)
- %+ murn ~(tap by by-group.s)
+ %- zing
+ %+ turn ~(tap by by-group.s)
|= [=path =links]
- ^- (unit card)
+ ^- (list card)
?. ?=([@ @ *] path)
(on-bad-path path links)
- :- ~
- %+ add-graph `resource`[(slav %p i.path) i.t.path]
+ =/ =resource [(slav %p i.path) i.t.path]
+ :_ [(archive-graph resource)]~
+ %+ add-graph resource
^- graph:gra
%+ gas:orm ~
=/ comments (~(gut by discussions.s) path *(map url discussion))
++ add-graph
|= [=resource =graph:gra]
^- card
- =- [%pass /migrate-link %agent [our.bowl %graph-store] -]
- ^- task:agent:gall
- :+ %poke %graph-update
- !> ^- update:gra
+ %- poke-graph-store
[%0 now.bowl %add-graph resource graph `%graph-validator-link]
+ ::
+ ++ archive-graph
+ |= =resource
+ ^- card
+ %- poke-graph-store
+ [%0 now.bowl %archive-graph resource]
+ ::
+ ++ poke-graph-store
+ |= =update:gra
+ ^- card
+ :* %pass /migrate-link %agent [our.bowl %graph-store]
+ %poke %graph-update !>(update)
+ ==
--
::
++ on-poke on-poke:def
|
get rid of iw | @@ -5,11 +5,9 @@ export WLANDEV=`ls -1 /sys/class/net | grep ^wl`
if [[ ! -z $WLANDEV ]]
then
ARCHIVNAME=`date +'%Y%m%d%H%M'`
- ip link set $WLANDEV down
- iw dev $WLANDEV set type monitor
- ip link set $WLANDEV up
- hcxdumptool --gpio_button=4 --gpio_statusled=17 -i $WLANDEV -o $ARCHIVNAME.pcapng --poweroff --filterlist_ap=blacklistown --filtermode=1
-# hcxdumptool --gpio_button=4 --gpio_statusled=17 -i $WLANDEV -o $ARCHIVNAME.pcapng --tot=1440 --filterlist_ap=blacklistown --filtermode=1 --disable_ap_attacks --disable_deauthentications -t 120
+ /opt/vc/bin/tvservice -o
+ hcxdumptool --gpio_button=4 --gpio_statusled=17 -i $WLANDEV -f 79 -o $ARCHIVNAME.pcapng --poweroff --stop_ap_attacks=6000 --resume_ap_attacks=12000 --active_beacon
+# hcxdumptool --gpio_button=4 --gpio_statusled=17 -i $WLANDEV -o $ARCHIVNAME.pcapng --tot=1440 --disable_deauthentication --disable_ap_attacks --active_beacon -c 1,3,5,7,9,11,2,4,6,8,10 -t 60
hcxret=$?
if [ $hcxret -eq 2 ]
then
@@ -18,6 +16,6 @@ then
poweroff
fi
fi
-hcxpioff --gpio_button=4 --gpio_statusled=17 &
systemctl start [email protected]
systemctl start sshd.service
+hcxpioff --gpio_button=4 --gpio_statusled=17 &
|
build: support building with MinGW-w64
Removed the check that prevented --use-system-libuv from working
in windows
Disable MSVC compiler flags in MinGW | @@ -146,9 +146,8 @@ class libuv_build_ext(build_ext):
def build_extensions(self):
self.force = self.force or self.libuv_force_fetch or self.libuv_clean_compile
- if self.use_system_libuv:
- if sys.platform == 'win32':
- raise DistutilsError('using a system provided libuv is unsupported on Windows')
+
+ if self.compiler.compiler_type == 'mingw32' or self.use_system_libuv:
self.compiler.add_library('uv')
else:
if sys.platform == 'win32':
@@ -163,6 +162,7 @@ class libuv_build_ext(build_ext):
self.compiler.add_library('rt')
elif sys.platform == 'win32':
self.extensions[0].define_macros.append(('WIN32', 1))
+ if self.compiler.compiler_type != 'mingw32':
self.extensions[0].extra_link_args.extend(['/NODEFAULTLIB:libcmt', '/LTCG'])
self.compiler.add_library('advapi32')
self.compiler.add_library('iphlpapi')
|
API: Add dependency on compiler for API .json and .api generation.
Add dependency on the API compiler, so that builds can deal with changes to the tool. | @@ -24,7 +24,7 @@ function(vpp_generate_api_c_header file)
COMMAND mkdir -p ${output_dir}
COMMAND ${VPP_APIGEN}
ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --output ${output_name}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+ DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file}
COMMENT "Generating API header ${output_name}"
)
endfunction()
@@ -39,7 +39,7 @@ function(vpp_generate_api_json_header file dir component)
COMMAND mkdir -p ${output_dir}
COMMAND ${VPP_APIGEN}
ARGS --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} JSON --output ${output_name}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+ DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file}
COMMENT "Generating API header ${output_name}"
)
install(
|
Ezkinil: Update thermal table
Remove thermal_cpu. Not using TEMP_SENSOR_CPU to do thermal shutdown
and throttle ap.
BRANCH=zork
TEST=none | @@ -701,18 +701,6 @@ const static struct ec_thermal_config thermal_soc = {
.temp_fan_max = C_TO_K(75),
};
-const static struct ec_thermal_config thermal_cpu = {
- .temp_host = {
- [EC_TEMP_THRESH_HIGH] = C_TO_K(85),
- [EC_TEMP_THRESH_HALT] = C_TO_K(95),
- },
- .temp_host_release = {
- [EC_TEMP_THRESH_HIGH] = C_TO_K(80),
- },
- .temp_fan_off = 0,
- .temp_fan_max = 0,
-};
-
struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT];
struct fan_step {
@@ -741,7 +729,6 @@ static void setup_fans(void)
{
thermal_params[TEMP_SENSOR_CHARGER] = thermal_thermistor;
thermal_params[TEMP_SENSOR_SOC] = thermal_soc;
- thermal_params[TEMP_SENSOR_CPU] = thermal_cpu;
}
DECLARE_HOOK(HOOK_INIT, setup_fans, HOOK_PRIO_DEFAULT);
|
tcptracer: Fix argparse is not defined error
argparse is imported as ap, using argparse explicitly results in a name
not defined error. | @@ -33,7 +33,7 @@ parser.add_argument("-N", "--netns", default=0, type=int,
parser.add_argument("-v", "--verbose", action="store_true",
help="include Network Namespace in the output")
parser.add_argument("--ebpf", action="store_true",
- help=argparse.SUPPRESS)
+ help=ap.SUPPRESS)
args = parser.parse_args()
bpf_text = """
|
removed adam moody line | @@ -101,7 +101,6 @@ We welcome contributions to the project. For details on how to help, see our [C
Copyright (c) 2013-2015, Lawrence Livermore National Security, LLC.
Produced at the Lawrence Livermore National Laboratory
- Written by Adam Moody <[email protected]>.
CODE-673838
Copyright (c) 2006-2007,2011-2015, Los Alamos National Security, LLC.
|
Replace sprintf with ostringstream. | @@ -1250,21 +1250,21 @@ tinyspline::BSpline::setControlPointVec4At(size_t idx, Vec4 &cp)
throw std::runtime_error(status.message);
}
-void tinyspline::BSpline::setKnots(const std::vector<tinyspline::real> &knots)
+void
+tinyspline::BSpline::setKnots(const std::vector<real> &knots)
{
size_t expected = ts_bspline_num_knots(&spline);
size_t actual = knots.size();
if (expected != actual) {
- char expected_str[32];
- char actual_str[32];
- sprintf(expected_str, "%lu", (unsigned long) expected);
- sprintf(actual_str, "%lu", (unsigned long) actual);
- throw std::runtime_error(
- "Expected size: " + std::string(expected_str) +
- ", Actual size: " + std::string(actual_str));
+ std::ostringstream oss;
+ oss << "Expected size: " << expected
+ << ", Actual size: " << actual;
+ throw std::runtime_error(oss.str());
}
tsStatus status;
- if (ts_bspline_set_knots(&spline, knots.data(), &status))
+ if (ts_bspline_set_knots(&spline,
+ knots.data(),
+ &status))
throw std::runtime_error(status.message);
}
|
Fix signatures of the TLS-mode dll_callback and p_process_term functions for Win64 | @@ -1619,10 +1619,12 @@ static int on_process_term(void)
#else
#pragma data_seg(".CRT$XLB")
#endif
-static void (APIENTRY *dll_callback)(HINSTANCE h, DWORD ul_reason_for_call, PVOID pv) = DllMain;
+
#ifdef _WIN64
+static const PIMAGE_TLS_CALLBACK dll_callback(HINSTANCE h, DWORD ul_reason_for_call, PVOID pv) = DllMain;
#pragma const_seg()
#else
+static void (APIENTRY *dll_callback)(HINSTANCE h, DWORD ul_reason_for_call, PVOID pv) = DllMain;
#pragma data_seg()
#endif
@@ -1631,10 +1633,12 @@ static void (APIENTRY *dll_callback)(HINSTANCE h, DWORD ul_reason_for_call, PVOI
#else
#pragma data_seg(".CRT$XTU")
#endif
-static int(*p_process_term)(void) = on_process_term;
+
#ifdef _WIN64
+static const int(*p_process_term)(void) = on_process_term;
#pragma const_seg()
#else
+static int(*p_process_term)(void) = on_process_term;
#pragma data_seg()
#endif
#endif
|
Fix issue 663 with enhanced error output | @@ -949,7 +949,7 @@ int stlink_load_device_params(stlink_t *sl) {
sl->sram_size, sl->sram_size / 1024, sl->flash_size, sl->flash_size / 1024,
(unsigned int)sl->flash_pgsz);
#else
- ILOG("%s: %d KiB SRAM, %d KiB flash in %d %s pages.\n",
+ ILOG("%s: %zd KiB SRAM, %zd KiB flash in at least %zd %s pages.\n",
params->description, sl->sram_size / 1024, sl->flash_size / 1024,
(sl->flash_pgsz < 1024)? sl->flash_pgsz : sl->flash_pgsz/1024,
(sl->flash_pgsz < 1024)? "byte" : "KiB");
@@ -2223,7 +2223,7 @@ int stlink_write_flash(stlink_t *sl, stm32_addr_t addr, uint8_t* base, uint32_t
WLOG("unaligned len 0x%x -- padding with zero\n", len);
len += 1;
} else if (addr & (sl->flash_pgsz - 1)) {
- ELOG("addr not a multiple of pagesize, not supported\n");
+ ELOG("addr not a multiple of current pagesize (%zd bytes), not supported\n", sl->flash_pgsz);
return -1;
}
|
build: use new mbedtls-2.8.0 | @@ -235,8 +235,8 @@ if(FLB_TLS)
option(ENABLE_TESTING OFF)
option(ENABLE_PROGRAMS OFF)
option(INSTALL_MBEDTLS_HEADERS OFF)
- add_subdirectory(lib/mbedtls-2.6.0 EXCLUDE_FROM_ALL)
- include_directories(lib/mbedtls-2.6.0/include)
+ add_subdirectory(lib/mbedtls-2.8.0 EXCLUDE_FROM_ALL)
+ include_directories(lib/mbedtls-2.8.0/include)
endif()
# Metrics
|
Fix Device ID prefix | @@ -191,11 +191,8 @@ namespace ARIASDK_NS_BEGIN {
if (iter != m_commonContextFieldsP->end())
{
// Ref: https://osgwiki.com/wiki/CommonSchema/device_id
- // Use "c:" prefix instead of "m:" prefix because Aria Device.Id
- // is a custom device ID, not MAC address. Unfortunately c: isn't
- // handled by collector, so we'd use the iOS identifier prefix
- // for now.
- std::string temp("i:");
+ // Use "c:" prefix
+ std::string temp("c:");
const char *deviceId = iter->second.as_string;
if (deviceId != nullptr)
{
|
Add echo for end of each build phase | @@ -163,12 +163,24 @@ script:
- if [ -n "$DESTDIR" ]; then
cd _build;
fi
- - $make update;
+ - if $make update; then
+ echo -e '+\057 MAKE UPDATE OK';
+ else
+ echo -e '+\057 MAKE UPDATE FAILED'; false;
+ fi;
git diff --quiet
- if [ -n "$CHECKDOCS" ]; then
- $make doc-nits;
+ if $make doc-nits; then
+ echo -e '+\057\057 MAKE DOC-NITS OK';
+ else
+ echo -e '+\057\057 MAKE DOC-NITS FAILED'; false;
+ fi;
fi
- - $make
+ - if $make; then
+ echo -e '+\057\057\057 MAKE OK';
+ else
+ echo -e '+\057\057\057 MAKE FAILED'; false;
+ fi;
- if [ -z "$BUILDONLY" ]; then
if [ -n "$CROSS_COMPILE" ]; then
sudo dpkg --add-architecture i386;
@@ -179,13 +191,25 @@ script:
if [ -e krb5/src ]; then
sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python-cjson python-paste python-pyrad slapd tcl-dev tcsh;
fi;
- HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test;
+ if HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; then
+ echo -e '+\057\057\057\057 MAKE TEST OK';
else
- $make build_tests;
+ echo -e '+\057\057\057\057 MAKE TEST FAILED'; false;
+ fi;
+ else
+ if $make build_tests; then
+ echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS OK';
+ else
+ echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS FAILED'; false;
+ fi;
fi
- if [ -n "$DESTDIR" ]; then
mkdir "$top/$DESTDIR";
- $make install install_docs DESTDIR="$top/$DESTDIR";
+ if $make install install_docs DESTDIR="$top/$DESTDIR"; then
+ echo -e '+\057\057\057\057\057\057 MAKE INSTALL OK';
+ else
+ echo -e '+\057\057\057\057\057\057 MAKE INSTALL FAILED'; false;
+ fi;
fi
- cd $top
|
Python generators. | @@ -30,6 +30,7 @@ Janet makes a good system scripting language, or a language to embed in other pr
* First class closures
* Garbage collection
* First class green threads (continuations)
+* Python style generators
* Mutable and immutable arrays (array/tuple)
* Mutable and immutable hashtables (table/struct)
* Mutable and immutable strings (buffer/string)
|
unified_redpine: add debug logging | #include "drv_serial.h"
#include "drv_time.h"
#include "profile.h"
+#include "usb_configurator.h"
#include "util.h"
#define REDPINE_CHANNEL_START 3
@@ -55,6 +56,9 @@ uint16_t redpine_crc16(uint8_t *data, uint16_t len) {
}
void rx_serial_process_redpine() {
+ if (rx_frame_position != 11) {
+ quic_debugf("REDPINE: unexpected frame length %d vs %d", rx_frame_position, expected_frame_length);
+ }
for (uint8_t i = 0; i < 11; i++) {
rx_data[i] = rx_buffer[i % RX_BUFF_SIZE];
@@ -65,6 +69,7 @@ void rx_serial_process_redpine() {
if (crc_our != crc_theirs) {
// invalid crc, bail
+ quic_debugf("REDPINE: invalid crc");
frame_status = FRAME_IDLE;
return;
}
|
Fix api test_client.c compilation
removed
mr_create_table_if_needed parameter in FIB API calls.
This commit fixes the API test program, which was not compiling
anymore. | @@ -730,7 +730,6 @@ add_del_ip4_route (test_main_t * tm, int enable_disable)
mp->client_index = tm->my_client_index;
mp->context = 0xdeadbeef;
mp->table_id = ntohl (0);
- mp->create_vrf_if_needed = 1;
mp->next_hop_sw_if_index = ntohl (5);
mp->is_add = enable_disable;
|
Fix tutorial for RMSE vs Accuracy error
Note: mandatory check (NEED_CHECK) was skipped | " iterations=500,\n",
" eval_metric='Accuracy',\n",
" random_seed=42,\n",
- " logging_level='Silent'\n",
+ " verbose=False,\n",
+ " loss_function='Logloss',\n",
" )\n",
" \n",
" cv_data = cv(\n",
" iterations=500,\n",
" eval_metric='Accuracy',\n",
" random_seed=42,\n",
- " logging_level='Silent'\n",
+ " verbose=False,\n",
+ " loss_function='Logloss',\n",
")\n",
"cv_data = cv(Pool(X, y, cat_features=categorical_features_indices), model.get_params())"
]
|
document exception for masterTablesVersionNumber 19 | constant defaultSequence=0;
constant tablesMasterDir="bufr/tables/[masterTableNumber]/wmo/[masterTablesVersionNumber]" : hidden;
if (masterTablesVersionNumber == 19) {
+ # See SUP-2302: We need this exception for EUMETSAT local tables, because there are conflicting elements in their table version 1 when
+ # used in combination with different WMO tables versions. This is associated with the way BUFRDC manages the tables that
+ # are files with masterTablesVersionNumber and localTablesVersionNumber in the name.
+ # ecCodes doesn't associate a local version number with a particular master table version number.
+
+ # EUMETSAT use a combination of masterTablesVersionNumber and localTablesVersionNumber
+ # to version the tables. This is a problem because they reuse codes in the different versions.
+
+ # They can have version 19-1 ( masterTablesVersionNumber=19, localTablesVersionNumber=1) and also 25-1 and
+ # in the two tables they may reuse an element changing width, reference, scale and meaning.
+
+ # The correct way of doing this would be to have two different tables localTablesVersionNumber=1 and localTablesVersionNumber=2
+ # with a different use of their own descriptors. Local tables should be managed by the owner with different version numbers.
+ # They rely on the fact that the two versions of the tables are used in combination with different master tables.
+ # This is not always true.
+ # Hence this 'if' statement to solve the conflict of tables.
+
constant tablesLocalDir="bufr/tables/[masterTableNumber]/local/[masterTablesVersionNumber]-[localTablesVersionNumber]/[bufrHeaderCentre:l]/[bufrHeaderSubCentre]" : hidden;
} else {
constant tablesLocalDir="bufr/tables/[masterTableNumber]/local/[localTablesVersionNumber]/[bufrHeaderCentre:l]/[bufrHeaderSubCentre]" : hidden;
|
USBC PD: update usb-c doc
change new state machine file references to be up to date with
the current code.
BRANCH=none
TEST=none | @@ -83,8 +83,11 @@ Right now platform/ec has two different implementations of USB-C PD stack.
[`usb_pd_protocol.c`](../common/usb_pd_protocol.c)
2. The newer implementation is broken up into multiple different files and
state machines
- * Policy engine state machine files, such as `usb_pe_*_sm.c`.
- * Type-C physical layer state machine: `usb_tc_sm.c`
+ * Policy engine state machine files, `usb_pe_*_sm.c`.
+ * Protocol engine state machine file, `usb_prl_sm.c`.
+ * State machine manager file, `usb_sm.c`.
+ * Type-C physical layer state machine files, `usb_tc_*_sm.c`.
+ * USB-C PD Task file, `usbc_task.c`.
The older implementation supports firmware for device types other than
Chromebooks. For example, the older stack supports the Zinger, which is the
@@ -106,7 +109,7 @@ In both older and newer implementations, the following details apply:
* The `PD_C#` task runs the state machine (old or new) for the port and
communicates with the TCPC, MUX, and PPC. This task needs a large task
stack.
- * The `PD_INT_C#` tasks runs at a higher priority than the state machine
+ * The `PD_INT_C#` tasks run at a higher priority than the state machine
task, and its sole job is to receive interrupts from the TCPC as quickly
as possible then send appropriate messages to other tasks (including
`PD_C#`). This task shouldn't need much stack space, but the i2c
|
scale all maps up after recon | @@ -105,9 +105,10 @@ static void rescale_maps(unsigned int model, double scaling_Y, const struct lino
} else {
+ md_zsmul(DIMS, maps_dims, maps, maps, 1000.); // kHz --> Hz
+
long nr_coeff = maps_dims[COEFF_DIM];
- long R2S_flag = set_R2S_flag(model);
long fB0_flag = set_fB0_flag(model);
long map_dims[DIMS];
@@ -125,14 +126,9 @@ static void rescale_maps(unsigned int model, double scaling_Y, const struct lino
md_zsmul(DIMS, map_dims, map, map, scaling[n]);
- if (MD_IS_SET(R2S_flag, n) || MD_IS_SET(fB0_flag, n)) {
-
if (MD_IS_SET(fB0_flag, n))
linop_forward_unchecked(op, map, map);
- md_zsmul(DIMS, map_dims, map, map, 1000.); // kHz --> Hz
- }
-
md_copy_block(DIMS, pos, maps_dims, maps, map_dims, map, CFL_SIZE);
}
|
Still trying to improve the reliability of the memcmp test. | @@ -207,7 +207,7 @@ int util_memcmp_test()
ret = -1;
break;
}
- if (i == 0 && const_compare_time[i] < 1000) {
+ if (i == 0 && const_compare_time[i] < 4000) {
zero_found = 1;
break;
}
|
perf(mainloop): set run all tasks in one frame | @@ -237,10 +237,12 @@ void LCUI_DestroyEvent( LCUI_SysEvent e )
void LCUI_ProcessEvents( void )
{
- LCUIWorker_RunTask( MainApp.main_worker );
if( MainApp.driver_ready ) {
MainApp.driver->ProcessEvents();
}
+ while( LCUIWorker_RunTask( MainApp.main_worker ) ) {
+ LCUIDisplay_Update();
+ }
}
LCUI_BOOL LCUI_PostTask( LCUI_Task task )
@@ -313,7 +315,6 @@ int LCUIMainLoop_Run( LCUI_MainLoop loop )
MainApp.loop = loop;
while( loop->state != STATE_EXITED ) {
LCUI_ProcessEvents();
- LCUIDisplay_Update();
LCUIDisplay_Render();
LCUIDisplay_Present();
StepTimer_Remain( MainApp.timer );
|
README: install devtoolset after centos-release-scl
For me, I received "No package devtoolset-8 available." when
trying to install devtoolset-8 before centos-release-scl. | @@ -83,11 +83,11 @@ To install the required libraries on Debian and Ubuntu run:
To install the required libraries on Redhat / Centos run:
- $ sudo yum install devtoolset-8 atlas-devel fftw3-devel libpng-devel lapack-devel
+ $ sudo yum install atlas-devel fftw3-devel libpng-devel lapack-devel
It may be required to install support for software collections (for Centos):
- $ sudo yum install centos-release-scl
+ $ sudo yum install centos-release-scl devtoolset-8
To enable gcc 8 and start a bash shell run:
|
Updater: Remove unused resource | @@ -141,17 +141,6 @@ BEGIN
END
END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// AFX_DIALOG_LAYOUT
-//
-
-IDD_OPTIONS AFX_DIALOG_LAYOUT
-BEGIN
- 0
-END
-
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
|
Added usb rules. | #cp rules /etc/udev/rules.d/
#sudo udevadm control --reload-rules
+#sudo udevadm trigger
ATTRS{idVendor}=="0483" ATTRS{idProduct}=="5740", ENV{ID_MM_DEVICE_IGNORE}="1", MODE:="0666"
ATTRS{idVendor}=="0483" ATTRS{idProduct}=="df11", MODE:="0666"
+ATTRS{idVendor}=="FFF1" ATTRS{idProduct}=="FF48", ENV{ID_MM_DEVICE_IGNORE}="1", MODE:="0666"
|
Always include parallax settings for scene | @@ -346,7 +346,7 @@ export const compileParallax = (
return str;
});
}
- return undefined;
+ return [`PARALLAX_STEP(0,0,0)`];
};
export const compileScene = (
@@ -373,10 +373,9 @@ export const compileScene = (
type: `SCENE_TYPE_${scene.type}`,
background: toFarPtr(backgroundSymbol(scene.backgroundIndex)),
collisions: toFarPtr(sceneCollisionsSymbol(sceneIndex)),
- parallax_rows:
- scene.width > SCREEN_WIDTH
- ? compileParallax(scene.parallax)
- : undefined,
+ parallax_rows: compileParallax(
+ scene.width > SCREEN_WIDTH ? scene.parallax : undefined
+ ),
palette: toFarPtr(paletteSymbol(bgPalette)),
sprite_palette: toFarPtr(paletteSymbol(actorsPalette)),
player_sprite: toFarPtr(spriteSheetSymbol(scene.playerSpriteIndex)),
|
Reinitiate OCSP stapling.
The commit removed H2O_USE_OCSP
but it was still refered to, so OCSP stapling was always 'not used'. | @@ -861,10 +861,6 @@ static int listener_setup_ssl(h2o_configurator_command_t *cmd, h2o_configurator_
ssl_config->certificate_file = h2o_strdup(NULL, (*certificate_file)->data.scalar, SIZE_MAX).base;
ssl_config->http2_origin_frame = http2_origin_frame;
-#if !H2O_USE_OCSP
- if (ocsp_update_interval != 0)
- fprintf(stderr, "[OCSP Stapling] disabled (not support by the SSL library)\n");
-#else
#ifndef OPENSSL_NO_OCSP
SSL_CTX_set_tlsext_status_cb(ssl_ctx, on_staple_ocsp_ossl);
SSL_CTX_set_tlsext_status_arg(ssl_ctx, ssl_config);
@@ -904,7 +900,6 @@ static int listener_setup_ssl(h2o_configurator_command_t *cmd, h2o_configurator_
} break;
}
}
-#endif
if (use_picotls) {
const char *errstr = listener_setup_ssl_picotls(listener, ssl_config, ssl_ctx);
|
[bsp] fix bug: emac hardfault when RJ45 not inserted | @@ -287,9 +287,19 @@ static rt_err_t lpc_emac_phy_init(phy_speed_t * speed, phy_duplex_t * duplex)
bool link = false;
int32_t status;
+ RT_ASSERT(speed != NULL);
+ RT_ASSERT(duplex != NULL);
+
status = PHY_Init(lpc_emac_device.base, lpc_emac_device.phyAddr, 0);
if (status != kStatus_Success)
{
+ /* Half duplex. */
+ *duplex = kPHY_HalfDuplex;
+ /* 10M speed. */
+ *speed = kPHY_Speed10M;
+
+ eth_device_linkchange(&lpc_emac_device.parent, RT_FALSE);
+
ETH_PRINTF("PHY_Init failed!\n");
return RT_ERROR;
}
@@ -307,11 +317,10 @@ static rt_err_t lpc_emac_phy_init(phy_speed_t * speed, phy_duplex_t * duplex)
PHY_GetLinkStatus(lpc_emac_device.base, lpc_emac_device.phyAddr, &link);
}
- RT_ASSERT(speed != NULL);
- RT_ASSERT(duplex != NULL);
-
PHY_GetLinkSpeedDuplex(lpc_emac_device.base, lpc_emac_device.phyAddr, speed, duplex);
+ eth_device_linkchange(&lpc_emac_device.parent, RT_TRUE);
+
return RT_EOK;
}
@@ -326,10 +335,7 @@ static rt_err_t lpc_emac_init(rt_device_t dev)
lcp_emac_io_init();
- if (lpc_emac_phy_init(&speed, &duplex) != RT_EOK)
- {
- return RT_ERROR;
- }
+ lpc_emac_phy_init(&speed, &duplex);
/* calculate start addresses of all rx buffers */
for (i = 0; i < ENET_RXBD_NUM; i++)
@@ -377,8 +383,6 @@ static rt_err_t lpc_emac_init(rt_device_t dev)
/* Active TX/RX. */
ENET_StartRxTx(lpc_emac_device.base, 1, 1);
- eth_device_linkchange(&lpc_emac_device.parent, RT_TRUE);
-
return RT_EOK;
}
@@ -456,16 +460,10 @@ rt_err_t lpc_emac_tx(rt_device_t dev, struct pbuf *p)
result = ENET_SendFrame(enet_base, enet_handle, data, p->len);
- RT_ASSERT(result != kStatus_ENET_TxFrameBusy);
-
- if ((result == kStatus_ENET_TxFrameFail) || (result == kStatus_ENET_TxFrameOverLen))
+ if ((result == kStatus_ENET_TxFrameFail) || (result == kStatus_ENET_TxFrameOverLen) || (result == kStatus_ENET_TxFrameBusy))
{
return RT_ERROR;
}
- else if (result == kStatus_ENET_TxFrameBusy)
- {
- RT_ASSERT(NULL);
- }
return RT_EOK;
}
|
Fix Xiaomi hourly reporting (2)
Skip ZCL string attributes until 0xff01 is detected. Like when pressing the Xiaomi Cube setup button. | @@ -6891,17 +6891,35 @@ void DeRestPluginPrivate::handleZclAttributeReportIndication(const deCONZ::ApsDa
*/
void DeRestPluginPrivate::handleZclAttributeReportIndicationXiaomiSpecial(const deCONZ::ApsDataIndication &ind, deCONZ::ZclFrame &zclFrame)
{
- quint16 attrId;
- quint8 dataType;
- quint8 length;
+ quint16 attrId = 0;
+ quint8 dataType = 0;
+ quint8 length = 0;
QDataStream stream(zclFrame.payload());
stream.setByteOrder(QDataStream::LittleEndian);
+ while (attrId != 0xff01)
+ {
+ if (stream.atEnd())
+ {
+ break;
+ }
+
stream >> attrId;
stream >> dataType;
stream >> length;
+ if (dataType == deCONZ::ZclCharacterString && attrId != 0xff01)
+ {
+ DBG_Printf(DBG_INFO, "0x%016llX skip Xiaomi attribute 0x%04X\n", ind.srcAddress().ext(), attrId);
+ for (; length > 0; length--) // skip
+ {
+ quint8 dummy;
+ stream >> dummy;
+ }
+ }
+ }
+
if (stream.atEnd() || attrId != 0xff01 || dataType != deCONZ::ZclCharacterString)
{
return;
|
support hwloc 2 API
simple substition based upon
detect API version from hwloc.h in-place, rather than using CMake.
no test for header-library incompatibility. | @@ -101,6 +101,15 @@ pocl_topology_detect_device_info(cl_device_id device)
return ret;
}
+#if HWLOC_API_VERSION >= 0x00020000
+ hwloc_topology_set_io_types_filter(pocl_topology, HWLOC_TYPE_FILTER_KEEP_NONE);
+ hwloc_topology_set_type_filter (pocl_topology, HWLOC_OBJ_SYSTEM, HWLOC_TYPE_FILTER_KEEP_NONE);
+ hwloc_topology_set_type_filter (pocl_topology, HWLOC_OBJ_GROUP, HWLOC_TYPE_FILTER_KEEP_NONE);
+ hwloc_topology_set_type_filter (pocl_topology, HWLOC_OBJ_BRIDGE, HWLOC_TYPE_FILTER_KEEP_NONE);
+ hwloc_topology_set_type_filter (pocl_topology, HWLOC_OBJ_MISC, HWLOC_TYPE_FILTER_KEEP_NONE);
+ hwloc_topology_set_type_filter (pocl_topology, HWLOC_OBJ_PCI_DEVICE, HWLOC_TYPE_FILTER_KEEP_NONE);
+ hwloc_topology_set_type_filter (pocl_topology, HWLOC_OBJ_OS_DEVICE, HWLOC_TYPE_FILTER_KEEP_NONE);
+#else
hwloc_topology_ignore_type (pocl_topology, HWLOC_TOPOLOGY_FLAG_WHOLE_IO);
hwloc_topology_ignore_type (pocl_topology, HWLOC_OBJ_SYSTEM);
hwloc_topology_ignore_type (pocl_topology, HWLOC_OBJ_GROUP);
@@ -108,6 +117,7 @@ pocl_topology_detect_device_info(cl_device_id device)
hwloc_topology_ignore_type (pocl_topology, HWLOC_OBJ_MISC);
hwloc_topology_ignore_type (pocl_topology, HWLOC_OBJ_PCI_DEVICE);
hwloc_topology_ignore_type (pocl_topology, HWLOC_OBJ_OS_DEVICE);
+#endif
ret = hwloc_topology_load (pocl_topology);
if (ret == -1)
@@ -116,8 +126,13 @@ pocl_topology_detect_device_info(cl_device_id device)
goto exit_destroy;
}
+#if HWLOC_API_VERSION >= 0x00020000
+ device->global_mem_size =
+ hwloc_get_root_obj(pocl_topology)->total_memory;
+#else
device->global_mem_size =
hwloc_get_root_obj(pocl_topology)->memory.total_memory;
+#endif
// Try to get the number of CPU cores from topology
int depth = hwloc_get_type_depth(pocl_topology, HWLOC_OBJ_PU);
|
Clarify definitions for non-functional and unmanageable in documentation
Also updated bullets in section to be proper so sub-bullets are
rendered correctly. | @@ -104,19 +104,23 @@ Capacity::
HealthState::
(Default) Overall PMem module health. One of:
- - Healthy
- - Noncritical: Maintenance is required.
- - Critical: Features or performance are degraded due to failure.
- - Fatal: Critical internal state failure (DPA Failure, Internal Buffer Failure,
+ * Healthy
+ * Noncritical: Maintenance is required.
+ * Critical: Features or performance are degraded due to failure.
+ * Fatal: Critical internal state failure (DPA Failure, Internal Buffer Failure,
AIT Failure, etc) is non-recoverable and data loss has occurred or is imminent.
In this case, the firmware will disable the media and access to user data and
operations that require use of the media will fail.
- - Non-functional: The PMem module is present but failed to initialize and is
- non-responsive via the DDRT communication path. It may be possible to
- communicate with this PMem module via SMBus for a subset of commands.
- - Unmanageable: The PMem module is not supported by this version of
- the software
- - Unknown: Unable to determine the PMem module health state.
+ * Non-functional: The PMem module is detected and manageable, though some
+ commands and capabilities may be limited. The PMem module has limited
+ communication or another error preventing complete functionality. Common
+ causes include:
+ - DDRT memory interface training failure
+ - Expected region mapping to SPA range unable to be found
+ * Unmanageable: The PMem module has an incompatible firmware API version or
+ hardware revision or is unresponsive (possibly due to a communication
+ interface failure or a firmware/hardware error).
+ * Unknown: Unable to determine the PMem module health state.
Refer to _HealthStateReason_ for _HealthState_ details.
HealthStateReason::
|
unlinks console from :dns-collector on startup | $% [%dns-address =address:dns]
[%dns-complete =ship =binding:dns]
==
- +$ out-poke-data ~
+ +$ out-poke-data
+ $% [%drum-unlink =dock]
+ ==
+$ in-peer-data ~
+$ out-peer-data
$% [%dns-binding =binding:dns]
^- tapp-core-all:tapp
|_ [=bowl:gall state=app-state]
::
-++ handle-init handle-init:default-tapp
++ handle-diff handle-diff:default-tapp
++ handle-take handle-take:default-tapp
::
+++ handle-init
+ =/ m tapp-async
+ ^- form:m
+ ;< ~ bind:m (poke-app:stdio [[our %hood] [%drum-unlink our dap]]:bowl)
+ (pure:m state)
+::
++ handle-poke
|= =in-poke-data
=/ m tapp-async
|
Remove excess semicolon.
This was causing pedantic errors. | @@ -135,7 +135,7 @@ typedef struct TCOD_Tileset TCOD_Tileset;
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
-};
+}
// clang-format on
/**
A character mapping of a Code Page 437 tileset to Unicode.
|
fixed endianess issue | @@ -234,7 +234,6 @@ shbhdr->byte_order_magic = PCAPNGMAGICNUMBERBE;
#else
shbhdr->byte_order_magic = PCAPNGMAGICNUMBER;
#endif
-shbhdr->byte_order_magic = PCAPNGMAGICNUMBER;
shbhdr->major_version = PCAPNG_MAJOR_VER;
shbhdr->minor_version = PCAPNG_MINOR_VER;
shbhdr->section_length = -1;
|
doc: update SGS and Sample App to match release 3.2
1. update grub item in SGS
2. update acrn kernel version
3. update file names | @@ -698,7 +698,7 @@ Install ACRN
.. code-block:: bash
- reboot
+ sudo reboot
#. Confirm that you see the GRUB menu with the "ACRN multiboot2" entry. Select
it and proceed to booting ACRN. (It may be auto-selected, in which case it
@@ -825,7 +825,7 @@ Launch the User VM
.. code-block:: console
ubuntu@ubuntu:~$ uname -r
- 5.15.0-43-generic
+ 5.15.71-acrn-service-vm-00001-g7df95512ae9e
Then open a new terminal window and use the command to see that the Service
VM is running the ``acrn-kernel`` Service VM image:
|
Android: build driver playback and poser kalman only | @@ -95,6 +95,18 @@ endif
include $(BUILD_SHARED_LIBRARY)
+# driver_playback
+include $(CLEAR_VARS)
+LOCAL_MODULE := libsurvive-plugin-driver_playback
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
+LOCAL_SHARED_LIBRARIES := libsurvive libz
+LOCAL_SRC_FILES := src/driver_playback.c
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := libsurvive/plugins
+include $(BUILD_SHARED_LIBRARY)
+
# driver_vive
include $(CLEAR_VARS)
LOCAL_MODULE := libsurvive-plugin-driver_vive
@@ -131,6 +143,18 @@ LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := libsurvive/plugins
include $(BUILD_SHARED_LIBRARY)
+# poser_kalman
+include $(CLEAR_VARS)
+LOCAL_MODULE := libsurvive-plugin-poser_kalman_only
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
+LOCAL_SHARED_LIBRARIES := libsurvive
+LOCAL_SRC_FILES := src/poser_kalman_only.c
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := libsurvive/plugins
+include $(BUILD_SHARED_LIBRARY)
+
# poser_mpfit
include $(CLEAR_VARS)
LOCAL_MODULE := libsurvive-plugin-poser_mpfit
|
httpd: Fixed wrong header in ws_send_async() for lengthy packets
Closes | @@ -377,9 +377,11 @@ esp_err_t httpd_ws_send_frame_async(httpd_handle_t hd, int fd, httpd_ws_frame_t
} else {
header_buf[1] = 127; /* Length for 64 bits */
uint8_t shift_idx = sizeof(uint64_t) - 1; /* Shift index starts at 7 */
- for (int8_t idx = 2; idx > 9; idx--) {
- /* Now do shifting (be careful of endianess, i.e. when buffer index is 2, frame length shift index is 7) */
- header_buf[idx] = (frame->len >> (uint8_t)(shift_idx * 8)) & 0xffU;
+ uint64_t len64 = frame->len; /* Raise variable size to make sure we won't shift by more bits
+ * than the length has (to avoid undefined behaviour) */
+ for (int8_t idx = 2; idx <= 9; idx++) {
+ /* Now do shifting (be careful of endianness, i.e. when buffer index is 2, frame length shift index is 7) */
+ header_buf[idx] = (len64 >> (shift_idx * 8)) & 0xffU;
shift_idx--;
}
tx_len = 10;
|
Added LibreSSL to crypto backend list | @@ -21,7 +21,7 @@ A clear and concise description of what you expected to happen.
**Version (please complete the following information):**
- OS and version: [e.g. iOS, macOS, Windows, Linux (distro)]
- libssh2 version: [e.g. 1.10.0]
- - crypto backend: [OpenSSL, MbedTLS, Libgcrypt, WinCNG, OS400, WolfSSL, None]
+ - crypto backend: [OpenSSL, MbedTLS, Libgcrypt, LibreSSL, WinCNG, OS400, WolfSSL, None]
**Additional context**
Add any other context about the problem here.
|
tests: cleanup of not needed benchmark code
see | @@ -339,12 +339,6 @@ static void checkTopOrder3 (Key ** array)
succeed_if_top (2, "/c");
succeed_if_top (3, "/a");
}
-uint64_t rdtsc (void)
-{
- unsigned int lo, hi;
- __asm__ __volatile__("rdtsc" : "=a"(lo), "=d"(hi));
- return ((uint64_t)hi << 32) | lo;
-}
static void test_top (void)
{
KeySet * test0 = ksNew (10, keyNew ("/a", KEY_VALUE, "whatever", KEY_END), KS_END);
|
kernel/os; need to change validity check for invalid timeout, now
that timeout parameter has changed sign. | @@ -73,7 +73,7 @@ os_callout_reset(struct os_callout *c, os_time_t ticks)
os_trace_api_u32x2(OS_TRACE_ID_CALLOUT_RESET, (uint32_t)c, (uint32_t)ticks);
- if (ticks < 0) {
+ if (ticks > INT32_MAX) {
ret = OS_EINVAL;
goto err;
}
|
Makefile: fix typos and style
Remove the trailing ";" and "\" and fix a typo in install. | @@ -13,25 +13,25 @@ TOOLS_OUT := $(ROOT_OUT)/tools
all: hypervisor devicemodel tools
hypervisor:
- make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) PLATFORM=$(PLAT) RELEASE=$(RELEASE) clean; \
+ make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) PLATFORM=$(PLAT) RELEASE=$(RELEASE) clean
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) PLATFORM=$(PLAT) RELEASE=$(RELEASE)
devicemodel:
- make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean; \
+ make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) clean
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT)
tools:
mkdir -p $(TOOLS_OUT)
- make -C $(T)/tools/acrnlog OUT_DIR=$(TOOLS_OUT);
- make -C $(T)/tools/acrn-manager OUT_DIR=$(TOOLS_OUT);
- make -C $(T)/tools/acrntrace OUT_DIR=$(TOOLS_OUT);
+ make -C $(T)/tools/acrnlog OUT_DIR=$(TOOLS_OUT)
+ make -C $(T)/tools/acrn-manager OUT_DIR=$(TOOLS_OUT)
+ make -C $(T)/tools/acrntrace OUT_DIR=$(TOOLS_OUT)
.PHONY: clean
clean:
rm -rf $(ROOT_OUT)
.PHONY: install
-install: hypervisor-install devicemodel-install tools-intall
+install: hypervisor-install devicemodel-install tools-install
hypervisor-install:
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) PLATFORM=$(PLAT) RELEASE=$(RELEASE) install
@@ -39,7 +39,7 @@ hypervisor-install:
devicemodel-install:
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
-tools-intall:
+tools-install:
make -C $(T)/tools/acrnlog OUT_DIR=$(TOOLS_OUT) install
make -C $(T)/tools/acrn-manager OUT_DIR=$(TOOLS_OUT) install
make -C $(T)/tools/acrntrace OUT_DIR=$(TOOLS_OUT) install
|
Update esp_rom functions and headers for ESP-IDF v4.3 & v4.4 compatibility
This patch uses macros to determine the correct header and functions to use for
compatability with all current supported versions of ESP-IDF and version 3.3.6,
the final release of the 3.x cycle. | #include <esp_partition.h>
#include <esp_sleep.h>
#include <esp_system.h>
-#include <rom/md5_hash.h>
#include <soc/soc.h>
#include <stdlib.h>
+#if defined __has_include
+# if __has_include (<esp_idf_version.h>)
+# include <esp_idf_version.h>
+# endif
+#endif
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
+#include <esp_rom_md5.h>
+#else
+#include <rom/md5_hash.h>
+#endif
//#define ENABLE_TRACE
#include "trace.h"
@@ -261,9 +270,16 @@ static term nif_rom_md5(Context *ctx, int argc, term argv[])
unsigned char digest[MD5_DIGEST_LENGTH];
struct MD5Context md5;
+ #if __has_include (<esp_idf_version.h>) && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
+ esp_rom_md5_init(&md5);
+ esp_rom_md5_update(&md5, (const unsigned char *) term_binary_data(data), term_binary_size(data));
+ esp_rom_md5_final(digest, &md5);
+ #else
MD5Init(&md5);
MD5Update(&md5, (const unsigned char *) term_binary_data(data), term_binary_size(data));
MD5Final(digest, &md5);
+ #endif
+
return term_from_literal_binary(digest, MD5_DIGEST_LENGTH, ctx);
}
|
Trivial typo fix
as suggested in | @@ -199,7 +199,7 @@ NO_AFFINITY = 1
# been reported to be optimal for certain workloads (50 is the recommended value for Julia).
# GEMM_MULTITHREAD_THRESHOLD = 4
-# If you need santy check by comparing reference BLAS. It'll be very
+# If you need sanity check by comparing results to reference BLAS. It'll be very
# slow (Not implemented yet).
# SANITY_CHECK = 1
|
Linux/arch: prctl()'s to make it attachable by ptrace | @@ -196,11 +196,19 @@ bool arch_launchChild(honggfuzz_t * hfuzz, char *fileName)
/*
* Kill the children when fuzzer dies (e.g. due to Ctrl+C)
*/
- if (prctl(PR_SET_PDEATHSIG, (long)SIGKILL, 0L, 0L, 0L) == -1) {
+ if (prctl(PR_SET_PDEATHSIG, (long)SIGKILL, 0UL, 0UL, 0UL) == -1) {
PLOG_E("prctl(PR_SET_PDEATHSIG, SIGKILL) failed");
return false;
}
+ /*
+ * Make it attach-able by ptrace()
+ */
+ if (prctl(PR_SET_DUMPABLE, 1UL, 0UL, 0UL, 0UL) == -1) {
+ PLOG_E("prctl(PR_SET_DUMPABLE, 1)");
+ return false;
+ }
+
/*
* Kill a process which corrupts its own heap (with ABRT)
*/
|
worker: plug leak in event tracing | @@ -796,9 +796,17 @@ _worker_poke_work(c3_d evt_d, // event number
u3_noun wir = u3h(u3t(job));
u3_noun cad = u3h(u3t(u3t(job)));
+ // XX these allocations should only be performed if tracing is enabled
+ //
c3_c lab_c[2048];
- snprintf(lab_c, 2048, "event %" PRIu64 ": [%s %s]", evt_d,
- u3m_pretty_path(wir), u3m_pretty(cad));
+ {
+ c3_c* cad_c = u3m_pretty(cad);
+ c3_c* wir_c = u3m_pretty_path(wir);
+ snprintf(lab_c, 2048, "event %" PRIu64 ": [%s %s]",
+ evt_d, wir_c, cad_c);
+ c3_free(cad_c);
+ c3_free(wir_c);
+ }
u3t_event_trace(lab_c, 'B');
_worker_work_live(evt_d, job);
|
Cherry-pick htslib#1258
Cherry-pick htslib commit ("Remove compressBound
assertions. (PR #1258)").
This fixes compressBound() assertions when running bedtools testsuite
on an IBM Z machine with hardware-accelerated zlib. | @@ -302,7 +302,6 @@ fail:
BGZF *bgzf_open(const char *path, const char *mode)
{
BGZF *fp = 0;
- assert(compressBound(BGZF_BLOCK_SIZE) < BGZF_MAX_BLOCK_SIZE);
if (strchr(mode, 'r')) {
hFILE *fpr;
if ((fpr = hopen(path, mode)) == 0) return 0;
@@ -325,7 +324,6 @@ BGZF *bgzf_open(const char *path, const char *mode)
BGZF *bgzf_dopen(int fd, const char *mode)
{
BGZF *fp = 0;
- assert(compressBound(BGZF_BLOCK_SIZE) < BGZF_MAX_BLOCK_SIZE);
if (strchr(mode, 'r')) {
hFILE *fpr;
if ((fpr = hdopen(fd, mode)) == 0) return 0;
@@ -348,7 +346,6 @@ BGZF *bgzf_dopen(int fd, const char *mode)
BGZF *bgzf_hopen(hFILE *hfp, const char *mode)
{
BGZF *fp = NULL;
- assert(compressBound(BGZF_BLOCK_SIZE) < BGZF_MAX_BLOCK_SIZE);
if (strchr(mode, 'r')) {
fp = bgzf_read_init(hfp);
if (fp == NULL) return NULL;
@@ -428,6 +425,7 @@ int bgzf_compress(void *_dst, size_t *dlen, const void *src, size_t slen, int le
uint8_t *dst = (uint8_t*)_dst;
if (level == 0) {
+ uncomp:
// Uncompressed data
if (*dlen < slen+5 + BLOCK_HEADER_LENGTH + BLOCK_FOOTER_LENGTH) return -1;
dst[BLOCK_HEADER_LENGTH] = 1; // BFINAL=1, BTYPE=00; see RFC1951
@@ -449,9 +447,21 @@ int bgzf_compress(void *_dst, size_t *dlen, const void *src, size_t slen, int le
return -1;
}
if ((ret = deflate(&zs, Z_FINISH)) != Z_STREAM_END) {
+ if (ret == Z_OK && zs.avail_out == 0) {
+ deflateEnd(&zs);
+ goto uncomp;
+ } else {
hts_log_error("Deflate operation failed: %s", bgzf_zerr(ret, ret == Z_DATA_ERROR ? &zs : NULL));
+ }
return -1;
}
+ // If we used up the entire output buffer, then we either ran out of
+ // room or we *just* fitted, but either way we may as well store
+ // uncompressed for faster decode.
+ if (zs.avail_out == 0) {
+ deflateEnd(&zs);
+ goto uncomp;
+ }
if ((ret = deflateEnd(&zs)) != Z_OK) {
hts_log_error("Call to deflateEnd failed: %s", bgzf_zerr(ret, NULL));
return -1;
|
menu-items.c: savedir/savelog: g_free (filename) | @@ -100,6 +100,7 @@ static void save_dirlist_dlg_cb (GtkDialog * dlg, gint responseID, gpointer data
ftp_log (gftp_logging_error, NULL,
_("Error: Cannot open %s for writing: %s\n"), filename, g_strerror (errno));
}
+ g_free (filename);
}
gtk_widget_destroy (GTK_WIDGET (dlg));
}
@@ -272,6 +273,7 @@ static void savelog_dlg_cb (GtkDialog * dlg, gint responseID, gpointer data)
ftp_log (gftp_logging_error, NULL,
_("Error: Cannot open %s for writing: %s\n"), filename,
g_strerror (errno));
+ g_free (filename);
return;
}
textbuf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (logwdw));
@@ -307,6 +309,7 @@ static void savelog_dlg_cb (GtkDialog * dlg, gint responseID, gpointer data)
g_free (txt);
gtk_widget_destroy (GTK_WIDGET (dlg));
+ g_free (filename);
}
void savelog (gpointer data)
|
Tracked down issue to atmesc.c:fdHZRG14. Looks like a memort leak. | @@ -2237,17 +2237,22 @@ The rate of change of the envelope mass.
double fdDEnvelopeMassDt(BODY *body,SYSTEM *system,int *iaBody) {
// TODO: This needs to be moved. Ideally we'd just remove this equation from the matrix.
+ // RB: move to ForceBehaviorAtmesc
if ((body[iaBody[0]].dEnvelopeMass <= 0) || (body[iaBody[0]].dAge > body[iaBody[0]].dJeansTime)) {
- return 0;
+ return TINY;
}
if (body[iaBody[0]].iPlanetRadiusModel == ATMESC_LEHMER17) {
- return -body[iaBody[0]].dAtmXAbsEffH * PI * body[iaBody[0]].dFXUV * pow(body[iaBody[0]].dRadXUV, 3.0) / ( BIGG * (body[iaBody[0]].dMass - body[iaBody[0]].dEnvelopeMass));
+ return -body[iaBody[0]].dAtmXAbsEffH * PI * body[iaBody[0]].dFXUV
+ * pow(body[iaBody[0]].dRadXUV, 3.0) / ( BIGG * (body[iaBody[0]].dMass
+ - body[iaBody[0]].dEnvelopeMass));
- }
- else{
- return -body[iaBody[0]].dFHRef * (body[iaBody[0]].dAtmXAbsEffH / body[iaBody[0]].dAtmXAbsEffH2O) * (4 * ATOMMASS * PI * body[iaBody[0]].dRadius * body[iaBody[0]].dRadius * body[iaBody[0]].dXFrac * body[iaBody[0]].dXFrac);
+ } else {
+ return -body[iaBody[0]].dFHRef * (body[iaBody[0]].dAtmXAbsEffH
+ / body[iaBody[0]].dAtmXAbsEffH2O) * (4 * ATOMMASS * PI
+ * body[iaBody[0]].dRadius * body[iaBody[0]].dRadius
+ * body[iaBody[0]].dXFrac * body[iaBody[0]].dXFrac);
}
}
@@ -2381,6 +2386,8 @@ runaway greenhouse limit.
@param dEcc The planet's eccentricity -- RB: Why is ecc passed?
@param dPlanetMass The planet mass
*/
+
+// Why isn't this in system.c?
double fdHZRG14(double dLuminosity, double dTeff, double dEcc, double dPlanetMass) {
// Do a simple log-linear fit to the Kopparapu+14 mass-dependent RG limit
int i;
@@ -2457,6 +2464,8 @@ Performs a really simple linear least-squares fit on data.
@param iLen The length of the arrays
@param daCoeffs The slope and the intercept of the fit
*/
+
+// should be in another file. control?
void fvLinearFit(double *x, double *y, int iLen, double *daCoeffs){
// Simple least squares linear regression, y(x) = mx + b
// from http://en.wikipedia.org/wiki/Simple_linear_regression
|
Fix error message for maximum number of dimensions | @@ -2077,7 +2077,7 @@ mp_obj_t ndarray_reshape_core(mp_obj_t oin, mp_obj_t _shape, bool inplace) {
mp_obj_tuple_t *shape = MP_OBJ_TO_PTR(_shape);
if(shape->len > ULAB_MAX_DIMS) {
- mp_raise_ValueError(translate("maximum number of dimensions is 4"));
+ mp_raise_ValueError(translate("maximum number of dimensions is " MP_STRINGIFY(ULAB_MAX_DIMS)));
}
size_t *new_shape = m_new0(size_t, ULAB_MAX_DIMS);
|
Tab-completion: differentiate between "first option" and "no common prefix" | @@ -1180,14 +1180,8 @@ static void addAutocompleteOption(AutocompleteData* data, const char* option)
{
if (strstr(option, data->incompleteWord) == option)
{
- // The option matches the incomplete word, add it to the list.
- strncat(data->options, option, CONSOLE_BUFFER_SCREEN);
- strncat(data->options, " ", CONSOLE_BUFFER_SCREEN);
-
// Possibly reduce the common prefix of all possible options.
- if (strlen(data->incompleteWord) > 0)
- {
- if (strlen(data->commonPrefix) == 0)
+ if (strlen(data->options) == 0)
{
// This is the first option to be added. Initialize the prefix.
strncpy(data->commonPrefix, option, CONSOLE_BUFFER_SCREEN);
@@ -1205,7 +1199,10 @@ static void addAutocompleteOption(AutocompleteData* data, const char* option)
*tmpCommonPrefix = 0;
}
- }
+
+ // The option matches the incomplete word, add it to the list.
+ strncat(data->options, option, CONSOLE_BUFFER_SCREEN);
+ strncat(data->options, " ", CONSOLE_BUFFER_SCREEN);
}
}
|
group-filter: close modal on navigation | @@ -223,7 +223,12 @@ onClick={() => this.addGroup(group)}
}}
>
<p className="tc bb b--gray3 b--gray1-d gray3 pv4 f9">Group Select and Filter</p>
- <Link to="/~groups" className="ma4 bg-gray5 bg-gray1-d f9 tl pa1 br1 db no-underline" style={{ paddingLeft: '6.5px', paddingRight: '6.5px' }}>Manage all Groups
+ <Link to="/~groups"
+ className="ma4 bg-gray5 bg-gray1-d f9 tl pa1 br1 db no-underline"
+ style={{ paddingLeft: '6.5px', paddingRight: '6.5px' }}
+ onClick={() => this.setState({ open: false })}
+ >
+ Manage all Groups
{inviteCount}
</Link>
<p className="pt4 gray3 f9 tl mh4">Filter Groups</p>
|
BugID:22217146:Increase ping task stack | #define PING_RESULT(ping_ok)
#endif
-#ifndef PING_PRIO
-#define PING_PRIO 1536
+#ifndef PING_STACK_SIZE
+#define PING_STACK_SIZE 2048
#endif
/* ping variables */
@@ -282,7 +282,7 @@ ping_thread(void *arg)
LWIP_ASSERT("setting receive timeout failed", ret == 0);
LWIP_UNUSED_ARG(ret);
- while (true) {
+ while (1){
if(count >= 0) {
if(count == 0) {
LWIP_DEBUGF( PING_DEBUG, ("ping: send %"U32_F"times finished", ping_send_count));
@@ -418,7 +418,7 @@ ping_init(const ip_addr_t* ping_addr)
#if PING_USE_SOCKETS
if(!ping_started) {
ping_started = 1;
- aos_task_new("ping_thread", ping_thread, NULL, PING_PRIO);
+ aos_task_new("ping_thread", ping_thread, NULL, PING_STACK_SIZE);
}
else {
LWIP_DEBUGF( PING_DEBUG, ("ping: ping task is already running\n"));
|
Specify rpath linker option to fix dynamic lib lookup failure on Linux | @@ -67,10 +67,18 @@ module RMagick
check_multiple_imagemagick_versions
check_partial_imagemagick_versions
+ libdir = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '')
+ ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
+
# Save flags
$CPPFLAGS = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
- $LDFLAGS = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
$LOCAL_LIBS = "#{ENV['LIBS']} " + `pkg-config --libs #{$magick_package}`.chomp
+ $LDFLAGS = "#{ldflags} -Wl,-rpath,#{libdir}"
+
+ unless try_link("int main() { }")
+ # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
+ $LDFLAGS = ldflags
+ end
configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
|
attempt to fix Wii USB load | @@ -89,7 +89,7 @@ int main(int argc, char *argv[])
initDirPath(logsDir, "Logs");
initDirPath(screenShotsDir, "ScreenShots");
#else
- if(strncmp(argv[0], "usb:/", 5) == 0)
+ if(strstr(argv[0], "usb:/") != NULL)
{
strcpy(rootDir, "usb:/apps/OpenBOR/");
strcpy(paksDir, "usb:/apps/OpenBOR/Paks");
@@ -112,6 +112,11 @@ int main(int argc, char *argv[])
dirExists(logsDir, 1);
dirExists(screenShotsDir, 1);
+ printf("DIR1: %s\n", argv[0]);
+ char buff[MAX_BUFFER_LEN];
+ getcwd(buff,MAX_BUFFER_LEN);
+ printf("DIR2: %s\n", buff);
+
Menu();
openborMain(argc, argv);
borExit(0);
|
Directory Value: Update test data | CppKeySet { 10,
keyNew (PREFIX "key", KEY_END),
keyNew (PREFIX "key/map", KEY_END),
- keyNew (PREFIX "key/array", KEY_END),
+ keyNew (PREFIX "key/array", KEY_META, "array", "#4", KEY_END),
keyNew (PREFIX "key/array/#0", KEY_END),
keyNew (PREFIX "key/array/#1", KEY_END),
- keyNew (PREFIX "key/array/#2/nested", KEY_END),
+ keyNew (PREFIX "key/array/#2/nested", KEY_META, "array", "#1", KEY_END),
keyNew (PREFIX "key/array/#2/nested/#0", KEY_END),
keyNew (PREFIX "key/array/#2/nested/#1", KEY_END),
keyNew (PREFIX "key/array/#3/not/an/array", KEY_END),
keyNew (PREFIX "key/array/#3/not/an/array/#0", KEY_END),
keyNew (PREFIX "key/array/#3/not/an/array/key", KEY_END),
- keyNew (PREFIX "key/array/#4/array/without/parent/#0", KEY_END),
- keyNew (PREFIX "key/array/#4/array/without/parent/#1", KEY_END),
+ keyNew (PREFIX "key/array/#4/no/array/#0", KEY_END),
+ keyNew (PREFIX "key/array/#4/no/array/#1", KEY_END),
keyNew (PREFIX "key/empty/array", KEY_META, "array", "", KEY_END),
KS_END }
|
Add PhNfpTrayIconFont | @@ -36,6 +36,7 @@ PH_NF_BITMAP PhNfpDefaultBitmapContext = { 0 };
PH_NF_BITMAP PhNfpBlackBitmapContext = { 0 };
HBITMAP PhNfpBlackBitmap = NULL;
HICON PhNfpBlackIcon = NULL;
+HFONT PhNfpTrayIconFont = NULL;
GUID PhNfpTrayIconItemGuids[PH_TRAY_ICON_GUID_MAXIMUM];
static POINT IconClickLocation;
|
qword: Implement sys_sleep | @@ -514,7 +514,15 @@ int sys_getsockopt(int fd, int layer, int number,
int sys_setsockopt(int fd, int layer, int number,
const void *buffer, socklen_t size) STUB_ONLY
-int sys_sleep(time_t *secs, long *nanos) STUB_ONLY
+int sys_sleep(time_t *secs, long *nanos) {
+ asm volatile ("syscall"
+ :
+ : "a"(40), "D"(*secs)
+ : "rcx", "r11");
+ *secs = 0;
+ *nanos = 0;
+ return 0;
+}
int sys_fork(pid_t *child) {
pid_t ret;
int sys_errno;
|
Make sure CONTIKI_BOARD_xyz is defined | @@ -46,11 +46,6 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ_
TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
CFLAGS += -DCONTIKI_TARGET_STRING=\"$(TARGET)\"
-ifneq ($(BOARD),)
-TARGET_BOARD_UPPERCASE := ${strip ${shell echo $(BOARD) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
-CFLAGS += -DCONTIKI_BOARD_$(TARGET_BOARD_UPPERCASE)=1
-CFLAGS += -DCONTIKI_BOARD_STRING=\"$(BOARD)\"
-endif
CFLAGS += -Wno-unused-const-variable
@@ -129,6 +124,12 @@ endif # $(BOARD) not empty
PLATFORM_ACTION ?= build
+ifneq ($(BOARD),)
+ TARGET_BOARD_UPPERCASE := ${strip ${shell echo $(BOARD) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
+ CFLAGS += -DCONTIKI_BOARD_$(TARGET_BOARD_UPPERCASE)=1
+ CFLAGS += -DCONTIKI_BOARD_STRING=\"$(BOARD)\"
+endif
+
# Configure MAC layer
# The different options
|
Switch deprecation method for CRYPTO | @@ -354,27 +354,32 @@ void CRYPTO_get_alloc_counts(int *mcount, int *rcount, int *fcount);
# define OPENSSL_mem_debug_pop() \
CRYPTO_mem_debug_pop()
# endif
-DEPRECATEDIN_3_0(int CRYPTO_set_mem_debug(int flag))
-DEPRECATEDIN_3_0(int CRYPTO_mem_ctrl(int mode))
-DEPRECATEDIN_3_0(int CRYPTO_mem_debug_push(const char *info,
- const char *file, int line))
-DEPRECATEDIN_3_0(int CRYPTO_mem_debug_pop(void))
-
-DEPRECATEDIN_3_0(void CRYPTO_mem_debug_malloc(void *addr, size_t num,
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0 int CRYPTO_set_mem_debug(int flag);
+OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_ctrl(int mode);
+OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_debug_push(const char *info,
+ const char *file, int line);
+OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_debug_pop(void);
+OSSL_DEPRECATEDIN_3_0 void CRYPTO_mem_debug_malloc(void *addr, size_t num,
int flag,
- const char *file, int line))
-DEPRECATEDIN_3_0(void CRYPTO_mem_debug_realloc(void *addr1, void *addr2,
+ const char *file, int line);
+OSSL_DEPRECATEDIN_3_0 void CRYPTO_mem_debug_realloc(void *addr1, void *addr2,
size_t num, int flag,
- const char *file, int line))
-DEPRECATEDIN_3_0(void CRYPTO_mem_debug_free(void *addr, int flag,
- const char *file, int line))
-
-DEPRECATEDIN_3_0(int CRYPTO_mem_leaks_cb(
- int (*cb)(const char *str, size_t len, void *u), void *u))
+ const char *file, int line);
+OSSL_DEPRECATEDIN_3_0 void CRYPTO_mem_debug_free(void *addr, int flag,
+ const char *file, int line);
+OSSL_DEPRECATEDIN_3_0
+int CRYPTO_mem_leaks_cb(int (*cb)(const char *str, size_t len, void *u),
+ void *u);
+# endif
# ifndef OPENSSL_NO_STDIO
-DEPRECATEDIN_3_0(int CRYPTO_mem_leaks_fp(FILE *))
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_leaks_fp(FILE *);
+# endif
+# endif
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_leaks(BIO *bio);
# endif
-DEPRECATEDIN_3_0(int CRYPTO_mem_leaks(BIO *bio))
# endif /* OPENSSL_NO_CRYPTO_MDEBUG */
/* die if we have to */
|
js: additional check for _mm_mask_blend_epi32
Travis is now sometimes running on machines with support, which
is resulting is some compile-time errors for versions of clang which
don't support _mm_mask_blend_epi32. This just checks for the builtin
used to implement _mm_mask_bleng_epi32 on clang before using it,
hopefully that's sufficient. | @@ -400,7 +400,8 @@ simde_em_int32x4_select (simde_em_bool32x4 selector, simde_em_int32x4 a, simde_e
#if defined(SIMDE_EM_NATIVE)
return SIMDE_EM_INT32X4_C(emscripten_int32x4_select(selector.n, a.n, b.n));
#elif defined(SIMDE_EM_SSE2)
- #if defined(__AVX512VL__)
+ #if defined(__AVX512VL__) && \
+ (!defined(__clang__) || HEDLEY_HAS_BUILTIN(__builtin_ia32_blendmd_128_mask))
return SIMDE_EM_INT32X4_SSE_C(_mm_mask_blend_epi32(selector.n, b.n, a.n));
#else
/* TODO: check if this is faster than the portable version */
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.