X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fqos_sched%2Fcfg_file.h;h=cc5a2cd5424ba0459171d704ff87d17927124b3f;hb=36572831720450f3657480de36721fee7c65f92d;hp=eaaeb0a1095f9ce0e3f8410bdb9f2d833a94fe0d;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git

diff --git a/examples/qos_sched/cfg_file.h b/examples/qos_sched/cfg_file.h
old mode 100755
new mode 100644
index eaaeb0a109..cc5a2cd542
--- a/examples/qos_sched/cfg_file.h
+++ b/examples/qos_sched/cfg_file.h
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -35,68 +35,12 @@
 #define __CFG_FILE_H__
 
 #include <rte_sched.h>
+#include <rte_cfgfile.h>
 
-#define CFG_NAME_LEN 32
-#define CFG_VALUE_LEN 64
+int cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port);
 
-struct cfg_entry {
-	char name[CFG_NAME_LEN];
-	char value[CFG_VALUE_LEN];
-};
+int cfg_load_pipe(struct rte_cfgfile *cfg, struct rte_sched_pipe_params *pipe);
 
-struct cfg_section {
-	char name[CFG_NAME_LEN];
-	int num_entries;
-	struct cfg_entry *entries[0];
-};
-
-struct cfg_file {
-	int flags;
-	int num_sections;
-	struct cfg_section *sections[0];
-};
-
-
-int cfg_load_port(struct cfg_file *cfg, struct rte_sched_port_params *port);
-
-int cfg_load_pipe(struct cfg_file *cfg, struct rte_sched_pipe_params *pipe);
-
-int cfg_load_subport(struct cfg_file *cfg, struct rte_sched_subport_params *subport);
-
-
-/* reads a config file from disk and returns a handle to the config 
- * 'flags' is reserved for future use and must be 0
- */
-struct cfg_file *cfg_load(const char *filename, int flags);
-
-/* returns the number of sections in the config */
-int cfg_num_sections(struct cfg_file *cfg, const char *sec_name, size_t length);
-
-/* fills the array "sections" with the names of all the sections in the file
- * (up to a max of max_sections).
- * NOTE: buffers in the sections array must be at least CFG_NAME_LEN big
- */
-int cfg_sections(struct cfg_file *cfg, char *sections[], int max_sections);
-
-/* true if the named section exists, false otherwise */
-int cfg_has_section(struct cfg_file *cfg, const char *sectionname);
-
-/* returns the number of entries in a section */
-int cfg_section_num_entries(struct cfg_file *cfg, const char *sectionname);
-
-/* returns the entries in a section as key-value pairs in the "entries" array */
-int cfg_section_entries(struct cfg_file *cfg, const char *sectionname,
-		struct cfg_entry *entries, int max_entries);
-
-/* returns a pointer to the value of the named entry in the named section */
-const char *cfg_get_entry(struct cfg_file *cfg, const char *sectionname,
-		const char *entryname);
-
-/* true if the given entry exists in the given section, false otherwise */
-int cfg_has_entry(struct cfg_file *cfg, const char *sectionname,
-		const char *entryname);
-
-/* cleans up memory allocated by cfg_load() */
-int cfg_close(struct cfg_file *cfg);
+int cfg_load_subport(struct rte_cfgfile *cfg, struct rte_sched_subport_params *subport);
 
 #endif