From 147c4a3b24cb2026f729f5a0012a8eca3e227183 Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Thu, 24 Apr 2008 16:24:18 +0000
Subject: [PATCH] xavier : Win32 part : minor change
---
src/Win32SocketLecroy.cpp | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/Win32SocketLecroy.cpp b/src/Win32SocketLecroy.cpp
index 4dc79a7..cae38c0 100644
--- a/src/Win32SocketLecroy.cpp
+++ b/src/Win32SocketLecroy.cpp
@@ -11,6 +11,13 @@
//
//******************************************************************************************
+static int hSocket;
+static int sTimeout = 15;
+//static int sWinsockInitFlag = FALSE;
+static char sCurrentAddress[256];
+static int sConnectedFlag = false;
+const int CMD_BUF_LEN = 8192;
+static char sCommandBuffer[CMD_BUF_LEN];
//- INCLUDE
#include "SocketLecroy.h"
@@ -51,7 +58,7 @@ SocketLecroy::~SocketLecroy()
}
//- Build the connection
-void SocketLecroy::TCP_Connect(char *ip_address) throw (lecroy::LecroyException)
+void SocketLecroy::TCP_Connect(char *ip_address) throw (lecroy::SocketException)
{
SOCKADDR_IN serverAddr;
@@ -163,7 +170,7 @@ void SocketLecroy::TCP_Disconnect(void)
}
//- Clear a connection
-void SocketLecroy::TCP_ClearDevice(void) throw (lecroy::LecroyException)
+void SocketLecroy::TCP_ClearDevice(void) throw (lecroy::SocketException)
{
if ( !sConnectedFlag )
@@ -177,7 +184,7 @@ void SocketLecroy::TCP_ClearDevice(void) throw (lecroy::LecroyException)
}
//- Send commands to the remote device
-void SocketLecroy::TCP_WriteDevice(char *buf, int len, BOOL eoi_flag) throw (lecroy::LecroyException)
+void SocketLecroy::TCP_WriteDevice(char *buf, int len, bool eoi_flag) throw (lecroy::SocketException)
{
TCP_HEADER header;
@@ -234,7 +241,7 @@ char *idxPtr;
}
//- Read the device answer
-void SocketLecroy::TCP_ReadDevice(char *buf, int len, int *recv_count) throw (lecroy::LecroyException)
+void SocketLecroy::TCP_ReadDevice(char *buf, int len, int *recv_count) throw (lecroy::SocketException)
{
TCP_HEADER header;
--
GitLab