X-Git-Url: http://pilppa.org/gitweb/?p=lib1wire.git;a=blobdiff_plain;f=src%2FFactory.cc;fp=src%2FFactory.cc;h=93d72628d62ac6f7cafcf9e5fc985ba54be95070;hp=d9556e376e4ecc05fe47d06e8d1e1c70f2351b09;hb=a7002b0a87c5f17b542dfbd44f482014a191df97;hpb=da203ad44792ca37320768f4cbe68587c4806910

diff --git a/src/Factory.cc b/src/Factory.cc
index d9556e3..93d7262 100644
--- a/src/Factory.cc
+++ b/src/Factory.cc
@@ -12,12 +12,13 @@
 #include <string.h>
 
 #include <plp/log.h>
+#include <plp/DeviceConfig.hh>
+#include <plp/DeviceTypes.hh>
+#include <plp/FileUtil.hh>
 
-#include "DeviceTypes.hh"
 #include "Factory.hh"
 #include "W1TemperatureSensor.hh"
 #include "W1CounterDevice.hh"
-#include "W1Util.hh"
 
 using namespace w1;
 using namespace plp;
@@ -83,10 +84,10 @@ Device *Factory::create_w1_device(int family_code_param,
 	switch(family_code_param) {
 		case	0x10:
 		case	0x28:
-			ret_val	= new W1TemperatureSensor(type, device_id_param, direntry_param);
+			ret_val	= new W1TemperatureSensor(device_id_param, type, direntry_param);
 			break;
 		case	0x1d:
-			ret_val	= new W1CounterDevice(type, device_id_param, direntry_param);
+			ret_val	= new W1CounterDevice(device_id_param, type, direntry_param);
 			break;
 		case 	0x81:
 			// 0x81 is the 1-wire USB dongle... No need to create device for it.
@@ -97,12 +98,12 @@ Device *Factory::create_w1_device(int family_code_param,
 	}
 	if (ret_val != NULL) {
 		// check that device config exist
-		config	= get_device_config(device_id_param);
+		config	= DeviceConfig::get_device_config(device_id_param);
 		if (config != NULL) {
 			// if not, create default device config
 			type	= config->get_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
 			if (type.empty() == true) {
-				type	= ret_val->get_device_type();
+				type	= ret_val->get_type();
 				config->set_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE, type);
 				config->set_cfg_value(DEVICE_CONFIG_VALUE_KEY__ID, ret_val->get_id());
 			}
@@ -179,7 +180,7 @@ list<Device *> Factory::get_device_list() {
 	if (dir != NULL) {
 		direntry	= readdir(dir);
 		while(direntry != NULL) {
-			is_subdir	= W1Util::is_subdirectory(W1_SCAN_ROOTDIR, direntry);
+			is_subdir	= FileUtil::is_subdirectory(W1_SCAN_ROOTDIR, direntry);
 			if (is_subdir == true) {
 				err_flg	= 0;
 				device	= create_w1_device(direntry, &err_flg);
@@ -238,7 +239,7 @@ list<DataReader *> Factory::get_data_reader_list() {
 		direntry	= readdir(dir);
 		while(direntry != NULL) {
 			if (strcmp(direntry->d_name, "cache") != 0) {
-				is_subdir	= W1Util::is_subdirectory(dr_name.c_str(), direntry);
+				is_subdir	= FileUtil::is_subdirectory(dr_name.c_str(), direntry);
 				if (is_subdir == true) {
 					reader	= new DataReader(direntry->d_name);
 					ret_val.push_back(reader);
@@ -253,10 +254,3 @@ list<DataReader *> Factory::get_data_reader_list() {
 	}
 	return ret_val;
 }
-
-DeviceConfig *Factory::get_device_config(string device_id) {
-	DeviceConfig	*ret_val;
-
-	ret_val	= new DeviceConfig(device_id);
-	return ret_val;
-}