Cellular: Fix ATHandler set/restore_at_timeout with mutex lock

Ari Parkkila · Ari Parkkila · commit d48adcce2c06 · 2019-02-19T00:16:45.000-08:00
diff --git a/features/cellular/framework/AT/ATHandler.cpp b/features/cellular/framework/AT/ATHandler.cpp
@@ -272,20 +272,24 @@ nsapi_error_t ATHandler::unlock_return_error()
 
 void ATHandler::set_at_timeout(uint32_t timeout_milliseconds, bool default_timeout)
 {
+    lock();
     if (default_timeout) {
         _previous_at_timeout = timeout_milliseconds;
         _at_timeout = timeout_milliseconds;
     } else if (timeout_milliseconds != _at_timeout) {
         _previous_at_timeout = _at_timeout;
         _at_timeout = timeout_milliseconds;
     }
+    unlock();
 }
 
 void ATHandler::restore_at_timeout()
 {
+    lock();
     if (_previous_at_timeout != _at_timeout) {
         _at_timeout = _previous_at_timeout;
     }
+    unlock();
 }
 
 void ATHandler::process_oob()

Original file line number	Diff line number	Diff line change
`@@ -272,20 +272,24 @@ nsapi_error_t ATHandler::unlock_return_error()`
`272`	`272`
`273`	`273`	`void ATHandler::set_at_timeout(uint32_t timeout_milliseconds, bool default_timeout)`
`274`	`274`	`{`
	`275`	`+ lock();`
`275`	`276`	`if (default_timeout) {`
`276`	`277`	`_previous_at_timeout = timeout_milliseconds;`
`277`	`278`	`_at_timeout = timeout_milliseconds;`
`278`	`279`	`} else if (timeout_milliseconds != _at_timeout) {`
`279`	`280`	`_previous_at_timeout = _at_timeout;`
`280`	`281`	`_at_timeout = timeout_milliseconds;`
`281`	`282`	`}`
	`283`	`+ unlock();`
`282`	`284`	`}`
`283`	`285`
`284`	`286`	`void ATHandler::restore_at_timeout()`
`285`	`287`	`{`
	`288`	`+ lock();`
`286`	`289`	`if (_previous_at_timeout != _at_timeout) {`
`287`	`290`	`_at_timeout = _previous_at_timeout;`
`288`	`291`	`}`
	`292`	`+ unlock();`
`289`	`293`	`}`
`290`	`294`
`291`	`295`	`void ATHandler::process_oob()`