Changeset 95c675b in mainline for uspace/drv/platform/amdm37x/main.c


Ignore:
Timestamp:
2017-10-17T13:11:35Z (8 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
60af4cdb
Parents:
dbf32b1 (diff), a416d070 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/platform/amdm37x/main.c

    rdbf32b1 r95c675b  
    150150
    151151static hw_resource_list_t *amdm37x_get_resources(ddf_fun_t *fnode);
    152 static bool amdm37x_enable_interrupt(ddf_fun_t *fun);
     152static int amdm37x_enable_interrupt(ddf_fun_t *fun, int);
    153153
    154154static hw_res_ops_t fun_hw_res_ops = {
    … …  
    265265}
    266266
    267 static bool amdm37x_enable_interrupt(ddf_fun_t *fun)
     267static int amdm37x_enable_interrupt(ddf_fun_t *fun, int irq)
    268268{
    269269        //TODO: Implement
Note: See TracChangeset for help on using the changeset viewer.