diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-08-20 18:19:21 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-08-20 18:19:21 -0500 |
| commit | e0ff90e6dac6aee39cb29c358402aadc6ff51905 (patch) | |
| tree | 66a15b35d7a6da94bcb7938029362788dc750d51 | |
| parent | 4fac5d1c73f0f12eb97c737389b3d701d616cf65 (diff) | |
| download | ofono-e0ff90e6dac6aee39cb29c358402aadc6ff51905.tar.bz2 | |
Rename ofono_modem_*_userdata
Rename ofono_modem_get_userdata to ofono_modem_get_data
Rename ofono_modem_set_userdata to ofono_modem_set_data
For consistency with other drivers
| -rw-r--r-- | drivers/atmodem/atmodem.c | 2 | ||||
| -rw-r--r-- | drivers/isimodem/isimodem.c | 2 | ||||
| -rw-r--r-- | include/modem.h | 4 | ||||
| -rw-r--r-- | src/modem.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c index 4cf87ddc..8a37c89d 100644 --- a/drivers/atmodem/atmodem.c +++ b/drivers/atmodem/atmodem.c @@ -197,7 +197,7 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user) if (!at->modem) goto out; - ofono_modem_set_userdata(at->modem, at); + ofono_modem_set_data(at->modem, at); ofono_devinfo_create(at->modem, "generic_at", at->parser); ofono_ussd_create(at->modem, "generic_at", at->parser); diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index 557e9007..fc57db66 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -70,7 +70,7 @@ static void netlink_status_cb(bool up, uint8_t addr, GIsiModem *idx, if (!isi->modem) return; - ofono_modem_set_userdata(isi->modem, isi); + ofono_modem_set_data(isi->modem, isi); ofono_devinfo_create(isi->modem, "isi", idx); ofono_phonebook_create(isi->modem, "isi", NULL); } diff --git a/include/modem.h b/include/modem.h index 0c53d739..b021c6cc 100644 --- a/include/modem.h +++ b/include/modem.h @@ -36,8 +36,8 @@ void ofono_modem_remove_interface(struct ofono_modem *modem, const char *ofono_modem_get_path(struct ofono_modem *modem); -void ofono_modem_set_userdata(struct ofono_modem *modem, void *data); -void *ofono_modem_get_userdata(struct ofono_modem *modem); +void ofono_modem_set_data(struct ofono_modem *modem, void *data); +void *ofono_modem_get_data(struct ofono_modem *modem); struct ofono_modem *ofono_modem_register(); int ofono_modem_unregister(struct ofono_modem *modem); diff --git a/src/modem.c b/src/modem.c index 68c77b40..40669108 100644 --- a/src/modem.c +++ b/src/modem.c @@ -99,15 +99,15 @@ void __ofono_modem_release_callid(struct ofono_modem *modem, int id) modem->call_ids &= ~(0x1 << id); } -void ofono_modem_set_userdata(struct ofono_modem *modem, void *userdata) +void ofono_modem_set_data(struct ofono_modem *modem, void *data) { if (modem == NULL) return; - modem->driver_data = userdata; + modem->driver_data = data; } -void *ofono_modem_get_userdata(struct ofono_modem *modem) +void *ofono_modem_get_data(struct ofono_modem *modem) { if (modem == NULL) return NULL; |