diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-12-04 16:20:40 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-12-04 16:52:30 -0600 |
| commit | c7ac706de15812287f4d55ce7a47f50b57021066 (patch) | |
| tree | 46e31a561c49a83a1fba9392d4ba02fe56005503 /src | |
| parent | 8e02b1a67fc1738aabd954d7ce68b8d7e8e14599 (diff) | |
| download | ofono-c7ac706de15812287f4d55ce7a47f50b57021066.tar.bz2 | |
Refactor: call id allocation / release
Diffstat (limited to 'src')
| -rw-r--r-- | src/modem.c | 10 | ||||
| -rw-r--r-- | src/ofono.h | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/modem.c b/src/modem.c index 5d0ea567..3a6a163d 100644 --- a/src/modem.c +++ b/src/modem.c @@ -98,7 +98,7 @@ struct ofono_property { void *value; }; -unsigned int __ofono_modem_alloc_callid(struct ofono_modem *modem) +unsigned int __ofono_modem_callid_next(struct ofono_modem *modem) { unsigned int i; @@ -106,14 +106,18 @@ unsigned int __ofono_modem_alloc_callid(struct ofono_modem *modem) if (modem->call_ids & (0x1 << i)) continue; - modem->call_ids |= (0x1 << i); return i; } return 0; } -void __ofono_modem_release_callid(struct ofono_modem *modem, int id) +void __ofono_modem_callid_hold(struct ofono_modem *modem, int id) +{ + modem->call_ids |= (0x1 << id); +} + +void __ofono_modem_callid_release(struct ofono_modem *modem, int id) { modem->call_ids &= ~(0x1 << id); } diff --git a/src/ofono.h b/src/ofono.h index b05320e9..31524b50 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -90,8 +90,9 @@ void __ofono_plugin_cleanup(void); #include <ofono/modem.h> -unsigned int __ofono_modem_alloc_callid(struct ofono_modem *modem); -void __ofono_modem_release_callid(struct ofono_modem *modem, int id); +unsigned int __ofono_modem_callid_next(struct ofono_modem *modem); +void __ofono_modem_callid_hold(struct ofono_modem *modem, int id); +void __ofono_modem_callid_release(struct ofono_modem *modem, int id); struct ofono_atom; |