mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-19 19:40:56 +00:00
avoid 802.15.4 using a standard BSD function name, enable BSD test after mg_error() fix
This commit is contained in:
1 parent
8296b88fb6
commit
b766c65615
3 files changed
+5
-12
No files matched your search
+3
-3
@@ -5781,7 +5781,7 @@ size_t mg_l2_driver_output(struct mg_tcpip_if *ifp, size_t len) {
|
|||||||
#define MGI_802154_DATA (125 - MGI_802154_HDR)
|
#define MGI_802154_DATA (125 - MGI_802154_HDR)
|
||||||
|
|
||||||
size_t mg_l2_802154_tx(struct mg_tcpip_if *ifp, const void *buf, size_t len,
|
size_t mg_l2_802154_tx(struct mg_tcpip_if *ifp, const void *buf, size_t len,
|
||||||
size_t (*send)(const uint8_t *, size_t,
|
size_t (*send_fn)(const uint8_t *, size_t,
|
||||||
struct mg_tcpip_if *)) {
|
struct mg_tcpip_if *)) {
|
||||||
struct mg_l2_802154_data *d =
|
struct mg_l2_802154_data *d =
|
||||||
(struct mg_l2_802154_data *) ifp->driver_data;
|
(struct mg_l2_802154_data *) ifp->driver_data;
|
||||||
@@ -5799,7 +5799,7 @@ size_t mg_l2_802154_tx(struct mg_tcpip_if *ifp, const void *buf, size_t len,
|
|||||||
f[12] = m[2], f[13] = m[1], f[14] = m[0]; // Little endian EUI-64
|
f[12] = m[2], f[13] = m[1], f[14] = m[0]; // Little endian EUI-64
|
||||||
f[15] = d->tag, f[16] = (uint8_t) ((i << 4) | last);
|
f[15] = d->tag, f[16] = (uint8_t) ((i << 4) | last);
|
||||||
memcpy(f + MGI_802154_HDR, p + i * MGI_802154_DATA, n);
|
memcpy(f + MGI_802154_HDR, p + i * MGI_802154_DATA, n);
|
||||||
if (send(f, MGI_802154_HDR + n, ifp) == 0) return 0;
|
if (send_fn(f, MGI_802154_HDR + n, ifp) == 0) return 0;
|
||||||
}
|
}
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
@@ -34528,7 +34528,7 @@ static bool st67w6_init(uint8_t *mac) {
|
|||||||
}
|
}
|
||||||
// set clock, who cares ???
|
// set clock, who cares ???
|
||||||
if (!st67w6_at_cmd("AT+GET_CLOCK\r\n", 14)) return false;
|
if (!st67w6_at_cmd("AT+GET_CLOCK\r\n", 14)) return false;
|
||||||
MG_DEBUG(("%.*s", s_at_resp_len, at_resp)); // TODO(scaprile): --> VERBOSE
|
MG_VERBOSE(("%.*s", s_at_resp_len, at_resp));
|
||||||
// BT-ENABLED DEPENDENCY
|
// BT-ENABLED DEPENDENCY
|
||||||
|
|
||||||
// MODULE DEPENDENCY
|
// MODULE DEPENDENCY
|
||||||
|
|||||||
+2
-2
@@ -11,7 +11,7 @@
|
|||||||
#define MGI_802154_DATA (125 - MGI_802154_HDR)
|
#define MGI_802154_DATA (125 - MGI_802154_HDR)
|
||||||
|
|
||||||
size_t mg_l2_802154_tx(struct mg_tcpip_if *ifp, const void *buf, size_t len,
|
size_t mg_l2_802154_tx(struct mg_tcpip_if *ifp, const void *buf, size_t len,
|
||||||
size_t (*send)(const uint8_t *, size_t,
|
size_t (*send_fn)(const uint8_t *, size_t,
|
||||||
struct mg_tcpip_if *)) {
|
struct mg_tcpip_if *)) {
|
||||||
struct mg_l2_802154_data *d =
|
struct mg_l2_802154_data *d =
|
||||||
(struct mg_l2_802154_data *) ifp->driver_data;
|
(struct mg_l2_802154_data *) ifp->driver_data;
|
||||||
@@ -29,7 +29,7 @@ size_t mg_l2_802154_tx(struct mg_tcpip_if *ifp, const void *buf, size_t len,
|
|||||||
f[12] = m[2], f[13] = m[1], f[14] = m[0]; // Little endian EUI-64
|
f[12] = m[2], f[13] = m[1], f[14] = m[0]; // Little endian EUI-64
|
||||||
f[15] = d->tag, f[16] = (uint8_t) ((i << 4) | last);
|
f[15] = d->tag, f[16] = (uint8_t) ((i << 4) | last);
|
||||||
memcpy(f + MGI_802154_HDR, p + i * MGI_802154_DATA, n);
|
memcpy(f + MGI_802154_HDR, p + i * MGI_802154_DATA, n);
|
||||||
if (send(f, MGI_802154_HDR + n, ifp) == 0) return 0;
|
if (send_fn(f, MGI_802154_HDR + n, ifp) == 0) return 0;
|
||||||
}
|
}
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -555,7 +555,6 @@ static void task2(void *args) {
|
|||||||
DASHBOARD("select_child_write");
|
DASHBOARD("select_child_write");
|
||||||
DASHBOARD("poll_child_write");
|
DASHBOARD("poll_child_write");
|
||||||
|
|
||||||
#if 0
|
|
||||||
s_error = false;
|
s_error = false;
|
||||||
s_backlog_ready = s_backlog_full = s_backlog_accept = false;
|
s_backlog_ready = s_backlog_full = s_backlog_accept = false;
|
||||||
ASSERT(xTaskCreate(backlog_task, "backlog", 512, NULL,
|
ASSERT(xTaskCreate(backlog_task, "backlog", 512, NULL,
|
||||||
@@ -570,12 +569,6 @@ static void task2(void *args) {
|
|||||||
while (!client_done(first, &status)) vTaskDelay(1);
|
while (!client_done(first, &status)) vTaskDelay(1);
|
||||||
check_client(status);
|
check_client(status);
|
||||||
DASHBOARD("listen_backlog");
|
DASHBOARD("listen_backlog");
|
||||||
#else
|
|
||||||
(void) first;
|
|
||||||
(void) second;
|
|
||||||
(void) status;
|
|
||||||
(void) backlog_task;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
s_error = false;
|
s_error = false;
|
||||||
// atask at higher priority than task1
|
// atask at higher priority than task1
|
||||||
|
|||||||
Reference in new issue
Block a user