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

Commit 7b3c541b authored by Giulio Cervera's avatar Giulio Cervera
Browse files

fmradio: cleanup QCOM_HARDWARE/STE_FM defs and ifdef 

Change-Id: I00b5e6536511b3bedee6105bf010ee2b5f2e36ac
parent 1c8f8ce4

include/system/audio.h

+12 −13
Original line number Diff line number Diff line
@@ -68,7 +68,10 @@ typedef enum { 
                                          /* An example of remote presentation is Wifi Display */

                                          /*  where a dongle attached to a TV can be used to   */

                                          /*  play the mix captured by this audio source.      */

    AUDIO_SOURCE_FM_RADIO_RX         = 9,

#if defined(QCOM_FM_ENABLED) || defined(STE_FM)

    AUDIO_SOURCE_FM_RX               = 9,

    AUDIO_SOURCE_FM_RX_A2DP          = 10,

#endif

    AUDIO_SOURCE_CNT,

    AUDIO_SOURCE_MAX                 = AUDIO_SOURCE_CNT - 1,

} audio_source_t;
@@ -366,11 +369,10 @@ enum { 
    AUDIO_DEVICE_OUT_ANC_HEADSET               = 0x10000,

    AUDIO_DEVICE_OUT_ANC_HEADPHONE             = 0x20000,

    AUDIO_DEVICE_OUT_PROXY                     = 0x40000,

#endif

#if defined(QCOM_FM_ENABLED) || defined(STE_FM)

    AUDIO_DEVICE_OUT_FM                        = 0x80000,

    AUDIO_DEVICE_OUT_FM_TX                     = 0x100000,

#endif

#ifdef STE_FM

    AUDIO_DEVICE_OUT_FM_TX                     = 0x10000,

#endif

    AUDIO_DEVICE_OUT_DEFAULT                   = AUDIO_DEVICE_BIT_DEFAULT,

    AUDIO_DEVICE_OUT_ALL      = (AUDIO_DEVICE_OUT_EARPIECE |
@@ -393,10 +395,9 @@ enum { 
                                 AUDIO_DEVICE_OUT_ANC_HEADSET |

                                 AUDIO_DEVICE_OUT_ANC_HEADPHONE |

                                 AUDIO_DEVICE_OUT_PROXY |

                                 AUDIO_DEVICE_OUT_FM |

                                 AUDIO_DEVICE_OUT_FM_TX |

#endif

#ifdef STE_FM

#if defined(QCOM_FM_ENABLED) || defined(STE_FM)

                                 AUDIO_DEVICE_OUT_FM |

                                 AUDIO_DEVICE_OUT_FM_TX |

#endif

                                 AUDIO_DEVICE_OUT_DEFAULT),
@@ -442,11 +443,10 @@ enum { 
#ifdef QCOM_HARDWARE

    AUDIO_DEVICE_IN_ANC_HEADSET           = AUDIO_DEVICE_BIT_IN | 0x2000,

    AUDIO_DEVICE_IN_PROXY                 = AUDIO_DEVICE_BIT_IN | 0x4000,

#endif

#if defined(QCOM_FM_ENABLED) || defined(STE_FM)

    AUDIO_DEVICE_IN_FM_RX                 = AUDIO_DEVICE_BIT_IN | 0x8000,

    AUDIO_DEVICE_IN_FM_RX_A2DP            = AUDIO_DEVICE_BIT_IN | 0x10000,

#endif

#ifdef STE_FM

    AUDIO_DEVICE_IN_FM_RX                 = AUDIO_DEVICE_BIT_IN | 0x2000,

#endif

    AUDIO_DEVICE_IN_DEFAULT               = AUDIO_DEVICE_BIT_IN | AUDIO_DEVICE_BIT_DEFAULT,

#endif
@@ -466,12 +466,11 @@ enum { 
                               AUDIO_DEVICE_IN_USB_DEVICE |

#ifdef QCOM_HARDWARE

                               AUDIO_DEVICE_IN_ANC_HEADSET |

                               AUDIO_DEVICE_IN_FM_RX |

                               AUDIO_DEVICE_IN_FM_RX_A2DP |

                               AUDIO_DEVICE_IN_PROXY |

#endif

#ifdef STE_FM

#if defined(QCOM_FM_ENABLED) || defined(STE_FM)

                               AUDIO_DEVICE_IN_FM_RX |

                               AUDIO_DEVICE_IN_FM_RX_A2DP |

#endif

                               AUDIO_DEVICE_IN_DEFAULT),

    AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,