diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-05 13:57:10 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-05 13:57:10 +0300 |
| commit | 3fa62ccff84d7dcd719d3df2422a933f0fffe9f6 (patch) | |
| tree | a12b8699e96409055d05e9be34598930b4051da3 | |
| parent | 5de9db9d1205a9d3fb314792ed6936ede5e5836c (diff) | |
Make indicator table read-only (const) on headset.c side
| -rw-r--r-- | audio/headset.c | 9 | ||||
| -rw-r--r-- | audio/telephony.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/audio/headset.c b/audio/headset.c index 83267ca6..f4afa090 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -73,7 +73,7 @@ static struct { gboolean telephony_ready; /* Telephony plugin initialized */ uint32_t features; /* HFP AG features */ - struct indicator *indicators; /* Available HFP indicators */ + const struct indicator *indicators; /* Available HFP indicators */ int er_mode; /* Event reporting mode */ int er_ind; /* Event reporting for indicators */ int rh; /* Response and Hold state */ @@ -273,7 +273,7 @@ static int supported_features(struct audio_device *device, const char *buf) return headset_send(hs, "\r\nOK\r\n"); } -static char *indicator_ranges(struct indicator *indicators) +static char *indicator_ranges(const struct indicator *indicators) { int i; GString *gstr; @@ -296,7 +296,7 @@ static char *indicator_ranges(struct indicator *indicators) return g_string_free(gstr, FALSE); } -static char *indicator_values(struct indicator *indicators) +static char *indicator_values(const struct indicator *indicators) { int i; GString *gstr; @@ -2122,7 +2122,8 @@ int telephony_response_and_hold_ind(int rh) return headset_send(hs, "\r\n+BTRH:%d\r\n", ag.rh); } -int telephony_ready(uint32_t features, struct indicator *indicators, int rh) +int telephony_ready(uint32_t features, const struct indicator *indicators, + int rh) { ag.telephony_ready = TRUE; ag.features = features; diff --git a/audio/telephony.h b/audio/telephony.h index 38eb6a11..0f48b583 100644 --- a/audio/telephony.h +++ b/audio/telephony.h @@ -76,7 +76,8 @@ int telephony_terminate_call(void); int telephony_answer_call(void); -int telephony_ready(uint32_t features, struct indicator *indicators, int rh); +int telephony_ready(uint32_t features, const struct indicator *indicators, + int rh); /* Helper function for quick indicator updates */ static inline int telephony_update_indicator(struct indicator *indicators, |