Changeset 5a6cc679 in mainline for uspace/drv/platform/ski/ski.c


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works :)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/platform/ski/ski.c

    r132ab5d1 r5a6cc679  
    4646#define NAME "ski"
    4747
    48 static int ski_dev_add(ddf_dev_t *dev);
     48static errno_t ski_dev_add(ddf_dev_t *dev);
    4949
    5050static driver_ops_t ski_ops = {
     
    5757};
    5858
    59 static int ski_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id)
     59static errno_t ski_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id)
    6060{
    6161        ddf_msg(LVL_NOTE, "Adding function '%s'.", name);
    6262
    6363        ddf_fun_t *fnode = NULL;
    64         int rc;
     64        errno_t rc;
    6565
    6666        /* Create new device. */
     
    9494}
    9595
    96 static int ski_add_functions(ddf_dev_t *dev)
     96static errno_t ski_add_functions(ddf_dev_t *dev)
    9797{
    98         int rc;
     98        errno_t rc;
    9999
    100100        rc = ski_add_fun(dev, "console", "ski/console");
     
    106106
    107107/** Add device. */
    108 static int ski_dev_add(ddf_dev_t *dev)
     108static errno_t ski_dev_add(ddf_dev_t *dev)
    109109{
    110110        ddf_msg(LVL_NOTE, "ski_dev_add, device handle = %d",
     
    121121int main(int argc, char *argv[])
    122122{
    123         int rc;
     123        errno_t rc;
    124124
    125125        printf(NAME ": Ski platform driver\n");
Note: See TracChangeset for help on using the changeset viewer.