X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FFactory.hh;h=a4c1c1f4683e10415a711a9e36f0aaeae3dd2088;hb=f280d6c6383f3642069fac8a490f827195619278;hp=6e2beb2b337617b21fbf80c1a1608df8468e2933;hpb=3d2ca40bf3d475f7e2d7e67bd888bd33a94ca978;p=lib1wire.git

diff --git a/src/Factory.hh b/src/Factory.hh
index 6e2beb2..a4c1c1f 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<plp::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, int *err_code_param);
+			//int parse_family_code(string folder_name);
+			static plp::Device *create_w1_device(int family_code_param, string device_type_param, string device_id_param, dirent *direntry_param);
+			static plp::Device *create_w1_device(int family_code, string device_id, dirent *direntry_param);
+			static plp::Device *create_w1_device(string device_type_param, 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(string device_type_param);
+			static string get_device_type_by_family_code(int family_code_param);
 	};
 }