giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into contrib/log-snprintf

Browse Source
This commit is contained in:
George Oikonomou 2018-05-17 22:51:40 +01:00 committed by GitHub
commit 0903da2fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -58,6 +58,8 @@ COOJA.testlog
*.err *.err
summary summary
tests/[0-9][0-9]-*/org/ tests/[0-9][0-9]-*/org/
tests/18-coap-lwm2m/Californium.properties
tests/18-coap-lwm2m/leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar
# x86 UEFI files # x86 UEFI files
cpu/x86/uefi/Makefile.uefi cpu/x86/uefi/Makefile.uefi

1
os/net/mac/ble/ble-l2cap.c
View File

@ -512,7 +512,6 @@ const struct mac_driver ble_l2cap_driver = {
input, input,
on, on,
off, off,
NULL,
}; };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(ble_l2cap_tx_process, ev, data) PROCESS_THREAD(ble_l2cap_tx_process, ev, data)

1
os/services/ip64/ip64-arp.c
View File

@ -94,7 +94,6 @@ struct arp_entry {
static const struct ip64_eth_addr broadcast_ethaddr = static const struct ip64_eth_addr broadcast_ethaddr =
{{0xff,0xff,0xff,0xff,0xff,0xff}}; {{0xff,0xff,0xff,0xff,0xff,0xff}};
static const uint16_t broadcast_ipaddr[2] = {0xffff,0xffff};
static struct arp_entry arp_table[UIP_ARPTAB_SIZE]; static struct arp_entry arp_table[UIP_ARPTAB_SIZE];