Update GetPinCodeLength and GetEncryptionKeySize methods

4 files changed, 18 insertions, 18 deletions

diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index 050aab69..9d35ced4 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -1078,7 +1078,7 @@ static DBusMessage *handle_dev_list_bondings_req(DBusMessage *msg, void *data)
 	return reply;
 }
 
-static DBusMessage *handle_dev_pin_code_length_req(DBusMessage *msg, void *data)
+static DBusMessage *handle_dev_get_pin_code_length_req(DBusMessage *msg, void *data)
 {
 	struct hci_dbus_data *dbus_data = data;
 	DBusMessageIter iter;
@@ -1111,7 +1111,7 @@ static DBusMessage *handle_dev_pin_code_length_req(DBusMessage *msg, void *data)
 	return reply;
 }
 
-static DBusMessage *handle_dev_encryption_key_size_req(DBusMessage *msg, void *data)
+static DBusMessage *handle_dev_get_encryption_key_size_req(DBusMessage *msg, void *data)
 {
 	struct hci_dbus_data *dbus_data = data;
 	DBusMessageIter iter;
@@ -1272,8 +1272,8 @@ static const struct service_data dev_services[] = {
 	{ DEV_REMOVE_BONDING,		handle_dev_remove_bonding_req,		DEV_REMOVE_BONDING_SIGNATURE		},
 	{ DEV_HAS_BONDING_NAME,		handle_dev_has_bonding_req,		DEV_HAS_BONDING_SIGNATURE		},
 	{ DEV_LIST_BONDINGS,		handle_dev_list_bondings_req,		DEV_LIST_BONDINGS_SIGNATURE		},
-	{ DEV_PIN_CODE_LENGTH,		handle_dev_pin_code_length_req,		DEV_PIN_CODE_LENGTH_SIGNATURE		},
-	{ DEV_ENCRYPTION_KEY_SIZE,	handle_dev_encryption_key_size_req,	DEV_ENCRYPTION_KEY_SIZE_SIGNATURE	},
+	{ DEV_GET_PIN_CODE_LENGTH,	handle_dev_get_pin_code_length_req,	DEV_GET_PIN_CODE_LENGTH_SIGNATURE	},
+	{ DEV_GET_ENCRYPTION_KEY_SIZE,	handle_dev_get_encryption_key_size_req,	DEV_GET_ENCRYPTION_KEY_SIZE_SIGNATURE	},
 
 	{ DEV_DISCOVER,			handle_dev_discover_req,		DEV_DISCOVER_SIGNATURE			},
 	{ DEV_DISCOVER_CANCEL,		handle_dev_discover_cancel_req,		DEV_DISCOVER_CANCEL_SIGNATURE		},
diff --git a/hcid/dbus-api.txt b/hcid/dbus-api.txt
index 4b92de2d..947a0536 100644
--- a/hcid/dbus-api.txt
+++ b/hcid/dbus-api.txt
@@ -293,12 +293,12 @@ Methods		string GetAddress()
 
 			List device addresses of currently bonded adapter.
 
-		uint8 PinCodeLength(string address)
+		uint8 GetPinCodeLength(string address)
 
 			Returns the PIN code length that was used in the
 			pairing process.
 
-		uint8 EncryptionKeySize(string address)
+		uint8 GetEncryptionKeySize(string address)
 
 			Returns the currently used encryption key size.
 
diff --git a/hcid/dbus-test b/hcid/dbus-test
index cd78456a..e15431be 100755
--- a/hcid/dbus-test
+++ b/hcid/dbus-test
@@ -42,8 +42,8 @@ dev_cmds = [ "GetAddress",
              "RemoveBonding",
              "HasBonding",
              "ListBondings",
-             "PinCodeLength",
-             "EncryptionKeySize" ]
+             "GetPinCodeLength",
+             "GetEncryptionKeySize" ]
 dev_signals = [ "ModeChanged",
                 "NameChanged",
                 "MinorClassChanged",
@@ -311,16 +311,16 @@ class Tester:
                bondings = self.device.ListBondings()
                for bond in bondings: 
                    print bond,
-           elif self.cmd == 'PinCodeLength':
+           elif self.cmd == 'GetPinCodeLength':
                if len(self.cmd_args) == 1:
-                   print self.device.PinCodeLength(self.cmd_args[0])
+                   print self.device.GetPinCodeLength(self.cmd_args[0])
                else:
-                   print 'Usage: %s -i <dev> PinCodeLength address' % self.name
-           elif self.cmd == 'EncryptionKeySize':
+                   print 'Usage: %s -i <dev> GetPinCodeLength address' % self.name
+           elif self.cmd == 'GetEncryptionKeySize':
                if len(self.cmd_args) == 1:
-                   print self.device.EncryptionKeySize(self.cmd_args[0])
+                   print self.device.GetEncryptionKeySize(self.cmd_args[0])
                else:
-                   print 'Usage: %s -i <dev> EncryptionKeySize address' % self.name
+                   print 'Usage: %s -i <dev> GetEncryptionKeySize address' % self.name
            else:
                 # FIXME: remove at future version
                 print 'Script Error: Method %s not found. Maybe a mispelled word.' % (self.cmd_args)
diff --git a/hcid/dbus.h b/hcid/dbus.h
index 640c48a7..1e255e46 100644
--- a/hcid/dbus.h
+++ b/hcid/dbus.h
@@ -143,8 +143,8 @@ DBusMessage *error_no_such_device(DBusMessage *msg);
 #define DEV_REMOVE_BONDING		"RemoveBonding"
 #define DEV_HAS_BONDING_NAME		"HasBonding"
 #define DEV_LIST_BONDINGS		"ListBondings"
-#define DEV_PIN_CODE_LENGTH		"PinCodeLength"
-#define DEV_ENCRYPTION_KEY_SIZE		"EncryptionKeySize"
+#define DEV_GET_PIN_CODE_LENGTH		"GetPinCodeLength"
+#define DEV_GET_ENCRYPTION_KEY_SIZE	"GetEncryptionKeySize"
 #define DEV_DISCOVER			"Discover"
 #define DEV_DISCOVER_CANCEL		"DiscoverCancel"
 #define DEV_DISCOVER_CACHE		"DiscoverCache"
@@ -200,9 +200,9 @@ DBusMessage *error_no_such_device(DBusMessage *msg);
 #define DEV_HAS_BONDING_SIGNATURE		DBUS_TYPE_STRING_AS_STRING \
 						__END_SIG__
 #define DEV_LIST_BONDINGS_SIGNATURE		__END_SIG__
-#define DEV_PIN_CODE_LENGTH_SIGNATURE		DBUS_TYPE_STRING_AS_STRING \
+#define DEV_GET_PIN_CODE_LENGTH_SIGNATURE	DBUS_TYPE_STRING_AS_STRING \
 						__END_SIG__
-#define DEV_ENCRYPTION_KEY_SIZE_SIGNATURE	DBUS_TYPE_STRING_AS_STRING \
+#define DEV_GET_ENCRYPTION_KEY_SIZE_SIGNATURE	DBUS_TYPE_STRING_AS_STRING \
 						__END_SIG__
 #define DEV_DISCOVER_SIGNATURE			__END_SIG__
 #define DEV_DISCOVER_CANCEL_SIGNATURE		__END_SIG__