diff options
| author | Aki Niemi <aki.niemi@nokia.com> | 2009-09-12 15:47:00 +0300 |
|---|---|---|
| committer | Aki Niemi <aki.niemi@nokia.com> | 2009-09-12 18:36:22 +0300 |
| commit | 7507b7376715a5dd333eb6a6a3bdca4c18846e9a (patch) | |
| tree | ebac51a45464aa8c38614d830e9a9ef9c6b6ec17 /drivers | |
| parent | 75719f0c01f29b24413ec21a1be7f14cfa2f311e (diff) | |
| download | ofono-7507b7376715a5dd333eb6a6a3bdca4c18846e9a.tar.bz2 | |
Clean up macros for success/failure callbacks
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/isimodem/isi.h | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/drivers/isimodem/isi.h b/drivers/isimodem/isi.h index 89ed5346..7749449c 100644 --- a/drivers/isimodem/isi.h +++ b/drivers/isimodem/isi.h @@ -21,20 +21,25 @@ * */ -#define DECLARE_FAILURE(e) \ - struct ofono_error e; \ - e.type = OFONO_ERROR_TYPE_FAILURE; \ - e.error = 0 \ - -#define DECLARE_SUCCESS(e) \ - struct ofono_error e; \ - e.type = OFONO_ERROR_TYPE_NO_ERROR; \ - e.error = 0 \ +#define CALLBACK_WITH_FAILURE(f, args...) \ + do { \ + struct ofono_error e; \ + e.type = OFONO_ERROR_TYPE_FAILURE; \ + e.error = 0; \ + f(&e, ##args); \ + } while(0) \ + +#define CALLBACK_WITH_SUCCESS(f, args...) \ + do { \ + struct ofono_error e; \ + e.type = OFONO_ERROR_TYPE_NO_ERROR; \ + e.error = 0; \ + f(&e, ##args); \ + } while(0) \ struct isi_cb_data { void *cb; void *data; - struct ofono_modem *modem; void *user; }; @@ -43,8 +48,8 @@ struct isi_version { unsigned short minor; }; -static inline struct isi_cb_data *isi_cb_data_new(struct ofono_modem *modem, - void *cb, void *data) +static inline struct isi_cb_data *isi_cb_data_new(void *user, void *cb, + void *data) { struct isi_cb_data *ret; @@ -53,7 +58,7 @@ static inline struct isi_cb_data *isi_cb_data_new(struct ofono_modem *modem, if (ret) { ret->cb = cb; ret->data = data; - ret->modem = modem; + ret->user = user; } return ret; } |