Skip to content

Commit 42cc305

Browse files
committed
Merge branch 'master' of https://github.com/mbedmicro/mbed
2 parents 7173cad + d1d900d commit 42cc305

File tree

13 files changed

+1199
-1210
lines changed

13 files changed

+1199
-1210
lines changed

libraries/mbed/api/mbed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef MBED_H
1717
#define MBED_H
1818

19-
#define MBED_LIBRARY_VERSION 95
19+
#define MBED_LIBRARY_VERSION 96
2020

2121
#include "platform.h"
2222

libraries/mbed/common/us_ticker_api.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,17 @@ void us_ticker_insert_event(ticker_event_t *obj, timestamp_t timestamp, uint32_t
7777
prev = p;
7878
p = p->next;
7979
}
80+
81+
/* if we're at the end p will be NULL, which is correct */
82+
obj->next = p;
83+
8084
/* if prev is NULL we're at the head */
8185
if (prev == NULL) {
8286
head = obj;
8387
us_ticker_set_interrupt(timestamp);
8488
} else {
8589
prev->next = obj;
8690
}
87-
/* if we're at the end p will be NULL, which is correct */
88-
obj->next = p;
8991

9092
__enable_irq();
9193
}

0 commit comments

Comments
 (0)