From da52930b89bb0e03948f3981e75f8727ea023587 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Tue, 27 Dec 2011 13:50:07 -0800 Subject: Add support for p2p socket communication Right now, everything goes over the primary interface socket connection. Add support for a seperate connection over the p2p interface. Change-Id: I09118f88cfaa201b2d62d27add410cfd441d4454 --- include/hardware_legacy/wifi.h | 65 ++++++++---------------------------------- 1 file changed, 12 insertions(+), 53 deletions(-) (limited to 'include/hardware_legacy/wifi.h') diff --git a/include/hardware_legacy/wifi.h b/include/hardware_legacy/wifi.h index 4166a6d..26a3912 100644 --- a/include/hardware_legacy/wifi.h +++ b/include/hardware_legacy/wifi.h @@ -65,24 +65,25 @@ int wifi_start_p2p_supplicant(); int wifi_stop_supplicant(); /** - * Open a connection to supplicant. + * Open a connection to supplicant on interface * * @return 0 on success, < 0 on failure. */ -int wifi_connect_to_supplicant(); +int wifi_connect_to_supplicant(const char *ifname); /** - * Close connection supplicant. + * Close connection to supplicant on interface * * @return 0 on success, < 0 on failure. */ -void wifi_close_supplicant_connection(); +void wifi_close_supplicant_connection(const char *ifname); /** * wifi_wait_for_event() performs a blocking call to * get a Wi-Fi event and returns a string representing * a Wi-Fi event when it occurs. * + * @param iface is the interface on which event is received * @param buf is the buffer that receives the event * @param len is the maximum length of the buffer * @@ -90,61 +91,19 @@ void wifi_close_supplicant_connection(); * event (for instance, no connection), and less than 0 * if there is an error. */ -int wifi_wait_for_event(char *buf, size_t len); +int wifi_wait_for_event(const char *iface, char *buf, size_t len); /** * wifi_command() issues a command to the Wi-Fi driver. * - * Android extends the standard commands listed at - * /link http://hostap.epitest.fi/wpa_supplicant/devel/ctrl_iface_page.html + * Android extends the standard commands listed at + * /link http://hostap.epitest.fi/wpa_supplicant/devel/ctrl_iface_page.html * to include support for sending commands to the driver: * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Command / Command summaryForm of ResponseProcessing
DRIVER START
  Turn on Wi-Fi Hardware		OK if successfulOK ? true : false
DRIVER STOP
  Turn off Wi-Fi hardware		OK if successfulOK ? true : false
DRIVER RSSI
  Return received signal strength indicator in -db for current AP		<ssid> Rssi xx%*s %*s %d", &rssi
DRIVER LINKSPEED
  Return link speed in MBPS		LinkSpeed xx%*s %d", &linkspd
DRIVER MACADDR
  Return mac address of the station		Macaddr = xx.xx.xx.xx.xx.xx"%*s = %s", &macadr
DRIVER SCAN-ACTIVE
  Set scan type to active		"OK" if successful"OK" ? true : false
DRIVER SCAN-PASSIVE
  Set scan type to passive		"OK" if successful"OK" ? true : false
- * - * See libs/android_runtime/android_net_wifi_Wifi.cpp for more information - * describing how these and other commands are invoked. + * See wifi/java/android/net/wifi/WifiNative.java for the details of + * driver commands that are supported * + * @param iface is the interface on which command is sent * @param command is the string command * @param reply is a buffer to receive a reply string * @param reply_len on entry, this is the maximum length of @@ -153,7 +112,7 @@ int wifi_wait_for_event(char *buf, size_t len); * * @return 0 if successful, < 0 if an error. */ -int wifi_command(const char *command, char *reply, size_t *reply_len); +int wifi_command(const char *iface, const char *command, char *reply, size_t *reply_len); /** * do_dhcp_request() issues a dhcp request and returns the acquired -- cgit v1.1