Index: input/manager.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/manager.c,v
retrieving revision 1.26
diff -u -p -r1.26 manager.c
--- input/manager.c	21 Jun 2007 22:06:33 -0000	1.26
+++ input/manager.c	22 Jun 2007 15:21:02 -0000
@@ -962,6 +962,25 @@ cleanup:
 		g_free(hidp.rd_data);
 }
 
+/* hidd to input transition function */
+static void stored_hidd(char *key, char *value, void *data)
+{
+	struct hidp_connadd_req hidp; 
+	bdaddr_t dst, *src = data;
+
+	str2ba(key, &dst);
+
+	if (input_device_stored(src, &dst) > 0)
+		return;
+
+	memset(&hidp, 0, sizeof(struct hidp_connadd_req));
+
+	if (parse_stored_hidd(value, &hidp) < 0)
+		return;
+
+	store_device_info(src, &dst, &hidp);
+}
+
 static void register_stored_inputs(void)
 {
 	char dirname[PATH_MAX + 1];
@@ -980,10 +999,16 @@ static void register_stored_inputs(void)
 		if (!isdigit(de->d_name[0]))
 			continue;
 
+		str2ba(de->d_name, &src);
+
+		/* move the hidd entries to the input storage */
 		create_name(filename, PATH_MAX, STORAGEDIR,
-						de->d_name, "input");
+						de->d_name, "hidd");
+		textfile_foreach(filename, stored_hidd, &src);
 
-		str2ba(de->d_name, &src);
+		/* load the input stored devices */
+		create_name(filename, PATH_MAX, STORAGEDIR,
+						de->d_name, "input");
 
 		textfile_foreach(filename, stored_input, &src);
 	}
Index: input/storage.c
===================================================================
RCS file: /cvsroot/bluez/utils/input/storage.c,v
retrieving revision 1.10
diff -u -p -r1.10 storage.c
--- input/storage.c	19 Mar 2007 14:58:44 -0000	1.10
+++ input/storage.c	22 Jun 2007 15:21:02 -0000
@@ -59,6 +59,70 @@ static inline int create_filename(char *
 	return create_name(buf, size, STORAGEDIR, addr, name);
 }
 
+int input_device_stored(bdaddr_t *src, bdaddr_t *dst)
+{
+	char filename[PATH_MAX + 1], *str;
+	char peer[18];
+
+	create_filename(filename, PATH_MAX, src, "input");
+
+	ba2str(dst, peer);
+	str = textfile_get(filename, peer);
+	if (!str)
+		return -ENOENT;
+
+	free(str);
+
+	return 1;
+}
+
+int parse_stored_hidd(const char *str, struct hidp_connadd_req *req)
+{
+	char tmp[3];
+	char *desc;
+	unsigned int vendor, product, version, subclass, country, parser, pos;
+	size_t len;
+	int i;
+
+	desc = malloc(4096);
+	if (!desc)
+		return -ENOMEM;
+
+	memset(desc, 0, 4096);
+
+	sscanf(str, "%04X:%04X:%04X %02X %02X %04X %4095s %08X %n",
+			&vendor, &product, &version, &subclass, &country,
+			&parser, desc, &req->flags, &pos);
+
+	len = strlen(desc);
+	if (len <= 0)
+		return -ENOENT;
+
+
+	req->vendor   = vendor;
+	req->product  = product;
+	req->version  = version;
+	req->subclass = subclass;
+	req->country  = country;
+	req->parser   = parser;
+
+	req->rd_size = len / 2;
+	req->rd_data = g_try_malloc0(req->rd_size);
+	if (!req->rd_data) {
+		return -ENOMEM;
+	}
+
+	memset(tmp, 0, sizeof(tmp));
+	for (i = 0; i < req->rd_size; i++) {
+		memcpy(tmp, desc + (i * 2), 2);
+		req->rd_data[i] = (uint8_t) strtol(tmp, NULL, 16);
+	}
+
+	g_free(desc);
+
+	return 0;
+}
+
 int parse_stored_device_info(const char *str, struct hidp_connadd_req *req)
 {
 	char tmp[3];
Index: input/storage.h
===================================================================
RCS file: /cvsroot/bluez/utils/input/storage.h,v
retrieving revision 1.6
diff -u -p -r1.6 storage.h
--- input/storage.h	19 Mar 2007 14:58:44 -0000	1.6
+++ input/storage.h	22 Jun 2007 15:21:02 -0000
@@ -21,6 +21,8 @@
  *
  */
 
+int input_device_stored(bdaddr_t *src, bdaddr_t *dst);
+
 int get_stored_device_info(bdaddr_t *src, bdaddr_t *dst,
 				struct hidp_connadd_req *req);
 
@@ -29,6 +31,7 @@ int del_stored_device_info(bdaddr_t *src
 int store_device_info(bdaddr_t *src, bdaddr_t *dst,
 				struct hidp_connadd_req *req);
 
+int parse_stored_hidd(const char *str, struct hidp_connadd_req *req);
 int parse_stored_device_info(const char *str,
 				struct hidp_connadd_req *req);