message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
The -q option no longer disables repl output. | (if-not *quiet*
(print "Janet " janet/version "-" janet/build " Copyright (C) 2017-2020 Calvin Rose"))
(flush)
- (defn noprompt [_] "")
(defn getprompt [p]
(def [line] (parser/where p))
(string "janet:" line ":" (parser/state p :delimiters) "> "))
- (def prompter (if *quiet* noprompt getprompt))
(defn getstdin [prompt buf _]
(file/write stdout prompt)
(file/flush stdout)
(if *debug* (put env :debug true))
(def getter (if *raw-stdin* getstdin getline))
(defn getchunk [buf p]
- (getter (prompter p) buf env))
+ (getter (getprompt p) buf env))
(def onsig (if *quiet* (fn [x &] x) nil))
(setdyn :pretty-format (if *colorize* "%.20Q" "%.20q"))
(setdyn :err-color (if *colorize* true))
|
esp_wifi: Fixes issue of crashing when verbose logs are enabled. | @@ -160,17 +160,12 @@ static void adc_power_on_internal(void)
void adc_power_acquire(void)
{
- bool powered_on = false;
ADC_POWER_ENTER();
s_adc_power_on_cnt++;
if (s_adc_power_on_cnt == 1) {
adc_power_on_internal();
- powered_on = true;
}
ADC_POWER_EXIT();
- if (powered_on) {
- ESP_LOGV(ADC_TAG, "%s: ADC powered on", __func__);
- }
}
void adc_power_on(void)
@@ -187,7 +182,6 @@ static void adc_power_off_internal(void)
void adc_power_release(void)
{
- bool powered_off = false;
ADC_POWER_ENTER();
s_adc_power_on_cnt--;
/* Sanity check */
@@ -197,12 +191,8 @@ void adc_power_release(void)
abort();
} else if (s_adc_power_on_cnt == 0) {
adc_power_off_internal();
- powered_off = true;
}
ADC_POWER_EXIT();
- if (powered_off) {
- ESP_LOGV(ADC_TAG, "%s: ADC powered off", __func__);
- }
}
void adc_power_off(void)
|
Change regression suite delay to post results to 10 hours. | @@ -558,6 +558,6 @@ if test "$testHost" = "pascal" ; then
subTag=`date +%Y-%m-%d-%H:%M`
ssh pascal "./checkout_pascal $subTag"
ssh pascal "msub -l nodes=1:ppn=16 -l gres=ignore -l walltime=10:00:00 -o pascal_testit_$subTag.out -q pvis -A wbronze -z ./runit_pascal $subTag"
- sleep 28800
+ sleep 36000
ssh pascal "./postit_pascal $subTag"
fi
|
testutil.h: Remove duplicate test macros
A block of six TEST_int_xy() macro definitions was duplicated. | @@ -294,13 +294,6 @@ void test_perror(const char *s);
# define TEST_int_gt(a, b) test_int_gt(__FILE__, __LINE__, #a, #b, a, b)
# define TEST_int_ge(a, b) test_int_ge(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_eq(a, b) test_int_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_ne(a, b) test_int_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_lt(a, b) test_int_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_le(a, b) test_int_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_gt(a, b) test_int_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_ge(a, b) test_int_ge(__FILE__, __LINE__, #a, #b, a, b)
-
# define TEST_uint_eq(a, b) test_uint_eq(__FILE__, __LINE__, #a, #b, a, b)
# define TEST_uint_ne(a, b) test_uint_ne(__FILE__, __LINE__, #a, #b, a, b)
# define TEST_uint_lt(a, b) test_uint_lt(__FILE__, __LINE__, #a, #b, a, b)
|
spec: fix memleak | @@ -409,7 +409,7 @@ static void validateEmptyArray (KeySet * ks, Key * arraySpecParent, Key * parent
}
bool immediate = arrayParent == NULL;
- if (arrayParent == NULL)
+ if (immediate)
{
arrayParent = keyNew (keyName (parentLookup), KEY_END);
}
@@ -450,15 +450,18 @@ static void validateEmptyArray (KeySet * ks, Key * arraySpecParent, Key * parent
}
}
- if (immediate && haveConflict)
+ if (immediate)
+ {
+ if (haveConflict)
{
char * problemKeys =
elektraMetaArrayToString (arrayParent, keyName (keyGetMeta (arrayParent, "conflict/arraymember")), ", ");
- char * msg = elektraFormat ("Array key %s has invalid children (only array elements allowed): %s", keyName (arrayParent),
- problemKeys);
+ char * msg = elektraFormat ("Array key %s has invalid children (only array elements allowed): %s",
+ keyName (arrayParent), problemKeys);
handleConflict (parentKey, msg, onConflict);
elektraFree (msg);
safeFree (problemKeys);
+ }
keyDel (arrayParent);
}
|
sp: on fd event, initialize instance variable | @@ -2349,8 +2349,7 @@ int flb_sp_fd_event(int fd, struct flb_sp *sp)
struct mk_list *tmp;
struct mk_list *head;
struct flb_sp_task *task;
- struct flb_input_instance *in;
-
+ struct flb_input_instance *in = NULL;
/* Lookup Tasks that matches the incoming event */
mk_list_foreach_safe(head, tmp, &sp->tasks) {
@@ -2371,6 +2370,9 @@ int flb_sp_fd_event(int fd, struct flb_sp *sp)
tag_len = strlen(in->name);
}
}
+ else {
+ in = NULL;
+ }
if (task->window.records > 0) {
/* find input tag from task source */
@@ -2389,7 +2391,7 @@ int flb_sp_fd_event(int fd, struct flb_sp *sp)
flb_utils_timer_consume(fd);
- if (update_timer_event) {
+ if (update_timer_event && in) {
task->window.first_hop = false;
mk_event_timeout_destroy(in->config->evl, &task->window.event);
mk_event_closesocket(fd);
|
linalg.dot : also accepts 2 vectors of same dimension | @@ -146,6 +146,19 @@ static mp_obj_t linalg_dot(mp_obj_t _m1, mp_obj_t _m2) {
}
ndarray_obj_t *m1 = MP_OBJ_TO_PTR(_m1);
ndarray_obj_t *m2 = MP_OBJ_TO_PTR(_m2);
+
+ if ((m1->m == 1) && (m2->m == 1)) {
+ // 2 vectors
+ if (m1->array->len != m2->array->len) {
+ mp_raise_ValueError(translate("vectors must have same dimension"));
+ }
+ mp_float_t dot = 0.0;
+ for (size_t pos=0; pos < m1->array->len; pos++) {
+ dot += ndarray_get_float_value(m1->array->items, m1->array->typecode, pos)*ndarray_get_float_value(m2->array->items, m2->array->typecode, pos);
+ }
+ return mp_obj_new_float(dot);
+ } else {
+ // 2 matrices
if(m1->n != m2->m) {
mp_raise_ValueError(translate("matrix dimensions do not match"));
}
@@ -166,6 +179,7 @@ static mp_obj_t linalg_dot(mp_obj_t _m1, mp_obj_t _m2) {
}
return MP_OBJ_FROM_PTR(out);
}
+}
MP_DEFINE_CONST_FUN_OBJ_2(linalg_dot_obj, linalg_dot);
|
chat fe: disable advanced groupify
Introduced in the new functionality seems able to induce weird
behavior causing messages to be processed twice. Disabling this
functionality on the frontend until that has been fixed. | @@ -222,6 +222,7 @@ export class SettingsScreen extends Component {
Convert this chat into a group with associated chat, or select a
group to add this chat to.
</p>
+ {/*
<InviteSearch
groups={props.groups}
contacts={props.contacts}
@@ -235,8 +236,9 @@ export class SettingsScreen extends Component {
setInvite={this.changeTargetGroup}
/>
{inclusiveToggle}
+ */}
<a onClick={this.groupifyChat.bind(this)}
- className={"dib f9 black gray4-d bg-gray0-d ba pa2 mt4 b--black b--gray1-d pointer"}>
+ className={"dib f9 black gray4-d bg-gray0-d ba pa2 b--black b--gray1-d pointer"}>
Convert to group
</a>
</div>
|
Use fputs when changing the terminal color | @@ -54,10 +54,10 @@ void term_doSetTextColor(int color)
};
if (color >= 0 && color < 16)
{
- puts(colorTable[color]);
+ fputs(colorTable[color], stdout);
} else
{
- puts("\x1B[0m");
+ fputs("\x1B[0m", stdout);
}
#endif
}
|
Replace GPL-2.0+ license with BSD-3.0+ license | @@ -10,7 +10,7 @@ Release: @CPACK_PACKAGE_RELEASE@
Summary: @PACKAGE_SUMMARY@
Vendor: @PACKAGE_VENDOR@
URL: @PACKAGE_URL@
-License: GPL-2.0+
+License: BSD-3.0+
Group: unknown
BuildArch: x86_64
|
add channel info in packet. | @@ -25,7 +25,7 @@ end of frame event), it will turn on its error LED.
//=========================== defines =========================================
-#define LENGTH_PACKET 30+LENGTH_CRC ///< maximum length is 127 bytes
+#define LENGTH_PACKET 125+LENGTH_CRC ///< maximum length is 127 bytes
#define LEN_PKT_TO_SEND 20+LENGTH_CRC
#define CHANNEL 11 ///< 11=2.405GHz
#define TIMER_PERIOD (0xffff>>4) ///< 0xffff = 2s@32kHz
@@ -269,6 +269,7 @@ int mote_main(void) {
app_vars.packet[i++] = 'e';
app_vars.packet[i++] = 's';
app_vars.packet[i++] = 't';
+ app_vars.packet[i++] = CHANNEL;
while (i<app_vars.packet_len) {
app_vars.packet[i++] = ID;
}
|
Don't accept FORWARD-TSN chunks when I-FORWARD-TSN was negotiated and vice versa | #if defined(__FreeBSD__) && !defined(__Userspace__)
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 363008 2020-07-08 12:25:19Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 363010 2020-07-08 15:49:30Z tuexen $");
#endif
#include <netinet/sctp_os.h>
@@ -5549,7 +5549,8 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
break;
case SCTP_FORWARD_CUM_TSN:
case SCTP_IFORWARD_CUM_TSN:
- SCTPDBG(SCTP_DEBUG_INPUT3, "SCTP_FWD_TSN\n");
+ SCTPDBG(SCTP_DEBUG_INPUT3, "%s\n",
+ ch->chunk_type == SCTP_FORWARD_CUM_TSN ? "FORWARD_TSN" : "I_FORWARD_TSN");
if (chk_length < sizeof(struct sctp_forward_tsn_chunk)) {
/* Its not ours */
*offset = length;
@@ -5562,6 +5563,18 @@ sctp_process_control(struct mbuf *m, int iphlen, int *offset, int length,
if (stcb->asoc.prsctp_supported == 0) {
goto unknown_chunk;
}
+ if (((asoc->idata_supported == 1) && (ch->chunk_type == SCTP_FORWARD_CUM_TSN)) ||
+ ((asoc->idata_supported == 0) && (ch->chunk_type == SCTP_IFORWARD_CUM_TSN))) {
+ if (ch->chunk_type == SCTP_FORWARD_CUM_TSN) {
+ SCTP_SNPRINTF(msg, sizeof(msg), "%s", "FORWARD-TSN chunk received when I-FORWARD-TSN was negotiated");
+ } else {
+ SCTP_SNPRINTF(msg, sizeof(msg), "%s", "I-FORWARD-TSN chunk received when FORWARD-TSN was negotiated");
+ }
+ op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
+ sctp_abort_an_association(inp, stcb, op_err, SCTP_SO_NOT_LOCKED);
+ *offset = length;
+ return (NULL);
+ }
*fwd_tsn_seen = 1;
if (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) {
/* We are not interested anymore */
|
Removed unused delta %quit. | nos/(set naem) ::
dif/diff-status ::
== ::
- {$quit ost/bone} ::< force unsubscribe
== ::
++ delta-story ::> story delta
$? diff-story ::< both in & outward
$init da-init
$observe (da-observe +.det)
$present (da-present +.det)
- $quit (da-emit [ost.det %quit ~])
==
::
++ da-init ::< startup side-effects
|
observe-hook: warm up caches in +on-init also, not just +on-load | (act [%watch %group-store /groups %group-on-leave])
(act [%watch %group-store /groups %group-on-remove-member])
(act [%watch %metadata-store /updates %md-on-add-group-feed])
+ (act [%warm-cache-all ~])
==
::
++ act
|
dojo: print %help hints with ?? | [%face ^] a(q $(a q.a))
[%cell ^] a(p $(a p.a), q $(a q.a))
[%fork *] a(p (silt (turn ~(tap in p.a) |=(b=type ^$(a b)))))
- [%hint *] ?. ?=(%know -.q.p.a) $(a q.a)
+ [%hint *] ?+ -.q.p.a $(a q.a)
+ %know
?@ p.q.p.a [(cat 3 '#' mark.p.q.p.a)]~
[(rap 3 '#' auth.p.q.p.a (spat type.p.q.p.a) ~)]~
+ ::
+ %help
+ [summary.crib.p.q.p.a]~
+ ==
[%core ^] `wain`/core
- [%hold *] a(p $(a p.a))
+ [%hold *] $(a (~(play ut p.a) q.a))
==
::
:: XX needs filter
|
Avoid some unsupported xterm code on WIN32. | @@ -200,10 +200,12 @@ static void xterm_handle_input_escape() {
static int xterm_handle_input(void *arg) {
while (true) {
int ch = getchar();
+#ifndef _WIN32
if (ch == '\x1b') {
xterm_handle_input_escape();
continue;
}
+#endif
int sym = ch;
int mod = KMOD_NONE;
if (isupper(ch)) {
@@ -243,6 +245,7 @@ static int xterm_handle_input(void *arg) {
return 0;
}
+#ifndef _WIN32
static TCOD_Error xterm_recommended_console_size(
struct TCOD_Context* __restrict self,
float magnification,
@@ -262,6 +265,7 @@ static TCOD_Error xterm_recommended_console_size(
}
return TCOD_E_ERROR;
}
+#endif
#ifndef _WIN32
static void xterm_on_window_change_signal(int signum) {
|
DEV: Always process state.enter event in new event queue run | @@ -839,10 +839,6 @@ Device::Device(DeviceKey key, deCONZ::ApsController *apsCtrl, QObject *parent) :
addItem(DataTypeString, RAttrModelId);
d->setState(DEV_InitStateHandler);
-
- static int initTimer = 1000;
- d->startStateTimer(initTimer, StateLevel0);
- initTimer += 300; // hack for the first round init, so that each device will start 300ms later
}
Device::~Device()
@@ -885,14 +881,20 @@ bool Device::managed() const
}
void Device::handleEvent(const Event &event, DEV_StateLevel level)
+{
+ if (event.what() == REventStateEnter || event.what() == REventStateLeave)
+ {
+ Q_ASSERT(event.num() >= StateLevel0);
+ Q_ASSERT(event.num() < StateLevelMax);
+ d->state[event.num()](this, event);
+ }
+ else if (d->state[level])
{
if (event.what() == REventAwake && level == StateLevel0)
{
d->awake.start();
}
- if (d->state[level])
- {
d->state[level](this, event);
}
}
@@ -910,17 +912,8 @@ void DevicePrivate::setState(DeviceStateHandler newState, DEV_StateLevel level)
if (state[level])
{
- if (level == StateLevel0)
- {
- // invoke the handler in the next event loop iteration
emit q->eventNotify(Event(q->prefix(), REventStateEnter, level, q->key()));
}
- else
- {
- // invoke sub-states directly
- state[level](q, Event(q->prefix(), REventStateEnter, level, q->key()));
- }
- }
}
}
|
Remove +define+ from front of defines since sim plugin does that already | @@ -112,7 +112,7 @@ $(SIM_CONF): $(VLSI_RTL) $(HARNESS_FILE) $(HARNESS_SMEMS_FILE) $(sim_common_file
done
echo " options_meta: 'append'" >> $@
echo " defines:" >> $@
- for x in $(VCS_DEFINE_OPTS); do \
+ for x in $(subst +define+,,$(VCS_DEFINE_OPTS)); do \
echo ' - "'$$x'"' >> $@; \
done
echo " defines_meta: 'append'" >> $@
|
Allow table.remove to work with the hash part too | @@ -1460,12 +1460,13 @@ local function generate_exp_builtin_table_remove(exp, ctx)
${UI_DECL} = luaH_getn(${CVALUE_T});
if (TITAN_LIKELY(${UI} > 0)) {
${UI} = ${UI} - 1;
- ${SLOT_DECL} = &${CVALUE_T}->array[${UI}];
- setempty(${SLOT});
- ${HALFSIZE_DECL} = ${CVALUE_T}->sizearray / 2;
- if (${UI} < ${HALFSIZE}) {
- luaH_resizearray(L, ${CVALUE_T}, ${HALFSIZE});
+ ${SLOT_DECL};
+ if (TITAN_LIKELY(${UI} < ${CVALUE_T}->sizearray)) {
+ ${SLOT} = &${CVALUE_T}->array[${UI}];
+ } else {
+ ${SLOT} = (TValue *) luaH_getint(${CVALUE_T}, ${UI});
}
+ setempty(${SLOT});
}
]], {
CSTATS_T = cstats_t,
|
docs(logging): Update documentation on USB logging | @@ -20,8 +20,8 @@ It is recommended to only enable logging when needed, and not leaving it on by d
## Kconfig
-The following KConfig values need to be set, either by copy and pasting into the `app/prj.conf` file, or by running
-`west build -t menuconfig` and manually enabling the various settings in that UI.
+The `CONFIG_ZMK_USB_LOGGING` KConfig value needs to be set, either by copy and pasting into the `app/prj.conf` file, or by running
+`west build -t menuconfig` and manually enabling the setting in that UI at `ZMK -> Advanced -> USB Logging`.
:::note
If you are debugging your own keyboard in your [user config repository](./user-setup.md), use
@@ -32,27 +32,7 @@ for you successfully.
```
# Turn on logging, and set ZMK logging to debug output
-CONFIG_LOG=y
-CONFIG_ZMK_LOG_LEVEL_DBG=y
-
-# Turn on USB CDC ACM device
-CONFIG_USB=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_CDC_ACM=y
-CONFIG_USB_CDC_ACM_RINGBUF_SIZE=1024
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=1
-
-# Enable serial console
-CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_UART_LINE_CTRL=y
-
-# Enable USB UART, and set the console device
-CONFIG_UART_CONSOLE=y
-CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
+CONFIG_ZMK_USB_LOGGING=y
```
## Viewing Logs
|
indexcmds.c: reorder function prototypes
... out of an overabundance of neatnikism, perhaps. | /* non-export function prototypes */
+static bool CompareOpclassOptions(Datum *opts1, Datum *opts2, int natts);
static void CheckPredicate(Expr *predicate);
static void ComputeIndexAttrs(IndexInfo *indexInfo,
Oid *typeOidP,
@@ -87,13 +88,11 @@ static char *ChooseIndexNameAddition(List *colnames);
static List *ChooseIndexColumnNames(List *indexElems);
static void RangeVarCallbackForReindexIndex(const RangeVar *relation,
Oid relId, Oid oldRelId, void *arg);
-static bool ReindexRelationConcurrently(Oid relationOid, int options);
-
+static void reindex_error_callback(void *args);
static void ReindexPartitions(Oid relid, int options, bool isTopLevel);
static void ReindexMultipleInternal(List *relids, int options);
-static void reindex_error_callback(void *args);
+static bool ReindexRelationConcurrently(Oid relationOid, int options);
static void update_relispartition(Oid relationId, bool newval);
-static bool CompareOpclassOptions(Datum *opts1, Datum *opts2, int natts);
/*
* callback argument type for RangeVarCallbackForReindexIndex()
|
add onekey ilock | @@ -152,6 +152,7 @@ static const char *instantpacmancmd[] = {"instantpacman", NULL};
static const char *instantsharecmd[] = {"instantshare", "snap", NULL};
static const char *nautiluscmd[] = {".config/instantos/default/filemanager", NULL};
static const char *slockcmd[] = {".config/instantos/default/lockscreen", NULL};
+static const char *onekeylock[] = {"ilock", "-o", NULL};
static const char *langswitchcmd[] = {"ilayout", NULL};
static const char *oslockcmd[] = {"instantlock", "-o", NULL};
static const char *helpcmd[] = {"instanthotkeys", "gui", NULL};
@@ -309,12 +310,13 @@ static Key keys[] = {
{MODKEY|Mod1Mask|ControlMask|ShiftMask, XK_Tab, alttabfree, {0}},
{MODKEY, XK_dead_circumflex, spawn, {.v = caretinstantswitchcmd}},
{MODKEY|ControlMask, XK_l, spawn, {.v = slockcmd}},
+ {MODKEY|ControlMask|ShiftMask, XK_l, spawn, {.v = onekeylock}},
{MODKEY|ControlMask, XK_h, hidewin, {0}},
{MODKEY|Mod1Mask|ControlMask, XK_h, unhideall, {0}},
{MODKEY|Mod1Mask|ControlMask, XK_l, spawn, {.v = langswitchcmd}},
{MODKEY, XK_Return, spawn, {.v = termcmd}},
{MODKEY, XK_v, spawn, {.v = quickmenucmd}},
- {MODKEY, XK_b, directionfocus, {0}},
+ {MODKEY, XK_b, togglebar, {0}},
{MODKEY, XK_j, focusstack, {.i = +1}},
{MODKEY, XK_Down, downkey, {.i = +1}},
{MODKEY|ShiftMask, XK_Down, downpress, {0}},
|
Makefile tweaks to fix out-of-the-box building | @@ -20,7 +20,7 @@ CFLAGS = -g -ffreestanding -std=gnu99 -Wall -Wextra -fstack-protector-all -I ./s
LDFLAGS = -ffreestanding -nostdlib -lgcc -T $(RESOURCES)/linker.ld
# Tools
-ISO_MAKER = $(TOOLCHAIN)/bin/grub-mkrescue --directory=$(TOOLCHAIN)/lib/grub/i386-pc
+ISO_MAKER = $(TOOLCHAIN)/bin/grub-mkrescue
EMULATOR = qemu-system-i386
FSGENERATOR = fsgen
@@ -45,7 +45,7 @@ ifdef BMP
CFLAGS += -DBMP
endif
-EMFLAGS = -hda ax_drive.img -vga std -net nic,model=ne2k_pci -d cpu_reset -D qemu.log -serial file:syslog.log
+EMFLAGS = -vga std -net nic,model=ne2k_pci -d cpu_reset -D qemu.log -serial file:syslog.log
ifdef debug
EMFLAGS += -s -S
endif
@@ -80,7 +80,7 @@ $(ISO_DIR)/boot/initrd.img: $(FSGENERATOR)
@./$(FSGENERATOR) $(INITRD); mv $(INITRD).img $@
$(ISO_NAME): $(ISO_DIR)/boot/axle.bin $(ISO_DIR)/boot/grub/grub.cfg $(ISO_DIR)/boot/initrd.img
- $(ISO_MAKER) -o $@ $(ISO_DIR)
+ $(ISO_MAKER) -d ./i686-toolchain/lib/grub/i386-pc -o $@ $(ISO_DIR)
run: $(ISO_NAME)
tmux split-window -p 75 "tail -f syslog.log"
|
Improve update of cmake target property | @@ -104,9 +104,7 @@ celix_deprecated_utils_headers(<target_name>))
function(celix_deprecated_utils_headers)
list(GET ARGN 0 TARGET_NAME)
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/libs/utils/include_deprecated)
- get_target_property(TARGETS celix-deprecated "UTIL_TARGETS")
- list(APPEND TARGETS ${TARGET_NAME})
- set_target_properties(celix-deprecated PROPERTIES "UTIL_TARGETS" "${TARGETS}")
+ set_properties(TARGET celix-deprecated APPEND PROPERTY "UTIL_TARGETS" "${TARGET_NAME}")
endfunction()
include(${CMAKE_CURRENT_LIST_DIR}/ApacheRat.cmake)
|
Switch to master branch of rocm-device-libs and comgr to support hip updates in the master | @@ -82,7 +82,8 @@ AOMP_LLD_REPO_BRANCH=${AOMP_LLD_REPO_BRANCH:-release_80}
AOMP_OPENMP_REPO_NAME=${AOMP_OPENMP_REPO_NAME:-openmp}
AOMP_OPENMP_REPO_BRANCH=${AOMP_OPENMP_REPO_BRANCH:-release_80_AOMP_063}
AOMP_LIBDEVICE_REPO_NAME=${AOMP_LIBDEVICE_REPO_NAME:-rocm-device-libs}
-AOMP_LIBDEVICE_REPO_BRANCH=${AOMP_LIBDEVICE_REPO_BRANCH:-roc-2.5.x}
+#AOMP_LIBDEVICE_REPO_BRANCH=${AOMP_LIBDEVICE_REPO_BRANCH:-roc-2.5.x}
+AOMP_LIBDEVICE_REPO_BRANCH=${AOMP_LIBDEVICE_REPO_BRANCH:-master}
AOMP_OCLRUNTIME_REPO_NAME=${AOMP_OCLRUNTIME_REPO_NAME:-rocm-opencl-runtime}
AOMP_OCLRUNTIME_REPO_BRANCH=${AOMP_OCLRUNTIME_REPO_BRANCH:-roc-2.5.x}
AOMP_OCLDRIVER_REPO_NAME=${AOMP_OCLDRIVER_REPO_NAME:-rocm-opencl-driver}
@@ -92,7 +93,7 @@ AOMP_OCLICD_REPO_BRANCH=${AOMP_OCLICD_REPO_BRANCH:-master}
AOMP_HCC_REPO_NAME=${AOMP_HCC_REPO_NAME:-hcc}
AOMP_HCC_REPO_BRANCH=${AOMP_HCC_REPO_BRANCH:-roc-2.5.x}
AOMP_HIP_REPO_NAME=${AOMP_HIP_REPO_NAME:-hip}
-AOMP_HIP_REPO_BRANCH=${AOMP_HIP_REPO_BRANCH:-AOMP-190412}
+AOMP_HIP_REPO_BRANCH=${AOMP_HIP_REPO_BRANCH:-AOMP-190628}
AOMP_ROCT_REPO_NAME=${AOMP_ROCT_REPO_NAME:-roct-thunk-interface}
AOMP_ROCT_REPO_BRANCH=${AOMP_ROCT_REPO_BRANCH:-roc-2.5.x}
AOMP_ROCR_REPO_NAME=${AOMP_ROCR_REPO_NAME:-rocr-runtime}
@@ -104,7 +105,8 @@ AOMP_EXTRAS_REPO_BRANCH=${AOMP_EXTRAS_REPO_BRANCH:-0.7-0}
AOMP_APPS_REPO_NAME=${AOMP_APPS_REPO_NAME:-openmpapps}
AOMP_APPS_REPO_BRANCH=${AOMP_APPS_REPO_BRANCH:-AOMP-0.5}
AOMP_COMGR_REPO_NAME=${AOMP_COMGR_REPO_NAME:-rocm-compilersupport}
-AOMP_COMGR_REPO_BRANCH=${AOMP_COMGR_REPO_BRANCH:-roc-2.5.x}
+#AOMP_COMGR_REPO_BRANCH=${AOMP_COMGR_REPO_BRANCH:-roc-2.5.x}
+AOMP_COMGR_REPO_BRANCH=${AOMP_COMGR_REPO_BRANCH:-master}
AOMP_FLANG_REPO_NAME=${AOMP_FLANG_REPO_NAME:-flang}
AOMP_FLANG_REPO_BRANCH=${AOMP_FLANG_REPO_BRANCH:-master}
|
Fix signature of lua_checkstack
The number of extra slots should not be typed as StackIndex. | @@ -104,7 +104,7 @@ foreign import capi SAFTY "lua.h lua_replace"
-- | See <https://www.lua.org/manual/5.3/manual.html#lua_checkstack lua_checkstack>
foreign import capi SAFTY "lua.h lua_checkstack"
- lua_checkstack :: Lua.State -> StackIndex -> IO LuaBool
+ lua_checkstack :: Lua.State -> CInt -> IO LuaBool
-- lua_xmove is currently not supported.
|
Example ip64-router: only meant for platform Zoul/Orion | @@ -2,4 +2,8 @@ CONTIKI_PROJECT = ip64-router
all: $(CONTIKI_PROJECT)
CONTIKI=../..
+# Currently only supported on Orion, the only platform with 802.15.4 + Ethernet
+PLATFORMS_ONLY = zoul
+BOARD = orion
+
include $(CONTIKI)/Makefile.include
|
ci: Add version tag to release artifacts. | @@ -693,7 +693,13 @@ jobs:
name: Release ${{ github.ref }}
- name: Get all artifacts.
uses: actions/download-artifact@v2
- - name: Upload Gadget Release *-gadget-*-*.tar.gz
+ - name: Rename all artifacts to *-${{ env.GITHUB_REF_NAME }}.tar.gz
+ shell: bash
+ run: |
+ for i in *-gadget-*-*-tar-gz/*-gadget-*-*.tar.gz; do
+ mv $i $(dirname $i)/$(basename $i .tar.gz)-${GITHUB_REF_NAME}.tar.gz
+ done
+ - name: Upload Gadget Release *.tar.gz
uses: csexton/release-asset-action@v2
with:
pattern: "*-gadget-*-*-tar-gz/*-gadget-*-*.tar.gz"
|
fixing rampsmooth bug | @@ -66,7 +66,7 @@ static t_int *rampsmooth_perform(t_int *w)
else if (nleft > 0)
{
*out++ = (last += incr);
- if (--nleft == 0)
+ if (--nleft == 1)
{
incr = 0.;
last = target;
|
VERSION bump to version 2.0.259 | @@ -61,7 +61,7 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
# set version of the project
set(LIBYANG_MAJOR_VERSION 2)
set(LIBYANG_MINOR_VERSION 0)
-set(LIBYANG_MICRO_VERSION 258)
+set(LIBYANG_MICRO_VERSION 259)
set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
# set version of the library
set(LIBYANG_MAJOR_SOVERSION 2)
|
YAML Smith: Add function returning plugin contract | @@ -23,6 +23,25 @@ using CppKeySet = kdb::KeySet;
// -- Functions ----------------------------------------------------------------------------------------------------------------------------
+namespace
+{
+
+/**
+ * @brief This function returns a key set containing the contract of the plugin.
+ *
+ * @return A contract describing the functionality of this plugin
+ */
+CppKeySet contractYamlsmith ()
+{
+ return CppKeySet (30, keyNew ("system/elektra/modules/yamlsmith", KEY_VALUE, "yamlsmith plugin waits for your orders", KEY_END),
+ keyNew ("system/elektra/modules/yamlsmith/exports", KEY_END),
+ keyNew ("system/elektra/modules/yamlsmith/exports/get", KEY_FUNC, elektraYamlsmithGet, KEY_END),
+ keyNew ("system/elektra/modules/yamlsmith/exports/set", KEY_FUNC, elektraYamlsmithSet, KEY_END),
+#include ELEKTRA_README (yamlsmith)
+ keyNew ("system/elektra/modules/yamlsmith/infos/version", KEY_VALUE, PLUGINVERSION, KEY_END), KS_END);
+}
+} // end namespace
+
extern "C" {
// ====================
// = Plugin Interface =
@@ -36,15 +55,7 @@ int elektraYamlsmithGet (Plugin * handle ELEKTRA_UNUSED, KeySet * returned, Key
if (parent.getName () == "system/elektra/modules/yamlsmith")
{
- auto contract = CppKeySet (
- 30, keyNew ("system/elektra/modules/yamlsmith", KEY_VALUE, "yamlsmith plugin waits for your orders", KEY_END),
- keyNew ("system/elektra/modules/yamlsmith/exports", KEY_END),
- keyNew ("system/elektra/modules/yamlsmith/exports/get", KEY_FUNC, elektraYamlsmithGet, KEY_END),
- keyNew ("system/elektra/modules/yamlsmith/exports/set", KEY_FUNC, elektraYamlsmithSet, KEY_END),
-#include ELEKTRA_README (yamlsmith)
- keyNew ("system/elektra/modules/yamlsmith/infos/version", KEY_VALUE, PLUGINVERSION, KEY_END), KS_END);
- keys.append (contract);
-
+ keys.append (contractYamlsmith ());
parent.release ();
keys.release ();
|
arch/arm/amebad_reboot_reason.c : Change initialization value
1) In up_reboot_reason_init, write REBOOT_REASON_INITIALIZED instead of 0.
2) In up_reboot_reason_clear, set the backup_reg to REBOOT_REASON_INITIALIZED also. | @@ -68,7 +68,7 @@ void up_reboot_reason_init(void)
{
/* Read the same backup register for the boot reason */
backup_reg = BKUP_Read(BKUP_REG1);
- BKUP_Write(BKUP_REG1, 0);
+ BKUP_Write(BKUP_REG1, REBOOT_REASON_INITIALIZED);
}
@@ -76,7 +76,7 @@ reboot_reason_code_t up_reboot_reason_read(void)
{
u32 boot_reason = 0;
- if (backup_reg) {
+ if (backup_reg != REBOOT_REASON_INITIALIZED) {
return backup_reg;
} else {
/* Read AmebaD Boot Reason, WDT and HW reset supported */
@@ -104,9 +104,10 @@ void up_reboot_reason_write(reboot_reason_code_t reason)
void up_reboot_reason_clear(void)
{
- /* Reboot Reason Clear API writes the REBOOT_UNKNOWN by default.
+ /* Reboot Reason Clear API writes the REBOOT_REASON_INITIALIZED by default.
* If chip vendor needs another thing to do, please change the below.
*/
- up_reboot_reason_write(REBOOT_UNKNOWN);
+ up_reboot_reason_write(REBOOT_REASON_INITIALIZED);
+ backup_reg = REBOOT_REASON_INITIALIZED;
}
#endif
|
Fix find_template bug. | @@ -87,15 +87,16 @@ static float find_block_ncc(image_t *f, image_t *t, i_image_t *sum, int t_mean,
if (u < 0) {
u = 0;
}
+
if (v < 0) {
v = 0;
}
- if (u+t->w >= f->w) {
+ if (u+w >= f->w) {
w = f->w - u;
}
- if (v+t->h >= f->h) {
+ if (v+h >= f->h) {
h = f->h - v;
}
@@ -150,8 +151,7 @@ float imlib_template_match_ds(image_t *f, image_t *t, rectangle_t *r)
// Step size == template width
int step = t->w;
- while (step) {
- //while (true) {
+ while (step > 0) {
// Set the Diamond Search Pattern (DSP).
set_dsp(cx, cy, pts, sdsp, step);
@@ -160,6 +160,9 @@ float imlib_template_match_ds(image_t *f, image_t *t, rectangle_t *r)
// Find the block with the highest NCC
for (int i=0; i<num_pts; i++) {
+ if (pts[i].x >= f->w || pts[i].y >= f->h) {
+ continue;
+ }
float blk_xc = find_block_ncc(f, t, &sum, t_mean, t_sumsq, pts[i].x, pts[i].y);
if (blk_xc > max_xc) {
px = pts[i].x;
@@ -169,17 +172,11 @@ float imlib_template_match_ds(image_t *f, image_t *t, rectangle_t *r)
}
// If the highest correlation is found at the center block and search is using
- // SDSP then the highest correlation is found, if not then switch search to SDSP.
+ // LDSP then the highest correlation is found, if not then switch search to SDSP.
if (px == cx && py == cy) {
- //if (sdsp == true) {
- // break;
- //}
- //sdsp = true;
-
// Note instead of switching to the smaller pattern, the step size can be reduced
// each time the highest correlation is found at the center, and break on step == 0.
// This makes DS much more accurate, but slower.
-
step --;
}
|
kernel/binary_manager: fix typo, infomation -> information
infomation -> information | @@ -177,7 +177,7 @@ void binary_manager_register_kpart(int part_num, int part_size)
* Name: binary_manager_scan_kbin
*
* Description:
- * This function scans kernel binaries and update infomation.
+ * This function scans kernel binaries and update information.
*
****************************************************************************/
bool binary_manager_scan_kbin(void)
|
minor changes to VDP_resetScreen() | @@ -122,20 +122,8 @@ void VDP_init()
VDP_setAPlanAddress(0xE000);
*/
- // reset video memory (len = 0 is a special value to define 0x10000)
- DMA_doVRamFill(0, 0, 0, 1);
- // wait for DMA completion
- VDP_waitDMACompletion();
-
- // system tiles (16 plain tile)
- i = 16;
- while(i--) VDP_fillTileData(i | (i << 4), TILE_SYSTEMINDEX + i, 1, TRUE);
-
- // load defaults palettes
- PAL_setPalette(PAL0, palette_grey);
- PAL_setPalette(PAL1, palette_red);
- PAL_setPalette(PAL2, palette_green);
- PAL_setPalette(PAL3, palette_blue);
+ // clear VRAM, reset palettes and scroll mode
+ VDP_resetScreen();
// load default font
if (!VDP_loadFont(&font_default, 0))
@@ -149,10 +137,6 @@ void VDP_init()
while(1);
}
- // reset vertical scroll for plan A & B
- VDP_setVerticalScroll(PLAN_A, 0);
- VDP_setVerticalScroll(PLAN_B, 0);
-
// reset sprite struct
VDP_resetSprites();
@@ -729,11 +713,17 @@ static void computeFrameCPULoad(u16 blank, u16 vcnt)
void VDP_resetScreen()
{
- VDP_clearPlan(PLAN_A, TRUE);
- VDP_waitDMACompletion();
- VDP_clearPlan(PLAN_B, TRUE);
+ u16 i;
+
+ // reset video memory (len = 0 is a special value to define 0x10000)
+ DMA_doVRamFill(0, 0, 0, 1);
+ // wait for DMA completion
VDP_waitDMACompletion();
+ // system tiles (16 plain tile)
+ i = 16;
+ while(i--) VDP_fillTileData(i | (i << 4), TILE_SYSTEMINDEX + i, 1, TRUE);
+
PAL_setPalette(PAL0, palette_grey);
PAL_setPalette(PAL1, palette_red);
PAL_setPalette(PAL2, palette_green);
|
framework/media : Handling errors according to fwrite return value
Compares whether the size returned by fwrite is equal to the size of the data to be written. | @@ -536,7 +536,7 @@ bool createWavHeader(FILE *fp)
memset(header, 0xff, WAVE_HEADER_LENGTH);
int ret;
ret = fwrite(header, sizeof(unsigned char), WAVE_HEADER_LENGTH, fp);
- if (ret < 0) {
+ if (ret != WAVE_HEADER_LENGTH) {
meddbg("file write failed error %d\n", errno);
return false;
}
@@ -612,7 +612,7 @@ bool writeWavHeader(FILE *fp, unsigned int channel, unsigned int sampleRate, aud
int ret = 0;
ret = fwrite(header, sizeof(unsigned char), WAVE_HEADER_LENGTH, fp);
- if (ret < 0) {
+ if (ret != WAVE_HEADER_LENGTH) {
meddbg("file write failed error %d\n", errno);
return false;
}
|
Flatten md_parallel_nary
flatten all parallel dimensions into one parallel loop | @@ -85,27 +85,51 @@ void md_parallel_nary(unsigned int C, unsigned int D, const long dim[D], unsigne
return;
}
+ long dimc[D];
+ md_select_dims(D, ~flags, dimc, dim);
+
+ // Collect all parallel dimensions
+ long parallel_dim[D];
+ int parallel_b[D];
+ int nparallel = 0;
+ long total_iterations = 0L;
+ while(0 != flags)
+ {
int b = ffsl(flags & -flags) - 1;
assert(MD_IS_SET(flags, b));
-
flags = MD_CLEAR(flags, b);
-
- long dimc[D];
- md_select_dims(D, ~MD_BIT(b), dimc, dim);
-
debug_printf(DP_DEBUG4, "Parallelize: %d\n", dim[b]);
+ parallel_b[nparallel] = b;
+ parallel_dim[nparallel] = dim[b];
+ if(total_iterations > 0) total_iterations *= parallel_dim[nparallel];
+ else total_iterations = parallel_dim[nparallel];
+ nparallel++;
+ }
- // FIXME: this probably doesn't nest
- // (maybe collect all parallelizable dims into one giant loop?)
+ // Run parallel work
#pragma omp parallel for
- for (long i = 0; i < dim[b]; i++) {
+ for(long i = 0 ; i < total_iterations ; i++)
+ {
+ // Recover place in parallel iteration space
+ long iter_i[D];
+ long ii = i;
+ for(int p = nparallel-1 ; p >= 0 ; p--)
+ {
+ iter_i[p] = ii % parallel_dim[p];
+ ii /= parallel_dim[p];
+ }
+ // Update ptr
void* moving_ptr[C];
for (unsigned int j = 0; j < C; j++)
- moving_ptr[j] = ptr[j] + i * str[j][b];
+ {
+ moving_ptr[j] = ptr[j];
+ for(int p = 0 ; p < nparallel ; p++)
+ moving_ptr[j] += iter_i[p] * str[j][parallel_b[p]];
+ }
- md_parallel_nary(C, D, dimc, flags, str, moving_ptr, data, fun);
+ md_nary(C, D, dimc, str, moving_ptr, data, fun);
}
}
|
board/poppy/base_detect_lux.c: Format with clang-format
BRANCH=none
TEST=none | @@ -181,8 +181,7 @@ static void base_detect_deferred(void)
retry:
print_base_detect_value("status unclear", v);
/* Unclear base status, schedule again in a while. */
- hook_call_deferred(&base_detect_deferred_data,
- BASE_DETECT_RETRY_US);
+ hook_call_deferred(&base_detect_deferred_data, BASE_DETECT_RETRY_US);
}
void base_detect_interrupt(enum gpio_signal signal)
|
tree data BUGFIX init fractions with zero chars | @@ -866,7 +866,7 @@ API LY_ERR
ly_time_str2ts(const char *value, struct timespec *ts)
{
LY_ERR rc;
- char *fractions_s, frac_buf[10] = {'0'};
+ char *fractions_s, frac_buf[10];
int frac_len;
LY_CHECK_ARG_RET(NULL, value, ts, LY_EINVAL);
@@ -876,6 +876,10 @@ ly_time_str2ts(const char *value, struct timespec *ts)
/* convert fractions of a second to nanoseconds */
if (fractions_s) {
+ /* init frac_buf with zeroes */
+ memset(frac_buf, '0', 9);
+ frac_buf[9] = '\0';
+
frac_len = strlen(fractions_s);
memcpy(frac_buf, fractions_s, frac_len > 9 ? 9 : frac_len);
ts->tv_nsec = atol(frac_buf);
|
Use Clang built on Ubuntu 12.
Note: mandatory check (NEED_CHECK) was skipped | },
"clang7": {
"formula": {
- "sandbox_id": [290050315, 290144580],
+ "sandbox_id": [296874093, 290144580],
"match": "CLANG"
},
"executable": {
|
shelter/dist: fix unrecognized option '-Wl,-Bsymbolic-functions' error | @@ -36,6 +36,6 @@ fi
# build_deb_package
cp -rf $SCRIPT_DIR/debian $DEB_BUILD_FOLDER
cd $DEB_BUILD_FOLDER
-dpkg-buildpackage -us -uc
+DEB_CFLAGS_SET="-std=gnu11 -fPIC" DEB_CXXFLAGS_SET="-std=c++11 -fPIC" DEB_LDFLAGS_SET="-fPIC" dpkg-buildpackage -us -uc
cp $DEBBUILD_DIR/*.*deb $PROJECT_DIR
rm -rf $DEBBUILD_DIR
|
Comment why encoding check in appendAttributeValue is never true
Also add comment tag so lcov can ignore unreachable code | @@ -5595,8 +5595,26 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, XML_Bool isCdata,
break;
}
if (entity->open) {
- if (enc == encoding)
- eventPtr = ptr;
+ if (enc == encoding) {
+ /* It does not appear that this line can be executed.
+ *
+ * The "if (entity->open)" check catches recursive entity
+ * definitions. In order to be called with an open
+ * entity, it must have gone through this code before and
+ * been through the recursive call to
+ * appendAttributeValue() some lines below. That call
+ * sets the local encoding ("enc") to the parser's
+ * internal encoding (internal_utf8 or internal_utf16),
+ * which can never be the same as the principle encoding.
+ * It doesn't appear there is another code path that gets
+ * here with entity->open being TRUE.
+ *
+ * Since it is not certain that this logic is watertight,
+ * we keep the line and merely exclude it from coverage
+ * tests.
+ */
+ eventPtr = ptr; /* LCOV_EXCL_LINE */
+ }
return XML_ERROR_RECURSIVE_ENTITY_REF;
}
if (entity->notation) {
|
options/posix: Stubbed fchmod(). | @@ -11,10 +11,13 @@ int chmod(const char *, mode_t) {
<< frg::endlog;
return 0;
}
+
int fchmod(int, mode_t) {
- __ensure(!"Not implemented");
- __builtin_unreachable();
+ mlibc::infoLogger() << "\e[31mmlibc: fchmod() is not implemented correctly\e[39m"
+ << frg::endlog;
+ return 0;
}
+
int fchmodat(int, const char *, mode_t, int) {
__ensure(!"Not implemented");
__builtin_unreachable();
|
flash:patch for clearing WEL in ROM | @@ -101,11 +101,13 @@ esp_rom_spiflash_result_t esp_rom_spiflash_unlock(void)
while (REG_READ(SPI_CMD_REG(SPI_IDX)) != 0) {
}
esp_rom_spiflash_wait_idle(&g_rom_spiflash_chip);
- if (esp_rom_spiflash_write_status(&g_rom_spiflash_chip, new_status) != ESP_ROM_SPIFLASH_RESULT_OK) {
- return ESP_ROM_SPIFLASH_RESULT_ERR;
+ esp_rom_spiflash_result_t ret = esp_rom_spiflash_write_status(&g_rom_spiflash_chip, new_status);
+ // WEL bit should be cleared after operations regardless of writing succeed or not.
+ esp_rom_spiflash_wait_idle(&g_rom_spiflash_chip);
+ REG_WRITE(SPI_CMD_REG(SPI_IDX), SPI_FLASH_WRDI);
+ while (REG_READ(SPI_CMD_REG(SPI_IDX)) != 0) {
}
-
- return ESP_ROM_SPIFLASH_RESULT_OK;
+ return ret;
}
#if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
|
appveyor vs2017 test | version: '{build}'
skip_tags: true
+image: Visual Studio 2017
configuration: Release
install:
- cmd: >-
git submodule update --init --recursive
- premake5 vs2015
+ premake.bat
build:
project: build/WidescreenFixesPack.sln
verbosity: minimal
|
Stub out dcd_edpt_close for samd
Not having this prevents the device from finishing the mounting process.
Tested on a SAMD51 and didn't seem to need to actually do anything in the close function. | @@ -250,6 +250,13 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_edpt)
return true;
}
+void dcd_edpt_close (uint8_t rhport, uint8_t ep_addr) {
+ (void) rhport;
+ (void) ep_addr;
+
+ // TODO: implement if necessary?
+}
+
void dcd_edpt_close_all (uint8_t rhport)
{
(void) rhport;
|
use `kdb ls -0` to prevent issues with newlines in keynames | @@ -161,8 +161,8 @@ const version = () =>
// list available paths under a given `path`
const ls = (path) =>
- safeExec(escapeValues`kdb ls ${path}`)
- .then(stdout => stdout && stdout.split('\n'))
+ safeExec(escapeValues`kdb ls -0 ${path}`)
+ .then(stdout => stdout && stdout.split('\0'))
// get value from given `path`
const get = (path) =>
|
fix: double free | @@ -124,8 +124,6 @@ orka_config_cleanup(struct orka_config *config)
{
if (config->fcontents)
free(config->fcontents);
- if (config->tag)
- free(config->tag);
if (config->f_http_dump)
fclose(config->f_http_dump);
}
|
tsoding#1225 don't init SDL haptic subsystem | @@ -106,7 +106,7 @@ int main(int argc, char *argv[])
}
}
- if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
+ if (SDL_Init(SDL_INIT_EVERYTHING & ~SDL_INIT_HAPTIC) < 0) {
log_fail("Could not initialize SDL: %s\n", SDL_GetError());
RETURN_LT(lt, -1);
}
|
Testing: Only run long test grib_padding if ENABLE_EXTRA_TESTS=1 | @@ -130,7 +130,6 @@ list( APPEND tests_data_reqd
tigge
tigge_conversions
read_any
- grib_padding
grib_dump
grib_dump_debug
grib_util_set_spec
@@ -143,6 +142,7 @@ if( HAVE_FORTRAN AND ENABLE_EXTRA_TESTS )
list(APPEND tests_data_reqd bufr_dump_decode_fortran)
endif()
if( ENABLE_EXTRA_TESTS )
+ list(APPEND tests_data_reqd grib_padding)
list(APPEND tests_data_reqd bufr_dump_encode_C)
list(APPEND tests_data_reqd bufr_dump_decode_C)
endif()
|
os/compression/compress_read.c: Use kmm_malloc instead of malloc
Use kmm_malloc for dynamic memory allocation from inside kernel | @@ -382,8 +382,8 @@ int compress_init(int filfd, uint16_t offset, off_t *filelen)
#if CONFIG_COMPRESSION_TYPE == 1
/* Allocating memory for read and out buffer to be used for LZMA decompression */
if (compression_header.compression_format == COMPRESSION_TYPE_LZMA) {
- buffers.read_buffer = (unsigned char *)malloc(compression_header.blocksize + 5);
- buffers.out_buffer = (unsigned char *)malloc(compression_header.blocksize);
+ buffers.read_buffer = (unsigned char *)kmm_malloc(compression_header.blocksize + 5);
+ buffers.out_buffer = (unsigned char *)kmm_malloc(compression_header.blocksize);
}
#endif
|
pem_password_cb: Clarify the documentation on passphrases | @@ -335,7 +335,7 @@ I<klen> bytes at I<kstr> are used as the passphrase and I<cb> is
ignored.
If the I<cb> parameters is set to NULL and the I<u> parameter is not
-NULL then the I<u> parameter is interpreted as a null terminated string
+NULL then the I<u> parameter is interpreted as a NUL terminated string
to use as the passphrase. If both I<cb> and I<u> are NULL then the
default callback routine is used which will typically prompt for the
passphrase on the current terminal with echoing turned off.
@@ -355,7 +355,8 @@ value as the I<u> parameter passed to the PEM routine. It allows
arbitrary data to be passed to the callback by the application
(for example a window handle in a GUI application). The callback
I<must> return the number of characters in the passphrase or -1 if
-an error occurred.
+an error occurred. The passphrase can be arbitrary data; in the case where it
+is a string, it is not NUL terminated. See the L</EXAMPLES> section below.
Some implementations may need to use cryptographic algorithms during their
operation. If this is the case and I<libctx> and I<propq> parameters have been
|
Remove the LICENSE and NOTICE files from clients installer
Authored-by: Tingfang Bao | @@ -515,10 +515,6 @@ endif
mkdir -p $(CLIENTSINSTLOC)
cp -f client/scripts/greenplum_$@_path$(SCRIPT) $(CLIENTSINSTLOC)/
- # ---- copy license files ----
- cp ${BLD_TOP}/../LICENSE $(CLIENTSINSTLOC)
- cp ${BLD_TOP}/../NOTICE $(CLIENTSINSTLOC)
-
# ---- updating the version in required packages ----
@$(MAKE) set_scripts_version INSTLOC=$(CLIENTSINSTLOC)
endif
|
[ctr/lua] bug fix - changed base58 to base58check at aergoluac | @@ -18,12 +18,12 @@ import (
"bytes"
"encoding/binary"
"fmt"
+ "github.com/aergoio/aergo/types"
"io/ioutil"
"log"
"os"
"unsafe"
- "github.com/mr-tron/base58/base58"
"github.com/spf13/cobra"
)
@@ -91,7 +91,7 @@ func dumpFromFile(srcFileName string) {
if errMsg := C.vm_stringdump(L); errMsg != nil {
log.Fatal(C.GoString(errMsg))
}
- fmt.Print(base58.Encode(b.Bytes()))
+ fmt.Print(types.EncodeAddress(b.Bytes()))
}
func dumpFromStdin() {
@@ -127,7 +127,7 @@ func dumpFromStdin() {
if errMsg := C.vm_stringdump(L); errMsg != nil {
log.Fatal(C.GoString(errMsg))
}
- fmt.Print(base58.Encode(b.Bytes()))
+ fmt.Print(types.EncodeAddress(b.Bytes()))
}
//export addLen
|
[mod_openssl] remove erroneous SSL_set_shutdown()
remove erroneous call to SSL_set_shutdown()
(historical from commit:3888c103)
(erroneous since lighttpd 1.4.40 moved to bidirectional input/output)
x-ref:
"wstunnel sample config" | @@ -1193,17 +1193,9 @@ static int
connection_write_cq_ssl (server *srv, connection *con,
chunkqueue *cq, off_t max_bytes)
{
- /* the remote side closed the connection before without shutdown request
- * - IE
- * - wget
- * if keep-alive is disabled */
handler_ctx *hctx = con->plugin_ctx[plugin_data_singleton->id];
SSL *ssl = hctx->ssl;
- if (con->keep_alive == 0) {
- SSL_set_shutdown(ssl, SSL_RECEIVED_SHUTDOWN);
- }
-
chunkqueue_remove_finished_chunks(cq);
while (max_bytes > 0 && NULL != cq->first) {
|
neon/padd: vpadd_f32 was buggy in older clang versions
I can't find any details on when this was fixed. | @@ -40,7 +40,7 @@ SIMDE_BEGIN_DECLS_
SIMDE_FUNCTION_ATTRIBUTES
simde_float32x2_t
simde_vpadd_f32(simde_float32x2_t a, simde_float32x2_t b) {
- #if defined(SIMDE_ARM_NEON_A32V7_NATIVE)
+ #if defined(SIMDE_ARM_NEON_A32V7_NATIVE) && !SIMDE_DETECT_CLANG_VERSION_NOT(9,0,0)
return vpadd_f32(a, b);
#else
return simde_vadd_f32(simde_vuzp1_f32(a, b), simde_vuzp2_f32(a, b));
|
Fix legacy board build | @@ -91,6 +91,7 @@ void set_can_mode(int canid, int use_gmlan) {
set_gpio_alternate(GPIOB, 13, GPIO_AF9_CAN2);
} else if (revision == PANDA_REV_C && canid == 2) {
+ #ifdef CAN3
// A8,A15: disable normal mode
set_gpio_mode(GPIOA, 8, MODE_INPUT);
set_gpio_mode(GPIOA, 15, MODE_INPUT);
@@ -98,6 +99,7 @@ void set_can_mode(int canid, int use_gmlan) {
// B3,B4: enable gmlan mode
set_gpio_alternate(GPIOB, 3, GPIO_AF11_CAN3);
set_gpio_alternate(GPIOB, 4, GPIO_AF11_CAN3);
+ #endif
}
can_ports[canid].bitrate = GMLAN_DEFAULT_BITRATE;
@@ -111,6 +113,7 @@ void set_can_mode(int canid, int use_gmlan) {
set_gpio_alternate(GPIOB, 5, GPIO_AF9_CAN2);
set_gpio_alternate(GPIOB, 6, GPIO_AF9_CAN2);
} else if (canid == 2) {
+ #ifdef CAN3
if(revision == PANDA_REV_C){
// B3,B4: disable gmlan mode
set_gpio_mode(GPIOB, 3, MODE_INPUT);
@@ -120,6 +123,7 @@ void set_can_mode(int canid, int use_gmlan) {
// A8,A15: normal mode
set_gpio_alternate(GPIOA, 8, GPIO_AF11_CAN3);
set_gpio_alternate(GPIOA, 15, GPIO_AF11_CAN3);
+ #endif
}
can_ports[canid].bitrate = CAN_DEFAULT_BITRATE;
|
wfas description | 1057 efas European Flood Awareness System (EFAS)
1058 efse European Flood Awareness System (EFAS) seasonal forecasts
1059 efra European Flood Awareness System (EFAS) reanalysis
-1060 wfas World Flood Awareness System
+1060 wfas Global flood awareness system
1070 msdc Monthly standard deviation and covariance
1071 moda Monthly means of daily means
1072 monr Monthly means using G. Boer's step function
|
Filter out preloader directory | @@ -25,7 +25,7 @@ class RunAll
static function filter(inName:String):Bool
{
- return inName!="android" && inName!="native" && inName!="html5" && inName!="watchos" && inName!="SwfAssetLib.hx" && inName!="ios" && inName!="compat";
+ return inName!="android" && inName!="native" && inName!="html5" && inName!="watchos" && inName!="SwfAssetLib.hx" && inName!="ios" && inName!="compat" && inName!="preloader";
}
public static function main()
|
input: use new config_map api prototype | @@ -436,7 +436,7 @@ int flb_input_instance_init(struct flb_input_instance *ins,
* Create a dynamic version of the configmap that will be used by the specific
* instance in question.
*/
- config_map = flb_config_map_create(p->config_map);
+ config_map = flb_config_map_create(config, p->config_map);
if (!config_map) {
flb_error("[filter] error loading config map for '%s' plugin",
p->name);
|
azimuth: add updated naive ropsten contract | 0x3e8c.a510.354b.c2fd.bbd6.1502.52d9.3105.c9c2.7bbe
::
++ naive
- 0xb581.01cd.3bbb.cc6f.a40b.cdb0.4bb7.1623.b5c7.d39b
+ 0xe7cf.4b83.06d3.11ba.ca15.585f.e3f0.7cd0.441c.21d1
::
++ launch 4.601.630
++ public launch
|
Refactor macro-spanning if in ssl_msg.c | @@ -3851,8 +3851,8 @@ int mbedtls_ssl_read_record( mbedtls_ssl_context *ssl,
if( ssl_record_is_in_progress( ssl ) == 0 )
{
+ int dtls_have_buffered = 0;
#if defined(MBEDTLS_SSL_PROTO_DTLS)
- int have_buffered = 0;
/* We only check for buffered messages if the
* current datagram is fully consumed. */
@@ -3860,11 +3860,11 @@ int mbedtls_ssl_read_record( mbedtls_ssl_context *ssl,
ssl_next_record_is_in_datagram( ssl ) == 0 )
{
if( ssl_load_buffered_message( ssl ) == 0 )
- have_buffered = 1;
+ dtls_have_buffered = 1;
}
- if( have_buffered == 0 )
#endif /* MBEDTLS_SSL_PROTO_DTLS */
+ if( dtls_have_buffered == 0 )
{
ret = ssl_get_next_record( ssl );
if( ret == MBEDTLS_ERR_SSL_CONTINUE_PROCESSING )
|
Added support for Sylvania/LEDVance RT 5/6 RBGW | @@ -2671,6 +2671,7 @@ void DeRestPluginPrivate::setLightNodeStaticCapabilities(LightNode *lightNode)
if (lightNode->manufacturerCode() == VENDOR_LEDVANCE &&
(lightNode->modelId() == QLatin1String("BR30 RGBW") ||
+ lightNode->modelId() == QLatin1String("RT RGBW") ||
lightNode->modelId() == QLatin1String("A19 RGBW")))
{
item = lightNode->item(RAttrType);
|
restrict rank calcs properly | @@ -518,6 +518,8 @@ bool GetFortunastakeRanks(CBlockIndex* pindex)
vecFortunastakeScores.clear();
int i;
if (vecFortunastakeScoresListHash == pindex->GetBlockHash()) {
+ // if ScoresList was calculated for the current pindex hash, then just use that list
+ // TODO: make a vector of these somehow
BOOST_FOREACH(CFortunaStake& mn, vecFortunastakeScoresList)
{
i++;
@@ -685,9 +687,11 @@ int CFortunaStake::GetPaymentAmount(const CBlockIndex *pindex, int nMaxBlocksToS
int matches = 0;
BOOST_FOREACH(PAIRTYPE(int, int64_t) &item, payData)
{
+ if (item.first > pindex->nHeight - nMaxBlocksToScanBack) { // find payments in last scanrange
amount += item.second;
matches++;
}
+ }
//printf("done checking for matches: %d found with %s value\n", matches, FormatMoney(amount).c_str());
if (matches > 0) {
totalValue = amount;
|
Fix the adjusting of the time when there is a rollover | @@ -43,7 +43,8 @@ static void gpio_intr_callback_task (task_param_t param, uint8 priority)
// Now must be >= then . Add the missing bits
if (then > (now & 0xffffff)) {
- then += 0x1000000;
+ // Now must have rolled over since the interrupt -- back it down
+ now -= 0x1000000;
}
then = (then + (now & 0x7f000000)) & 0x7fffffff;
|
bugID:18002625:[bt] rm BT releated maroco. | @@ -12,7 +12,6 @@ bz_en_awss = 0
$(NAME)_COMPONENTS := breeze cli
GLOBAL_DEFINES += DEBUG
-#GLOBAL_DEFINES += CONFIG_BLE_LINK_PARAMETERS
GLOBAL_DEFINES += BUILD_AOS
BREEZEAPP_CONFIG_EN_OTA ?= 0
|
MacOS prior to 10.12 does not support random API correctly
Fixes | # if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM)
# include <Availability.h>
-# if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \
+# if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || \
(defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
# define OPENSSL_APPLE_CRYPTO_RANDOM 1
# include <CommonCrypto/CommonCryptoError.h>
|
NVMe: Adding snap_conf.sv generation again | @@ -183,6 +183,7 @@ prepare_project: check_snap_settings prepare_logs
@ln -f -s $(SNAP_HDL_CORE)/dma_types_$(CAPI_VER).vhd_source $(SNAP_HDL_CORE)/dma_types.vhd;
@ln -f -s $(SNAP_HDL_CORE)/dma_buffer_$(CAPI_VER).vhd_source $(SNAP_HDL_CORE)/dma_buffer.vhd;
@ln -f -s $(SNAP_HDL_CORE)/dma_rams_$(CAPI_VER).vhd_source $(SNAP_HDL_CORE)/dma_rams.vhd;
+ $(MAKE) -C $(SNAP_ROOT)/hardware/sim/nvme_lite
@echo -e "[PREPARE PROJECT.....] done `date +"%T %a %b %d %Y"`";
snap_preprocess_start: prepare_project
@@ -432,7 +433,6 @@ $(SNAP_MODELS):
@$(MAKE) -s $(subst .model_,,$@)
model: check_simulator
- $(MAKE) -C $(SNAP_ROOT)/hardware/sim/nvme_lite
@$(MAKE) -s $(SIMULATOR)
sim: check_simulator
|
Uses latest ci image | @@ -12,7 +12,7 @@ parameters:
executors:
main-env:
docker:
- - image: ucbbar/chipyard-ci-image:34e56d5
+ - image: ucbbar/chipyard-ci-image:84cfc73
environment:
JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
|
Feat:Update boat_demo.c for MA510 | @@ -16,6 +16,7 @@ DESCRIPTION
#include "boatconfig.h"
#include "boatlog.h"
#include "my_contract.cpp.abi.h"
+#include "web3intf.h"
BoatPlatoneWallet *g_platone_wallet_ptr;
@@ -183,6 +184,7 @@ BOAT_RESULT platone_call_mycontract(BoatPlatoneWallet *wallet_ptr)
BCHAR *result_str;
BoatPlatoneTx tx_ctx;
BOAT_RESULT result;
+ BoatLog(BOAT_LOG_NORMAL, "1111111111\n");
/* Set Contract Address */
result = BoatPlatoneTxInit(wallet_ptr, &tx_ctx, BOAT_TRUE, NULL,
@@ -221,6 +223,8 @@ void boat_platone_entry(void)
BOAT_RESULT result = BOAT_SUCCESS;
int ret=0;
BoatLog(BOAT_LOG_NORMAL,"======= Ready to INIT BoatIotSdk ======\n");
+
+
/* step-1: Boat SDK initialization */
result = BoatIotSdkInit();
if(result != BOAT_SUCCESS)
@@ -249,7 +253,6 @@ void boat_platone_entry(void)
goto end;
}
BoatLog(BOAT_LOG_NORMAL,"=== platone create Wallet run success ===");
-
/* step-3: execute 'platone_call_mycontract' */
result = platone_call_mycontract( g_platone_wallet_ptr );
if( result != BOAT_SUCCESS )
@@ -272,21 +275,20 @@ end:
int fibocom_task_entry(void)
{
-
+ int ret=0;
qapi_Timer_Sleep(3, QAPI_TIMER_UNIT_SEC, true);
debug_uart_init(&debug_uart_context_D);
+ ret = dam_byte_pool_init();
+ if(ret != TX_SUCCESS)
+ {
+ BoatLog(BOAT_LOG_CRITICAL,"DAM_APP:Create DAM byte pool fail \n");
+ return ret;
+ }
+
/* BoAT demo task ----------------------------------------------------------*/
boat_platone_entry();
-
- while(1){
-
- BoatLog(BOAT_LOG_NORMAL,"123\n\r");
-
- qapi_Timer_Sleep(1, QAPI_TIMER_UNIT_SEC, true);
- }
-
return 0;
}
|
docs for option to not update parm anim for parallel or serial eval | @@ -80,4 +80,10 @@ Add attributes to flag locked normals on inputs, and set normals for the corresp
Discard the top level group node when baking an asset.
+@subsection Maya_Assets_Options_ Update Parms for Eval Mode
+
+When evaluating in DG mode parm animation is always evaluated as expected during playback. When the Evaluation Mode is serial or parallel, because of the way our attributes are structured, we only know that some parms has been dirtied, not which specific ones. We are forced to update all the parms if any animation is detected.
+
+Updating all the parms can impact playback speed if there are a lot of parms, and the asset cook itself is fast. Turning off this option lets you disable the parm animation update for serial and parallel mode when you don't need it. Note that animated input geometry will still update in serial or parallel mode if this option is off.
+
*/
|
remove old version of u3r_mug() | @@ -1554,42 +1554,6 @@ u3r_mug_cell(u3_noun hed,
return u3r_mug_both(lus_w, biq_w);
}
-/* u3r_mug(): MurmurHash3 on a noun.
-*/
-c3_w
-u3r_mug_old(u3_noun veb)
-{
- c3_assert(u3_none != veb);
-
- if ( _(u3a_is_cat(veb)) ) {
- c3_w len_w = u3r_met(3, veb);
- return u3r_mug_bytes((c3_y*)&veb, len_w);
- }
- else {
- c3_w mug_w;
-
- u3a_noun* veb_u = u3a_to_ptr(veb);
-
- if ( veb_u->mug_w ) {
- return veb_u->mug_w;
- }
-
- if ( _(u3a_is_cell(veb)) ) {
- mug_w = u3r_mug_cell(u3h(veb), u3t(veb));
- }
- else {
- u3a_atom* vat_u = (u3a_atom*)veb_u;
- c3_w len_w = u3r_met(3, veb);
-
- mug_w = u3r_mug_bytes((c3_y*)vat_u->buf_w, len_w);
- }
-
- veb_u->mug_w = mug_w;
-
- return mug_w;
- }
-}
-
// mugframe: head and tail mugs of veb, 0 if uncalculated
//
typedef struct mugframe
@@ -1686,7 +1650,7 @@ _mug_atom(u3_atom veb)
}
}
-// u3r_mug(): statefully mug a noun
+// u3r_mug(): statefully mug a noun using a 31-bit MurmurHash3
//
c3_w
u3r_mug(u3_noun veb)
|
fix ranking accuracy 00 | @@ -11,7 +11,7 @@ class RankingAccuracy(ARankingScreen):
super().__init__(dummy)
maxscore = (replayinfo.number_300s + replayinfo.number_100s + replayinfo.number_50s + replayinfo.misses) * 300
score = replayinfo.number_300s * 300 + replayinfo.number_100s * 100 + replayinfo.number_50s * 50
- self.accuracy = str(round(score/maxscore * 100, 2))
+ self.accuracy = str("{:.2f}".format(score/maxscore * 100))
self.numberframes = numberframes[1]
self.gap = gap * Settings.scale
|
Don't enable datapath queued sends when shared ec is enabled | @@ -320,8 +320,10 @@ endif()
if(QUIC_TLS STREQUAL "schannel")
message(STATUS "Enabling Schannel configuration tests")
list(APPEND QUIC_COMMON_DEFINES QUIC_TEST_SCHANNEL_FLAGS=1)
+ if (NOT QUIC_SHARED_EC)
message(STATUS "Enabling UDP Send Queuing")
list(APPEND QUIC_COMMON_DEFINES CXPLAT_DATAPATH_QUEUE_SENDS=1)
+ endif()
message(STATUS "Disabling PFX tests")
list(APPEND QUIC_COMMON_DEFINES QUIC_DISABLE_PFX_TESTS)
message(STATUS "Disabling 0-RTT support")
|
Correct fix for direct receive streams. | @@ -1826,6 +1826,7 @@ int picoquic_mark_direct_receive_stream(picoquic_cnx_t* cnx, uint64_t stream_id,
while ((data = (picoquic_stream_data_node_t*)picosplay_first(&stream->stream_data_tree)) != NULL) {
size_t length = data->length;
uint64_t offset = data->offset;
+ uint8_t* bytes = data->bytes;
if (offset < stream->consumed_offset) {
if (offset + length < stream->consumed_offset) {
@@ -1834,11 +1835,12 @@ int picoquic_mark_direct_receive_stream(picoquic_cnx_t* cnx, uint64_t stream_id,
else {
size_t delta_offset = (size_t)(stream->consumed_offset - offset);
length -= delta_offset;
+ offset += delta_offset;
}
}
if (length > 0) {
- ret = direct_receive_fn(cnx, stream_id, 0, data->bytes, data->offset, data->length, direct_receive_ctx);
+ ret = direct_receive_fn(cnx, stream_id, 0, bytes, offset, length, direct_receive_ctx);
}
if (ret == 0) {
|
Support ZCL attribute reporting configuration on multiple endpoints | @@ -685,7 +685,12 @@ void DeRestPluginPrivate::checkLightBindingsForAttributeReporting(LightNode *lig
/*! Creates binding for attribute reporting to gateway node. */
void DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *sensor)
{
- if (!apsCtrl || !sensor || !sensor->address().hasExt())
+ if (!apsCtrl || !sensor || !sensor->address().hasExt() || !sensor->node())
+ {
+ return;
+ }
+
+ if (idleTotalCounter < (IDLE_READ_LIMIT + 120)) // wait for some input before fire bindings
{
return;
}
@@ -703,7 +708,7 @@ void DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
sensor->setMgmtBindSupported(false);
}
- if (!endDeviceSupported && (!sensor->node() || sensor->node()->isEndDevice()))
+ if (!endDeviceSupported && sensor->node()->isEndDevice())
{
DBG_Printf(DBG_INFO, "don't create binding for attribute reporting of end-device %s\n", qPrintable(sensor->name()));
return;
@@ -763,6 +768,26 @@ void DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
continue;
}
+ quint8 srcEndpoint = sensor->fingerPrint().endpoint;
+
+ { // some clusters might not be on fingerprint endpoint (power configuration), search in other simple descriptors
+ deCONZ::SimpleDescriptor *sd= sensor->node()->getSimpleDescriptor(srcEndpoint);
+ if (!sd || !sd->cluster(*i, deCONZ::ServerCluster))
+ {
+ for (int j = 0; j < sensor->node()->simpleDescriptors().size(); j++)
+ {
+ sd = &sensor->node()->simpleDescriptors()[j];
+
+ if (sd && sd->cluster(*i, deCONZ::ServerCluster))
+ {
+ srcEndpoint = sd->endpoint();
+ break;
+ }
+ }
+ }
+ }
+
+
switch (*i)
{
case POWER_CONFIGURATION_CLUSTER_ID:
@@ -770,7 +795,8 @@ void DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
case ILLUMINANCE_MEASUREMENT_CLUSTER_ID:
case TEMPERATURE_MEASUREMENT_CLUSTER_ID:
{
- DBG_Printf(DBG_INFO, "create binding for attribute reporting of cluster 0x%04X\n", (*i));
+ DBG_Printf(DBG_INFO, "0x%016llX (%s) create binding for attribute reporting of cluster 0x%04X on endpoint 0x%02X\n",
+ sensor->address().ext(), qPrintable(sensor->modelId()), (*i), srcEndpoint);
BindingTask bindingTask;
@@ -789,7 +815,7 @@ void DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
Binding &bnd = bindingTask.binding;
bnd.srcAddress = sensor->address().ext();
bnd.dstAddrMode = deCONZ::ApsExtAddress;
- bnd.srcEndpoint = sensor->fingerPrint().endpoint;
+ bnd.srcEndpoint = srcEndpoint;
bnd.clusterId = *i;
bnd.dstAddress.ext = apsCtrl->getParameter(deCONZ::ParamMacAddress);
bnd.dstEndpoint = endpoint();
|
X11 icon change xbm to xpm | #include "gtk2/gtk_keyboard.h"
#include "gtk2/gtk_menu.h"
-#include "resources/np2.xbm"
+#include "resources/np2.xpm"
#define APPNAME "NP2"
@@ -210,12 +210,15 @@ main_loop_quit(gpointer p)
static void
set_icon_bitmap(GtkWidget *w)
{
- GdkPixmap *icon_pixmap;
+ GdkPixbuf *icon_pixbuf;
+ GList *pixbufs = NULL;
gdk_window_set_icon_name(w->window, APPNAME);
- icon_pixmap = gdk_bitmap_create_from_data(
- w->window, np2_bits, np2_width, np2_height);
- gdk_window_set_icon(w->window, NULL, icon_pixmap, NULL);
+ icon_pixbuf = gdk_pixbuf_new_from_xpm_data(np2_icon);
+ pixbufs = g_list_append(pixbufs, icon_pixbuf);
+ gdk_window_set_icon_list(w->window, pixbufs);
+ g_object_unref(icon_pixbuf);
+ g_list_free(pixbufs);
}
|
django1.9 was removed as useless | @@ -31,8 +31,6 @@ ALLOW mds -> contrib/deprecated/uriparser
ALLOW devtools/experimental/mds -> contrib/deprecated/uriparser
DENY .* -> contrib/deprecated/uriparser
-ALLOW travel/rasp -> contrib/python/django/django-1.9
-DENY .* -> contrib/python/django/django-1.9
ALLOW contrib/python/.*/tests? -> contrib/python/django/django-1.11
ALLOW contrib/python/.*/tests? -> contrib/python/django/django-2.2
DENY contrib/python -> contrib/python/django/django-1.11
|
fix(shields): added right alt and layer quick tap to Jian | #define RSE 2
#define ADJ 3
+< { quick_tap_ms = <200>; };
+&mt { quick_tap_ms = <200>; };
+
/ {
keymap {
compatible = "zmk,keymap";
bindings = <
&kp LWIN &kp GRAVE &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &mt RWIN RBKT
&kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT
- &kp LALT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp BSLH
+ &kp LALT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH
< RSE TAB &mt LSHFT SPACE < LWR RET < LWR ESC &mt RSHFT BSPC < RSE DEL
>;
};
|
Update product info for Danfoss Ally thermostat | "manufacturername": "Danfoss",
"modelid": "eTRV0100",
"vendor": "Danfoss",
- "product": "Ally",
+ "product": "Ally thermostat",
"sleeper": false,
"status": "Gold",
"subdevices": [
|
Optimize Ikea Tredansen DDF | "product": "TREDANSEN block-out cellul blind",
"sleeper": false,
"status": "Gold",
- "path": "/devices/tredansen_block-out_cellul_blind.json",
"subdevices": [
{
"type": "$TYPE_WINDOW_COVERING_DEVICE",
},
{
"name": "state/bri",
- "refresh.interval": 5
+ "parse": {
+ "at": "0x0008",
+ "cl": "0x0102",
+ "ep": 1,
+ "eval": "Item.val = (254 * Attr.val) / 100;",
+ "fn": "zcl"
+ },
+ "read": {
+ "fn": "none"
+ }
},
{
"name": "state/lift",
- "refresh.interval": 300,
- "default": 0
+ "refresh.interval": 360
},
{
"name": "state/on",
- "refresh.interval": 5
+ "parse": {
+ "at": "0x0008",
+ "cl": "0x0102",
+ "eval": "Item.val = Attr.val < 100",
+ "fn": "zcl"
+ },
+ "read": {
+ "fn": "none"
+ }
},
{
"name": "state/open",
"cl": "0x0102",
"eval": "Item.val = Attr.val < 100",
"fn": "zcl"
+ },
+ "read": {
+ "fn": "none"
}
},
{
"name": "attr/name"
},
{
- "name": "attr/swversion"
+ "name": "attr/swversion",
+ "read": {
+ "fn": "none"
+ }
},
{
"name": "attr/type"
},
{
"name": "state/battery",
- "refresh.interval": 3600,
+ "refresh.interval": 1900,
"parse": {
"at": "0x0021",
"cl": "0x0001",
}
],
"bindings": [
- {
- "bind": "unicast",
- "src.ep": 1,
- "dst.ep": 1,
- "cl": "0x0000",
- "report": [
- {
- "at": "0x4000",
- "dt": "0x42",
- "min": 0,
- "max": 65535
- }
- ]
- },
{
"bind": "unicast",
"src.ep": 1,
}
]
},
- {
- "bind": "unicast",
- "src.ep": 1,
- "dst.ep": 1,
- "cl": "0x0006",
- "report": [
- {
- "at": "0x0000",
- "dt": "0x10",
- "min": 1,
- "max": 1800
- }
- ]
- },
{
"bind": "unicast",
"src.ep": 1,
|
Adjusted and verified acc values on HMD | @@ -173,16 +173,12 @@ int survive_load_htc_config_format(SurviveObject *so, char *ct0conf, int len) {
// Handle device-specific sacling.
if (strcmp(so->codename, "HMD") == 0) {
if (so->acc_scale) {
- so->acc_scale[0] *= -1. / 8192.0;
- so->acc_scale[1] *= -1. / 8192.0;
- so->acc_scale[2] *= 1. / 8192.0;
+ scale3d(so->acc_scale, so->acc_scale, 1. / 8192.0);
}
if (so->acc_bias)
scale3d(so->acc_bias, so->acc_bias, 2. / 1000.); // Odd but seems right.
if (so->gyro_scale) {
- so->gyro_scale[0] *= -0.000065665;
- so->gyro_scale[1] *= -0.000065665;
- so->gyro_scale[2] *= 0.000065665;
+ scale3d(so->gyro_scale, so->gyro_scale, 0.000065665);
}
} else if (memcmp(so->codename, "WM", 2) == 0) {
if (so->acc_scale)
|
Add missing dependency for Cyrpess Psoc64. | @@ -272,6 +272,12 @@ function(cy_add_link_libraries)
"${ARG_BSP_DIR}"
)
+ target_link_libraries(
+ AFR::kernel::mcu_port
+ INTERFACE
+ 3rdparty::tinycrypt
+ )
+
add_library(CyObjStore INTERFACE)
target_sources(CyObjStore INTERFACE
"${cy_port_support_dir}/objstore/cyobjstore.c"
|
Don't lock what is already locked. | @@ -646,13 +646,13 @@ _papplPrinterDelete(
snprintf(prefix, sizeof(prefix), "%s/", printer->uriname);
prefixlen = strlen(prefix);
- pthread_rwlock_wrlock(&printer->system->rwlock);
for (r = (_pappl_resource_t *)cupsArrayFirst(printer->system->resources); r; r = (_pappl_resource_t *)cupsArrayNext(printer->system->resources))
{
+ // Note: System rwlock is already held when calling cupsArrayRemove for the
+ // system's printer object, so we don't need a separate lock here...
if (r->cbdata == printer || !strncmp(r->path, prefix, prefixlen))
cupsArrayRemove(printer->system->resources, r);
}
- pthread_rwlock_unlock(&printer->system->rwlock);
// If applicable, call the delete function...
if (printer->driver_data.delete_cb)
|
CI: Cache CMake build | @@ -18,7 +18,7 @@ jobs:
name: Linux
cache-key: linux
cmake-args: '-DPICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk -DPICO_SDK_POST_LIST_DIRS=$GITHUB_WORKSPACE/pico-extras'
- apt-packages: clang-tidy gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
+ apt-packages: ccache gcc-arm-none-eabi
runs-on: ${{matrix.os}}
@@ -26,6 +26,15 @@ jobs:
PICO_SDK_PATH: $GITHUB_WORKSPACE/pico-sdk
steps:
+ - name: Compiler Cache
+ uses: actions/cache@v2
+ with:
+ path: /home/runner/.ccache
+ key: ccache-cmake-${{github.ref}}-${{github.sha}}
+ restore-keys: |
+ ccache-cmake-${{github.ref}}
+ ccache-cmake
+
- uses: actions/checkout@v2
with:
submodules: true
@@ -44,7 +53,7 @@ jobs:
with:
repository: raspberrypi/pico-extras
path: pico-extras
- submodules: false # lwip breaks audio submodule fetchin
+ submodules: false # lwip breaks audio submodule fetching
# Linux deps
- name: Install deps
@@ -58,10 +67,12 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
- run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE ${{matrix.cmake-args}}
+ run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${{matrix.cmake-args}}
- name: Build
working-directory: ${{runner.workspace}}/build
shell: bash
run: |
+ ccache --zero-stats || true
cmake --build . --config $BUILD_TYPE -j 2
+ ccache --show-stats || true
|
Base64: Fix problem reported by OCLint | @@ -57,17 +57,12 @@ static int unescape (Key * key, Key * parent)
*/
static bool shouldDecode (Key * key, bool metaMode)
{
- if (metaMode)
- {
- return keyGetMeta (key, "type") && strcmp (keyValue (keyGetMeta (key, "type")), "binary") == 0;
- }
- else
- {
+ if (metaMode) return keyGetMeta (key, "type") && strcmp (keyValue (keyGetMeta (key, "type")), "binary") == 0;
+
const char * strVal = keyString (key);
return strlen (strVal) >= ELEKTRA_PLUGIN_BASE64_PREFIX_LENGTH &&
strncmp (strVal, ELEKTRA_PLUGIN_BASE64_PREFIX, ELEKTRA_PLUGIN_BASE64_PREFIX_LENGTH) == 0;
}
-}
/**
* @brief Decode a base64 encoded key value and save the result as binary data in the key.
|
Support exporting monthly statistics | ++ node-url (need (de-purl:html 'http://eth-mainnet.urbit.org:8545'))
::
++ prep
- |= old=(unit *) ::state)
- :: ?~ old
+ |= old=(unit state)
+ ?~ old
[~ ..prep]
- :: [~ ..prep(+<+ u.old)]
+ [~ ..prep(+<+ u.old)]
::
++ poke-noun
|= a=?(%kick-watcher %regaze %debug)
|= pax=path
^- (unit (unit [mark *]))
?~ pax ~
- ?. =(%days i.pax) ~
+ ?: =(%days i.pax)
:^ ~ ~ %txt
- export
+ (export days)
+ ?: =(%months i.pax)
+ :^ ~ ~ %txt
+ %- export
+ ^+ days
+ %+ roll (flop days)
+ |= [[day=@da sat=stats] mos=(list [mod=@da sat=stats])]
+ ^+ mos
+ =/ mod=@da
+ %- year
+ =+ (yore day)
+ -(d.t 1)
+ ?~ mos [mod sat]~
+ ?: !=(mod mod.i.mos)
+ [[mod sat] mos]
+ :_ t.mos
+ :- mod
+ ::TODO this is hideous. can we make a wet gate do this?
+ :* (weld spawned.sat spawned.sat.i.mos)
+ (weld activated.sat activated.sat.i.mos)
+ (weld transfer-p.sat transfer-p.sat.i.mos)
+ (weld transferred.sat transferred.sat.i.mos)
+ (weld configured.sat configured.sat.i.mos)
+ (weld breached.sat breached.sat.i.mos)
+ (weld request.sat request.sat.i.mos)
+ (weld sponsor.sat sponsor.sat.i.mos)
+ (weld management-p.sat management-p.sat.i.mos)
+ (weld voting-p.sat voting-p.sat.i.mos)
+ (weld spawn-p.sat spawn-p.sat.i.mos)
+ ==
+ ~
::
:: +diff-eth-watcher-update: process new logs, clear state on rollback
::
:: +export: generate a csv of stats per day
::
++ export
+ |= =_days
:- %- crip
;: weld
"date,"
|
feat(venachain):annotate useless variable | @@ -184,7 +184,7 @@ BOAT_RESULT venachain_call_mycontract(BoatVenachainWallet *wallet_ptr)
BCHAR *result_str;
BoatVenachainTx tx_ctx;
BOAT_RESULT result;
- venachain_nodesResult result_out = {0,NULL};
+// venachain_nodesResult result_out = {0,NULL};
/* Set Contract Address */
result = BoatVenachainTxInit(wallet_ptr, &tx_ctx, BOAT_TRUE, NULL,
|
ports/stm32: Disable lwip dispatch first before deinit. | @@ -633,13 +633,15 @@ soft_reset:
// Disable all other IRQs except Systick
irq_set_base_priority(IRQ_PRI_SYSTICK+1);
- #if MICROPY_PY_BLUETOOTH
- mp_bluetooth_deinit();
- #endif
#if MICROPY_PY_LWIP
systick_disable_dispatch(SYSTICK_DISPATCH_LWIP);
#endif
+ #if MICROPY_PY_BLUETOOTH
+ mp_bluetooth_deinit();
+ #endif
+ #if MICROPY_PY_NETWORK
mod_network_deinit();
+ #endif
timer_deinit();
i2c_deinit_all();
spi_deinit_all();
|
Fix test_alloc_set_base() to work for builds | @@ -8817,7 +8817,7 @@ END_TEST
/* Test robustness of XML_SetBase against a failing allocator */
START_TEST(test_alloc_set_base)
{
- const XML_Char *new_base = "/local/file/name.xml";
+ const XML_Char *new_base = XCS("/local/file/name.xml");
int i;
const int max_alloc_count = 5;
|
Correct a typo in some C comments. | * Name: netlib_ipv4router
*
* Description:
- * Given a destination address that is no on a local network, query the
+ * Given a destination address that is not on a local network, query the
* IPv4 routing table, and return the IPv4 address of the routing that
* will provide access to the correct sub-net.
*
|
ipip: Don't crash when showing non-existant tunnel index
Type: fix | @@ -232,6 +232,8 @@ static clib_error_t *show_ipip_tunnel_command_fn(vlib_main_t *vm,
({vlib_cli_output(vm, "%U", format_ipip_tunnel, t); }));
/* *INDENT-ON* */
} else {
+ if (pool_is_free_index (gm->tunnels, ti))
+ return clib_error_return(0, "unknown index:%d", ti);
t = pool_elt_at_index(gm->tunnels, ti);
if (t)
vlib_cli_output(vm, "%U", format_ipip_tunnel, t);
|
pyapi CHANGE support SSH channels
netconf2.Session.newChannel() to connect to the server via another
SSH channel. | typedef struct {
PyObject_HEAD
struct ly_ctx *ctx;
+ unsigned int *ctx_counter;
struct nc_session *session;
} ncSessionObject;
@@ -115,7 +116,12 @@ ncSessionFree(ncSessionObject *self)
PyErr_Fetch(&err_type, &err_value, &err_traceback);
nc_session_free(self->session, NULL);
+
+ (*self->ctx_counter)--;
+ if (!(*self->ctx_counter)) {
ly_ctx_destroy(self->ctx, NULL);
+ free(self->ctx_counter);
+ }
/* restore the saved exception state */
PyErr_Restore(err_type, err_value, err_traceback);
@@ -132,6 +138,7 @@ ncSessionNew(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (self != NULL) {
/* NULL initiation */
self->session = NULL;
+ self->ctx_counter = calloc(1, sizeof *self->ctx_counter);
/* prepare libyang context or use the one already present in the session */
self->ctx = ly_ctx_new(SCHEMAS_DIR);
@@ -139,6 +146,7 @@ ncSessionNew(PyTypeObject *type, PyObject *args, PyObject *kwds)
Py_DECREF(self);
return NULL;
}
+ (*self->ctx_counter)++;
}
return (PyObject *)self;
@@ -213,6 +221,33 @@ ncSessionInit(ncSessionObject *self, PyObject *args, PyObject *kwds)
return 0;
}
+static PyObject *
+newChannel(PyObject *self)
+{
+ ncSessionObject *new;
+
+ if (nc_session_get_ti(((ncSessionObject *)self)->session) != NC_TI_LIBSSH) {
+ PyErr_SetString(PyExc_TypeError, "The session must be on SSH.");
+ return NULL;
+ }
+
+ new = (ncSessionObject *)self->ob_type->tp_alloc(self->ob_type, 0);
+ if (!new) {
+ return NULL;
+ }
+
+ new->ctx = ((ncSessionObject *)self)->ctx;
+ new->session = nc_connect_ssh_channel(((ncSessionObject *)self)->session, new->ctx);
+ if (!new->session) {
+ Py_DECREF(new);
+ return NULL;
+ }
+
+ new->ctx_counter = ((ncSessionObject *)self)->ctx_counter;
+ (*new->ctx_counter)++;
+ return (PyObject*)new;
+}
+
static PyObject *
ncSessionStr(ncSessionObject *self)
{
@@ -332,6 +367,10 @@ static PyMemberDef ncSessionMembers[] = {
};
static PyMethodDef ncSessionMethods[] = {
+ {"newChannel", (PyCFunction)newChannel, METH_NOARGS,
+ "newChannel()\n--\n\n"
+ "Create another NETCONF session on existing SSH session using separated SSH channel\n\n"
+ ":returns: New netconf2.Session instance.\n"},
{NULL} /* Sentinel */
};
|
admin/meta-packages: reenable pdsh-mod-slurm in slurm server metapackage | @@ -279,8 +279,7 @@ Requires: slurm-slurmctld%{PROJ_DELIM}
Requires: munge%{PROJ_DELIM}
Requires: munge-libs%{PROJ_DELIM}
Requires: munge-devel%{PROJ_DELIM}
-# (1/19/2018) - pdsh slurm module not yet compatabile with newer slurm, removing for now
-#Requires: pdsh-mod-slurm%{PROJ_DELIM}
+Requires: pdsh-mod-slurm%{PROJ_DELIM}
%description -n %{PROJ_NAME}-slurm-server
Collection of server packages for SLURM
|
bugfix in Diemer15, Prada12 | @@ -132,8 +132,8 @@ class ConcentrationDiemer15(Concentration):
def _check_mdef(self, mdef):
if isinstance(mdef.Delta, str):
return True
- elif (int(mdef.Delta) != 200) and \
- (mdef.rho_type != 'critical'):
+ elif not ((int(mdef.Delta) == 200) and \
+ (mdef.rho_type == 'critical')):
return True
return False
@@ -239,8 +239,8 @@ class ConcentrationPrada12(Concentration):
def _check_mdef(self, mdef):
if isinstance(mdef.Delta, str):
return True
- elif (int(mdef.Delta) != 200) and \
- (mdef.rho_type != 'critical'):
+ elif not ((int(mdef.Delta) == 200) and \
+ (mdef.rho_type == 'critical')):
return True
return False
@@ -353,35 +353,6 @@ class ConcentrationDuffy08(Concentration):
return self.A * (M * M_pivot_inv)**self.B * a**(-self.C)
-class ConcentrationConstant(Concentration):
- """ Constant contentration-mass relation.
-
- Args:
- c (float): constant concentration value.
- mdef (:class:`~pyccl.halos.massdef.MassDef`): a mass
- definition object that fixes
- the mass definition used by this c(M)
- parametrization. In this case it's arbitrary.
- """
- name = 'Constant'
-
- def __init__(self, c=1, mdef=None):
- self.c = c
- super(ConcentrationConstant, self).__init__(mdef)
-
- def _default_mdef(self):
- self.mdef = MassDef(200, 'critical')
-
- def _check_mdef(self, mdef):
- return False
-
- def _concentration(self, cosmo, M, a):
- if np.ndim(M) == 0:
- return self.c
- else:
- return self.c * np.ones(M.size)
-
-
class ConcentrationIshiyama21(Concentration):
""" Concentration-mass relation by Ishiyama et al. 2021
(arXiv:2007.14720). This parametrization is only valid for
@@ -547,6 +518,35 @@ class ConcentrationIshiyama21(Concentration):
return c
+class ConcentrationConstant(Concentration):
+ """ Constant contentration-mass relation.
+
+ Args:
+ c (float): constant concentration value.
+ mdef (:class:`~pyccl.halos.massdef.MassDef`): a mass
+ definition object that fixes
+ the mass definition used by this c(M)
+ parametrization. In this case it's arbitrary.
+ """
+ name = 'Constant'
+
+ def __init__(self, c=1, mdef=None):
+ self.c = c
+ super(ConcentrationConstant, self).__init__(mdef)
+
+ def _default_mdef(self):
+ self.mdef = MassDef(200, 'critical')
+
+ def _check_mdef(self, mdef):
+ return False
+
+ def _concentration(self, cosmo, M, a):
+ if np.ndim(M) == 0:
+ return self.c
+ else:
+ return self.c * np.ones(M.size)
+
+
def concentration_from_name(name):
""" Returns halo concentration subclass from name string
|
[Realtek][RTL8721CSM] apps/examples/nettest/ :1st commit for Netork manager porting in apps
Porting network manager on RTL8721CSM board. 1st commit for the changes in apps, nettest example modification, setsockopt before bind. | @@ -381,6 +381,12 @@ void ipmcast_sender_thread(int num_packets, uint32_t sleep_time, const char *int
groupSock.sin_addr.s_addr = inet_addr(g_app_target_addr);
groupSock.sin_port = htons(g_app_target_port);
+ if (setsockopt(sd, IPPROTO_IP, IP_MULTICAST_IF, (char *)&localInterface, sizeof(localInterface)) < 0) {
+ printf("[MCASTCLIENT] [ERR] Failed setting local interface");
+ goto out_with_socket;
+ }
+ printf("[MCASTCLIENT] setsockopt IP_MULTICAST_IF success\n");
+
/*
* Set local interface for outbound multicast datagrams.
* The IP address specified must be associated with a local,
@@ -395,12 +401,6 @@ void ipmcast_sender_thread(int num_packets, uint32_t sleep_time, const char *int
printf("[MCASTCLIENT] group address(%s)\n", g_app_target_addr);
printf("[MCASTCLIENT] port(%d)\n", g_app_target_port);
- if (setsockopt(sd, IPPROTO_IP, IP_MULTICAST_IF, (char *)&localInterface, sizeof(localInterface)) < 0) {
- printf("[MCASTCLIENT] [ERR] Failed setting local interface");
- goto out_with_socket;
- }
- printf("[MCASTCLIENT] setsockopt IP_MULTICAST_IF success\n");
-
/*
* Send a message to the multicast group specified by the
* groupSock sockaddr structure.
@@ -471,6 +471,13 @@ void ipmcast_receiver_thread(int num_packets, const char *intf)
localSock.sin_port = htons(g_app_target_port);
localSock.sin_addr.s_addr = INADDR_ANY;
+ group.imr_interface.s_addr = INADDR_ANY;
+ group.imr_multiaddr.s_addr = inet_addr(g_app_target_addr);
+ if (setsockopt(sd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&group, sizeof(group)) < 0) {
+ printf("[MCASTSERV] fail: adding multicast group %d\n", errno);
+ goto out_with_socket;
+ }
+
if (bind(sd, (struct sockaddr *)&localSock, sizeof(localSock))) {
printf("[MCASTSERV] ERR: binding datagram socket\n");
goto out_with_socket;
@@ -494,12 +501,6 @@ void ipmcast_receiver_thread(int num_packets, const char *intf)
printf("[MCASTSERV] group address(%s)\n", g_app_target_addr);
printf("[MCASTSERV] port(%d)\n", g_app_target_port);
- group.imr_multiaddr.s_addr = inet_addr(g_app_target_addr);
- if (setsockopt(sd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&group, sizeof(group)) < 0) {
- printf("[MCASTSERV] fail: adding multicast group %d\n", errno);
- goto out_with_socket;
- }
-
printf("[MCASTSERV] join multicast success\n");
/*
* Read from the socket.
@@ -929,3 +930,4 @@ err_with_input:
show_usage();
return -1;
}
+
|
Added doxygen script for audio framework | */
/**
-* @ingroup TinyAlsa
* @defgroup TinyAlsa TinyAlsa
-* @brief All macros, structures and functions that make up the PCM interface.
+* @ingroup TinyAlsa
+* @brief Provides APIs for Audio Framework
* @{
*/
+/**
+ * @file tinyalsa.h
+ * @brief All macros, structures and functions that make up the PCM interface.
+ */
+
#ifndef __AUDIO_TINYALSA_H
#define __AUDIO_TINYALSA_H
|
Fix FateContext XZY -> XYZ -> Vec3 | +using System.Numerics;
using System.Runtime.InteropServices;
using FFXIVClientStructs.FFXIV.Client.System.String;
@@ -13,9 +14,7 @@ namespace FFXIVClientStructs.FFXIV.Client.Game.Fate
[FieldOffset(0x3AC)] public byte State;
[FieldOffset(0x3B8)] public byte Progress;
[FieldOffset(0x3F9)] public byte Level;
- [FieldOffset(0x450)] public float X;
- [FieldOffset(0x454)] public float Z;
- [FieldOffset(0x458)] public float Y;
+ [FieldOffset(0x450)] public Vector3 Location;
[FieldOffset(0x464)] public float Radius;
[FieldOffset(0x74E)] public ushort TerritoryID;
}
|
Tentative IPsec test case | #include "test.h"
-fake_cmd_t t4p4s_testcase_test[][RTE_MAX_LCORE] = {
- {
- FAST(0,0, hETH4("DDDDDDDD0000", ETH01), "0000000000000000000029f0", "12345678", "0a006363", "abcd"),
-
- FEND,
- },
-
- {
- FEND,
- },
-};
+fake_cmd_t t4p4s_testcase_test[][RTE_MAX_LCORE] = SINGLE_LCORE(
+ #define cHMAC12B "00000000800800df67020100"
+ FAST(0, 0, IN(hETH4("DDDDDDDD0000", ETH01)), IN(hMISC(IPv4, "0000000000000000000029f0" "1234" "5678" "0a006363")), IN(PAYLOAD("abcd")),
+ OUT(hMISC(IPsec, "003ba40201000000003b646b00000000800001000100ffff0000000000000000000000004200000074000000000000000000" cHMAC12B)))
+ );
testcase_t t4p4s_test_suite[MAX_TESTCASES] = {
{ "test", &t4p4s_testcase_test, "v1model" },
|
Replace string literals in src/vcf/validator.cpp | @@ -162,11 +162,11 @@ namespace ebi
std::string provided_version{line.substr(common_substring.size())};
util::remove_end_of_line(provided_version);
- if (provided_version == "VCFv4.1") {
+ if (provided_version == VCF_V41) {
return Version::v41;
- } else if (provided_version == "VCFv4.2") {
+ } else if (provided_version == VCF_V42) {
return Version::v42;
- } else if (provided_version == "VCFv4.3") {
+ } else if (provided_version == VCF_V43) {
return Version::v43;
}
}
|
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.