[PATCH 1/2] gobi: support rpmsg device node (SMD channel)

[Joey Hewitt]

---
 plugins/udevng.c | 61 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/plugins/udevng.c b/plugins/udevng.c
index ff5d41a..c85128a 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -202,39 +202,43 @@ static gboolean setup_gobi(struct modem_info *modem)
 
        DBG("%s", modem->syspath);
 
-       for (list = modem->devices; list; list = list->next) {
-               struct device_info *info = list->data;
+       if (modem->type == MODEM_TYPE_USB) {
+               for (list = modem->devices; list; list = list->next) {
+                       struct device_info *info = list->data;
 
-               DBG("%s %s %s %s %s %s", info->devnode, info->interface,
-                                               info->number, info->label,
-                                               info->sysattr, info->subsystem);
+                       DBG("%s %s %s %s %s %s", info->devnode, info->interface,
+                                                       info->number, 
info->label,
+                                                       info->sysattr, 
info->subsystem);
 
-               if (g_strcmp0(info->subsystem, "usbmisc") == 0) /* cdc-wdm */
-                       qmi = info->devnode;
-               else if (g_strcmp0(info->subsystem, "net") == 0) /* wwan */
-                       net = info->devnode;
-               else if (g_strcmp0(info->subsystem, "tty") == 0) {
-                       if (g_strcmp0(info->interface, "255/255/255") == 0) {
-                               if (g_strcmp0(info->number, "00") == 0)
-                                       diag = info->devnode; /* ec20 */
-                               else if (g_strcmp0(info->number, "01") == 0)
-                                       diag = info->devnode; /* gobi */
-                               else if (g_strcmp0(info->number, "02") == 0)
-                                       mdm = info->devnode; /* gobi */
-                               else if (g_strcmp0(info->number, "03") == 0)
-                                       gps = info->devnode; /* gobi */
-                       } else if (g_strcmp0(info->interface, "255/0/0") == 0) {
-                               if (g_strcmp0(info->number, "01") == 0)
-                                       gps = info->devnode; /* ec20 */
-                               if (g_strcmp0(info->number, "02") == 0)
-                                       mdm = info->devnode; /* ec20 */
-                               /* ignore the 3rd device second AT/mdm iface */
+                       if (g_strcmp0(info->subsystem, "usbmisc") == 0) /* 
cdc-wdm */
+                               qmi = info->devnode;
+                       else if (g_strcmp0(info->subsystem, "net") == 0) /* 
wwan */
+                               net = info->devnode;
+                       else if (g_strcmp0(info->subsystem, "tty") == 0) {
+                               if (g_strcmp0(info->interface, "255/255/255") 
== 0) {
+                                       if (g_strcmp0(info->number, "00") == 0)
+                                               diag = info->devnode; /* ec20 */
+                                       else if (g_strcmp0(info->number, "01") 
== 0)
+                                               diag = info->devnode; /* gobi */
+                                       else if (g_strcmp0(info->number, "02") 
== 0)
+                                               mdm = info->devnode; /* gobi */
+                                       else if (g_strcmp0(info->number, "03") 
== 0)
+                                               gps = info->devnode; /* gobi */
+                               } else if (g_strcmp0(info->interface, 
"255/0/0") == 0) {
+                                       if (g_strcmp0(info->number, "01") == 0)
+                                               gps = info->devnode; /* ec20 */
+                                       if (g_strcmp0(info->number, "02") == 0)
+                                               mdm = info->devnode; /* ec20 */
+                                       /* ignore the 3rd device second AT/mdm 
iface */
+                               }
                        }
                }
-       }
 
-       if (qmi == NULL || mdm == NULL || net == NULL)
-               return FALSE;
+               if (qmi == NULL || mdm == NULL || net == NULL)
+                       return FALSE;
+       } else if (modem->type == MODEM_TYPE_SERIAL) {
+               qmi = modem->serial->devnode;
+       }
 
        DBG("qmi=%s net=%s mdm=%s gps=%s diag=%s", qmi, net, mdm, gps, diag);
 
@@ -1772,6 +1776,7 @@ static void enumerate_devices(struct udev *context)
                return;
 
        udev_enumerate_add_match_subsystem(enumerate, "tty");
+       udev_enumerate_add_match_subsystem(enumerate, "rpmsg");
        udev_enumerate_add_match_subsystem(enumerate, "usb");
        udev_enumerate_add_match_subsystem(enumerate, "usbmisc");
        udev_enumerate_add_match_subsystem(enumerate, "net");
-- 
2.7.4

_______________________________________________
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono