Changeset ea28272 in mainline for kernel/generic/src/ddi/irq.c

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/ddi/irq.c (modified) (11 diffs)

kernel/generic/src/ddi/irq.c

@@ -106 +106 @@
  *
  */
-static size_t irq_ht_hash(unative_t *key);
-static bool irq_ht_compare(unative_t *key, size_t keys, link_t *item);
+static size_t irq_ht_hash(sysarg_t *key);
+static bool irq_ht_compare(sysarg_t *key, size_t keys, link_t *item);
 static void irq_ht_remove(link_t *item);
 
@@ -123 +123 @@
  *
  */
-static size_t irq_lin_hash(unative_t *key);
-static bool irq_lin_compare(unative_t *key, size_t keys, link_t *item);
+static size_t irq_lin_hash(sysarg_t *key);
+static bool irq_lin_compare(sysarg_t *key, size_t keys, link_t *item);
 static void irq_lin_remove(link_t *item);
 
@@ -136 +136 @@
 static size_t buckets;
 
+/** Last valid INR. */
+inr_t last_inr = 0;
+
 /** Initialize IRQ subsystem.
  *
@@ -145 +148 @@
 {
         buckets = chains;
+        last_inr = inrs - 1;
+
         /*
          * Be smart about the choice of the hash table operations.
@@ -194 +199 @@
 void irq_register(irq_t *irq)
 {
-        unative_t key[] = {
-                (unative_t) irq->inr,
-                (unative_t) irq->devno
+        sysarg_t key[] = {
+                (sysarg_t) irq->inr,
+                (sysarg_t) irq->devno
         };
         
@@ -212 +217 @@
 {
         link_t *lnk;
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) -1    /* Search will use claim() instead of devno */
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) -1    /* Search will use claim() instead of devno */
         };
         
@@ -235 +240 @@
 {
         link_t *lnk;
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) -1    /* Search will use claim() instead of devno */
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) -1    /* Search will use claim() instead of devno */
         };
         
@@ -306 +311 @@
  *
  */
-size_t irq_ht_hash(unative_t key[])
+size_t irq_ht_hash(sysarg_t key[])
 {
         inr_t inr = (inr_t) key[KEY_INR];
@@ -333 +338 @@
  *
  */
-bool irq_ht_compare(unative_t key[], size_t keys, link_t *item)
+bool irq_ht_compare(sysarg_t key[], size_t keys, link_t *item)
 {
         irq_t *irq = hash_table_get_instance(item, irq_t, link);
@@ -381 +386 @@
  *
  */
-size_t irq_lin_hash(unative_t key[])
+size_t irq_lin_hash(sysarg_t key[])
 {
         inr_t inr = (inr_t) key[KEY_INR];
@@ -408 +413 @@
  *
  */
-bool irq_lin_compare(unative_t key[], size_t keys, link_t *item)
+bool irq_lin_compare(sysarg_t key[], size_t keys, link_t *item)
 {
         irq_t *irq = list_get_instance(item, irq_t, link);