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

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

File:

• kernel/generic/src/ddi/irq.c (modified) (9 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);
 
@@ -194 +194 @@
 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 +212 @@
 {
         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 +235 @@
 {
         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 +306 @@
  *
  */
-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 +333 @@
  *
  */
-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 +381 @@
  *
  */
-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 +408 @@
  *
  */
-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);