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

udev: add common modem registration code 

Many of these drivers do exactly the same setup when registering
the modem.  Consolidate these setup functions into common code.
This commit is contained in:
Jonas Bonn 2017-03-25 17:57:57 +01:00 committed by Denis Kenzior
parent 55a4bbf7e3
commit 3c16db19e2
1 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
plugins/udev.c
View File

@ -154,7 +154,7 @@ static void add_isi(struct ofono_modem *modem,
ofono_modem_register(modem);
}
static void add_calypso(struct ofono_modem *modem,
static void __add_common(struct ofono_modem *modem,
struct udev_device *udev_device)
{
const char *devnode;
@ -192,45 +192,6 @@ static void add_wavecom(struct ofono_modem *modem,
ofono_modem_register(modem);
}
static void add_cinterion(struct ofono_modem *modem,
struct udev_device *udev_device)
{
const char *devnode;
DBG("modem %p", modem);
devnode = udev_device_get_devnode(udev_device);
ofono_modem_set_string(modem, "Device", devnode);
ofono_modem_register(modem);
}
static void add_nokiacdma(struct ofono_modem *modem,
struct udev_device *udev_device)
{
const char *devnode;
DBG("modem %p", modem);
devnode = udev_device_get_devnode(udev_device);
ofono_modem_set_string(modem, "Device", devnode);
ofono_modem_register(modem);
}
static void add_sim900(struct ofono_modem *modem,
struct udev_device *udev_device)
{
const char *devnode;
DBG("modem %p", modem);
devnode = udev_device_get_devnode(udev_device);
ofono_modem_set_string(modem, "Device", devnode);
ofono_modem_register(modem);
}
static void add_modem(struct udev_device *udev_device)
{
struct ofono_modem *modem;
@ -282,13 +243,13 @@ static void add_modem(struct udev_device *udev_device)
else if (g_strcmp0(driver, "n900") == 0)
add_isi(modem, udev_device);
else if (g_strcmp0(driver, "calypso") == 0)
add_calypso(modem, udev_device);
__add_common(modem, udev_device);
else if (g_strcmp0(driver, "cinterion") == 0)
add_cinterion(modem, udev_device);
__add_common(modem, udev_device);
else if (g_strcmp0(driver, "nokiacdma") == 0)
add_nokiacdma(modem, udev_device);
__add_common(modem, udev_device);
else if (g_strcmp0(driver, "sim900") == 0)
add_sim900(modem, udev_device);
__add_common(modem, udev_device);
else if (g_strcmp0(driver, "wavecom") == 0)
add_wavecom(modem, udev_device);
}