sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

history: Update to the new SHA1 based sms id API

This commit is contained in:
Denis Kenzior 2010-09-20 16:38:52 -05:00
parent 753cab6f70
commit dbd7639d25
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/history.h
View File

@ -26,6 +26,8 @@
extern "C" {
#endif
#include <ofono/types.h>
enum ofono_disconnect_reason;
struct ofono_call;
@ -53,14 +55,16 @@ struct ofono_history_driver {
void (*call_missed)(struct ofono_history_context *context,
const struct ofono_call *call, time_t when);
void (*sms_received)(struct ofono_history_context *context,
unsigned int msg_id, const char *from,
const struct ofono_uuid *uuid, const char *from,
const struct tm *remote, const struct tm *local,
const char *text);
void (*sms_send_pending)(struct ofono_history_context *context,
unsigned int id, const char *to,
const struct ofono_uuid *uuid,
const char *to,
time_t when, const char *text);
void (*sms_send_status)(struct ofono_history_context *context,
unsigned int id, time_t when,
const struct ofono_uuid *uuid,
time_t when,
enum ofono_history_sms_status status);
};

22
src/history.c
View File

@ -45,7 +45,7 @@ struct history_call_foreach_data {
};
struct history_sms_foreach_data {
unsigned int msg_id;
const struct ofono_uuid *uuid;
const char *address;
const char *text;
union {
@ -170,12 +170,12 @@ static void history_sms_received(struct ofono_atom *atom, void *data)
if (context->driver->sms_received == NULL)
return;
context->driver->sms_received(context, hfd->msg_id, hfd->address,
context->driver->sms_received(context, hfd->uuid, hfd->address,
hfd->remote, hfd->local, hfd->text);
}
void __ofono_history_sms_received(struct ofono_modem *modem,
unsigned int msg_id,
const struct ofono_uuid *uuid,
const char *from,
const struct tm *remote,
const struct tm *local,
@ -183,7 +183,7 @@ void __ofono_history_sms_received(struct ofono_modem *modem,
{
struct history_sms_foreach_data hfd;
hfd.msg_id = msg_id;
hfd.uuid = uuid;
hfd.address = from;
hfd.remote = remote;
hfd.local = local;
@ -201,17 +201,18 @@ static void history_sms_send_pending(struct ofono_atom *atom, void *data)
if (context->driver->sms_send_pending == NULL)
return;
context->driver->sms_send_pending(context, hfd->msg_id, hfd->address,
context->driver->sms_send_pending(context, hfd->uuid, hfd->address,
hfd->when, hfd->text);
}
void __ofono_history_sms_send_pending(struct ofono_modem *modem,
unsigned int msg_id, const char *to,
const struct ofono_uuid *uuid,
const char *to,
time_t when, const char *text)
{
struct history_sms_foreach_data hfd;
hfd.msg_id = msg_id;
hfd.uuid = uuid;
hfd.address = to;
hfd.text = text;
hfd.when = when;
@ -229,17 +230,18 @@ static void history_sms_send_status(struct ofono_atom *atom, void *data)
if (context->driver->sms_send_status == NULL)
return;
context->driver->sms_send_status(context, hfd->msg_id,
context->driver->sms_send_status(context, hfd->uuid,
hfd->when, hfd->status);
}
void __ofono_history_sms_send_status(struct ofono_modem *modem,
unsigned int msg_id, time_t when,
const struct ofono_uuid *uuid,
time_t when,
enum ofono_history_sms_status status)
{
struct history_sms_foreach_data hfd;
hfd.msg_id = msg_id;
hfd.uuid = uuid;
hfd.address = NULL;
hfd.text = NULL;
hfd.when = when;

9
src/ofono.h
View File

@ -305,17 +305,20 @@ void __ofono_history_call_missed(struct ofono_modem *modem,
const struct ofono_call *call, time_t when);
void __ofono_history_sms_received(struct ofono_modem *modem,
unsigned int msg_id, const char *from,
const struct ofono_uuid *uuid,
const char *from,
const struct tm *remote,
const struct tm *local,
const char *text);
void __ofono_history_sms_send_pending(struct ofono_modem *modem,
unsigned int msg_id, const char *to,
const struct ofono_uuid *uuid,
const char *to,
time_t when, const char *text);
void __ofono_history_sms_send_status(struct ofono_modem *modem,
unsigned int msg_id, time_t when,
const struct ofono_uuid *uuid,
time_t when,
enum ofono_history_sms_status status);
#include <ofono/message-waiting.h>