From fc4ed93e0857f5f775c4767290785eb90ee57ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Teppo=20J=C3=A4rvelin?= <teppo.jarvelin@arm.com>
Date: Fri, 14 Dec 2018 09:27:51 +0200
Subject: [PATCH] Cellular: Fix to use PPP stack in PPP mode

In QUECTEL_BG96 and QUECTEL_BC95 there was missing #ifdefs for
PPP mode and our stack was used. Also BG96 needed to be added
AT_CellularBase::AT_CGDATA as not supported.
---
 .../targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.cpp       | 2 ++
 .../targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.h         | 2 ++
 .../cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96.cpp    | 1 +
 .../targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.cpp       | 2 ++
 .../targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.h         | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.cpp b/features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.cpp
index f6d5e5a6ef..0f87bac48c 100644
--- a/features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.cpp
+++ b/features/cellular/framework/targets/QUECTEL/BC95/QUECTEL_BC95_CellularContext.cpp
@@ -28,6 +28,7 @@ QUECTEL_BC95_CellularContext::~QUECTEL_BC95_CellularContext()
 {
 }
 
+#if !NSAPI_PPP_AVAILABLE
 NetworkStack *QUECTEL_BC95_CellularContext::get_stack()
 {
     if (!_stack) {
@@ -35,6 +36,7 @@ NetworkStack *QUECTEL_BC95_CellularContext::get_stack()
     }
     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
index e241275aeb..d1421c20b5 100644
--- 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 @@ public:
     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
index c63feb2888..e07b7001c0 100644
--- 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
index 295b0d3af9..73a971df52 100644
--- a/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.cpp
+++ b/features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularContext.cpp
@@ -36,6 +36,7 @@ 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) {
@@ -43,6 +44,7 @@ NetworkStack *QUECTEL_BG96_CellularContext::get_stack()
     }
     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
index 363aaa095e..89d20fc231 100644
--- 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 @@ public:
 
 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();
 };