manager: print modem debug info as soon as it gets exported

This commit is contained in:
Aleksander Morgado
2012-02-14 14:05:21 +01:00
parent 26ac82f607
commit 85dc060c82

View File

@@ -128,35 +128,27 @@ remove_modem (MMManager *manager,
static void static void
debug_modem_info (MMManager *self, debug_modem_info (MMManager *self,
MMBaseModem *modem) MMBaseModem *modem,
const gchar *path)
{ {
/* guint32 vid = 0; */ GUdevDevice *physdev;
/* guint32 pid = 0; */ const gchar *subsys;
/* GUdevDevice *physdev; */
/* const gchar *subsys; */
/* physdev = g_udev_client_query_by_sysfs_path ( */ physdev = g_udev_client_query_by_sysfs_path (self->priv->udev,
/* self->priv->udev, */ mm_base_modem_get_device (modem));
/* mm_base_modem_get_device (modem)); */ subsys = (physdev ?
/* subsys = (physdev ? */ g_udev_device_get_subsystem (physdev) :
/* g_udev_device_get_subsystem (physdev) : */ NULL);
/* NULL); */
/* g_object_get (G_OBJECT (modem), */ mm_dbg ("(%s): '%s' modem, VID 0x%04X PID 0x%04X (%s)",
/* MM_MODEM_DATA_DEVICE, &data_device, */ path,
/* MM_MODEM_HW_VID, &vid, */ mm_base_modem_get_plugin (modem),
/* MM_MODEM_HW_PID, &pid, */ (mm_base_modem_get_vendor_id (modem) & 0xFFFF),
/* NULL); */ (mm_base_modem_get_product_id (modem) & 0xFFFF),
/* mm_dbg ("(%s): VID 0x%04X PID 0x%04X (%s)", */ subsys ? subsys : "unknown");
/* path, */
/* (vid & 0xFFFF), */
/* (pid & 0xFFFF), */
/* subsys ? subsys : "unknown"); */
/* mm_dbg ("(%s): data port is %s", path, data_device); */
/* g_free (data_device); */
/* if (physdev) */ if (physdev)
/* g_object_unref (physdev); */ g_object_unref (physdev);
} }
static void static void
@@ -232,10 +224,10 @@ check_export_modem (MMManager *self,
g_dbus_object_manager_server_export (self->priv->object_manager, g_dbus_object_manager_server_export (self->priv->object_manager,
G_DBUS_OBJECT_SKELETON (modem)); G_DBUS_OBJECT_SKELETON (modem));
mm_dbg ("Exported modem '%s' at path '%s'", modem_physdev, path); mm_dbg ("Exported modem '%s' at path '%s'", modem_physdev, path);
g_free (path);
/* Once connected, dump additional debug info about the modem */ /* Once connected, dump additional debug info about the modem */
debug_modem_info (self, modem); debug_modem_info (self, modem, path);
g_free (path);
} }
static void static void