Changes in uspace/lib/drv/generic/remote_ieee80211.c [b7fd2a0:8a64320e] in mainline

File:

• uspace/lib/drv/generic/remote_ieee80211.c (modified) (12 diffs)

uspace/lib/drv/generic/remote_ieee80211.c

@@ -59 +59 @@
  *
  * @return EOK If the operation was successfully completed,
- *         error code otherwise.
- *
- */
-errno_t ieee80211_get_scan_results(async_sess_t *dev_sess,
+ *         negative error code otherwise.
+ *
+ */
+int ieee80211_get_scan_results(async_sess_t *dev_sess,
     ieee80211_scan_results_t *results, bool now)
 {
@@ -71 +71 @@
         aid_t aid = async_send_2(exch, DEV_IFACE_ID(IEEE80211_DEV_IFACE),
             IEEE80211_GET_SCAN_RESULTS, now, NULL);
-        errno_t rc = async_data_read_start(exch, results,
+        int rc = async_data_read_start(exch, results,
             sizeof(ieee80211_scan_results_t));
         async_exchange_end(exch);
         
-        errno_t res;
+        sysarg_t res;
         async_wait_for(aid, &res);
         
         if(res != EOK)
-                return (errno_t) res;
+                return (int) res;
         
         return rc;
@@ -100 +100 @@
         size_t count;
         
-        errno_t rc = inetcfg_get_link_list(&link_list, &count);
+        int rc = inetcfg_get_link_list(&link_list, &count);
         if (rc != EOK)
                 return -1;
@@ -123 +123 @@
  *
  * @return EOK If the operation was successfully completed,
- *         error code otherwise.
- *
- */
-errno_t ieee80211_connect(async_sess_t *dev_sess, char *ssid_start, char *password)
+ *         negative error code otherwise.
+ *
+ */
+int ieee80211_connect(async_sess_t *dev_sess, char *ssid_start, char *password)
 {
         assert(ssid_start);
         
-        errno_t rc_orig;
+        sysarg_t rc_orig;
         
         async_exch_t *exch = async_exchange_begin(dev_sess);
@@ -137 +137 @@
             IEEE80211_CONNECT, NULL);
         
-        errno_t rc = async_data_write_start(exch, ssid_start,
+        sysarg_t rc = async_data_write_start(exch, ssid_start,
             str_size(ssid_start) + 1);
         if (rc != EOK) {
@@ -144 +144 @@
                 
                 if (rc_orig == EOK)
-                        return (errno_t) rc;
-                
-                return (errno_t) rc_orig;
+                        return (int) rc;
+                
+                return (int) rc_orig;
         }
         
@@ -159 +159 @@
                 
                 if (rc_orig == EOK)
-                        return (errno_t) rc;
-                
-                return (errno_t) rc_orig;
+                        return (int) rc;
+                
+                return (int) rc_orig;
         }
         
@@ -182 +182 @@
         rc = dhcp_discover(link_id);
         
-        return (errno_t) rc;
+        return (int) rc;
 }
 
@@ -190 +190 @@
  *
  * @return EOK If the operation was successfully completed,
- *         error code otherwise.
- *
- */
-errno_t ieee80211_disconnect(async_sess_t *dev_sess)
+ *         negative error code otherwise.
+ *
+ */
+int ieee80211_disconnect(async_sess_t *dev_sess)
 {
         async_exch_t *exch = async_exchange_begin(dev_sess);
-        errno_t rc = async_req_1_0(exch, DEV_IFACE_ID(IEEE80211_DEV_IFACE),
+        int rc = async_req_1_0(exch, DEV_IFACE_ID(IEEE80211_DEV_IFACE),
             IEEE80211_DISCONNECT);
         async_exchange_end(exch);
@@ -278 +278 @@
         bool now = IPC_GET_ARG2(*call);
         
-        errno_t rc = ieee80211_iface->get_scan_results(fun, &scan_results, now);
+        int rc = ieee80211_iface->get_scan_results(fun, &scan_results, now);
         if (rc == EOK) {
                 ipc_callid_t data_callid;
@@ -324 +324 @@
         }
         
-        errno_t rc = async_data_write_finalize(data_callid, ssid_start, len);
+        int rc = async_data_write_finalize(data_callid, ssid_start, len);
         if (rc != EOK) {
                 async_answer_0(data_callid, EINVAL);
@@ -360 +360 @@
         ieee80211_iface_t *ieee80211_iface = (ieee80211_iface_t *) iface;
         assert(ieee80211_iface->disconnect);
-        errno_t rc = ieee80211_iface->disconnect(fun);
+        int rc = ieee80211_iface->disconnect(fun);
         async_answer_0(callid, rc);
 }