summaryrefslogtreecommitdiffstats
path: root/input/main.c
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.dentz@indt.org.br>2008-07-18 17:45:39 -0300
committerLuiz Augusto von Dentz <luiz.dentz@indt.org.br>2008-07-28 10:47:25 -0300
commite6d32d6c6dd52ec5af282fe214f2d06dee7e9731 (patch)
tree7561f5ffba6299e809ef6acbb0f16d9dc3a0e00a /input/main.c
parent4b0ab7e43f4fa555641902b07f2f7ab3821f2b75 (diff)
Cleanup input manager.
Diffstat (limited to 'input/main.c')
-rw-r--r--input/main.c74
1 files changed, 1 insertions, 73 deletions
diff --git a/input/main.c b/input/main.c
index 8462967a..d70bf2a0 100644
--- a/input/main.c
+++ b/input/main.c
@@ -33,77 +33,10 @@
#include <gdbus.h>
#include "plugin.h"
-#include "../hcid/device.h"
#include "logging.h"
#include "dbus-service.h"
#include "manager.h"
-#define INPUT_INTERFACE "org.bluez.Input"
-
-static DBusMessage *input_connect(DBusConnection *conn,
- DBusMessage *msg, void *user_data)
-{
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *input_disconnect(DBusConnection *conn,
- DBusMessage *msg, void *user_data)
-{
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *input_is_connected(DBusConnection *conn,
- DBusMessage *msg, void *user_data)
-{
- dbus_bool_t connected = FALSE;
-
- return g_dbus_create_reply(msg, DBUS_TYPE_BOOLEAN, &connected,
- DBUS_TYPE_INVALID);
-}
-
-static GDBusMethodTable input_methods[] = {
- { "Connect", "", "", input_connect },
- { "Disconnect", "", "", input_disconnect },
- { "IsConnected", "", "b", input_is_connected },
- { }
-};
-
-static GDBusSignalTable input_signals[] = {
- { "Connected", "" },
- { "Disconnected", "" },
- { }
-};
-
-static DBusConnection *conn;
-
-static int input_probe(struct btd_device *device, GSList *records)
-{
- const gchar *path = device_get_path(device);
- DBG("path %s", path);
-
- if (g_dbus_register_interface(conn, path, INPUT_INTERFACE,
- input_methods, input_signals, NULL,
- device, NULL) == FALSE)
- return -1;
-
- return 0;
-}
-
-static void input_remove(struct btd_device *device)
-{
- const gchar *path = device_get_path(device);
- DBG("path %s", path);
-
- g_dbus_unregister_interface(conn, path, INPUT_INTERFACE);
-}
-
-static struct btd_device_driver input_driver = {
- .name = "input",
- .uuids = BTD_UUIDS("00001124-0000-1000-8000-00805f9b34fb"),
- .probe = input_probe,
- .remove = input_remove,
-};
-
static GKeyFile *load_config_file(const char *file)
{
GKeyFile *keyfile;
@@ -124,6 +57,7 @@ static GKeyFile *load_config_file(const char *file)
static int input_init(void)
{
GKeyFile *config;
+ DBusConnection *conn;
conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
if (conn == NULL)
@@ -139,18 +73,12 @@ static int input_init(void)
if (config)
g_key_file_free(config);
- btd_register_device_driver(&input_driver);
-
return 0;
}
static void input_exit(void)
{
- btd_unregister_device_driver(&input_driver);
-
input_manager_exit();
-
- dbus_connection_unref(conn);
}
BLUETOOTH_PLUGIN_DEFINE("input", input_init, input_exit)