Changeset 5a6cc679 in mainline for uspace/drv/intctl/obio


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 :)

Location:
uspace/drv/intctl/obio
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/intctl/obio/main.c

    r132ab5d1 r5a6cc679  
    4343#define NAME  "obio"
    4444
    45 static int obio_dev_add(ddf_dev_t *dev);
    46 static int obio_dev_remove(ddf_dev_t *dev);
    47 static int obio_dev_gone(ddf_dev_t *dev);
    48 static int obio_fun_online(ddf_fun_t *fun);
    49 static int obio_fun_offline(ddf_fun_t *fun);
     45static errno_t obio_dev_add(ddf_dev_t *dev);
     46static errno_t obio_dev_remove(ddf_dev_t *dev);
     47static errno_t obio_dev_gone(ddf_dev_t *dev);
     48static errno_t obio_fun_online(ddf_fun_t *fun);
     49static errno_t obio_fun_offline(ddf_fun_t *fun);
    5050
    5151static driver_ops_t driver_ops = {
    … …  
    6262};
    6363
    64 static int obio_get_res(ddf_dev_t *dev, obio_res_t *res)
     64static errno_t obio_get_res(ddf_dev_t *dev, obio_res_t *res)
    6565{
    6666        async_sess_t *parent_sess;
    6767        hw_res_list_parsed_t hw_res;
    68         int rc;
     68        errno_t rc;
    6969
    7070        parent_sess = ddf_dev_parent_sess_get(dev);
    … …  
    9090}
    9191
    92 static int obio_dev_add(ddf_dev_t *dev)
     92static errno_t obio_dev_add(ddf_dev_t *dev)
    9393{
    9494        obio_t *obio;
    9595        obio_res_t obio_res;
    96         int rc;
     96        errno_t rc;
    9797
    9898        ddf_msg(LVL_DEBUG, "obio_dev_add(%p)", dev);
    … …  
    114114}
    115115
    116 static int obio_dev_remove(ddf_dev_t *dev)
     116static errno_t obio_dev_remove(ddf_dev_t *dev)
    117117{
    118118        obio_t *obio = (obio_t *)ddf_dev_data_get(dev);
    … …  
    123123}
    124124
    125 static int obio_dev_gone(ddf_dev_t *dev)
     125static errno_t obio_dev_gone(ddf_dev_t *dev)
    126126{
    127127        obio_t *obio = (obio_t *)ddf_dev_data_get(dev);
    … …  
    132132}
    133133
    134 static int obio_fun_online(ddf_fun_t *fun)
     134static errno_t obio_fun_online(ddf_fun_t *fun)
    135135{
    136136        ddf_msg(LVL_DEBUG, "obio_fun_online()");
    … …  
    138138}
    139139
    140 static int obio_fun_offline(ddf_fun_t *fun)
     140static errno_t obio_fun_offline(ddf_fun_t *fun)
    141141{
    142142        ddf_msg(LVL_DEBUG, "obio_fun_offline()");

  • uspace/drv/intctl/obio/obio.c

    r132ab5d1 r5a6cc679  
    114114
    115115/** Add OBIO device. */
    116 int obio_add(obio_t *obio, obio_res_t *res)
     116errno_t obio_add(obio_t *obio, obio_res_t *res)
    117117{
    118118        ddf_fun_t *fun_a = NULL;
    119         int rc;
     119        errno_t rc;
    120120
    121121        rc = pio_enable((void *)res->base, OBIO_SIZE, (void **) &obio->regs);
    … …  
    155155
    156156/** Remove OBIO device */
    157 int obio_remove(obio_t *obio)
     157errno_t obio_remove(obio_t *obio)
    158158{
    159159        return ENOTSUP;
    … …  
    161161
    162162/** OBIO device gone */
    163 int obio_gone(obio_t *obio)
     163errno_t obio_gone(obio_t *obio)
    164164{
    165165        return ENOTSUP;

  • uspace/drv/intctl/obio/obio.h

    r132ab5d1 r5a6cc679  
    5252} obio_t;
    5353
    54 extern int obio_add(obio_t *, obio_res_t *);
    55 extern int obio_remove(obio_t *);
    56 extern int obio_gone(obio_t *);
     54extern errno_t obio_add(obio_t *, obio_res_t *);
     55extern errno_t obio_remove(obio_t *);
     56extern errno_t obio_gone(obio_t *);
    5757
    5858#endif
Note: See TracChangeset for help on using the changeset viewer.