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

Commit 30240f61 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Redefine meaning of DAB/FM linking. 

Bug: 69958423
Test: VTS
Change-Id: I0ab4ddd6fc34f12720085cca9d0b821ec660a5c8
parent a2d9704c

broadcastradio/2.0/types.hal

+9 −13
Original line number Diff line number Diff line
@@ -86,21 +86,17 @@ enum ConfigFlag : uint32_t { 
     */

    RDS_REG,



    /**

     * Enables DAB implicit linking, based on program identifiers

     * (DAB SId, RDS PI).

     */

    DAB_IMPLICIT_LINKING,

    /** Enables DAB-DAB hard- and implicit-linking (the same content). */

    DAB_DAB_LINKING,



    /**

     * Enables DAB hard linking (the same content).

     */

    DAB_HARD_LINKING,

    /** Enables DAB-FM hard- and implicit-linking (the same content). */

    DAB_FM_LINKING,



    /**

     * Enables DAB hard linking (related content).

     */

    DAB_SOFT_LINKING,

    /** Enables DAB-DAB soft-linking (related content). */

    DAB_DAB_SOFT_LINKING,



    /** Enables DAB-FM soft-linking (related content). */

    DAB_FM_SOFT_LINKING,

};



/**

broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp

+9 −3
Original line number Diff line number Diff line
@@ -58,9 +58,15 @@ static constexpr auto tune = 30s; 
}  // namespace timeout



static const ConfigFlag gConfigFlagValues[] = {

    ConfigFlag::FORCE_MONO,       ConfigFlag::FORCE_ANALOG,     ConfigFlag::FORCE_DIGITAL,

    ConfigFlag::RDS_AF,           ConfigFlag::RDS_REG,          ConfigFlag::DAB_IMPLICIT_LINKING,

    ConfigFlag::DAB_HARD_LINKING, ConfigFlag::DAB_SOFT_LINKING,

    ConfigFlag::FORCE_MONO,

    ConfigFlag::FORCE_ANALOG,

    ConfigFlag::FORCE_DIGITAL,

    ConfigFlag::RDS_AF,

    ConfigFlag::RDS_REG,

    ConfigFlag::DAB_DAB_LINKING,

    ConfigFlag::DAB_FM_LINKING,

    ConfigFlag::DAB_DAB_SOFT_LINKING,

    ConfigFlag::DAB_FM_SOFT_LINKING,

};



struct TunerCallbackMock : public ITunerCallback {