Skip to content

Commit 1375c89

Browse files
author
Veijo Pesonen
committed
Renames identifiers related to global event queue
1 parent c8a4b6c commit 1375c89

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

ESP8266Interface.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ESP8266Interface::ESP8266Interface()
5353
_started(false),
5454
_conn_stat(NSAPI_STATUS_DISCONNECTED),
5555
_conn_stat_cb(NULL),
56-
_geq(NULL),
56+
_global_event_queue(NULL),
5757
_oob_event_id(0)
5858
{
5959
memset(_cbs, 0, sizeof(_cbs));
@@ -79,7 +79,7 @@ ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug, PinName r
7979
_started(false),
8080
_conn_stat(NSAPI_STATUS_DISCONNECTED),
8181
_conn_stat_cb(NULL),
82-
_geq(NULL),
82+
_global_event_queue(NULL),
8383
_oob_event_id(0)
8484
{
8585
memset(_cbs, 0, sizeof(_cbs));
@@ -99,7 +99,7 @@ ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug, PinName r
9999
ESP8266Interface::~ESP8266Interface()
100100
{
101101
if (_oob_event_id) {
102-
_geq->cancel(_oob_event_id);
102+
_global_event_queue->cancel(_oob_event_id);
103103
}
104104
}
105105

@@ -118,10 +118,10 @@ int ESP8266Interface::connect(const char *ssid, const char *pass, nsapi_security
118118
return connect();
119119
}
120120

121-
void ESP8266Interface::_oob2geq()
121+
void ESP8266Interface::_oob2global_event_queue()
122122
{
123-
_geq = mbed_event_queue();
124-
_oob_event_id = _geq->call_every(ESP8266_RECV_TIMEOUT, callback(this, &ESP8266Interface::proc_oob_evnt));
123+
_global_event_queue = mbed_event_queue();
124+
_oob_event_id = _global_event_queue->call_every(ESP8266_RECV_TIMEOUT, callback(this, &ESP8266Interface::proc_oob_evnt));
125125

126126
if (!_oob_event_id) {
127127
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER, MBED_ERROR_CODE_ENOMEM), \
@@ -149,7 +149,7 @@ int ESP8266Interface::connect()
149149
}
150150

151151
if (!_oob_event_id) {
152-
_oob2geq();
152+
_oob2global_event_queue();
153153
}
154154

155155
if(get_ip_address()) {
@@ -655,7 +655,7 @@ void ESP8266Interface::update_conn_state_cb()
655655
default:
656656
_started = false;
657657
_initialized = false;
658-
_geq->cancel(_oob_event_id);
658+
_global_event_queue->cancel(_oob_event_id);
659659
_oob_event_id = 0;
660660
_conn_stat = NSAPI_STATUS_DISCONNECTED;
661661
}

ESP8266Interface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,10 @@ class ESP8266Interface : public NetworkStack, public WiFiInterface
371371

372372
// Background OOB processing
373373
// Use global EventQueue
374-
events::EventQueue *_geq;
374+
events::EventQueue *_global_event_queue;
375375
int _oob_event_id;
376376
void proc_oob_evnt();
377-
void _oob2geq();
377+
void _oob2global_event_queue();
378378
};
379379

380380
#endif

0 commit comments

Comments
 (0)