Api cleanups for device querying

[lib1wire.git] / src / Factory.hh

diff --git a/src/Factory.hh b/src/Factory.hh
index 6e2beb2b337617b21fbf80c1a1608df8468e2933..7c16d6f7b702cedd8243ce2b94c165daf4e2ccdd 100644 (file)
--- 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 "DataReader.hh"
+#include "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 std::list<plp::Device *> get_device_list();
                        static DeviceConfig *get_device_config(std::string device_id);
                private:
                        //int parse_family_code(std::string folder_name);
-                       static W1Device *create_device(dirent *direntry_param, int *err_code_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);
        };
 }