sim: dv-sockser: pass up connected state

A few ports rely on internal dv-sockser state in order to detect whether
a connection has been made (look for 'extern sockser_addr').  Rather than
continuing that tradition, extend the existing status function to return
the socket connection status.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 2a386d700a38861d08db7e30033cd9a09c2867cd..eb585192bf8f6af2ffea147f745e002f0469aa6e 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-13  Mike Frysinger  <vapier@gentoo.org>
+
+       * dv-sockser.h (DV_SOCKSER_DISCONNECTED): Define.
+       * dv-sockser.c (dv_sockser_status): Set DV_SOCKSER_DISCONNECTED
+       initially.
+
 2010-04-13  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-hrw.c (sim_write): Add const to buf arg.

diff --git a/sim/common/dv-sockser.c b/sim/common/dv-sockser.c
index 1e530e2eb0f0466ee55e6f973b6bcb30d3f95834..a8626cda52386618fc0d2b9b0f42ded7770211d2 100644 (file)
--- a/sim/common/dv-sockser.c
+++ b/sim/common/dv-sockser.c
@@ -298,7 +298,8 @@ dv_sockser_status (SIM_DESC sd)
   fd_set readfds,writefds;
 
   /* status to return if the socket isn't set up, or select fails */
-  status = DV_SOCKSER_INPUT_EMPTY | DV_SOCKSER_OUTPUT_EMPTY;
+  status = DV_SOCKSER_INPUT_EMPTY | DV_SOCKSER_OUTPUT_EMPTY |
+          DV_SOCKSER_DISCONNECTED;
 
   if (! connected_p (sd))
     return status;

diff --git a/sim/common/dv-sockser.h b/sim/common/dv-sockser.h
index fc21b55aaa14fa3122c0ae309f444d10a2f190f7..209cf4631460ec701ca74c18072b50304508ec4c 100644 (file)
--- a/sim/common/dv-sockser.h
+++ b/sim/common/dv-sockser.h
@@ -20,8 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DV_SOCKSER_H
 
 /* bits in result of dev_sockser_status */
-#define DV_SOCKSER_INPUT_EMPTY  1
-#define DV_SOCKSER_OUTPUT_EMPTY 2
+#define DV_SOCKSER_INPUT_EMPTY  0x1
+#define DV_SOCKSER_OUTPUT_EMPTY 0x2
+#define DV_SOCKSER_DISCONNECTED 0x4
 
 /* FIXME: later add a device ptr arg */
 extern int dv_sockser_status (SIM_DESC);