X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FFactory.hh;h=c4adccb2e46c790a437c6ed41cb1f96b40522a78;hb=5b8fec4ada47c630e4484d21408fb354d0fb7d93;hp=a5cf254c31f60c4ae958ebc00f584948c7778ad9;hpb=8c97cbb9b5f8997fe9ab3917fcbea66d74b45837;p=lib1wire.git

diff --git a/src/Factory.hh b/src/Factory.hh
index a5cf254..c4adccb 100644
--- a/src/Factory.hh
+++ b/src/Factory.hh
@@ -9,12 +9,13 @@
 #define FACTORY_HH_
 
 #include <string>
+#include <list>
 
 #include <dirent.h>
 
-#include "DeviceConfig.hh"
-#include "DeviceData.hh"
-#include "W1Device.hh"
+#include <plp/DeviceConfig.hh>
+#include <plp/DataReader.hh>
+#include <plp/Device.hh>
 
 #ifndef W1_SCAN_ROOTDIR
 	#define W1_SCAN_ROOTDIR		"/sys/bus/w1/devices"
@@ -25,13 +26,16 @@ namespace w1 {
 		public:
 			Factory();
 			virtual ~Factory();
-			static W1Device *get_device(int family_code, std::string device_id, dirent *direntry_param);
-			static std::list<W1Device *> get_device_list();
-			static std::list<DeviceData *> get_device_data_list();
-			static DeviceConfig *get_device_config(std::string device_id);
+			static std::list<plp::Device *> get_device_list();
 		private:
 			//int parse_family_code(std::string folder_name);
-			static W1Device *create_device(dirent *direntry_param);
+			static plp::Device *create_w1_device(int family_code_param, string device_id_param, string type_param, dirent *direntry_param);
+			static plp::Device *create_w1_device(int family_code, std::string device_id, dirent *direntry_param);
+			static plp::Device *create_w1_device(std::string device_type_param, std::string device_id_param);
+			static plp::Device *create_w1_device(dirent *direntry_param, int *err_code_param);
+			static std::list<plp::DataReader *> get_data_reader_list();
+			static int get_family_code_by_device_type(std::string device_type_param);
+			static std::string get_device_type_by_family_code(int family_code_param);
 	};
 }