[gnome-disk-utility/new-ui] Rename Controller to Adapter
- From: David Zeuthen <davidz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility/new-ui] Rename Controller to Adapter
- Date: Sat, 28 Nov 2009 19:05:36 +0000 (UTC)
commit 9f36d7d42378c358c6d915dc33a872dc377a395b
Author: David Zeuthen <davidz redhat com>
Date: Sat Nov 28 14:04:42 2009 -0500
Rename Controller to Adapter
src/gdu/Makefile.am | 10 +-
src/gdu/{gdu-controller.c => gdu-adapter.c} | 148 +++++++++---------
src/gdu/gdu-adapter.h | 75 +++++++++
src/gdu/gdu-controller.h | 75 ---------
src/gdu/gdu-device.c | 12 +-
src/gdu/gdu-device.h | 2 +-
src/gdu/gdu-hba.c | 36 ++--
src/gdu/gdu-hba.h | 4 +-
src/gdu/gdu-pool.c | 230 +++++++++++++-------------
src/gdu/gdu-pool.h | 10 +-
src/gdu/gdu-private.h | 6 +-
src/gdu/gdu-types.h | 2 +-
src/gdu/gdu.h | 2 +-
src/palimpsest/gdu-section-hba.c | 18 +-
14 files changed, 315 insertions(+), 315 deletions(-)
---
diff --git a/src/gdu/Makefile.am b/src/gdu/Makefile.am
index 00f3125..b873e46 100644
--- a/src/gdu/Makefile.am
+++ b/src/gdu/Makefile.am
@@ -3,7 +3,7 @@ NULL =
BUILT_SOURCES = \
devkit-disks-daemon-glue.h \
devkit-disks-device-glue.h \
- devkit-disks-controller-glue.h \
+ devkit-disks-adapter-glue.h \
gdu-marshal.h gdu-marshal.c
gdu-marshal.h: gdu-marshal.list
@@ -18,8 +18,8 @@ devkit-disks-daemon-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.DeviceK
devkit-disks-device-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.DeviceKit.Disks.Device.xml Makefile.am
dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=devkit-disks-device-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.DeviceKit.Disks.Device.xml
-devkit-disks-controller-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.DeviceKit.Disks.Controller.xml Makefile.am
- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=devkit-disks-controller-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.DeviceKit.Disks.Controller.xml
+devkit-disks-adapter-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.DeviceKit.Disks.Adapter.xml Makefile.am
+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=devkit-disks-adapter-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.DeviceKit.Disks.Adapter.xml
lib_LTLIBRARIES=libgdu.la
@@ -30,7 +30,7 @@ libgduinclude_HEADERS = \
gdu-types.h \
gdu-callbacks.h \
gdu-device.h \
- gdu-controller.h \
+ gdu-adapter.h \
gdu-drive.h \
gdu-linux-md-drive.h \
gdu-error.h \
@@ -51,7 +51,7 @@ libgdu_la_SOURCES = \
gdu-util.h gdu-util.c \
gdu-pool.c gdu-pool.h \
gdu-device.c gdu-device.h \
- gdu-controller.c gdu-controller.h \
+ gdu-adapter.c gdu-adapter.h \
gdu-drive.c gdu-drive.h \
gdu-linux-md-drive.c gdu-linux-md-drive.h \
gdu-volume.c gdu-volume.h \
diff --git a/src/gdu/gdu-controller.c b/src/gdu/gdu-adapter.c
similarity index 58%
rename from src/gdu/gdu-controller.c
rename to src/gdu/gdu-adapter.c
index 9052ce3..6290ac1 100644
--- a/src/gdu/gdu-controller.c
+++ b/src/gdu/gdu-adapter.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/* gdu-controller.c
+/* gdu-adapter.c
*
* Copyright (C) 2009 David Zeuthen
*
@@ -30,8 +30,8 @@
#include "gdu-private.h"
#include "gdu-pool.h"
-#include "gdu-controller.h"
-#include "devkit-disks-controller-glue.h"
+#include "gdu-adapter.h"
+#include "devkit-disks-adapter-glue.h"
/* --- SUCKY CODE BEGIN --- */
@@ -48,10 +48,10 @@ typedef struct
gchar *vendor;
gchar *model;
gchar *driver;
-} ControllerProperties;
+} AdapterProperties;
static void
-collect_props (const char *key, const GValue *value, ControllerProperties *props)
+collect_props (const char *key, const GValue *value, AdapterProperties *props)
{
gboolean handled = TRUE;
@@ -72,7 +72,7 @@ collect_props (const char *key, const GValue *value, ControllerProperties *props
}
static void
-controller_properties_free (ControllerProperties *props)
+adapter_properties_free (AdapterProperties *props)
{
g_free (props->native_path);
g_free (props->vendor);
@@ -81,17 +81,17 @@ controller_properties_free (ControllerProperties *props)
g_free (props);
}
-static ControllerProperties *
-controller_properties_get (DBusGConnection *bus,
+static AdapterProperties *
+adapter_properties_get (DBusGConnection *bus,
const char *object_path)
{
- ControllerProperties *props;
+ AdapterProperties *props;
GError *error;
GHashTable *hash_table;
DBusGProxy *prop_proxy;
- const char *ifname = "org.freedesktop.DeviceKit.Disks.Controller";
+ const char *ifname = "org.freedesktop.DeviceKit.Disks.Adapter";
- props = g_new0 (ControllerProperties, 1);
+ props = g_new0 (AdapterProperties, 1);
prop_proxy = dbus_g_proxy_new_for_name (bus,
"org.freedesktop.DeviceKit.Disks",
@@ -110,7 +110,7 @@ controller_properties_get (DBusGConnection *bus,
g_warning ("Couldn't call GetAll() to get properties for %s: %s", object_path, error->message);
g_error_free (error);
- controller_properties_free (props);
+ adapter_properties_free (props);
props = NULL;
goto out;
}
@@ -134,7 +134,7 @@ out:
/* --- SUCKY CODE END --- */
-struct _GduControllerPrivate
+struct _GduAdapterPrivate
{
DBusGConnection *bus;
DBusGProxy *proxy;
@@ -142,7 +142,7 @@ struct _GduControllerPrivate
char *object_path;
- ControllerProperties *props;
+ AdapterProperties *props;
};
enum {
@@ -154,49 +154,49 @@ enum {
static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (GduController, gdu_controller, G_TYPE_OBJECT);
+G_DEFINE_TYPE (GduAdapter, gdu_adapter, G_TYPE_OBJECT);
GduPool *
-gdu_controller_get_pool (GduController *controller)
+gdu_adapter_get_pool (GduAdapter *adapter)
{
- return g_object_ref (controller->priv->pool);
+ return g_object_ref (adapter->priv->pool);
}
static void
-gdu_controller_finalize (GduController *controller)
+gdu_adapter_finalize (GduAdapter *adapter)
{
- g_debug ("##### finalized controller %s",
- controller->priv->props != NULL ? controller->priv->props->native_path : controller->priv->object_path);
-
- dbus_g_connection_unref (controller->priv->bus);
- g_free (controller->priv->object_path);
- if (controller->priv->proxy != NULL)
- g_object_unref (controller->priv->proxy);
- if (controller->priv->pool != NULL)
- g_object_unref (controller->priv->pool);
- if (controller->priv->props != NULL)
- controller_properties_free (controller->priv->props);
+ g_debug ("##### finalized adapter %s",
+ adapter->priv->props != NULL ? adapter->priv->props->native_path : adapter->priv->object_path);
+
+ dbus_g_connection_unref (adapter->priv->bus);
+ g_free (adapter->priv->object_path);
+ if (adapter->priv->proxy != NULL)
+ g_object_unref (adapter->priv->proxy);
+ if (adapter->priv->pool != NULL)
+ g_object_unref (adapter->priv->pool);
+ if (adapter->priv->props != NULL)
+ adapter_properties_free (adapter->priv->props);
if (G_OBJECT_CLASS (parent_class)->finalize)
- (* G_OBJECT_CLASS (parent_class)->finalize) (G_OBJECT (controller));
+ (* G_OBJECT_CLASS (parent_class)->finalize) (G_OBJECT (adapter));
}
static void
-gdu_controller_class_init (GduControllerClass *klass)
+gdu_adapter_class_init (GduAdapterClass *klass)
{
GObjectClass *obj_class = (GObjectClass *) klass;
parent_class = g_type_class_peek_parent (klass);
- obj_class->finalize = (GObjectFinalizeFunc) gdu_controller_finalize;
+ obj_class->finalize = (GObjectFinalizeFunc) gdu_adapter_finalize;
- g_type_class_add_private (klass, sizeof (GduControllerPrivate));
+ g_type_class_add_private (klass, sizeof (GduAdapterPrivate));
signals[CHANGED] =
g_signal_new ("changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GduControllerClass, changed),
+ G_STRUCT_OFFSET (GduAdapterClass, changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@@ -204,28 +204,28 @@ gdu_controller_class_init (GduControllerClass *klass)
g_signal_new ("removed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GduControllerClass, removed),
+ G_STRUCT_OFFSET (GduAdapterClass, removed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}
static void
-gdu_controller_init (GduController *controller)
+gdu_adapter_init (GduAdapter *adapter)
{
- controller->priv = G_TYPE_INSTANCE_GET_PRIVATE (controller, GDU_TYPE_CONTROLLER, GduControllerPrivate);
+ adapter->priv = G_TYPE_INSTANCE_GET_PRIVATE (adapter, GDU_TYPE_ADAPTER, GduAdapterPrivate);
}
static gboolean
-update_info (GduController *controller)
+update_info (GduAdapter *adapter)
{
- ControllerProperties *new_properties;
+ AdapterProperties *new_properties;
- new_properties = controller_properties_get (controller->priv->bus, controller->priv->object_path);
+ new_properties = adapter_properties_get (adapter->priv->bus, adapter->priv->object_path);
if (new_properties != NULL) {
- if (controller->priv->props != NULL)
- controller_properties_free (controller->priv->props);
- controller->priv->props = new_properties;
+ if (adapter->priv->props != NULL)
+ adapter_properties_free (adapter->priv->props);
+ adapter->priv->props = new_properties;
return TRUE;
} else {
return FALSE;
@@ -233,50 +233,50 @@ update_info (GduController *controller)
}
-GduController *
-_gdu_controller_new_from_object_path (GduPool *pool, const char *object_path)
+GduAdapter *
+_gdu_adapter_new_from_object_path (GduPool *pool, const char *object_path)
{
GError *error;
- GduController *controller;
+ GduAdapter *adapter;
- controller = GDU_CONTROLLER (g_object_new (GDU_TYPE_CONTROLLER, NULL));
- controller->priv->object_path = g_strdup (object_path);
- controller->priv->pool = g_object_ref (pool);
+ adapter = GDU_ADAPTER (g_object_new (GDU_TYPE_ADAPTER, NULL));
+ adapter->priv->object_path = g_strdup (object_path);
+ adapter->priv->pool = g_object_ref (pool);
error = NULL;
- controller->priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
- if (controller->priv->bus == NULL) {
+ adapter->priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+ if (adapter->priv->bus == NULL) {
g_warning ("Couldn't connect to system bus: %s", error->message);
g_error_free (error);
goto error;
}
- controller->priv->proxy = dbus_g_proxy_new_for_name (controller->priv->bus,
+ adapter->priv->proxy = dbus_g_proxy_new_for_name (adapter->priv->bus,
"org.freedesktop.DeviceKit.Disks",
- controller->priv->object_path,
- "org.freedesktop.DeviceKit.Disks.Controller");
- dbus_g_proxy_set_default_timeout (controller->priv->proxy, INT_MAX);
- dbus_g_proxy_add_signal (controller->priv->proxy, "Changed", G_TYPE_INVALID);
+ adapter->priv->object_path,
+ "org.freedesktop.DeviceKit.Disks.Adapter");
+ dbus_g_proxy_set_default_timeout (adapter->priv->proxy, INT_MAX);
+ dbus_g_proxy_add_signal (adapter->priv->proxy, "Changed", G_TYPE_INVALID);
/* TODO: connect signals */
- if (!update_info (controller))
+ if (!update_info (adapter))
goto error;
- g_debug ("_gdu_controller_new_from_object_path: %s", controller->priv->props->native_path);
+ g_debug ("_gdu_adapter_new_from_object_path: %s", adapter->priv->props->native_path);
- return controller;
+ return adapter;
error:
- g_object_unref (controller);
+ g_object_unref (adapter);
return NULL;
}
gboolean
-_gdu_controller_changed (GduController *controller)
+_gdu_adapter_changed (GduAdapter *adapter)
{
- g_debug ("_gdu_controller_changed: %s", controller->priv->props->native_path);
- if (update_info (controller)) {
- g_signal_emit (controller, signals[CHANGED], 0);
+ g_debug ("_gdu_adapter_changed: %s", adapter->priv->props->native_path);
+ if (update_info (adapter)) {
+ g_signal_emit (adapter, signals[CHANGED], 0);
return TRUE;
} else {
return FALSE;
@@ -284,32 +284,32 @@ _gdu_controller_changed (GduController *controller)
}
const gchar *
-gdu_controller_get_object_path (GduController *controller)
+gdu_adapter_get_object_path (GduAdapter *adapter)
{
- return controller->priv->object_path;
+ return adapter->priv->object_path;
}
const gchar *
-gdu_controller_get_native_path (GduController *controller)
+gdu_adapter_get_native_path (GduAdapter *adapter)
{
- return controller->priv->props->native_path;
+ return adapter->priv->props->native_path;
}
const gchar *
-gdu_controller_get_vendor (GduController *controller)
+gdu_adapter_get_vendor (GduAdapter *adapter)
{
- return controller->priv->props->vendor;
+ return adapter->priv->props->vendor;
}
const gchar *
-gdu_controller_get_model (GduController *controller)
+gdu_adapter_get_model (GduAdapter *adapter)
{
- return controller->priv->props->model;
+ return adapter->priv->props->model;
}
const gchar *
-gdu_controller_get_driver (GduController *controller)
+gdu_adapter_get_driver (GduAdapter *adapter)
{
- return controller->priv->props->driver;
+ return adapter->priv->props->driver;
}
diff --git a/src/gdu/gdu-adapter.h b/src/gdu/gdu-adapter.h
new file mode 100644
index 0000000..eb69307
--- /dev/null
+++ b/src/gdu/gdu-adapter.h
@@ -0,0 +1,75 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/* gdu-adapter.h
+ *
+ * Copyright (C) 2009 David Zeuthen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#if !defined (__GDU_INSIDE_GDU_H) && !defined (GDU_COMPILATION)
+#error "Only <gdu/gdu.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef __GDU_ADAPTER_H
+#define __GDU_ADAPTER_H
+
+#include <unistd.h>
+#include <sys/types.h>
+
+#include <gdu/gdu-types.h>
+#include <gdu/gdu-callbacks.h>
+
+G_BEGIN_DECLS
+
+#define GDU_TYPE_ADAPTER (gdu_adapter_get_type ())
+#define GDU_ADAPTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDU_TYPE_ADAPTER, GduAdapter))
+#define GDU_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GDU_ADAPTER, GduAdapterClass))
+#define GDU_IS_ADAPTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDU_TYPE_ADAPTER))
+#define GDU_IS_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDU_TYPE_ADAPTER))
+#define GDU_ADAPTER_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS ((k), GDU_TYPE_ADAPTER, GduAdapterClass))
+
+typedef struct _GduAdapterClass GduAdapterClass;
+typedef struct _GduAdapterPrivate GduAdapterPrivate;
+
+struct _GduAdapter
+{
+ GObject parent;
+
+ /* private */
+ GduAdapterPrivate *priv;
+};
+
+struct _GduAdapterClass
+{
+ GObjectClass parent_class;
+
+ /* signals */
+ void (*changed) (GduAdapter *adapter);
+ void (*removed) (GduAdapter *adapter);
+};
+
+GType gdu_adapter_get_type (void);
+const char *gdu_adapter_get_object_path (GduAdapter *adapter);
+GduPool *gdu_adapter_get_pool (GduAdapter *adapter);
+
+const gchar *gdu_adapter_get_native_path (GduAdapter *adapter);
+const gchar *gdu_adapter_get_vendor (GduAdapter *adapter);
+const gchar *gdu_adapter_get_model (GduAdapter *adapter);
+const gchar *gdu_adapter_get_driver (GduAdapter *adapter);
+
+G_END_DECLS
+
+#endif /* __GDU_ADAPTER_H */
diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c
index affe23a..dd0ecda 100644
--- a/src/gdu/gdu-device.c
+++ b/src/gdu/gdu-device.c
@@ -123,7 +123,7 @@ typedef struct
gboolean drive_is_rotational;
guint drive_rotation_rate;
char *drive_write_cache;
- char *drive_controller;
+ char *drive_adapter;
gboolean optical_disc_is_blank;
gboolean optical_disc_is_appendable;
@@ -319,8 +319,8 @@ collect_props (const char *key, const GValue *value, DeviceProperties *props)
props->drive_rotation_rate = g_value_get_uint (value);
else if (strcmp (key, "DriveWriteCache") == 0)
props->drive_write_cache = g_strdup (g_value_get_string (value));
- else if (strcmp (key, "DriveController") == 0)
- props->drive_controller = g_strdup (g_value_get_boxed (value));
+ else if (strcmp (key, "DriveAdapter") == 0)
+ props->drive_adapter = g_strdup (g_value_get_boxed (value));
else if (strcmp (key, "OpticalDiscIsBlank") == 0)
props->optical_disc_is_blank = g_value_get_boolean (value);
@@ -441,7 +441,7 @@ device_properties_free (DeviceProperties *props)
g_strfreev (props->drive_media_compatibility);
g_free (props->drive_media);
g_free (props->drive_write_cache);
- g_free (props->drive_controller);
+ g_free (props->drive_adapter);
g_free (props->drive_ata_smart_status);
g_free (props->drive_ata_smart_blob);
@@ -1087,9 +1087,9 @@ gdu_device_drive_get_write_cache (GduDevice *device)
}
const char *
-gdu_device_drive_get_controller (GduDevice *device)
+gdu_device_drive_get_adapter (GduDevice *device)
{
- return device->priv->props->drive_controller;
+ return device->priv->props->drive_adapter;
}
gboolean
diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h
index 4e59c48..d294450 100644
--- a/src/gdu/gdu-device.h
+++ b/src/gdu/gdu-device.h
@@ -144,7 +144,7 @@ gboolean gdu_device_drive_get_can_spindown (GduDevice *device);
gboolean gdu_device_drive_get_is_rotational (GduDevice *device);
guint gdu_device_drive_get_rotation_rate (GduDevice *device);
const char *gdu_device_drive_get_write_cache (GduDevice *device);
-const char *gdu_device_drive_get_controller (GduDevice *device);
+const char *gdu_device_drive_get_adapter (GduDevice *device);
gboolean gdu_device_optical_disc_get_is_blank (GduDevice *device);
gboolean gdu_device_optical_disc_get_is_appendable (GduDevice *device);
diff --git a/src/gdu/gdu-hba.c b/src/gdu/gdu-hba.c
index 1a09d4a..74d27e7 100644
--- a/src/gdu/gdu-hba.c
+++ b/src/gdu/gdu-hba.c
@@ -28,7 +28,7 @@
#include "gdu-private.h"
#include "gdu-util.h"
#include "gdu-pool.h"
-#include "gdu-controller.h"
+#include "gdu-adapter.h"
#include "gdu-hba.h"
#include "gdu-presentable.h"
#include "gdu-linux-md-drive.h"
@@ -39,14 +39,14 @@
* @short_description: HBAs
*
* #GduHba objects are used to represent host board adapters (also
- * called disk controllers).
+ * called disk adapters).
*
* See the documentation for #GduPresentable for the big picture.
*/
struct _GduHbaPrivate
{
- GduController *controller;
+ GduAdapter *adapter;
GduPool *pool;
gchar *id;
};
@@ -58,7 +58,7 @@ G_DEFINE_TYPE_WITH_CODE (GduHba, gdu_hba, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GDU_TYPE_PRESENTABLE,
gdu_hba_presentable_iface_init))
-static void controller_changed (GduController *controller, gpointer user_data);
+static void adapter_changed (GduAdapter *adapter, gpointer user_data);
static void
@@ -68,9 +68,9 @@ gdu_hba_finalize (GObject *object)
//g_debug ("##### finalized hba '%s' %p", hba->priv->id, hba);
- if (hba->priv->controller != NULL) {
- g_signal_handlers_disconnect_by_func (hba->priv->controller, controller_changed, hba);
- g_object_unref (hba->priv->controller);
+ if (hba->priv->adapter != NULL) {
+ g_signal_handlers_disconnect_by_func (hba->priv->adapter, adapter_changed, hba);
+ g_object_unref (hba->priv->adapter);
}
if (hba->priv->pool != NULL)
@@ -101,7 +101,7 @@ gdu_hba_init (GduHba *hba)
}
static void
-controller_changed (GduController *controller, gpointer user_data)
+adapter_changed (GduAdapter *adapter, gpointer user_data)
{
GduHba *hba = GDU_HBA (user_data);
g_signal_emit_by_name (hba, "changed");
@@ -109,15 +109,15 @@ controller_changed (GduController *controller, gpointer user_data)
}
GduHba *
-_gdu_hba_new_from_controller (GduPool *pool, GduController *controller)
+_gdu_hba_new_from_adapter (GduPool *pool, GduAdapter *adapter)
{
GduHba *hba;
hba = GDU_HBA (g_object_new (GDU_TYPE_HBA, NULL));
- hba->priv->controller = g_object_ref (controller);
+ hba->priv->adapter = g_object_ref (adapter);
hba->priv->pool = g_object_ref (pool);
- hba->priv->id = g_strdup (gdu_controller_get_native_path (hba->priv->controller));
- g_signal_connect (controller, "changed", (GCallback) controller_changed, hba);
+ hba->priv->id = g_strdup (gdu_adapter_get_native_path (hba->priv->adapter));
+ g_signal_connect (adapter, "changed", (GCallback) adapter_changed, hba);
return hba;
}
@@ -155,8 +155,8 @@ gdu_hba_get_vpd_name (GduPresentable *presentable)
const gchar *vendor;
const gchar *model;
- vendor = gdu_controller_get_vendor (hba->priv->controller);
- model = gdu_controller_get_model (hba->priv->controller);
+ vendor = gdu_adapter_get_vendor (hba->priv->adapter);
+ model = gdu_adapter_get_model (hba->priv->adapter);
//s = g_strdup_printf ("%s %s", vendor, model);
s = g_strdup (model);
return s;
@@ -193,7 +193,7 @@ static GduPool *
gdu_hba_get_pool (GduPresentable *presentable)
{
GduHba *hba = GDU_HBA (presentable);
- return gdu_controller_get_pool (hba->priv->controller);
+ return gdu_adapter_get_pool (hba->priv->adapter);
}
static gboolean
@@ -208,10 +208,10 @@ gdu_hba_is_recognized (GduPresentable *presentable)
return FALSE;
}
-GduController *
-gdu_hba_get_controller (GduHba *hba)
+GduAdapter *
+gdu_hba_get_adapter (GduHba *hba)
{
- return g_object_ref (hba->priv->controller);
+ return g_object_ref (hba->priv->adapter);
}
static void
diff --git a/src/gdu/gdu-hba.h b/src/gdu/gdu-hba.h
index 760ec78..e63b42d 100644
--- a/src/gdu/gdu-hba.h
+++ b/src/gdu/gdu-hba.h
@@ -53,8 +53,8 @@ struct _GduHbaClass
GObjectClass parent_class;
};
-GType gdu_hba_get_type (void);
-GduController *gdu_hba_get_controller (GduHba *hba);
+GType gdu_hba_get_type (void);
+GduAdapter *gdu_hba_get_adapter (GduHba *hba);
G_END_DECLS
diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
index adcc5f3..a4b232d 100644
--- a/src/gdu/gdu-pool.c
+++ b/src/gdu/gdu-pool.c
@@ -27,7 +27,7 @@
#include "gdu-pool.h"
#include "gdu-presentable.h"
#include "gdu-device.h"
-#include "gdu-controller.h"
+#include "gdu-adapter.h"
#include "gdu-drive.h"
#include "gdu-linux-md-drive.h"
#include "gdu-volume.h"
@@ -51,9 +51,9 @@ enum {
DEVICE_REMOVED,
DEVICE_CHANGED,
DEVICE_JOB_CHANGED,
- CONTROLLER_ADDED,
- CONTROLLER_REMOVED,
- CONTROLLER_CHANGED,
+ ADAPTER_ADDED,
+ ADAPTER_REMOVED,
+ ADAPTER_CHANGED,
PRESENTABLE_ADDED,
PRESENTABLE_REMOVED,
PRESENTABLE_CHANGED,
@@ -80,7 +80,7 @@ struct _GduPoolPrivate
GHashTable *object_path_to_device;
/* the current set of devices we know about */
- GHashTable *object_path_to_controller;
+ GHashTable *object_path_to_adapter;
};
G_DEFINE_TYPE (GduPool, gdu_pool, G_TYPE_OBJECT);
@@ -98,7 +98,7 @@ gdu_pool_finalize (GduPool *pool)
g_hash_table_unref (pool->priv->object_path_to_device);
- g_hash_table_unref (pool->priv->object_path_to_controller);
+ g_hash_table_unref (pool->priv->object_path_to_adapter);
g_list_foreach (pool->priv->presentables, (GFunc) g_object_unref, NULL);
g_list_free (pool->priv->presentables);
@@ -188,56 +188,56 @@ gdu_pool_class_init (GduPoolClass *klass)
GDU_TYPE_DEVICE);
/**
- * GduPool::controller-added
+ * GduPool::adapter-added
* @pool: The #GduPool emitting the signal.
- * @controller: The #GduController that was added.
+ * @adapter: The #GduAdapter that was added.
*
- * Emitted when @controller is added to @pool.
+ * Emitted when @adapter is added to @pool.
**/
- signals[CONTROLLER_ADDED] =
- g_signal_new ("controller-added",
+ signals[ADAPTER_ADDED] =
+ g_signal_new ("adapter-added",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GduPoolClass, controller_added),
+ G_STRUCT_OFFSET (GduPoolClass, adapter_added),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
- GDU_TYPE_CONTROLLER);
+ GDU_TYPE_ADAPTER);
/**
- * GduPool::controller-removed
+ * GduPool::adapter-removed
* @pool: The #GduPool emitting the signal.
- * @controller: The #GduController that was removed.
+ * @adapter: The #GduAdapter that was removed.
*
- * Emitted when @controller is removed from @pool. Recipients
- * should release references to @controller.
+ * Emitted when @adapter is removed from @pool. Recipients
+ * should release references to @adapter.
**/
- signals[CONTROLLER_REMOVED] =
- g_signal_new ("controller-removed",
+ signals[ADAPTER_REMOVED] =
+ g_signal_new ("adapter-removed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GduPoolClass, controller_removed),
+ G_STRUCT_OFFSET (GduPoolClass, adapter_removed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
- GDU_TYPE_CONTROLLER);
+ GDU_TYPE_ADAPTER);
/**
- * GduPool::controller-changed
+ * GduPool::adapter-changed
* @pool: The #GduPool emitting the signal.
- * @controller: A #GduController.
+ * @adapter: A #GduAdapter.
*
- * Emitted when @controller is changed.
+ * Emitted when @adapter is changed.
**/
- signals[CONTROLLER_CHANGED] =
- g_signal_new ("controller-changed",
+ signals[ADAPTER_CHANGED] =
+ g_signal_new ("adapter-changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GduPoolClass, controller_changed),
+ G_STRUCT_OFFSET (GduPoolClass, adapter_changed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
- GDU_TYPE_CONTROLLER);
+ GDU_TYPE_ADAPTER);
/**
@@ -352,7 +352,7 @@ gdu_pool_init (GduPool *pool)
NULL,
g_object_unref);
- pool->priv->object_path_to_controller = g_hash_table_new_full (g_str_hash,
+ pool->priv->object_path_to_adapter = g_hash_table_new_full (g_str_hash,
g_str_equal,
NULL,
g_object_unref);
@@ -671,14 +671,14 @@ recompute_presentables (GduPool *pool)
{
GList *l;
GList *devices;
- GList *controllers;
+ GList *adapters;
GList *new_partitioned_drives;
GList *new_presentables;
GList *added_presentables;
GList *removed_presentables;
GHashTable *hash_map_from_drive_to_extended_partition;
GHashTable *hash_map_from_linux_md_uuid_to_drive;
- GHashTable *hash_map_from_controller_objpath_to_hba;
+ GHashTable *hash_map_from_adapter_objpath_to_hba;
/* The general strategy for (re-)computing presentables is rather brute force; we
* compute the complete set of presentables every time and diff it against the
@@ -703,25 +703,25 @@ recompute_presentables (GduPool *pool)
NULL,
NULL);
- hash_map_from_controller_objpath_to_hba = g_hash_table_new_full (g_str_hash,
+ hash_map_from_adapter_objpath_to_hba = g_hash_table_new_full (g_str_hash,
g_str_equal,
NULL,
NULL);
/* First add all HBAs */
- controllers = gdu_pool_get_controllers (pool);
- for (l = controllers; l != NULL; l = l->next) {
- GduController *controller = GDU_CONTROLLER (l->data);
+ adapters = gdu_pool_get_adapters (pool);
+ for (l = adapters; l != NULL; l = l->next) {
+ GduAdapter *adapter = GDU_ADAPTER (l->data);
GduHba *hba;
- hba = _gdu_hba_new_from_controller (pool, controller);
+ hba = _gdu_hba_new_from_adapter (pool, adapter);
- g_hash_table_insert (hash_map_from_controller_objpath_to_hba,
- (gpointer) gdu_controller_get_object_path (controller),
+ g_hash_table_insert (hash_map_from_adapter_objpath_to_hba,
+ (gpointer) gdu_adapter_get_object_path (adapter),
hba);
new_presentables = g_list_prepend (new_presentables, hba);
- } /* for all controllers */
+ } /* for all adapters */
/* TODO: Ensure that pool->priv->devices is in topological sort order, then just loop
* through it and handle devices sequentially.
@@ -772,15 +772,15 @@ recompute_presentables (GduPool *pool)
} else {
- const gchar *controller_objpath;
+ const gchar *adapter_objpath;
GduPresentable *hba;
hba = NULL;
- controller_objpath = gdu_device_drive_get_controller (device);
- if (controller_objpath != NULL)
- hba = g_hash_table_lookup (hash_map_from_controller_objpath_to_hba,
- controller_objpath);
+ adapter_objpath = gdu_device_drive_get_adapter (device);
+ if (adapter_objpath != NULL)
+ hba = g_hash_table_lookup (hash_map_from_adapter_objpath_to_hba,
+ adapter_objpath);
drive = _gdu_drive_new_from_device (pool, device, hba);
}
@@ -914,7 +914,7 @@ recompute_presentables (GduPool *pool)
g_list_free (new_partitioned_drives);
g_hash_table_unref (hash_map_from_drive_to_extended_partition);
g_hash_table_unref (hash_map_from_linux_md_uuid_to_drive);
- g_hash_table_unref (hash_map_from_controller_objpath_to_hba);
+ g_hash_table_unref (hash_map_from_adapter_objpath_to_hba);
/* figure out the diff */
new_presentables = g_list_sort (new_presentables, (GCompareFunc) gdu_presentable_compare);
@@ -970,8 +970,8 @@ recompute_presentables (GduPool *pool)
g_list_free (new_presentables);
g_list_foreach (devices, (GFunc) g_object_unref, NULL);
g_list_free (devices);
- g_list_foreach (controllers, (GFunc) g_object_unref, NULL);
- g_list_free (controllers);
+ g_list_foreach (adapters, (GFunc) g_object_unref, NULL);
+ g_list_free (adapters);
}
/* ---------------------------------------------------------------------------------------------------- */
@@ -1094,33 +1094,33 @@ device_job_changed_signal_handler (DBusGProxy *proxy,
/* ---------------------------------------------------------------------------------------------------- */
static void
-controller_changed_signal_handler (DBusGProxy *proxy, const char *object_path, gpointer user_data);
+adapter_changed_signal_handler (DBusGProxy *proxy, const char *object_path, gpointer user_data);
static void
-controller_added_signal_handler (DBusGProxy *proxy, const char *object_path, gpointer user_data)
+adapter_added_signal_handler (DBusGProxy *proxy, const char *object_path, gpointer user_data)
{
GduPool *pool;
- GduController *controller;
+ GduAdapter *adapter;
pool = GDU_POOL (user_data);
- controller = gdu_pool_get_controller_by_object_path (pool, object_path);
- if (controller != NULL) {
- g_object_unref (controller);
- g_warning ("Treating add for previously added controller %s as change", object_path);
- controller_changed_signal_handler (proxy, object_path, user_data);
+ adapter = gdu_pool_get_adapter_by_object_path (pool, object_path);
+ if (adapter != NULL) {
+ g_object_unref (adapter);
+ g_warning ("Treating add for previously added adapter %s as change", object_path);
+ adapter_changed_signal_handler (proxy, object_path, user_data);
goto out;
}
- controller = _gdu_controller_new_from_object_path (pool, object_path);
- if (controller == NULL)
+ adapter = _gdu_adapter_new_from_object_path (pool, object_path);
+ if (adapter == NULL)
goto out;
- g_hash_table_insert (pool->priv->object_path_to_controller,
- (gpointer) gdu_controller_get_object_path (controller),
- controller);
- g_signal_emit (pool, signals[CONTROLLER_ADDED], 0, controller);
- //g_debug ("Added controller %s", object_path);
+ g_hash_table_insert (pool->priv->object_path_to_adapter,
+ (gpointer) gdu_adapter_get_object_path (adapter),
+ adapter);
+ g_signal_emit (pool, signals[ADAPTER_ADDED], 0, adapter);
+ //g_debug ("Added adapter %s", object_path);
recompute_presentables (pool);
@@ -1129,25 +1129,25 @@ controller_added_signal_handler (DBusGProxy *proxy, const char *object_path, gpo
}
static void
-controller_removed_signal_handler (DBusGProxy *proxy, const char *object_path, gpointer user_data)
+adapter_removed_signal_handler (DBusGProxy *proxy, const char *object_path, gpointer user_data)
{
GduPool *pool;
- GduController *controller;
+ GduAdapter *adapter;
pool = GDU_POOL (user_data);
- controller = gdu_pool_get_controller_by_object_path (pool, object_path);
- if (controller == NULL) {
- g_warning ("No controller to remove for remove %s", object_path);
+ adapter = gdu_pool_get_adapter_by_object_path (pool, object_path);
+ if (adapter == NULL) {
+ g_warning ("No adapter to remove for remove %s", object_path);
goto out;
}
- g_hash_table_remove (pool->priv->object_path_to_controller,
- gdu_controller_get_object_path (controller));
- g_signal_emit (pool, signals[CONTROLLER_REMOVED], 0, controller);
- g_signal_emit_by_name (controller, "removed");
- g_object_unref (controller);
- g_debug ("Removed controller %s", object_path);
+ g_hash_table_remove (pool->priv->object_path_to_adapter,
+ gdu_adapter_get_object_path (adapter));
+ g_signal_emit (pool, signals[ADAPTER_REMOVED], 0, adapter);
+ g_signal_emit_by_name (adapter, "removed");
+ g_object_unref (adapter);
+ g_debug ("Removed adapter %s", object_path);
recompute_presentables (pool);
@@ -1156,24 +1156,24 @@ controller_removed_signal_handler (DBusGProxy *proxy, const char *object_path, g
}
static void
-controller_changed_signal_handler (DBusGProxy *proxy, const char *object_path, gpointer user_data)
+adapter_changed_signal_handler (DBusGProxy *proxy, const char *object_path, gpointer user_data)
{
GduPool *pool;
- GduController *controller;
+ GduAdapter *adapter;
pool = GDU_POOL (user_data);
- controller = gdu_pool_get_controller_by_object_path (pool, object_path);
- if (controller == NULL) {
- g_warning ("Ignoring change event on non-existant controller %s", object_path);
+ adapter = gdu_pool_get_adapter_by_object_path (pool, object_path);
+ if (adapter == NULL) {
+ g_warning ("Ignoring change event on non-existant adapter %s", object_path);
goto out;
}
- if (_gdu_controller_changed (controller)) {
- g_signal_emit (pool, signals[CONTROLLER_CHANGED], 0, controller);
- g_signal_emit_by_name (controller, "changed");
+ if (_gdu_adapter_changed (adapter)) {
+ g_signal_emit (pool, signals[ADAPTER_CHANGED], 0, adapter);
+ g_signal_emit_by_name (adapter, "changed");
}
- g_object_unref (controller);
+ g_object_unref (adapter);
recompute_presentables (pool);
@@ -1263,7 +1263,7 @@ gdu_pool_new (void)
{
int n;
GPtrArray *devices;
- GPtrArray *controllers;
+ GPtrArray *adapters;
GduPool *pool;
GError *error;
@@ -1314,15 +1314,15 @@ gdu_pool_new (void)
dbus_g_proxy_connect_signal (pool->priv->proxy, "DeviceJobChanged",
G_CALLBACK (device_job_changed_signal_handler), pool, NULL);
- dbus_g_proxy_add_signal (pool->priv->proxy, "ControllerAdded", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (pool->priv->proxy, "ControllerRemoved", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (pool->priv->proxy, "ControllerChanged", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (pool->priv->proxy, "ControllerAdded",
- G_CALLBACK (controller_added_signal_handler), pool, NULL);
- dbus_g_proxy_connect_signal (pool->priv->proxy, "ControllerRemoved",
- G_CALLBACK (controller_removed_signal_handler), pool, NULL);
- dbus_g_proxy_connect_signal (pool->priv->proxy, "ControllerChanged",
- G_CALLBACK (controller_changed_signal_handler), pool, NULL);
+ dbus_g_proxy_add_signal (pool->priv->proxy, "AdapterAdded", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+ dbus_g_proxy_add_signal (pool->priv->proxy, "AdapterRemoved", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+ dbus_g_proxy_add_signal (pool->priv->proxy, "AdapterChanged", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal (pool->priv->proxy, "AdapterAdded",
+ G_CALLBACK (adapter_added_signal_handler), pool, NULL);
+ dbus_g_proxy_connect_signal (pool->priv->proxy, "AdapterRemoved",
+ G_CALLBACK (adapter_removed_signal_handler), pool, NULL);
+ dbus_g_proxy_connect_signal (pool->priv->proxy, "AdapterChanged",
+ G_CALLBACK (adapter_changed_signal_handler), pool, NULL);
/* get the properties on the daemon object at / */
if (!get_properties (pool)) {
@@ -1355,27 +1355,27 @@ gdu_pool_new (void)
g_ptr_array_foreach (devices, (GFunc) g_free, NULL);
g_ptr_array_free (devices, TRUE);
- /* prime the list of controllers */
+ /* prime the list of adapters */
error = NULL;
- if (!org_freedesktop_DeviceKit_Disks_enumerate_controllers (pool->priv->proxy, &controllers, &error)) {
- g_warning ("Couldn't enumerate controllers: %s", error->message);
+ if (!org_freedesktop_DeviceKit_Disks_enumerate_adapters (pool->priv->proxy, &adapters, &error)) {
+ g_warning ("Couldn't enumerate adapters: %s", error->message);
g_error_free (error);
goto error;
}
- for (n = 0; n < (int) controllers->len; n++) {
+ for (n = 0; n < (int) adapters->len; n++) {
const char *object_path;
- GduController *controller;
+ GduAdapter *adapter;
- object_path = controllers->pdata[n];
+ object_path = adapters->pdata[n];
- controller = _gdu_controller_new_from_object_path (pool, object_path);
+ adapter = _gdu_adapter_new_from_object_path (pool, object_path);
- g_hash_table_insert (pool->priv->object_path_to_controller,
- (gpointer) gdu_controller_get_object_path (controller),
- controller);
+ g_hash_table_insert (pool->priv->object_path_to_adapter,
+ (gpointer) gdu_adapter_get_object_path (adapter),
+ adapter);
}
- g_ptr_array_foreach (controllers, (GFunc) g_free, NULL);
- g_ptr_array_free (controllers, TRUE);
+ g_ptr_array_foreach (adapters, (GFunc) g_free, NULL);
+ g_ptr_array_free (adapters, TRUE);
/* and finally compute all presentables */
recompute_presentables (pool);
@@ -1414,17 +1414,17 @@ gdu_pool_get_by_object_path (GduPool *pool, const char *object_path)
* @pool: the pool
* @object_path: the D-Bus object path
*
- * Looks up #GduController object for @object_path.
+ * Looks up #GduAdapter object for @object_path.
*
- * Returns: A #GduController object for @object_path, otherwise
+ * Returns: A #GduAdapter object for @object_path, otherwise
* #NULL. Caller must unref this object using g_object_unref().
**/
-GduController *
-gdu_pool_get_controller_by_object_path (GduPool *pool, const char *object_path)
+GduAdapter *
+gdu_pool_get_adapter_by_object_path (GduPool *pool, const char *object_path)
{
- GduController *ret;
+ GduAdapter *ret;
- ret = g_hash_table_lookup (pool->priv->object_path_to_controller, object_path);
+ ret = g_hash_table_lookup (pool->priv->object_path_to_adapter, object_path);
if (ret != NULL) {
g_object_ref (ret);
}
@@ -1614,22 +1614,22 @@ gdu_pool_get_devices (GduPool *pool)
}
/**
- * gdu_pool_get_controllers:
+ * gdu_pool_get_adapters:
* @pool: A #GduPool.
*
- * Get a list of all controllers.
+ * Get a list of all adapters.
*
- * Returns: A #GList of #GduController objects. Caller must free this
+ * Returns: A #GList of #GduAdapter objects. Caller must free this
* (unref all objects, then use g_list_free()).
**/
GList *
-gdu_pool_get_controllers (GduPool *pool)
+gdu_pool_get_adapters (GduPool *pool)
{
GList *ret;
ret = NULL;
- ret = g_hash_table_get_values (pool->priv->object_path_to_controller);
+ ret = g_hash_table_get_values (pool->priv->object_path_to_adapter);
g_list_foreach (ret, (GFunc) g_object_ref, NULL);
return ret;
}
diff --git a/src/gdu/gdu-pool.h b/src/gdu/gdu-pool.h
index 7cabbd6..ea2ac84 100644
--- a/src/gdu/gdu-pool.h
+++ b/src/gdu/gdu-pool.h
@@ -59,9 +59,9 @@ struct _GduPoolClass
void (*device_changed) (GduPool *pool, GduDevice *device);
void (*device_job_changed) (GduPool *pool, GduDevice *device);
- void (*controller_added) (GduPool *pool, GduDevice *device);
- void (*controller_removed) (GduPool *pool, GduDevice *device);
- void (*controller_changed) (GduPool *pool, GduDevice *device);
+ void (*adapter_added) (GduPool *pool, GduDevice *device);
+ void (*adapter_removed) (GduPool *pool, GduDevice *device);
+ void (*adapter_changed) (GduPool *pool, GduDevice *device);
void (*presentable_added) (GduPool *pool, GduPresentable *presentable);
void (*presentable_removed) (GduPool *pool, GduPresentable *presentable);
@@ -91,8 +91,8 @@ GList *gdu_pool_get_devices (GduPool *pool);
GList *gdu_pool_get_presentables (GduPool *pool);
GList *gdu_pool_get_enclosed_presentables (GduPool *pool, GduPresentable *presentable);
-GduController *gdu_pool_get_controller_by_object_path (GduPool *pool, const char *object_path);
-GList *gdu_pool_get_controllers (GduPool *pool);
+GduAdapter *gdu_pool_get_adapter_by_object_path (GduPool *pool, const char *object_path);
+GList *gdu_pool_get_adapters (GduPool *pool);
/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/gdu/gdu-private.h b/src/gdu/gdu-private.h
index fa9bee0..cc9166e 100644
--- a/src/gdu/gdu-private.h
+++ b/src/gdu/gdu-private.h
@@ -104,9 +104,9 @@ void _gdu_device_job_changed (GduDevice *device,
gboolean job_is_cancellable,
double job_percentage);
-GduController *_gdu_controller_new_from_object_path (GduPool *pool, const char *object_path);
-gboolean _gdu_controller_changed (GduController *controller);
-GduHba *_gdu_hba_new_from_controller (GduPool *pool, GduController *controller);
+GduAdapter *_gdu_adapter_new_from_object_path (GduPool *pool, const char *object_path);
+gboolean _gdu_adapter_changed (GduAdapter *adapter);
+GduHba *_gdu_hba_new_from_adapter (GduPool *pool, GduAdapter *adapter);
void _gdu_drive_rewrite_enclosing_presentable (GduDrive *drive);
void _gdu_volume_rewrite_enclosing_presentable (GduVolume *volume);
diff --git a/src/gdu/gdu-types.h b/src/gdu/gdu-types.h
index be79c37..cc5ba70 100644
--- a/src/gdu/gdu-types.h
+++ b/src/gdu/gdu-types.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
typedef struct _GduPool GduPool;
typedef struct _GduDevice GduDevice;
-typedef struct _GduController GduController;
+typedef struct _GduAdapter GduAdapter;
typedef struct _GduPresentable GduPresentable; /* Dummy typedef */
typedef struct _GduDrive GduDrive;
diff --git a/src/gdu/gdu.h b/src/gdu/gdu.h
index 1f249e6..656e8bb 100644
--- a/src/gdu/gdu.h
+++ b/src/gdu/gdu.h
@@ -31,7 +31,7 @@
#include <gdu/gdu-types.h>
#include <gdu/gdu-linux-md-drive.h>
#include <gdu/gdu-device.h>
-#include <gdu/gdu-controller.h>
+#include <gdu/gdu-adapter.h>
#include <gdu/gdu-drive.h>
#include <gdu/gdu-error.h>
#include <gdu/gdu-known-filesystem.h>
diff --git a/src/palimpsest/gdu-section-hba.c b/src/palimpsest/gdu-section-hba.c
index 8bf1cf7..b274e33 100644
--- a/src/palimpsest/gdu-section-hba.c
+++ b/src/palimpsest/gdu-section-hba.c
@@ -57,29 +57,29 @@ gdu_section_hba_update (GduSection *_section)
{
GduSectionHba *section = GDU_SECTION_HBA (_section);
GduPresentable *p;
- GduController *c;
+ GduAdapter *a;
const gchar *vendor;
const gchar *model;
const gchar *driver;
- c = NULL;
+ a = NULL;
p = gdu_section_get_presentable (_section);
- c = gdu_hba_get_controller (GDU_HBA (p));
- if (c == NULL)
+ a = gdu_hba_get_adapter (GDU_HBA (p));
+ if (a == NULL)
goto out;
- vendor = gdu_controller_get_vendor (c);
- model = gdu_controller_get_model (c);
- driver = gdu_controller_get_driver (c);
+ vendor = gdu_adapter_get_vendor (a);
+ model = gdu_adapter_get_model (a);
+ driver = gdu_adapter_get_driver (a);
gdu_details_element_set_text (section->priv->vendor_element, vendor);
gdu_details_element_set_text (section->priv->model_element, model);
gdu_details_element_set_text (section->priv->driver_element, driver);
out:
- if (c != NULL)
- g_object_unref (c);
+ if (a != NULL)
+ g_object_unref (a);
}
/* ---------------------------------------------------------------------------------------------------- */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
