Changeset 56c0930 in mainline for uspace/lib

Timestamp:

2015-02-20T14:33:29Z (11 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4cb0148

Parents:

ab365c4

Message:

Started writing TX and RX handlers, VIF init, setting RX filter, PLL init and calibration, some corrections. Added HW values array initialization, registered diagnostic polling fibril. But still not receiving any packets…

Location:

uspace/lib/net

Files:

• ieee80211/ieee80211.c (modified) (5 diffs)
• ieee80211/ieee80211_impl.c (modified) (2 diffs)
• include/ieee80211.h (modified) (3 diffs)

uspace/lib/net/ieee80211/ieee80211.c

@@ -37 +37 @@
 
 #include <errno.h>
-#include <nic.h>
+#include <byteorder.h>
 
 #include <ieee80211_impl.h>
@@ -48 +48 @@
 static driver_ops_t ieee80211_nic_driver_ops;
 
+bool ieee80211_is_data_frame(ieee80211_header_t *header)
+{
+        return (header->frame_ctrl & 
+                host2uint16_t_le(IEEE80211_FRAME_CTRL_FRAME_TYPE)) ==
+                host2uint16_t_le(IEEE80211_FRAME_CTRL_DATA_FRAME);
+}
+
 static int ieee80211_open(ddf_fun_t *fun)
 {
@@ -53 +60 @@
         ieee80211_dev_t *ieee80211_dev = nic_get_specific(nic_data);
         
+        if(ieee80211_dev->started) {
+                return EOK;
+        } else {
+                ieee80211_dev->started = true;
+        }
+        
         int rc = ieee80211_dev->ops->start(ieee80211_dev);
         if(rc != EOK)
                 return rc;
+        
+        /*
+        rc = ieee80211_dev->ops->scan(ieee80211_dev);
+        if(rc != EOK)
+                return rc;
+         */
         
         return EOK;
@@ -70 +89 @@
         /* IEEE802.11 start operation must be implemented. */
         if(!ieee80211_ops->start)
+                return EINVAL;
+        
+        /* IEEE802.11 TX handler must be implemented. */
+        if(!ieee80211_ops->tx_handler)
                 return EINVAL;
         
@@ -93 +116 @@
         ieee80211_dev->ddf_dev = ddf_dev;
         ieee80211_dev->driver_data = driver_data;
+        ieee80211_dev->started = false;
+        ieee80211_dev->current_op_mode = IEEE80211_OPMODE_STATION;
         
         /* Bind NIC to device */

uspace/lib/net/ieee80211/ieee80211_impl.c

@@ -40 +40 @@
 #include <ieee80211_impl.h>
 
+static int ieee80211_freq_to_channel(uint16_t freq)
+{
+        return (freq - IEEE80211_FIRST_FREQ) / IEEE80211_CHANNEL_GAP + 1;
+}
+
+static int ieee80211_probe_request(ieee80211_dev_t *ieee80211_dev)
+{
+        size_t buffer_size = sizeof(ieee80211_header_t);
+        void *buffer = malloc(buffer_size);
+        
+        /* TODO */
+        
+        ieee80211_freq_to_channel(ieee80211_dev->current_freq);
+        
+        ieee80211_dev->ops->tx_handler(ieee80211_dev, buffer, buffer_size);
+        
+        free(buffer);
+        
+        return EOK;
+}
+
 /**
  * Default implementation of IEEE802.11 scan function.
@@ -49 +70 @@
 int ieee80211_scan_impl(ieee80211_dev_t *ieee80211_dev)
 {
-        /** TODO */
+        /* TODO */
+        int rc = ieee80211_probe_request(ieee80211_dev);
+        if(rc != EOK)
+                return rc;
         
         return EOK;

uspace/lib/net/include/ieee80211.h

@@ -41 +41 @@
 #include <ddf/driver.h>
 #include <sys/types.h>
+#include <nic.h>
 
 /** Initial channel frequency. */
-#define IEEE80211_FIRST_CHANNEL 2412
+#define IEEE80211_FIRST_FREQ 2412
 
 /** Max supported channel frequency. */
-#define IEEE80211_MAX_CHANNEL 2472
+#define IEEE80211_MAX_FREQ 2472
 
 /* Gap between IEEE80211 channels in MHz. */
 #define IEEE80211_CHANNEL_GAP 5
+
+#define IEEE80211_FRAME_CTRL_FRAME_TYPE 0x000C
+#define IEEE80211_FRAME_CTRL_DATA_FRAME 0x0008
 
 struct ieee80211_dev;
@@ -65 +69 @@
         int (*start)(struct ieee80211_dev *);
         int (*scan)(struct ieee80211_dev *);
+        int (*tx_handler)(struct ieee80211_dev *, void *, size_t);
 } ieee80211_ops_t;
 
@@ -77 +82 @@
         /** Pointer to driver specific data. */
         void *driver_data;
+        
+        /** Current operating frequency. */
+        uint16_t current_freq;
+        
+        /** Current operating mode. */
+        ieee80211_operating_mode_t current_op_mode;
+        
+        /* TODO: Probably to be removed later - nic.open function is now 
+         * executed multiple times, have to find out reason and fix it. 
+         */
+        /** Indicates whether driver has already started. */
+        bool started;
 } ieee80211_dev_t;
 
+/** IEEE 802.11 header structure. */
+typedef struct {
+        uint16_t frame_ctrl;            /**< Little Endian value! */
+        uint16_t duration_id;           /**< Little Endian value! */
+        uint8_t address1[ETH_ADDR];
+        uint8_t address2[ETH_ADDR];
+        uint8_t address3[ETH_ADDR];
+        uint16_t seq_ctrl;              /**< Little Endian value! */
+        uint8_t address4[ETH_ADDR];
+} __attribute__((packed)) __attribute__ ((aligned(2))) ieee80211_header_t;
+
+extern bool ieee80211_is_data_frame(ieee80211_header_t *header);
 extern int ieee80211_device_init(ieee80211_dev_t *ieee80211_dev, 
         void *driver_data, ddf_dev_t *ddf_dev);