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

Add udev support for ISI modems

This commit is contained in:
Aki Niemi 2010-09-28 10:33:36 +03:00
parent 43e9d09a1c
commit f6966a3c5e
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/isigen.c
View File

@ -253,17 +253,16 @@ static void phonet_status_cb(GIsiModem *idx,
g_isi_verify(isi->client, reachable_cb, isi);
else if (st == PN_LINK_DOWN)
set_power_by_mtc_state(isi, MTC_STATE_NONE);
else if (st == PN_LINK_REMOVED)
ofono_modem_remove(modem);
}
static int isigen_probe(struct ofono_modem *modem)
{
struct isi_data *isi;
char const *ifname = ofono_modem_get_string(modem, "Interface");
const char *ifname = ofono_modem_get_string(modem, "Interface");
unsigned address = ofono_modem_get_integer(modem, "Address");
GIsiModem *idx;
GPhonetNetlink *link;
if (ifname == NULL)
return -EINVAL;

2
plugins/n900.c
View File

@ -392,7 +392,7 @@ static int n900_probe(struct ofono_modem *modem)
struct isi_data *isi;
if (ifname == NULL)
ifname = "phonet0";
return -EINVAL;
DBG("(%p) with %s", modem, ifname);

13
plugins/ofono.rules
View File

@ -337,6 +337,19 @@ ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1486", ENV{OFONO_IFACE_NUM}=="02", E
LABEL="ofono_tty_end"
# ISI/Phonet drivers
SUBSYSTEM!="net", GOTO="ofono_isi_end"
ATTRS{type}!="820", GOTO="ofono_isi_end"
KERNELS=="gadget", GOTO="ofono_isi_end"
# Generic / PC Suite mode
SUBSYSTEMS=="usb", ENV{OFONO_DRIVER}="isigen", ENV{OFONO_ISI_ADDRESS}="16"
# Nokia N900 modem
SUBSYSTEMS=="hsi", ENV{OFONO_DRIVER}="n900", ENV{OFONO_ISI_ADDRESS}="108"
LABEL="ofono_isi_end"
SUBSYSTEM!="usb", GOTO="ofono_end"
ENV{DEVTYPE}!="usb_device", GOTO="ofono_end"

23
plugins/udev.c
View File

@ -25,6 +25,7 @@
#include <errno.h>
#include <ctype.h>
#include <stdlib.h>
#include <libudev.h>
@ -424,6 +425,24 @@ static void add_nokia(struct ofono_modem *modem,
}
}
static void add_isi(struct ofono_modem *modem,
struct udev_device *udev_device)
{
const char *ifname, *addr;
DBG("modem %p", modem);
ifname = udev_device_get_sysname(udev_device);
ofono_modem_set_string(modem, "Interface", ifname);
DBG("Interface=%s", ifname);
addr = udev_device_get_property_value(udev_device, "OFONO_ISI_ADDRESS");
ofono_modem_set_integer(modem, "Address", atoi(addr));
ofono_modem_register(modem);
}
static void add_modem(struct udev_device *udev_device)
{
struct ofono_modem *modem;
@ -504,6 +523,10 @@ done:
add_novatel(modem, udev_device);
else if (g_strcmp0(driver, "nokia") == 0)
add_nokia(modem, udev_device);
else if (g_strcmp0(driver, "isigen") == 0)
add_isi(modem, udev_device);
else if (g_strcmp0(driver, "n900") == 0)
add_isi(modem, udev_device);
}
static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data)