From 3f913efda03fd840cd526ef72e6f397c7da61bd7 Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Tue, 9 Aug 2022 22:23:08 +0200
Subject: code layout

---
 fw/fe310/eos/net/wifi.c | 113 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 93 insertions(+), 20 deletions(-)

(limited to 'fw/fe310/eos/net/wifi.c')

diff --git a/fw/fe310/eos/net/wifi.c b/fw/fe310/eos/net/wifi.c
index 0663582..4db49f8 100644
--- a/fw/fe310/eos/net/wifi.c
+++ b/fw/fe310/eos/net/wifi.c
@@ -4,10 +4,13 @@
 
 #include "eos.h"
 #include "event.h"
-#include "net.h"
+#include "dev/net.h"
 
 #include "wifi.h"
 
+#define WIFI_SIZE_SSID      33
+#define WIFI_SIZE_PWD       64
+
 static eos_evt_handler_t evt_handler[EOS_WIFI_MAX_MTYPE];
 
 static void wifi_handle_msg(unsigned char type, unsigned char *buffer, uint16_t len) {
@@ -26,7 +29,7 @@ static void wifi_handle_msg(unsigned char type, unsigned char *buffer, uint16_t
     }
 }
 
-void eos_wifi_netinit(void) {
+void eos_wifi_init(void) {
     int i;
 
     for (i=0; i<EOS_WIFI_MAX_MTYPE; i++) {
@@ -44,7 +47,64 @@ eos_evt_handler_t eos_wifi_get_handler(unsigned char mtype) {
     return NULL;
 }
 
-int eos_wifi_scan(unsigned char *buffer) {
+int eos_wifi_status(unsigned char *buffer, uint8_t *status, uint8_t ip_addr[], char *ssid) {
+    unsigned char *buf;
+    unsigned char type;
+    uint16_t len;
+    int do_release;
+    int rv;
+
+    do_release = 0;
+    if (buffer == NULL) {
+        buffer = eos_net_alloc();
+        do_release = 1;
+    }
+
+    type = EOS_NET_MTYPE_WIFI;
+    len = 1;
+    buffer[0] = EOS_WIFI_MTYPE_STATUS;
+
+    rv = eos_net_xchg(&type, buffer, &len);
+    if (rv) goto wifi_status_fin;
+
+    if (type != EOS_NET_MTYPE_WIFI) {
+        rv = EOS_ERR_NET;
+        goto wifi_status_fin;
+    }
+    if (len < 2) {
+        rv = EOS_ERR_SIZE;
+        goto wifi_status_fin;
+    }
+
+    *status = buffer[1];
+    buf = buffer + 2;
+    len -= 2;
+
+    switch (*status) {
+        case EOS_WIFI_STATUS_GOT_IP:
+            if (len < sizeof(uint32_t)) {
+                rv = EOS_ERR_SIZE;
+                goto wifi_status_fin;
+            }
+            if (ip_addr) memcpy(ip_addr, buf, sizeof(uint32_t));
+            buf += sizeof(uint32_t);
+            len -= sizeof(uint32_t);
+        case EOS_WIFI_STATUS_CONNECTED:
+            if ((len == 0) || (len > WIFI_SIZE_SSID)) {
+                rv = EOS_ERR_SIZE;
+                goto wifi_status_fin;
+            }
+            buf[len - 1] = '\0';
+            if (ssid) strcpy(ssid, buf);
+            break;
+    }
+
+wifi_status_fin:
+    if (do_release) eos_net_free(buffer, 1);
+    return rv;
+}
+
+int eos_wifi_start(unsigned char *buffer) {
     int async;
 
     async = 0;
@@ -52,13 +112,11 @@ int eos_wifi_scan(unsigned char *buffer) {
         buffer = eos_net_alloc();
         async = 1;
     }
-    buffer[0] = EOS_WIFI_MTYPE_SCAN;
+    buffer[0] = EOS_WIFI_MTYPE_START;
     return _eos_net_send(EOS_NET_MTYPE_WIFI, buffer, 1, async, 1);
 }
 
-int eos_wifi_auth(const char *ssid, const char *pass, unsigned char *buffer) {
-    unsigned char *buf;
-    size_t ssid_len, pass_len;
+int eos_wifi_stop(unsigned char *buffer) {
     int async;
 
     async = 0;
@@ -66,30 +124,45 @@ int eos_wifi_auth(const char *ssid, const char *pass, unsigned char *buffer) {
         buffer = eos_net_alloc();
         async = 1;
     }
-    ssid_len = strlen(ssid) + 1;
-    pass_len = strlen(pass) + 1;
-    if ((1 + ssid_len + pass_len) > EOS_NET_MTU) return EOS_ERR_SIZE;
+    buffer[0] = EOS_WIFI_MTYPE_STOP;
+    return _eos_net_send(EOS_NET_MTYPE_WIFI, buffer, 1, async, 1);
+}
 
-    buf = buffer;
-    buf[0] = EOS_WIFI_MTYPE_AUTH;
-    buf++;
-    strcpy(buf, ssid);
-    buf += ssid_len;
-    strcpy(buf, pass);
-    buf += pass_len;
+int eos_wifi_scan(unsigned char *buffer) {
+    int async;
 
-    return _eos_net_send(EOS_NET_MTYPE_WIFI, buffer, 1 + ssid_len + pass_len, async, 1);
+    async = 0;
+    if (buffer == NULL) {
+        buffer = eos_net_alloc();
+        async = 1;
+    }
+    buffer[0] = EOS_WIFI_MTYPE_SCAN;
+    return _eos_net_send(EOS_NET_MTYPE_WIFI, buffer, 1, async, 1);
 }
 
-int eos_wifi_connect(unsigned char *buffer) {
+int eos_wifi_connect(const char *ssid, const char *pwd, unsigned char *buffer) {
+    unsigned char *buf;
+    size_t ssid_len, pwd_len;
     int async;
 
+    ssid_len = strlen(ssid);
+    pwd_len = strlen(pwd);
+    if (ssid_len > WIFI_SIZE_SSID - 1) return EOS_ERR_SIZE;
+    if (pwd_len > WIFI_SIZE_PWD - 1) return EOS_ERR_SIZE;
+
     async = 0;
     if (buffer == NULL) {
         buffer = eos_net_alloc();
         async = 1;
     }
-    buffer[0] = EOS_WIFI_MTYPE_CONNECT;
+    buf = buffer;
+    buf[0] = EOS_WIFI_MTYPE_CONNECT;
+    buf++;
+    strcpy(buf, ssid);
+    buf += ssid_len + 1;
+    strcpy(buf, pwd);
+    buf += pwd_len + 1;
+
     return _eos_net_send(EOS_NET_MTYPE_WIFI, buffer, 1, async, 1);
 }
 
-- 
cgit v1.2.3