Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcf0785d authored by Etan Cohen's avatar Etan Cohen
Browse files

Add dummy interface combination for debugging 

Add another dummy interface combination to be used for debugging:
  STA+(STA||P2P||NAN||AP)

Bug: 211919010
Test: adb shell setprop persist.vendor.debug.wifi.hal.preset_interface_combination_idx 5
Change-Id: I0499da1d0920ce03fe142f5b0936c6efe0dcf21a
parent 3b417508

wifi/1.5/default/wifi_feature_flags.cpp

+15 −16
Original line number Diff line number Diff line
@@ -157,43 +157,42 @@ constexpr char kDebugPresetInterfaceCombinationIdxProperty[] = 
// List of pre-defined interface combinations that can be enabled at runtime via

// setting the property: "kDebugPresetInterfaceCombinationIdxProperty" to the

// corresponding index value.

static const std::vector<

    std::pair<std::string, std::vector<IWifiChip::ChipMode>>>

    kDebugChipModes{

static const std::vector<std::pair<std::string, std::vector<IWifiChip::ChipMode>>> kDebugChipModes{

        // Legacy combination - No STA/AP concurrencies.

        // 0 - (1 AP) or (1 STA + 1 of (P2P or NAN))

        {"No STA/AP Concurrency",

         {{kMainModeId,

           ChipIfaceCombination::make_vec(

               {{{{AP}, 1}}, {{{STA}, 1}, {{P2P, NAN}, 1}}})}}},

           ChipIfaceCombination::make_vec({{{{AP}, 1}}, {{{STA}, 1}, {{P2P, NAN}, 1}}})}}},



        // STA + AP concurrency

        // 1 - (1 STA + 1 AP) or (1 STA + 1 of (P2P or NAN))

        {"STA + AP Concurrency",

         {{kMainModeId,

           ChipIfaceCombination::make_vec(

         {{kMainModeId, ChipIfaceCombination::make_vec(

                                {{{{STA}, 1}, {{AP}, 1}}, {{{STA}, 1}, {{P2P, NAN}, 1}}})}}},



        // STA + STA concurrency

        // 2 - (1 STA + 1 AP) or (2 STA + 1 of (P2P or NAN))

        {"Dual STA Concurrency",

         {{kMainModeId,

           ChipIfaceCombination::make_vec(

         {{kMainModeId, ChipIfaceCombination::make_vec(

                                {{{{STA}, 1}, {{AP}, 1}}, {{{STA}, 2}, {{P2P, NAN}, 1}}})}}},



        // AP + AP + STA concurrency

        // 3 - (1 STA + 2 AP) or (1 STA + 1 of (P2P or NAN))

        {"Dual AP Concurrency",

         {{kMainModeId,

           ChipIfaceCombination::make_vec(

         {{kMainModeId, ChipIfaceCombination::make_vec(

                                {{{{STA}, 1}, {{AP}, 2}}, {{{STA}, 1}, {{P2P, NAN}, 1}}})}}},



        // STA + STA concurrency and AP + AP + STA concurrency

        // 4 - (1 STA + 2 AP) or (2 STA + 1 of (P2P or NAN))

        {"Dual STA & Dual AP Concurrency",

         {{kMainModeId, ChipIfaceCombination::make_vec(

                                {{{{STA}, 1}, {{AP}, 2}}, {{{STA}, 2}, {{P2P, NAN}, 1}}})}}},



        // STA + STA concurrency

        // 5 - (1 STA + 1 AP (bridged or single) | P2P | NAN), or (2 STA))

        {"Dual STA or STA plus single other interface",

         {{kMainModeId,

           ChipIfaceCombination::make_vec(

               {{{{STA}, 1}, {{AP}, 2}}, {{{STA}, 2}, {{P2P, NAN}, 1}}})}}}};

           ChipIfaceCombination::make_vec({{{{STA}, 1}, {{P2P, NAN, AP}, 1}}, {{{STA}, 2}}})}}}};



#undef STA

#undef AP