From 8fbb452a3130fc51f58156c7bdc9d8af64f811f8 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Mon, 21 Feb 2011 08:47:43 +0000
Subject: [PATCH] Winbond 840 NIC driver: implemented link status api (tested)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40594 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../kernel/drivers/network/wb840/device.c      | 18 ++++++++++++++++++
 .../kernel/drivers/network/wb840/wb840.c       |  7 +++++--
 .../kernel/drivers/network/wb840/wb840.h       |  2 ++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/add-ons/kernel/drivers/network/wb840/device.c b/src/add-ons/kernel/drivers/network/wb840/device.c
index 4de89624b3..53d96dcfcd 100644
--- a/src/add-ons/kernel/drivers/network/wb840/device.c
+++ b/src/add-ons/kernel/drivers/network/wb840/device.c
@@ -8,12 +8,16 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <net/if_media.h>
+
 #include "debug.h"
 #include "device.h"
 #include "driver.h"
 #include "interface.h"
 #include "wb840.h"
 
+
+
 #define MAX_CARDS 4
 
 extern char * gDevNameList[];
@@ -296,6 +300,20 @@ wb840_control (void *cookie, uint32 op, void *arg, size_t len)
 			*(uint32 *)arg = WB_MAX_FRAMELEN;
 			return B_OK;
 			
+		case ETHER_GET_LINK_STATE:
+		{
+			ether_link_state_t state;
+			LOG(("ETHER_GET_LINK_STATE"));
+						
+			state.media = (data->link ? IFM_ACTIVE : 0) | IFM_ETHER
+				| (data->full_duplex ? IFM_FULL_DUPLEX : IFM_HALF_DUPLEX)
+				| (data->speed == LINK_SPEED_100_MBIT ? IFM_100_TX : IFM_10_T);
+			state.speed = data->speed == LINK_SPEED_100_MBIT ? 100000000 : 10000;
+			state.quality = 1000;
+
+			return user_memcpy(arg, &state, sizeof(ether_link_state_t));
+		}
+
 		case ETHER_ADDMULTI:
 			LOG(("ETHER_ADDMULTI\n"));
 			break;
diff --git a/src/add-ons/kernel/drivers/network/wb840/wb840.c b/src/add-ons/kernel/drivers/network/wb840/wb840.c
index 9062c61c3f..e165efd79c 100644
--- a/src/add-ons/kernel/drivers/network/wb840/wb840.c
+++ b/src/add-ons/kernel/drivers/network/wb840/wb840.c
@@ -615,16 +615,19 @@ void
 wb_set_mode(wb_device *info, int mode)
 {
 	uint32 cfgAddress = (uint32)info->reg_base + WB_NETCFG;
-	int32 speed = mode & LINK_SPEED_MASK;
+
 	uint32 configFlags = 0;
 	status_t status;
 
+	info->speed = mode & LINK_SPEED_MASK;
+	info->full_duplex = mode & LINK_DUPLEX_MASK;
+
 	status = wb_stop(info);
 
 	if ((mode & LINK_DUPLEX_MASK) == LINK_FULL_DUPLEX)
 		configFlags |= WB_NETCFG_FULLDUPLEX;
 
-	if (speed == LINK_SPEED_100_MBIT)
+	if (info->speed == LINK_SPEED_100_MBIT)
 		configFlags |= WB_NETCFG_100MBPS;
 
 	write32(cfgAddress, configFlags);
diff --git a/src/add-ons/kernel/drivers/network/wb840/wb840.h b/src/add-ons/kernel/drivers/network/wb840/wb840.h
index 76ca267d58..ec9c9cdca4 100644
--- a/src/add-ons/kernel/drivers/network/wb840/wb840.h
+++ b/src/add-ons/kernel/drivers/network/wb840/wb840.h
@@ -367,6 +367,8 @@ struct wb_device {
 	uint16 phy;
 	bool autoNegotiationComplete;
 	bool link;
+	bool full_duplex;
+	uint16 speed;
 	uint16 fixedMode;
 	
 	volatile int32 blockFlag;