Add wizard mark. Add configuration file. Move some conf to its file.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3631 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cfg/cfg_hashtable.h b/bertos/cfg/cfg_hashtable.h
new file mode 100644 (file)
index 0000000..7560617
--- /dev/null
+++ b/bertos/cfg/cfg_hashtable.h
@@ -0,0 +1,52 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2008 Develer S.r.l. (http://www.develer.com/)
+ * All Rights Reserved.
+ * -->
+ *
+ * \brief Configuration file for hashtable module.
+ *
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+#ifndef CFG_HASHTABLE_H
+#define CFG_HASHTABLE_H
+
+/**
+ * Enable/disable support to declare special hash tables which maintain a copy of
+ * the key internally instead of relying on the hook to extract it from the data.
+ *
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_HT_OPTIONAL_INTERNAL_KEY      1
+
+#endif /* CFG_HASHTABLE_H */
+
+
+

diff --git a/bertos/struct/hashtable.c b/bertos/struct/hashtable.c
index 6f5471dd7fb7680be18e09529033eda7a98d9497..5e4ee652076a69ae581736a147beb3e250b24735 100644 (file)
--- a/bertos/struct/hashtable.c
+++ b/bertos/struct/hashtable.c
@@ -78,11 +78,12 @@
  *        the common case (external keys) both can be used.</li>
  *    </ul>
  *
- * \version $Id$
  * \author Giovanni Bajo <rasky@develer.com>
  */
 
 #include "hashtable.h"
+
+#include "cfg/cfg_hashtable.h"
 #include <cfg/debug.h>
 #include <cfg/compiler.h>
 #include <cfg/macros.h> //ROTL(), ROTR();

diff --git a/bertos/struct/hashtable.h b/bertos/struct/hashtable.h
index 363241e3d14f7de589e51a99bb5bb879c23a59da..9a102a8a9ce9a35327540f94be9470f45159e66f 100644 (file)
--- a/bertos/struct/hashtable.h
+++ b/bertos/struct/hashtable.h
@@ -30,6 +30,8 @@
  * Copyright 2004 Giovanni Bajo
  * -->
  *
+ * \author Giovanni Bajo <rasky@develer.com>
+ *
  * \brief Portable hash table
  *
  * This file implements a portable hash table, with the following features:
@@ -48,23 +50,19 @@
  * a marker for a free node, so it is invalid to store a NULL pointer in the table
  * with \c ht_insert().
  *
- * \version $Id$
- * \author Giovanni Bajo <rasky@develer.com>
+ * $WIZ$ module_name = "hashtable"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_hashtable.h"
  */
 
 #ifndef STRUCT_HASHTABLE_H
 #define STRUCT_HASHTABLE_H
 
+#include "cfg/cfg_hashtable.h"
+
 #include <cfg/compiler.h>
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 
-/**
- * Enable/disable support to declare special hash tables which maintain a copy of
- * the key internally instead of relying on the hook to extract it from the data.
- */
-#define CONFIG_HT_OPTIONAL_INTERNAL_KEY      1
-
 /// Maximum length of the internal key (use (2^n)-1 for slight speedup)
 #define INTERNAL_KEY_MAX_LENGTH     15
 
@@ -151,7 +149,7 @@ typedef struct
  * \param ht Hash table declared with \c DECLARE_HASHTABLE
  *
  * \note This function must be called before using the hash table. Optionally,
- * it can be called later in the program to clear the hash table, 
+ * it can be called later in the program to clear the hash table,
  * removing all its elements.
  */
 void ht_init(struct HashTable* ht);