From 36fb1ffcdfe95bca07c9f4154ffc7991c42b2e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <jean.andre.santoni@gmail.com>
Date: Wed, 21 Sep 2016 19:46:02 +0200
Subject: [PATCH] WiFi driver: add scan callback

---
 wifi/drivers/connmanctl.c | 12 ++++++++++++
 wifi/drivers/nullwifi.c   |  6 ++++++
 wifi/wifi_driver.c        |  3 ---
 wifi/wifi_driver.h        |  3 +++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/wifi/drivers/connmanctl.c b/wifi/drivers/connmanctl.c
index d36e1717f8..a05b0a94f8 100644
--- a/wifi/drivers/connmanctl.c
+++ b/wifi/drivers/connmanctl.c
@@ -14,6 +14,7 @@
  */
 
 #include "../wifi_driver.h"
+#include <file/file_path.h>
 
 static void *connmanctl_init(const char *device, uint64_t caps,
       unsigned width, unsigned height)
@@ -38,10 +39,21 @@ static void connmanctl_stop(void *data)
    (void)data;
 }
 
+static void connmanctl_scan(void *data, struct string_list *list)
+{
+   (void)data;
+
+   union string_list_elem_attr attr;
+   attr.i = RARCH_FILETYPE_UNSET;
+
+   string_list_append(list, "LALA", attr);
+}
+
 wifi_driver_t wifi_connmanctl = {
    connmanctl_init,
    connmanctl_free,
    connmanctl_start,
    connmanctl_stop,
+   connmanctl_scan,
    "connmanctl",
 };
diff --git a/wifi/drivers/nullwifi.c b/wifi/drivers/nullwifi.c
index 2dedbf8303..9b73dffe05 100644
--- a/wifi/drivers/nullwifi.c
+++ b/wifi/drivers/nullwifi.c
@@ -38,10 +38,16 @@ static void nullwifi_stop(void *data)
    (void)data;
 }
 
+static void nullwifi_scan(void *data, struct string_list *list)
+{
+   (void)data;
+}
+
 wifi_driver_t wifi_null = {
    nullwifi_init,
    nullwifi_free,
    nullwifi_start,
    nullwifi_stop,
+   nullwifi_scan,
    "null",
 };
diff --git a/wifi/wifi_driver.c b/wifi/wifi_driver.c
index fa4945973f..ba3fc42441 100644
--- a/wifi/wifi_driver.c
+++ b/wifi/wifi_driver.c
@@ -175,9 +175,6 @@ bool wifi_driver_ctl(enum rarch_wifi_ctl_state state, void *data)
         {
            if (settings->wifi.allow)
               return wifi_driver->start(wifi_data);
-
-           runloop_msg_queue_push(
-                 "Camera is explicitly disabled.\n", 1, 180, false);
         }
         return false;
       case RARCH_WIFI_CTL_SET_CB:
diff --git a/wifi/wifi_driver.h b/wifi/wifi_driver.h
index d075c9c590..574a47243c 100644
--- a/wifi/wifi_driver.h
+++ b/wifi/wifi_driver.h
@@ -22,6 +22,7 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 #include <libretro.h>
+#include <lists/string_list.h>
 
 RETRO_BEGIN_DECLS
 
@@ -52,6 +53,8 @@ typedef struct wifi_driver
    bool (*start)(void *data);
    void (*stop)(void *data);
 
+   void (*scan)(void *data, struct string_list *list);
+
    const char *ident;
 } wifi_driver_t;