Merge pull request #9751 from AriParkkila/athandler-set_at_timeout

Cruz Monrreal · web-flow · commit 2234dac127e4 · 2019-02-19T15:29:38.000-06:00
Cellular: Fix ATHandler set/restore_at_timeout with mutex lock
diff --git a/features/cellular/framework/AT/ATHandler.cpp b/features/cellular/framework/AT/ATHandler.cpp
@@ -273,20 +273,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
`@@ -273,20 +273,24 @@ nsapi_error_t ATHandler::unlock_return_error()`
`273`	`273`
`274`	`274`	`void ATHandler::set_at_timeout(uint32_t timeout_milliseconds, bool default_timeout)`
`275`	`275`	`{`
	`276`	`+ lock();`
`276`	`277`	`if (default_timeout) {`
`277`	`278`	`_previous_at_timeout = timeout_milliseconds;`
`278`	`279`	`_at_timeout = timeout_milliseconds;`
`279`	`280`	`} else if (timeout_milliseconds != _at_timeout) {`
`280`	`281`	`_previous_at_timeout = _at_timeout;`
`281`	`282`	`_at_timeout = timeout_milliseconds;`
`282`	`283`	`}`
	`284`	`+ unlock();`
`283`	`285`	`}`
`284`	`286`
`285`	`287`	`void ATHandler::restore_at_timeout()`
`286`	`288`	`{`
	`289`	`+ lock();`
`287`	`290`	`if (_previous_at_timeout != _at_timeout) {`
`288`	`291`	`_at_timeout = _previous_at_timeout;`
`289`	`292`	`}`
	`293`	`+ unlock();`
`290`	`294`	`}`
`291`	`295`
`292`	`296`	`void ATHandler::process_oob()`