Changeset 98000fb in mainline for kernel/generic/src/ddi

Timestamp:

2009-06-03T19:34:45Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

Location:

kernel/generic/src/ddi

Files:

• ddi.c (modified) (3 diffs)
• irq.c (modified) (8 diffs)

kernel/generic/src/ddi/ddi.c

@@ -98 +98 @@
  *
  */
-static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, count_t pages, int flags)
+static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, size_t pages, int flags)
 {
         ASSERT(TASK);
@@ -119 +119 @@
         /* Find the zone of the physical memory */
         spinlock_lock(&zones.lock);
-        count_t znum = find_zone(ADDR2PFN(pf), pages, 0);
-        
-        if (znum == (count_t) -1) {
+        size_t znum = find_zone(ADDR2PFN(pf), pages, 0);
+        
+        if (znum == (size_t) -1) {
                 /* Frames not found in any zones
                  * -> assume it is hardware device and allow mapping
@@ -243 +243 @@
         return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
             FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
-            (count_t) pages, (int) flags);
+            (size_t) pages, (int) flags);
 }
 

kernel/generic/src/ddi/irq.c

@@ -100 +100 @@
  * there will be collisions between different keys.
  */
-static index_t irq_ht_hash(unative_t *key);
-static bool irq_ht_compare(unative_t *key, count_t keys, link_t *item);
+static size_t irq_ht_hash(unative_t *key);
+static bool irq_ht_compare(unative_t *key, size_t keys, link_t *item);
 static void irq_ht_remove(link_t *item);
 
@@ -116 +116 @@
  * elements with single key (sharing of one IRQ).
  */
-static index_t irq_lin_hash(unative_t *key);
-static bool irq_lin_compare(unative_t *key, count_t keys, link_t *item);
+static size_t irq_lin_hash(unative_t *key);
+static bool irq_lin_compare(unative_t *key, size_t keys, link_t *item);
 static void irq_lin_remove(link_t *item);
 
@@ -127 +127 @@
 
 /** Number of buckets in either of the hash tables. */
-static count_t buckets;
+static size_t buckets;
 
 /** Initialize IRQ subsystem.
@@ -134 +134 @@
  * @param chains Number of chains in the hash table.
  */
-void irq_init(count_t inrs, count_t chains)
+void irq_init(size_t inrs, size_t chains)
 {
         buckets = chains;
@@ -299 +299 @@
  * @return Index into the hash table.
  */
-index_t irq_ht_hash(unative_t key[])
+size_t irq_ht_hash(unative_t key[])
 {
         inr_t inr = (inr_t) key[KEY_INR];
@@ -325 +325 @@
  * @return True on match or false otherwise.
  */
-bool irq_ht_compare(unative_t key[], count_t keys, link_t *item)
+bool irq_ht_compare(unative_t key[], size_t keys, link_t *item)
 {
         irq_t *irq = hash_table_get_instance(item, irq_t, link);
@@ -372 +372 @@
  * @return Index into the hash table.
  */
-index_t irq_lin_hash(unative_t key[])
+size_t irq_lin_hash(unative_t key[])
 {
         inr_t inr = (inr_t) key[KEY_INR];
@@ -398 +398 @@
  * @return True on match or false otherwise.
  */
-bool irq_lin_compare(unative_t key[], count_t keys, link_t *item)
+bool irq_lin_compare(unative_t key[], size_t keys, link_t *item)
 {
         irq_t *irq = list_get_instance(item, irq_t, link);