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

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/apic

Files:

• apic.c (modified) (4 diffs)
• apic.h (modified) (1 diff)
• main.c (modified) (7 diffs)

uspace/drv/intctl/apic/apic.c

@@ -140 +140 @@
 }
 
-static int apic_enable_irq(apic_t *apic, sysarg_t irq)
+static errno_t apic_enable_irq(apic_t *apic, sysarg_t irq)
 {
         io_redirection_reg_t reg;
@@ -207 +207 @@
 
 /** Add APIC device. */
-int apic_add(apic_t *apic, apic_res_t *res)
+errno_t apic_add(apic_t *apic, apic_res_t *res)
 {
         sysarg_t have_apic;
         ddf_fun_t *fun_a = NULL;
         void *regs;
-        int rc;
+        errno_t rc;
         
         if ((sysinfo_get_value("apic", &have_apic) != EOK) || (!have_apic)) {
@@ -254 +254 @@
 
 /** Remove APIC device */
-int apic_remove(apic_t *apic)
+errno_t apic_remove(apic_t *apic)
 {
         return ENOTSUP;
@@ -260 +260 @@
 
 /** APIC device gone */
-int apic_gone(apic_t *apic)
+errno_t apic_gone(apic_t *apic)
 {
         return ENOTSUP;

uspace/drv/intctl/apic/apic.h

@@ -52 +52 @@
 } apic_t;
 
-extern int apic_add(apic_t *, apic_res_t *);
-extern int apic_remove(apic_t *);
-extern int apic_gone(apic_t *);
+extern errno_t apic_add(apic_t *, apic_res_t *);
+extern errno_t apic_remove(apic_t *);
+extern errno_t apic_gone(apic_t *);
 
 #endif

uspace/drv/intctl/apic/main.c

@@ -43 +43 @@
 #define NAME  "apic"
 
-static int apic_dev_add(ddf_dev_t *dev);
-static int apic_dev_remove(ddf_dev_t *dev);
-static int apic_dev_gone(ddf_dev_t *dev);
-static int apic_fun_online(ddf_fun_t *fun);
-static int apic_fun_offline(ddf_fun_t *fun);
+static errno_t apic_dev_add(ddf_dev_t *dev);
+static errno_t apic_dev_remove(ddf_dev_t *dev);
+static errno_t apic_dev_gone(ddf_dev_t *dev);
+static errno_t apic_fun_online(ddf_fun_t *fun);
+static errno_t apic_fun_offline(ddf_fun_t *fun);
 
 static driver_ops_t driver_ops = {
@@ -62 +62 @@
 };
 
-static int apic_get_res(ddf_dev_t *dev, apic_res_t *res)
+static errno_t apic_get_res(ddf_dev_t *dev, apic_res_t *res)
 {
         async_sess_t *parent_sess;
         hw_res_list_parsed_t hw_res;
-        int rc;
+        errno_t rc;
 
         parent_sess = ddf_dev_parent_sess_get(dev);
@@ -90 +90 @@
 }
 
-static int apic_dev_add(ddf_dev_t *dev)
+static errno_t apic_dev_add(ddf_dev_t *dev)
 {
         apic_t *apic;
         apic_res_t apic_res;
-        int rc;
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "apic_dev_add(%p)", dev);
@@ -114 +114 @@
 }
 
-static int apic_dev_remove(ddf_dev_t *dev)
+static errno_t apic_dev_remove(ddf_dev_t *dev)
 {
         apic_t *apic = (apic_t *)ddf_dev_data_get(dev);
@@ -123 +123 @@
 }
 
-static int apic_dev_gone(ddf_dev_t *dev)
+static errno_t apic_dev_gone(ddf_dev_t *dev)
 {
         apic_t *apic = (apic_t *)ddf_dev_data_get(dev);
@@ -132 +132 @@
 }
 
-static int apic_fun_online(ddf_fun_t *fun)
+static errno_t apic_fun_online(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "apic_fun_online()");
@@ -138 +138 @@
 }
 
-static int apic_fun_offline(ddf_fun_t *fun)
+static errno_t apic_fun_offline(ddf_fun_t *fun)
 {
         ddf_msg(LVL_DEBUG, "apic_fun_offline()");