diff options
48 files changed, 94 insertions, 67 deletions
diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c index 1009f0bd..f5d6ed7f 100644 --- a/drivers/atmodem/call-barring.c +++ b/drivers/atmodem/call-barring.c @@ -206,8 +206,8 @@ static gboolean at_call_barring_register(gpointer user) return FALSE; } -static int at_call_barring_probe(struct ofono_call_barring *cb, int vendor, - void *user) +static int at_call_barring_probe(struct ofono_call_barring *cb, + unsigned int vendor, void *user) { GAtChat *chat = user; diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c index 24fd8332..7fb5fb1f 100644 --- a/drivers/atmodem/call-forwarding.c +++ b/drivers/atmodem/call-forwarding.c @@ -262,7 +262,7 @@ static gboolean at_ccfc_register(gpointer user) return FALSE; } -static int at_ccfc_probe(struct ofono_call_forwarding *cf, int vendor, +static int at_ccfc_probe(struct ofono_call_forwarding *cf, unsigned int vendor, void *data) { GAtChat *chat = data; diff --git a/drivers/atmodem/call-meter.c b/drivers/atmodem/call-meter.c index 2b68d058..ef86c6de 100644 --- a/drivers/atmodem/call-meter.c +++ b/drivers/atmodem/call-meter.c @@ -365,7 +365,8 @@ static void at_call_meter_initialized(gboolean ok, GAtResult *result, ofono_call_meter_register(cm); } -static int at_caoc_probe(struct ofono_call_meter *cm, int vendor, void *data) +static int at_caoc_probe(struct ofono_call_meter *cm, unsigned int vendor, + void *data) { GAtChat *chat = data; diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c index d540ec16..a41023d7 100644 --- a/drivers/atmodem/call-settings.c +++ b/drivers/atmodem/call-settings.c @@ -365,8 +365,8 @@ static gboolean at_call_settings_register(gpointer user) return FALSE; } -static int at_call_settings_probe(struct ofono_call_settings *cs, int vendor, - void *data) +static int at_call_settings_probe(struct ofono_call_settings *cs, + unsigned int vendor, void *data) { GAtChat *chat = data; diff --git a/drivers/atmodem/devinfo.c b/drivers/atmodem/devinfo.c index 8e3123af..66a62353 100644 --- a/drivers/atmodem/devinfo.c +++ b/drivers/atmodem/devinfo.c @@ -189,7 +189,8 @@ static gboolean at_devinfo_register(gpointer user_data) return FALSE; } -static int at_devinfo_probe(struct ofono_devinfo *info, int vendor, void *data) +static int at_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor, + void *data) { GAtChat *chat = data; diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c index 79c59a08..8a42854a 100644 --- a/drivers/atmodem/network-registration.c +++ b/drivers/atmodem/network-registration.c @@ -636,7 +636,8 @@ static void at_network_registration_initialized(gboolean ok, GAtResult *result, ofono_netreg_register(netreg); } -static int at_netreg_probe(struct ofono_netreg *netreg, int vendor, void *data) +static int at_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor, + void *data) { GAtChat *chat = data; struct netreg_data *nd; diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c index f4d3ef1a..12c31b3c 100644 --- a/drivers/atmodem/phonebook.c +++ b/drivers/atmodem/phonebook.c @@ -518,7 +518,7 @@ static void at_list_charsets(struct ofono_phonebook *pb) phonebook_not_supported(pb); } -static int at_phonebook_probe(struct ofono_phonebook *pb, int vendor, +static int at_phonebook_probe(struct ofono_phonebook *pb, unsigned int vendor, void *data) { GAtChat *chat = data; diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c index 9f4577d9..8779ea71 100644 --- a/drivers/atmodem/sim.c +++ b/drivers/atmodem/sim.c @@ -440,7 +440,8 @@ static gboolean at_sim_register(gpointer user) return FALSE; } -static int at_sim_probe(struct ofono_sim *sim, int vendor, void *data) +static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor, + void *data) { GAtChat *chat = data; diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c index 3ce104f4..d007c63e 100644 --- a/drivers/atmodem/sms.c +++ b/drivers/atmodem/sms.c @@ -73,7 +73,7 @@ struct sms_data { char *cnma_ack_pdu; int cnma_ack_pdu_len; GAtChat *chat; - int vendor; + unsigned int vendor; }; struct cpms_request { @@ -957,7 +957,8 @@ out: at_csms_set_cb, sms, NULL); } -static int at_sms_probe(struct ofono_sms *sms, int vendor, void *user) +static int at_sms_probe(struct ofono_sms *sms, unsigned int vendor, + void *user) { GAtChat *chat = user; struct sms_data *data; diff --git a/drivers/atmodem/ssn.c b/drivers/atmodem/ssn.c index 7c7e86ea..78078ebe 100644 --- a/drivers/atmodem/ssn.c +++ b/drivers/atmodem/ssn.c @@ -111,7 +111,8 @@ static gboolean at_ssn_register(gpointer user) return FALSE; } -static int at_ssn_probe(struct ofono_ssn *ssn, int vendor, void *data) +static int at_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor, + void *data) { GAtChat *chat = data; diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c index 3f454b16..a390f4f5 100644 --- a/drivers/atmodem/ussd.c +++ b/drivers/atmodem/ussd.c @@ -143,7 +143,8 @@ static gboolean at_ussd_register(gpointer user) return FALSE; } -static int at_ussd_probe(struct ofono_ussd *ussd, int vendor, void *data) +static int at_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor, + void *data) { GAtChat *chat = data; diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c index 9b115a5e..70f42d90 100644 --- a/drivers/atmodem/voicecall.c +++ b/drivers/atmodem/voicecall.c @@ -983,7 +983,7 @@ static void at_voicecall_initialized(gboolean ok, GAtResult *result, ofono_voicecall_register(vc); } -static int at_voicecall_probe(struct ofono_voicecall *vc, int vendor, +static int at_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor, void *data) { GAtChat *chat = data; diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c index d091930c..7474e0aa 100644 --- a/drivers/isimodem/call-barring.c +++ b/drivers/isimodem/call-barring.c @@ -65,8 +65,8 @@ static void isi_set_passwd(struct ofono_call_barring *barr, const char *lock, { } -static int isi_call_barring_probe(struct ofono_call_barring *barr, int vendor, - void *user) +static int isi_call_barring_probe(struct ofono_call_barring *barr, + unsigned int vendor, void *user) { GIsiModem *idx = user; struct call_barring_data *data = g_try_new0(struct call_barring_data, 1); diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c index ce5e40f0..68d1bb51 100644 --- a/drivers/isimodem/call-forwarding.c +++ b/drivers/isimodem/call-forwarding.c @@ -80,7 +80,7 @@ static void isi_query(struct ofono_call_forwarding *cf, int type, int cls, } static int isi_call_forwarding_probe(struct ofono_call_forwarding *cf, - int vendor, void *user) + unsigned int vendor, void *user) { GIsiModem *idx = user; struct call_forwarding_data *data; diff --git a/drivers/isimodem/call-meter.c b/drivers/isimodem/call-meter.c index 712b98ee..8b932f6c 100644 --- a/drivers/isimodem/call-meter.c +++ b/drivers/isimodem/call-meter.c @@ -87,8 +87,8 @@ static void isi_puct_set(struct ofono_call_meter *cm, const char *currency, { } -static int isi_call_meter_probe(struct ofono_call_meter *cm, int vendor, - void *user) +static int isi_call_meter_probe(struct ofono_call_meter *cm, + unsigned int vendor, void *user) { GIsiModem *idx = user; struct call_meter_data *data = g_try_new0(struct call_meter_data, 1); diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c index f564f0e8..03316277 100644 --- a/drivers/isimodem/call-settings.c +++ b/drivers/isimodem/call-settings.c @@ -83,7 +83,7 @@ static void isi_cw_set(struct ofono_call_settings *cs, int mode, int cls, { } -static int isi_call_settings_probe(struct ofono_call_settings *cs, int vendor, +static int isi_call_settings_probe(struct ofono_call_settings *cs, unsigned int vendor, void *user) { GIsiModem *idx = user; diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c index 7e503780..523aa4e0 100644 --- a/drivers/isimodem/devinfo.c +++ b/drivers/isimodem/devinfo.c @@ -370,7 +370,8 @@ static gboolean isi_devinfo_register(gpointer user) return FALSE; } -static int isi_devinfo_probe(struct ofono_devinfo *info, int vendor, void *user) +static int isi_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor, + void *user) { GIsiModem *idx = user; struct devinfo_data *data = g_try_new0(struct devinfo_data, 1); diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c index e00994bf..4442248a 100644 --- a/drivers/isimodem/network-registration.c +++ b/drivers/isimodem/network-registration.c @@ -178,7 +178,8 @@ static gboolean isi_netreg_register(gpointer user) return FALSE; } -static int isi_netreg_probe(struct ofono_netreg *netreg, int vendor, void *user) +static int isi_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor, + void *user) { GIsiModem *idx = user; struct netreg_data *data = g_try_new0(struct netreg_data, 1); diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c index f683638c..b8011684 100644 --- a/drivers/isimodem/phonebook.c +++ b/drivers/isimodem/phonebook.c @@ -376,7 +376,7 @@ static gboolean isi_phonebook_register(gpointer user) return FALSE; } -static int isi_phonebook_probe(struct ofono_phonebook *pb, int vendor, +static int isi_phonebook_probe(struct ofono_phonebook *pb, unsigned int vendor, void *user) { GIsiModem *idx = user; diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c index 1537ccf5..1960e308 100644 --- a/drivers/isimodem/sim.c +++ b/drivers/isimodem/sim.c @@ -96,7 +96,8 @@ static void isi_read_imsi(struct ofono_sim *sim, { } -static int isi_sim_probe(struct ofono_sim *sim, int vendor, void *user) +static int isi_sim_probe(struct ofono_sim *sim, unsigned int vendor, + void *user) { GIsiModem *idx = user; struct sim_data *data = g_try_new0(struct sim_data, 1); diff --git a/drivers/isimodem/sms.c b/drivers/isimodem/sms.c index 36cbdae0..0303fc03 100644 --- a/drivers/isimodem/sms.c +++ b/drivers/isimodem/sms.c @@ -65,7 +65,8 @@ static void isi_submit(struct ofono_sms *sms, unsigned char *pdu, { } -static int isi_sms_probe(struct ofono_sms *sms, int vendor, void *user) +static int isi_sms_probe(struct ofono_sms *sms, unsigned int vendor, + void *user) { GIsiModem *idx = user; struct sms_data *data = g_try_new0(struct sms_data, 1); diff --git a/drivers/isimodem/ssn.c b/drivers/isimodem/ssn.c index a5539fbe..5e3fbb26 100644 --- a/drivers/isimodem/ssn.c +++ b/drivers/isimodem/ssn.c @@ -48,7 +48,8 @@ struct ssn_data { struct isi_version version; }; -static int isi_ssn_probe(struct ofono_ssn *ssn, int vendor, void *user) +static int isi_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor, + void *user) { GIsiModem *idx = user; struct ssn_data *data = g_try_new0(struct ssn_data, 1); diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c index 4ba70fc1..7e80fec2 100644 --- a/drivers/isimodem/ussd.c +++ b/drivers/isimodem/ussd.c @@ -58,7 +58,8 @@ static void isi_cancel(struct ofono_ussd *ussd, { } -static int isi_ussd_probe(struct ofono_ussd *ussd, int vendor, void *user) +static int isi_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor, + void *user) { GIsiModem *idx = user; struct ussd_data *data = g_try_new0(struct ussd_data, 1); diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c index b1cee1c8..eefb2f40 100644 --- a/drivers/isimodem/voicecall.c +++ b/drivers/isimodem/voicecall.c @@ -127,8 +127,8 @@ static void isi_send_tones(struct ofono_voicecall *vc, const char *tones, { } -static int isi_voicecall_probe(struct ofono_voicecall *call, int vendor, - void *user) +static int isi_voicecall_probe(struct ofono_voicecall *call, + unsigned int vendor, void *user) { GIsiModem *idx = user; struct voicecall_data *data = g_try_new0(struct voicecall_data, 1); diff --git a/include/call-barring.h b/include/call-barring.h index 6350ec64..e767d02c 100644 --- a/include/call-barring.h +++ b/include/call-barring.h @@ -37,7 +37,8 @@ typedef void (*ofono_call_barring_query_cb_t)(const struct ofono_error *error, struct ofono_call_barring_driver { const char *name; - int (*probe)(struct ofono_call_barring *cb, int vendor, void *data); + int (*probe)(struct ofono_call_barring *cb, unsigned int vendor, + void *data); int (*remove)(struct ofono_call_barring *cb); void (*set)(struct ofono_call_barring *barr, const char *lock, int enable, const char *passwd, int cls, @@ -53,7 +54,7 @@ int ofono_call_barring_driver_register(const struct ofono_call_barring_driver *d void ofono_call_barring_driver_unregister(const struct ofono_call_barring_driver *d); struct ofono_call_barring *ofono_call_barring_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data); diff --git a/include/call-forwarding.h b/include/call-forwarding.h index 3f6ce443..05aa39d4 100644 --- a/include/call-forwarding.h +++ b/include/call-forwarding.h @@ -47,7 +47,8 @@ typedef void (*ofono_call_forwarding_query_cb_t)(const struct ofono_error *error struct ofono_call_forwarding_driver { const char *name; - int (*probe)(struct ofono_call_forwarding *cf, int vendor, void *data); + int (*probe)(struct ofono_call_forwarding *cf, unsigned int vendor, + void *data); int (*remove)(struct ofono_call_forwarding *cf); void (*activation)(struct ofono_call_forwarding *cf, int type, int cls, @@ -71,7 +72,7 @@ int ofono_call_forwarding_driver_register(const struct ofono_call_forwarding_dri void ofono_call_forwarding_driver_unregister(const struct ofono_call_forwarding_driver *d); struct ofono_call_forwarding *ofono_call_forwarding_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data); diff --git a/include/call-meter.h b/include/call-meter.h index bb8d05c6..a553c39b 100644 --- a/include/call-meter.h +++ b/include/call-meter.h @@ -42,7 +42,8 @@ typedef void(*ofono_call_meter_set_cb_t)(const struct ofono_error *error, struct ofono_call_meter_driver { const char *name; - int (*probe)(struct ofono_call_meter *cm, int vendor, void *data); + int (*probe)(struct ofono_call_meter *cm, unsigned int vendor, + void *data); int (*remove)(struct ofono_call_meter *cm); void (*call_meter_query)(struct ofono_call_meter *cm, ofono_call_meter_query_cb_t cb, void *data); @@ -66,7 +67,7 @@ int ofono_call_meter_driver_register(const struct ofono_call_meter_driver *d); void ofono_call_meter_driver_unregister(const struct ofono_call_meter_driver *d); struct ofono_call_meter *ofono_call_meter_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data); diff --git a/include/call-settings.h b/include/call-settings.h index 5aca0c43..01e6d864 100644 --- a/include/call-settings.h +++ b/include/call-settings.h @@ -41,7 +41,8 @@ typedef void (*ofono_call_settings_clir_cb_t)(const struct ofono_error *error, struct ofono_call_settings_driver { const char *name; - int (*probe)(struct ofono_call_settings *cs, int vendor, void *data); + int (*probe)(struct ofono_call_settings *cs, unsigned int vendor, + void *data); int (*remove)(struct ofono_call_settings *cs); void (*clip_query)(struct ofono_call_settings *cs, ofono_call_settings_status_cb_t cb, void *data); @@ -63,7 +64,7 @@ int ofono_call_settings_driver_register(const struct ofono_call_settings_driver void ofono_call_settings_driver_unregister(const struct ofono_call_settings_driver *d); struct ofono_call_settings *ofono_call_settings_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data); diff --git a/include/devinfo.h b/include/devinfo.h index 5bb7ccc3..7aa0f111 100644 --- a/include/devinfo.h +++ b/include/devinfo.h @@ -35,7 +35,8 @@ typedef void (*ofono_devinfo_query_cb_t)(const struct ofono_error *error, struct ofono_devinfo_driver { const char *name; - int (*probe)(struct ofono_devinfo *info, int vendor, void *data); + int (*probe)(struct ofono_devinfo *info, unsigned int vendor, + void *data); int (*remove)(struct ofono_devinfo *info); void (*query_manufacturer)(struct ofono_devinfo *info, ofono_devinfo_query_cb_t cb, void *data); @@ -51,7 +52,7 @@ int ofono_devinfo_driver_register(const struct ofono_devinfo_driver *d); void ofono_devinfo_driver_unregister(const struct ofono_devinfo_driver *d); struct ofono_devinfo *ofono_devinfo_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data); void ofono_devinfo_register(struct ofono_devinfo *info); diff --git a/include/netreg.h b/include/netreg.h index 9bb94783..dbd63bc7 100644 --- a/include/netreg.h +++ b/include/netreg.h @@ -70,7 +70,8 @@ typedef void (*ofono_netreg_strength_cb_t)(const struct ofono_error *error, */ struct ofono_netreg_driver { const char *name; - int (*probe)(struct ofono_netreg *netreg, int vendor, void *data); + int (*probe)(struct ofono_netreg *netreg, unsigned int vendor, + void *data); int (*remove)(struct ofono_netreg *netreg); void (*registration_status)(struct ofono_netreg *netreg, ofono_netreg_status_cb_t cb, void *data); @@ -96,8 +97,10 @@ void ofono_netreg_status_notify(struct ofono_netreg *netreg, int status, int ofono_netreg_driver_register(const struct ofono_netreg_driver *d); void ofono_netreg_driver_unregister(const struct ofono_netreg_driver *d); -struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem, int vendor, - const char *driver, void *data); +struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem, + unsigned int vendor, + const char *driver, + void *data); void ofono_netreg_register(struct ofono_netreg *netreg); void ofono_netreg_remove(struct ofono_netreg *netreg); diff --git a/include/phonebook.h b/include/phonebook.h index 1fc154d2..73f2bb9a 100644 --- a/include/phonebook.h +++ b/include/phonebook.h @@ -38,7 +38,8 @@ typedef void (*ofono_phonebook_cb_t)(const struct ofono_error *error, */ struct ofono_phonebook_driver { const char *name; - int (*probe)(struct ofono_phonebook *pb, int vendor, void *data); + int (*probe)(struct ofono_phonebook *pb, unsigned int vendor, + void *data); int (*remove)(struct ofono_phonebook *pb); void (*export_entries)(struct ofono_phonebook *pb, const char *storage, ofono_phonebook_cb_t cb, void *data); @@ -56,7 +57,7 @@ int ofono_phonebook_driver_register(const struct ofono_phonebook_driver *d); void ofono_phonebook_driver_unregister(const struct ofono_phonebook_driver *d); struct ofono_phonebook *ofono_phonebook_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data); diff --git a/include/sim.h b/include/sim.h index 2cabd79f..9ab60845 100644 --- a/include/sim.h +++ b/include/sim.h @@ -66,7 +66,7 @@ typedef void (*ofono_sim_file_write_cb_t)(int ok, void *userdata); struct ofono_sim_driver { const char *name; - int (*probe)(struct ofono_sim *sim, int vendor, void *data); + int (*probe)(struct ofono_sim *sim, unsigned int vendor, void *data); int (*remove)(struct ofono_sim *sim); void (*read_file_info)(struct ofono_sim *sim, int fileid, ofono_sim_file_info_cb_t cb, void *data); @@ -95,7 +95,8 @@ struct ofono_sim_driver { int ofono_sim_driver_register(const struct ofono_sim_driver *d); void ofono_sim_driver_unregister(const struct ofono_sim_driver *d); -struct ofono_sim *ofono_sim_create(struct ofono_modem *modem, int vendor, +struct ofono_sim *ofono_sim_create(struct ofono_modem *modem, + unsigned int vendor, const char *driver, void *data); void ofono_sim_register(struct ofono_sim *sim); diff --git a/include/sms.h b/include/sms.h index 546d40af..35025f15 100644 --- a/include/sms.h +++ b/include/sms.h @@ -40,7 +40,7 @@ typedef void (*ofono_sms_sca_set_cb_t)(const struct ofono_error *error, struct ofono_sms_driver { const char *name; - int (*probe)(struct ofono_sms *sms, int vendor, void *data); + int (*probe)(struct ofono_sms *sms, unsigned int vendor, void *data); int (*remove)(struct ofono_sms *sms); void (*sca_query)(struct ofono_sms *sms, ofono_sms_sca_query_cb_t cb, void *data); @@ -60,7 +60,8 @@ void ofono_sms_status_notify(struct ofono_sms *sms, unsigned char *pdu, int ofono_sms_driver_register(const struct ofono_sms_driver *d); void ofono_sms_driver_unregister(const struct ofono_sms_driver *d); -struct ofono_sms *ofono_sms_create(struct ofono_modem *modem, int vendor, +struct ofono_sms *ofono_sms_create(struct ofono_modem *modem, + unsigned int vendor, const char *driver, void *data); void ofono_sms_register(struct ofono_sms *sms); diff --git a/include/ssn.h b/include/ssn.h index b1e51bfe..c5e428c5 100644 --- a/include/ssn.h +++ b/include/ssn.h @@ -32,7 +32,7 @@ struct ofono_ssn; struct ofono_ssn_driver { const char *name; - int (*probe)(struct ofono_ssn *ssn, int vendor, void *data); + int (*probe)(struct ofono_ssn *ssn, unsigned int vendor, void *data); int (*remove)(struct ofono_ssn *ssn); }; @@ -44,7 +44,8 @@ void ofono_ssn_cssu_notify(struct ofono_ssn *ssn, int code, int index, int ofono_ssn_driver_register(const struct ofono_ssn_driver *d); void ofono_ssn_driver_unregister(const struct ofono_ssn_driver *d); -struct ofono_ssn *ofono_ssn_create(struct ofono_modem *modem, int vendor, +struct ofono_ssn *ofono_ssn_create(struct ofono_modem *modem, + unsigned int vendor, const char *driver, void *data); void ofono_ssn_register(struct ofono_ssn *ssn); diff --git a/include/ussd.h b/include/ussd.h index feb20ce3..6f5acdad 100644 --- a/include/ussd.h +++ b/include/ussd.h @@ -34,7 +34,7 @@ typedef void (*ofono_ussd_cb_t)(const struct ofono_error *error, void *data); struct ofono_ussd_driver { const char *name; - int (*probe)(struct ofono_ussd *ussd, int vendor, void *data); + int (*probe)(struct ofono_ussd *ussd, unsigned int vendor, void *data); int (*remove)(struct ofono_ussd *ussd); void (*request)(struct ofono_ussd *ussd, const char *str, ofono_ussd_cb_t, void *data); @@ -47,7 +47,8 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str); int ofono_ussd_driver_register(const struct ofono_ussd_driver *d); void ofono_ussd_driver_unregister(const struct ofono_ussd_driver *d); -struct ofono_ussd *ofono_ussd_create(struct ofono_modem *modem, int vendor, +struct ofono_ussd *ofono_ussd_create(struct ofono_modem *modem, + unsigned int vendor, const char *driver, void *data); void ofono_ussd_register(struct ofono_ussd *ussd); diff --git a/include/voicecall.h b/include/voicecall.h index e22b0ca5..b19a0fd5 100644 --- a/include/voicecall.h +++ b/include/voicecall.h @@ -46,7 +46,8 @@ typedef void (*ofono_call_list_cb_t)(const struct ofono_error *error, */ struct ofono_voicecall_driver { const char *name; - int (*probe)(struct ofono_voicecall *vc, int vendor, void *data); + int (*probe)(struct ofono_voicecall *vc, unsigned int vendor, + void *data); int (*remove)(struct ofono_voicecall *vc); void (*dial)(struct ofono_voicecall *vc, const struct ofono_phone_number *number, @@ -93,7 +94,7 @@ int ofono_voicecall_driver_register(const struct ofono_voicecall_driver *d); void ofono_voicecall_driver_unregister(const struct ofono_voicecall_driver *d); struct ofono_voicecall *ofono_voicecall_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data); void ofono_voicecall_register(struct ofono_voicecall *vc); diff --git a/src/call-barring.c b/src/call-barring.c index 2e831f84..75b1be7d 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -1098,7 +1098,7 @@ static void call_barring_remove(struct ofono_atom *atom) } struct ofono_call_barring *ofono_call_barring_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 7c66bec3..9ca5a549 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -1147,7 +1147,7 @@ static void call_forwarding_remove(struct ofono_atom *atom) } struct ofono_call_forwarding *ofono_call_forwarding_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { diff --git a/src/call-meter.c b/src/call-meter.c index b56169cd..45c41c51 100644 --- a/src/call-meter.c +++ b/src/call-meter.c @@ -717,7 +717,7 @@ static void call_meter_remove(struct ofono_atom *atom) } struct ofono_call_meter *ofono_call_meter_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { diff --git a/src/call-settings.c b/src/call-settings.c index 06b3de8c..a5bb4ccc 100644 --- a/src/call-settings.c +++ b/src/call-settings.c @@ -1229,7 +1229,7 @@ static void call_settings_remove(struct ofono_atom *atom) } struct ofono_call_settings *ofono_call_settings_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { diff --git a/src/modem.c b/src/modem.c index 502d567a..91d6993b 100644 --- a/src/modem.c +++ b/src/modem.c @@ -832,7 +832,7 @@ static void devinfo_remove(struct ofono_atom *atom) } struct ofono_devinfo *ofono_devinfo_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { diff --git a/src/network.c b/src/network.c index a4f7a062..7139e60d 100644 --- a/src/network.c +++ b/src/network.c @@ -1399,7 +1399,7 @@ static void netreg_remove(struct ofono_atom *atom) } struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { diff --git a/src/phonebook.c b/src/phonebook.c index eb9e63f8..c28b9020 100644 --- a/src/phonebook.c +++ b/src/phonebook.c @@ -537,7 +537,7 @@ static void phonebook_remove(struct ofono_atom *atom) } struct ofono_phonebook *ofono_phonebook_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { struct ofono_phonebook *pb; @@ -1299,7 +1299,7 @@ static void sim_remove(struct ofono_atom *atom) } struct ofono_sim *ofono_sim_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { @@ -819,7 +819,7 @@ static void sms_remove(struct ofono_atom *atom) } struct ofono_sms *ofono_sms_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { @@ -248,7 +248,7 @@ static void ssn_remove(struct ofono_atom *atom) } struct ofono_ssn *ofono_ssn_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { @@ -522,7 +522,7 @@ static void ussd_remove(struct ofono_atom *atom) } struct ofono_ussd *ofono_ussd_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { diff --git a/src/voicecall.c b/src/voicecall.c index 367d6b11..194ce83b 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -1813,7 +1813,7 @@ static void voicecall_remove(struct ofono_atom *atom) } struct ofono_voicecall *ofono_voicecall_create(struct ofono_modem *modem, - int vendor, + unsigned int vendor, const char *driver, void *data) { |