mirror of
https://github.com/espressif/openthread.git
synced 2026-08-03 17:37:46 +00:00
[instance] define ot::Instance class (#2307)
This commit makes the following changes: It defines the public `otInstance` as an empty opaque structure which is used by all public C OpenThread APIs. It defines a new class `ot::Instance` (inheriting from `otInstance) which is then used in core source files. The functionality related to the instance is also moved/added into the newly added `Instance` class (as class/static or member methods).
This commit is contained in:
committed by
Jonathan Hui
parent
a394155372
commit
02c876ef62
@@ -36,7 +36,7 @@ using ot::Encoding::BigEndian::HostSwap16;
|
||||
|
||||
namespace ot {
|
||||
|
||||
otInstance *sInstance;
|
||||
ot::Instance *sInstance;
|
||||
Ip6::Ip6 *sIp6;
|
||||
ThreadNetif *sThreadNetif;
|
||||
Lowpan::Lowpan *sLowpan;
|
||||
@@ -176,7 +176,7 @@ static void Test(TestIphcVector &aVector, bool aCompress, bool aDecompress)
|
||||
|
||||
if (aCompress)
|
||||
{
|
||||
VerifyOrQuit((message = sInstance->mMessagePool.New(Message::kTypeIp6, 0)) != NULL,
|
||||
VerifyOrQuit((message = sInstance->GetMessagePool().New(Message::kTypeIp6, 0)) != NULL,
|
||||
"6lo: Ip6::NewMessage failed");
|
||||
|
||||
aVector.GetUncompressedStream(*message);
|
||||
@@ -211,7 +211,7 @@ static void Test(TestIphcVector &aVector, bool aCompress, bool aDecompress)
|
||||
|
||||
if (aDecompress)
|
||||
{
|
||||
VerifyOrQuit((message = sInstance->mMessagePool.New(Message::kTypeIp6, 0)) != NULL,
|
||||
VerifyOrQuit((message = sInstance->GetMessagePool().New(Message::kTypeIp6, 0)) != NULL,
|
||||
"6lo: Ip6::NewMessage failed");
|
||||
|
||||
int decompressedBytes = sLowpan->Decompress(*message, aVector.mMacSource, aVector.mMacDestination,
|
||||
@@ -1866,8 +1866,8 @@ void TestLowpanIphc(void)
|
||||
|
||||
VerifyOrQuit(sInstance != NULL, "NULL instance");
|
||||
|
||||
sIp6 = &sInstance->mIp6;
|
||||
sThreadNetif = &sInstance->mThreadNetif;
|
||||
sIp6 = &sInstance->GetIp6();
|
||||
sThreadNetif = &sInstance->GetThreadNetif();
|
||||
sLowpan = &sThreadNetif->GetLowpan();
|
||||
|
||||
Init();
|
||||
|
||||
Reference in New Issue
Block a user