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

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

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

kernel/generic/src/ddi/irq.c

@@ -73 +73 @@
 
 static size_t irq_ht_hash(const ht_link_t *);
-static size_t irq_ht_key_hash(void *);
+static size_t irq_ht_key_hash(const void *);
 static bool irq_ht_equal(const ht_link_t *, const ht_link_t *);
-static bool irq_ht_key_equal(void *, const ht_link_t *);
+static bool irq_ht_key_equal(const void *, const ht_link_t *);
 
 static hash_table_ops_t irq_ht_ops = {
@@ -208 +208 @@
 
 /** Return the hash of the key. */
-size_t irq_ht_key_hash(void *key)
-{
-        inr_t *inr = (inr_t *) key;
+size_t irq_ht_key_hash(const void *key)
+{
+        const inr_t *inr = key;
         return hash_mix(*inr);
 }
@@ -223 +223 @@
 
 /** Return true if the key is equal to the item's lookup key. */
-bool irq_ht_key_equal(void *key, const ht_link_t *item)
-{
-        inr_t *inr = (inr_t *) key;
+bool irq_ht_key_equal(const void *key, const ht_link_t *item)
+{
+        const inr_t *inr = key;
         irq_t *irq = hash_table_get_inst(item, irq_t, link);
         return irq->inr == *inr;