Remove custom org.openbmc.Object.ObjectMapper
Use the standard freedesktop ObjectManager interface.
Moved gdbus OM export calls to the correct place so these
signals are emitted as expected by system_manager.py.
Python apps that use pyobmc are already emitting these
correctly.
Change system_manager.py to watch for the freedesktop
signal rather than the custom one.
Added an sd_bus OM to led_controller.
diff --git a/objects/flash_bios_obj.c b/objects/flash_bios_obj.c
index a3f7ac4..f865be1 100644
--- a/objects/flash_bios_obj.c
+++ b/objects/flash_bios_obj.c
@@ -5,7 +5,6 @@
#include <sys/types.h>
#include "interfaces/openbmc_intf.h"
#include "openbmc.h"
-#include "object_mapper.h"
/* ------------------------------------------------------------------------- */
static const gchar* dbus_object_path = "/org/openbmc/control/flash";
@@ -275,10 +274,6 @@
object_skeleton_set_shared_resource(object, lock);
g_object_unref(lock);
- ObjectMapper* mapper = object_mapper_skeleton_new();
- object_skeleton_set_object_mapper(object, mapper);
- g_object_unref(mapper);
-
shared_resource_set_lock(lock,false);
shared_resource_set_name(lock,"");
@@ -344,13 +339,11 @@
flash_set_filename(flash,"");
/* Export the object (@manager takes its own reference to @object) */
+ g_dbus_object_manager_server_set_connection(manager, connection);
g_dbus_object_manager_server_export(manager, G_DBUS_OBJECT_SKELETON(object));
g_object_unref(object);
}
g_free(flasher_file);
- /* Export all objects */
- g_dbus_object_manager_server_set_connection(manager, connection);
- emit_object_added((GDBusObjectManager*)manager);
}
static void