1 files changed, 12 insertions, 8 deletions

diff --git a/pcilib/view.h b/pcilib/view.h
index bf0ea28..4af4c00 100644
--- a/pcilib/view.h
+++ b/pcilib/view.h
@@ -6,8 +6,8 @@
 
 #define PCILIB_VIEW_INVALID ((pcilib_view_t)-1)
 
-//typedef void *pcilib_view_context_t;
-typedef struct pcilib_view_context_s *pcilib_view_context_t;
+typedef struct pcilib_view_context_s pcilib_view_context_t;
+typedef struct pcilib_view_description_s pcilib_view_description_t;
 
 typedef enum {
     PCILIB_VIEW_FLAG_PROPERTY = 1                                               /**< Indicates that view does not depend on a value and is independent property */
@@ -16,30 +16,34 @@ typedef enum {
 typedef struct {
     pcilib_version_t version;
     size_t description_size;
-    pcilib_view_context_t (*init)(pcilib_t *ctx);
+    pcilib_view_context_t *(*init)(pcilib_t *ctx);
     void (*free)(pcilib_t *ctx, pcilib_view_context_t *view);
+    void (*free_description)(pcilib_t *ctx, pcilib_view_description_t *view);
     int (*read_from_reg)(pcilib_t *ctx, pcilib_view_context_t *view, const pcilib_register_value_t *regval, pcilib_value_t *val);
     int (*write_to_reg)(pcilib_t *ctx, pcilib_view_context_t *view, pcilib_register_value_t *regval, const pcilib_value_t *val);
 } pcilib_view_api_description_t;
 
-typedef struct {
+struct pcilib_view_description_s {
     const pcilib_view_api_description_t *api;
     pcilib_value_type_t type;			                                /**< The default data type returned by operation, PCILIB_VIEW_TYPE_STRING is supported by all operations */
     pcilib_view_flags_t flags;                                                  /**< Flags specifying type of the view */
     const char *unit;				                                /**< Returned unit (if any) */
     const char *name;				                                /**< Name of the view */
     const char *description;			                                /**< Short description */
-} pcilib_view_description_t;
+};
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 int pcilib_add_views(pcilib_t *ctx, size_t n, const pcilib_view_description_t *desc);
+void pcilib_clean_views(pcilib_t *ctx);
+
+pcilib_view_context_t *pcilib_find_view_context_by_name(pcilib_t *ctx, const char *view);
+pcilib_view_context_t *pcilib_find_register_view_context_by_name(pcilib_t *ctx, pcilib_register_t reg, const char *name);
+pcilib_view_context_t *pcilib_find_register_view_context(pcilib_t *ctx, pcilib_register_t reg, const char *name);
 
-pcilib_view_t pcilib_find_view_by_name(pcilib_t *ctx, const char *view);
-pcilib_view_t pcilib_find_register_view_by_name(pcilib_t *ctx, pcilib_register_t reg, const char *name);
-pcilib_view_t pcilib_find_register_view(pcilib_t *ctx, pcilib_register_t reg, const char *name);
+pcilib_view_t pcilib_find_view_by_name(pcilib_t *ctx, const char *name);
 
 #ifdef __cplusplus
 }