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

Refactor: Don't use ofono_ prefix 

only meant for public API
This commit is contained in:
Denis Kenzior 2010-05-26 15:09:11 -05:00
parent c53d084234
commit 1b34af054d
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/modem.c
View File

@ -42,11 +42,11 @@ static int next_modem_id = 0;
static gboolean powering_down = FALSE; static gboolean powering_down = FALSE;
static int modems_remaining = 0; static int modems_remaining = 0;
enum ofono_property_type { enum property_type {
OFONO_PROPERTY_TYPE_INVALID = 0, PROPERTY_TYPE_INVALID = 0,
OFONO_PROPERTY_TYPE_STRING, PROPERTY_TYPE_STRING,
OFONO_PROPERTY_TYPE_INTEGER, PROPERTY_TYPE_INTEGER,
OFONO_PROPERTY_TYPE_BOOLEAN, PROPERTY_TYPE_BOOLEAN,
}; };
enum modem_state { enum modem_state {
@ -105,7 +105,7 @@ struct ofono_atom_watch {
}; };
struct ofono_property { struct ofono_property {
enum ofono_property_type type; enum property_type type;
void *value; void *value;
}; };
@ -1058,15 +1058,14 @@ static void unregister_property(gpointer data)
} }
static int set_modem_property(struct ofono_modem *modem, const char *name, static int set_modem_property(struct ofono_modem *modem, const char *name,
enum ofono_property_type type, enum property_type type, const void *value)
const void *value)
{ {
struct ofono_property *property; struct ofono_property *property;
DBG("modem %p property %s", modem, name); DBG("modem %p property %s", modem, name);
if (type != OFONO_PROPERTY_TYPE_STRING && if (type != PROPERTY_TYPE_STRING &&
type != OFONO_PROPERTY_TYPE_INTEGER) type != PROPERTY_TYPE_INTEGER)
return -EINVAL; return -EINVAL;
property = g_try_new0(struct ofono_property, 1); property = g_try_new0(struct ofono_property, 1);
@ -1076,13 +1075,13 @@ static int set_modem_property(struct ofono_modem *modem, const char *name,
property->type = type; property->type = type;
switch (type) { switch (type) {
case OFONO_PROPERTY_TYPE_STRING: case PROPERTY_TYPE_STRING:
property->value = g_strdup((const char *) value); property->value = g_strdup((const char *) value);
break; break;
case OFONO_PROPERTY_TYPE_INTEGER: case PROPERTY_TYPE_INTEGER:
property->value = g_memdup(value, sizeof(int)); property->value = g_memdup(value, sizeof(int));
break; break;
case OFONO_PROPERTY_TYPE_BOOLEAN: case PROPERTY_TYPE_BOOLEAN:
property->value = g_memdup(value, sizeof(bool)); property->value = g_memdup(value, sizeof(bool));
break; break;
default: default:
@ -1095,7 +1094,7 @@ static int set_modem_property(struct ofono_modem *modem, const char *name,
} }
static gboolean get_modem_property(struct ofono_modem *modem, const char *name, static gboolean get_modem_property(struct ofono_modem *modem, const char *name,
enum ofono_property_type type, enum property_type type,
void *value) void *value)
{ {
struct ofono_property *property; struct ofono_property *property;
@ -1111,13 +1110,13 @@ static gboolean get_modem_property(struct ofono_modem *modem, const char *name,
return FALSE; return FALSE;
switch (property->type) { switch (property->type) {
case OFONO_PROPERTY_TYPE_STRING: case PROPERTY_TYPE_STRING:
*((const char **) value) = property->value; *((const char **) value) = property->value;
return TRUE; return TRUE;
case OFONO_PROPERTY_TYPE_INTEGER: case PROPERTY_TYPE_INTEGER:
memcpy(value, property->value, sizeof(int)); memcpy(value, property->value, sizeof(int));
return TRUE; return TRUE;
case OFONO_PROPERTY_TYPE_BOOLEAN: case PROPERTY_TYPE_BOOLEAN:
memcpy(value, property->value, sizeof(bool)); memcpy(value, property->value, sizeof(bool));
return TRUE; return TRUE;
default: default:
@ -1128,22 +1127,19 @@ static gboolean get_modem_property(struct ofono_modem *modem, const char *name,
int ofono_modem_set_string(struct ofono_modem *modem, int ofono_modem_set_string(struct ofono_modem *modem,
const char *key, const char *value) const char *key, const char *value)
{ {
return set_modem_property(modem, key, return set_modem_property(modem, key, PROPERTY_TYPE_STRING, value);
OFONO_PROPERTY_TYPE_STRING, value);
} }
int ofono_modem_set_integer(struct ofono_modem *modem, int ofono_modem_set_integer(struct ofono_modem *modem,
const char *key, int value) const char *key, int value)
{ {
return set_modem_property(modem, key, return set_modem_property(modem, key, PROPERTY_TYPE_INTEGER, &value);
OFONO_PROPERTY_TYPE_INTEGER, &value);
} }
int ofono_modem_set_boolean(struct ofono_modem *modem, int ofono_modem_set_boolean(struct ofono_modem *modem,
const char *key, bool value) const char *key, bool value)
{ {
return set_modem_property(modem, key, return set_modem_property(modem, key, PROPERTY_TYPE_BOOLEAN, &value);
OFONO_PROPERTY_TYPE_BOOLEAN, &value);
} }
const char *ofono_modem_get_string(struct ofono_modem *modem, const char *key) const char *ofono_modem_get_string(struct ofono_modem *modem, const char *key)
@ -1151,7 +1147,7 @@ const char *ofono_modem_get_string(struct ofono_modem *modem, const char *key)
const char *value; const char *value;
if (get_modem_property(modem, key, if (get_modem_property(modem, key,
OFONO_PROPERTY_TYPE_STRING, &value) == FALSE) PROPERTY_TYPE_STRING, &value) == FALSE)
return NULL; return NULL;
return value; return value;
@ -1162,7 +1158,7 @@ int ofono_modem_get_integer(struct ofono_modem *modem, const char *key)
int value; int value;
if (get_modem_property(modem, key, if (get_modem_property(modem, key,
OFONO_PROPERTY_TYPE_INTEGER, &value) == FALSE) PROPERTY_TYPE_INTEGER, &value) == FALSE)
return 0; return 0;
return value; return value;
@ -1173,7 +1169,7 @@ bool ofono_modem_get_boolean(struct ofono_modem *modem, const char *key)
bool value; bool value;
if (get_modem_property(modem, key, if (get_modem_property(modem, key,
OFONO_PROPERTY_TYPE_BOOLEAN, &value) == FALSE) PROPERTY_TYPE_BOOLEAN, &value) == FALSE)
return FALSE; return FALSE;
return value; return value;