Changeset b3f8fb7 in mainline for kernel/generic/include/adt

Timestamp:

2007-01-28T13:25:49Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8e8c1a5

Parents:

1ba41c5

Message:

huge type system cleanup
remove cyclical type dependencies across multiple header files
many minor coding style fixes

Location:

kernel/generic/include/adt

Files:

• bitmap.h (modified) (1 diff)
• btree.h (modified) (4 diffs)
• fifo.h (modified) (1 diff)
• hash_table.h (modified) (2 diffs)
• list.h (modified) (1 diff)

kernel/generic/include/adt/bitmap.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 
 #define BITS2BYTES(bits)        (bits ? ((((bits)-1)>>3)+1) : 0)

kernel/generic/include/adt/btree.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 #include <adt/list.h>
 
@@ -46 +45 @@
 
 /** B-tree node structure. */
-struct btree_node {
+typedef struct btree_node {
         /** Number of keys. */
         count_t keys;
@@ -66 +65 @@
          * There is room for storing a subtree pointer for the extra key.
          */
-        btree_node_t *subtree[BTREE_M + 1];
+        struct btree_node *subtree[BTREE_M + 1];
 
         /** Pointer to parent node. Root node has NULL parent. */
-        btree_node_t *parent;
+        struct btree_node *parent;
 
         /** Link connecting leaf-level nodes. Defined only when this node is a leaf. */
@@ -77 +76 @@
         link_t bfs_link;
         int depth;
-};
+} btree_node_t;
 
 /** B-tree structure. */
-struct btree {
+typedef struct {
         btree_node_t *root;     /**< B-tree root node pointer. */
         link_t leaf_head;       /**< Leaf-level list head. */
-};
+} btree_t;
 
 extern void btree_init(void);

kernel/generic/include/adt/fifo.h

@@ -46 +46 @@
 #define KERN_FIFO_H_
 
-#include <typedefs.h>
 #include <mm/slab.h>
 

kernel/generic/include/adt/hash_table.h

@@ -38 +38 @@
 #include <adt/list.h>
 #include <arch/types.h>
-#include <typedefs.h>
-
-/** Hash table structure. */
-struct hash_table {
-        link_t *entry;
-        count_t entries;
-        count_t max_keys;
-        hash_table_operations_t *op;
-};
 
 /** Set of operations for hash table. */
-struct hash_table_operations {
+typedef struct {
         /** Hash function.
          *
@@ -71 +62 @@
          */
         void (*remove_callback)(link_t *item);
-};
+} hash_table_operations_t;
+
+/** Hash table structure. */
+typedef struct {
+        link_t *entry;
+        count_t entries;
+        count_t max_keys;
+        hash_table_operations_t *op;
+} hash_table_t;
 
 #define hash_table_get_instance(item, type, member)     list_get_instance((item), type, member)

kernel/generic/include/adt/list.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 
 /** Doubly linked list head and link type. */
-struct link {
-        link_t *prev;   /**< Pointer to the previous item in the list. */
-        link_t *next;   /**< Pointer to the next item in the list. */
-};
+typedef struct link {
+        struct link *prev;      /**< Pointer to the previous item in the list. */
+        struct link *next;      /**< Pointer to the next item in the list. */
+} link_t;
 
 /** Declare and initialize statically allocated list.