Merge pull request #9101 from jarvte/fix_pppmode_wrong_stack

Cruz Monrreal · web-flow · commit 6380d8826e80 · 2018-12-14T10:13:52.000-06:00
Cellular: Fix to use PPP stack in PPP mode
diff --git a/features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.cpp b/features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.cpp
@@ -28,13 +28,15 @@ QUECTEL_BC95_CellularContext::~QUECTEL_BC95_CellularContext()
 {
 }
 
+#if !NSAPI_PPP_AVAILABLE
 NetworkStack *QUECTEL_BC95_CellularContext::get_stack()
 {
     if (!_stack) {
         _stack = new QUECTEL_BC95_CellularStack(_at, _cid, _ip_stack_type);
     }
     return _stack;
 }
+#endif // #if !NSAPI_PPP_AVAILABLE
 
 bool QUECTEL_BC95_CellularContext::stack_type_supported(nsapi_ip_stack_t stack_type)
 {
diff --git a/features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.h b/features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.h
@@ -27,7 +27,9 @@ class QUECTEL_BC95_CellularContext: public AT_CellularContext {
     virtual ~QUECTEL_BC95_CellularContext();
 
 protected:
+#if !NSAPI_PPP_AVAILABLE
     virtual NetworkStack *get_stack();
+#endif // #if !NSAPI_PPP_AVAILABLE
     virtual bool stack_type_supported(nsapi_ip_stack_t stack_type);
 };
 
diff --git a/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96.cpp b/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96.cpp
@@ -34,6 +34,7 @@ using namespace events;
 
 static const AT_CellularBase::SupportedFeature unsupported_features[] =  {
     AT_CellularBase::AT_CGSN_WITH_TYPE,
+    AT_CellularBase::AT_CGDATA,
     AT_CellularBase::SUPPORTED_FEATURE_END_MARK
 };
 
diff --git a/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.cpp b/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.cpp
@@ -36,13 +36,15 @@ bool QUECTEL_BG96_CellularContext::stack_type_supported(nsapi_ip_stack_t stack_t
     return false;
 }
 
+#if !NSAPI_PPP_AVAILABLE
 NetworkStack *QUECTEL_BG96_CellularContext::get_stack()
 {
     if (!_stack) {
         _stack = new QUECTEL_BG96_CellularStack(_at, _cid, _ip_stack_type);
     }
     return _stack;
 }
+#endif // #if !NSAPI_PPP_AVAILABLE
 
 nsapi_error_t QUECTEL_BG96_CellularContext::do_user_authentication()
 {
diff --git a/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.h b/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.h
@@ -28,7 +28,9 @@ class QUECTEL_BG96_CellularContext: public AT_CellularContext {
 
 protected:
     virtual bool stack_type_supported(nsapi_ip_stack_t stack_type);
+#if !NSAPI_PPP_AVAILABLE
     virtual NetworkStack *get_stack();
+#endif // #if !NSAPI_PPP_AVAILABLE
     virtual nsapi_error_t do_user_authentication();
 };
 

Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,15 @@ QUECTEL_BC95_CellularContext::~QUECTEL_BC95_CellularContext()`
`28`	`28`	`{`
`29`	`29`	`}`
`30`	`30`
	`31`	`+#if !NSAPI_PPP_AVAILABLE`
`31`	`32`	`NetworkStack *QUECTEL_BC95_CellularContext::get_stack()`
`32`	`33`	`{`
`33`	`34`	`if (!_stack) {`
`34`	`35`	`_stack = new QUECTEL_BC95_CellularStack(_at, _cid, _ip_stack_type);`
`35`	`36`	`}`
`36`	`37`	`return _stack;`
`37`	`38`	`}`
	`39`	`+#endif // #if !NSAPI_PPP_AVAILABLE`
`38`	`40`
`39`	`41`	`bool QUECTEL_BC95_CellularContext::stack_type_supported(nsapi_ip_stack_t stack_type)`
`40`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,15 @@ bool QUECTEL_BG96_CellularContext::stack_type_supported(nsapi_ip_stack_t stack_t`
`36`	`36`	`return false;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+#if !NSAPI_PPP_AVAILABLE`
`39`	`40`	`NetworkStack *QUECTEL_BG96_CellularContext::get_stack()`
`40`	`41`	`{`
`41`	`42`	`if (!_stack) {`
`42`	`43`	`_stack = new QUECTEL_BG96_CellularStack(_at, _cid, _ip_stack_type);`
`43`	`44`	`}`
`44`	`45`	`return _stack;`
`45`	`46`	`}`
	`47`	`+#endif // #if !NSAPI_PPP_AVAILABLE`
`46`	`48`
`47`	`49`	`nsapi_error_t QUECTEL_BG96_CellularContext::do_user_authentication()`
`48`	`50`	`{`