X-Git-Url: http://pilppa.org/gitweb/?p=lib1wire.git;a=blobdiff_plain;f=src%2FFactory.cc;h=9d704b59e32b620489bd1174df32458a68e1c375;hp=6145a469065afe0a7dc37b03dbebd94d0a17ceb6;hb=f280d6c6383f3642069fac8a490f827195619278;hpb=5b8fec4ada47c630e4484d21408fb354d0fb7d93

diff --git a/src/Factory.cc b/src/Factory.cc
index 6145a46..9d704b5 100644
--- a/src/Factory.cc
+++ b/src/Factory.cc
@@ -95,28 +95,28 @@ Device *Factory::create_w1_device(int family_code_param,
 	return ret_val;
 }
 
-Device *Factory::create_w1_device(int family_code_param,
+Device *Factory::create_w1_device(int device_w1_family_code_param,
+			string device_type_param,
 			string device_id_param,
-			string type_param,
 			dirent *direntry_param) {
 	Device 		*ret_val;
 	DeviceConfig	*config;
 
 	ret_val	= NULL;
-	if (type_param.empty() == false) {
-		switch(family_code_param) {
+	if (device_type_param.empty() == false) {
+		switch(device_w1_family_code_param) {
 			case	0x10:
 			case	0x28:
-				ret_val	= new W1TemperatureSensor(device_id_param, type_param, direntry_param);
+				ret_val	= new W1TemperatureSensor(device_id_param, device_type_param, direntry_param);
 				break;
 			case	0x1d:
-				ret_val	= new W1CounterDevice(device_id_param, type_param, direntry_param);
+				ret_val	= new W1CounterDevice(device_id_param, device_type_param, direntry_param);
 				break;
 			case 	0x81:
 				// 0x81 is the 1-wire USB dongle... No need to create device for it.
 				break;
 			default:
-				log_debug("Unsupported 1-wire-family code: %#x, device not created: %s\n", family_code_param, device_id_param.c_str());
+				log_debug("Unsupported 1-wire-family code: %#x, device not created: %s\n", device_w1_family_code_param, device_id_param.c_str());
 				break;
 		}
 		if (ret_val != NULL) {
@@ -124,10 +124,10 @@ Device *Factory::create_w1_device(int family_code_param,
 			config	= DeviceConfig::get_device_config(device_id_param);
 			if (config != NULL) {
 				// if not, create default device config
-				type_param	= config->get_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
-				if (type_param.empty() == true) {
-					type_param	= ret_val->get_type();
-					config->set_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE, type_param);
+				device_type_param	= config->get_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
+				if (device_type_param.empty() == true) {
+					device_type_param	= ret_val->get_type();
+					config->set_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE, device_type_param);
 					config->set_config_value(DEVICE_CONFIG_VALUE_KEY__ID, ret_val->get_id());
 				}
 				delete(config);
@@ -142,11 +142,11 @@ Device *Factory::create_w1_device(string device_type_param,
 	int	family_code;
 	Device	*ret_val;
 
-	ret_val		= NULL;
+	ret_val	= NULL;
 	if (device_type_param.empty() == false) {
 		family_code	= get_family_code_by_device_type(device_type_param);
 		if (family_code != -1) {
-			ret_val		= create_w1_device(family_code, device_type_param, device_id_param, NULL);
+			ret_val	= create_w1_device(family_code, device_type_param, device_id_param, NULL);
 		}
 	}
 	return ret_val;
@@ -156,7 +156,7 @@ Device *Factory::create_w1_device(dirent *direntry_param,
 				int *err_code_param) {
 	string	folder_name;
 	string	tmp_str;
-	string	device_name;
+	string	device_id;
 	int 	pos;
 	int	family_code;
 	bool	suc_flg;
@@ -174,9 +174,9 @@ Device *Factory::create_w1_device(dirent *direntry_param,
 		if (family_code != 0x81) {
 			if (suc_flg == true) {
 				log_debug("1-wire device family code: %#x\n", family_code);
-				device_name	= folder_name.substr(pos + 1, folder_name.length() - pos);
+				device_id	= folder_name.substr(pos + 1, folder_name.length() - pos);
 				ret_val		= Factory::create_w1_device(family_code,
-								device_name,
+								device_id,
 								direntry_param);
 				if ((ret_val == NULL) &&
 				    (family_code != 0x81)) {