Changeset 5a6cc679 in mainline for uspace/lib/ieee80211/include/ieee80211.h

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:

• uspace/lib/ieee80211/include/ieee80211.h (modified) (8 diffs)

uspace/lib/ieee80211/include/ieee80211.h

@@ -106 +106 @@
          *
          */
-        int (*start)(struct ieee80211_dev *);
+        errno_t (*start)(struct ieee80211_dev *);
         
         /** Scan neighborhood for networks.
@@ -118 +118 @@
          *
          */
-        int (*scan)(struct ieee80211_dev *);
+        errno_t (*scan)(struct ieee80211_dev *);
         
         /** Handler for TX frames to be send from device.
@@ -132 +132 @@
          *
          */
-        int (*tx_handler)(struct ieee80211_dev *, void *, size_t);
+        errno_t (*tx_handler)(struct ieee80211_dev *, void *, size_t);
         
         /** Set device operating frequency to given value.
@@ -142 +142 @@
          *
          */
-        int (*set_freq)(struct ieee80211_dev *, uint16_t);
+        errno_t (*set_freq)(struct ieee80211_dev *, uint16_t);
         
         /** Callback to inform device about BSSID change.
@@ -152 +152 @@
          *
          */
-        int (*bssid_change)(struct ieee80211_dev *, bool);
+        errno_t (*bssid_change)(struct ieee80211_dev *, bool);
         
         /** Callback to setup encryption key in IEEE 802.11 device.
@@ -164 +164 @@
          *
          */
-        int (*key_config)(struct ieee80211_dev *,
+        errno_t (*key_config)(struct ieee80211_dev *,
             ieee80211_key_config_t *key_conf, bool);
 } ieee80211_ops_t;
@@ -170 +170 @@
 /* Initialization functions. */
 extern ieee80211_dev_t *ieee80211_device_create(void);
-extern int ieee80211_device_init(ieee80211_dev_t *, ddf_dev_t *);
-extern int ieee80211_init(ieee80211_dev_t *, ieee80211_ops_t *,
+extern errno_t ieee80211_device_init(ieee80211_dev_t *, ddf_dev_t *);
+extern errno_t ieee80211_init(ieee80211_dev_t *, ieee80211_ops_t *,
     ieee80211_iface_t *, nic_iface_t *, ddf_dev_ops_t *);
 
@@ -201 +201 @@
 
 /* Worker functions. */
-extern int ieee80211_rx_handler(ieee80211_dev_t *, void *, size_t);
+extern errno_t ieee80211_rx_handler(ieee80211_dev_t *, void *, size_t);
 
 #endif