Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ddi/irq.c

    r70e5ad5 r5863a95  
    106106 *
    107107 */
    108 static size_t irq_ht_hash(unative_t *key);
    109 static bool irq_ht_compare(unative_t *key, size_t keys, link_t *item);
     108static size_t irq_ht_hash(sysarg_t *key);
     109static bool irq_ht_compare(sysarg_t *key, size_t keys, link_t *item);
    110110static void irq_ht_remove(link_t *item);
    111111
     
    123123 *
    124124 */
    125 static size_t irq_lin_hash(unative_t *key);
    126 static bool irq_lin_compare(unative_t *key, size_t keys, link_t *item);
     125static size_t irq_lin_hash(sysarg_t *key);
     126static bool irq_lin_compare(sysarg_t *key, size_t keys, link_t *item);
    127127static void irq_lin_remove(link_t *item);
    128128
     
    194194void irq_register(irq_t *irq)
    195195{
    196         unative_t key[] = {
    197                 (unative_t) irq->inr,
    198                 (unative_t) irq->devno
     196        sysarg_t key[] = {
     197                (sysarg_t) irq->inr,
     198                (sysarg_t) irq->devno
    199199        };
    200200       
     
    212212{
    213213        link_t *lnk;
    214         unative_t key[] = {
    215                 (unative_t) inr,
    216                 (unative_t) -1    /* Search will use claim() instead of devno */
     214        sysarg_t key[] = {
     215                (sysarg_t) inr,
     216                (sysarg_t) -1    /* Search will use claim() instead of devno */
    217217        };
    218218       
     
    235235{
    236236        link_t *lnk;
    237         unative_t key[] = {
    238                 (unative_t) inr,
    239                 (unative_t) -1    /* Search will use claim() instead of devno */
     237        sysarg_t key[] = {
     238                (sysarg_t) inr,
     239                (sysarg_t) -1    /* Search will use claim() instead of devno */
    240240        };
    241241       
     
    306306 *
    307307 */
    308 size_t irq_ht_hash(unative_t key[])
     308size_t irq_ht_hash(sysarg_t key[])
    309309{
    310310        inr_t inr = (inr_t) key[KEY_INR];
     
    333333 *
    334334 */
    335 bool irq_ht_compare(unative_t key[], size_t keys, link_t *item)
     335bool irq_ht_compare(sysarg_t key[], size_t keys, link_t *item)
    336336{
    337337        irq_t *irq = hash_table_get_instance(item, irq_t, link);
     
    381381 *
    382382 */
    383 size_t irq_lin_hash(unative_t key[])
     383size_t irq_lin_hash(sysarg_t key[])
    384384{
    385385        inr_t inr = (inr_t) key[KEY_INR];
     
    408408 *
    409409 */
    410 bool irq_lin_compare(unative_t key[], size_t keys, link_t *item)
     410bool irq_lin_compare(sysarg_t key[], size_t keys, link_t *item)
    411411{
    412412        irq_t *irq = list_get_instance(item, irq_t, link);
Note: See TracChangeset for help on using the changeset viewer.