ngscopeclient · May 25, 2020
diff --git a/scopehal/SCPILxiTransport.cpp b/scopehal/SCPILxiTransport.cpp
@@ -77,7 +77,7 @@ SCPILxiTransport::SCPILxiTransport(string args)
 	// I haven't been able to fetch waveforms larger than 1.4M (for reasons unknown.)
 	// Maybe we should reduce this number...
 	m_staging_buf_size = 150000000;
-	m_staging_buf = new char[m_staging_buf_size];
+	m_staging_buf = new unsigned char[m_staging_buf_size];
 	if (m_staging_buf == NULL)
 		return;
 	m_data_in_staging_buf = 0;
@@ -87,7 +87,7 @@ SCPILxiTransport::SCPILxiTransport(string args)
 
 SCPILxiTransport::~SCPILxiTransport()
 {
-	delete(m_staging_buf);
+	delete[] m_staging_buf;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -109,7 +109,7 @@ bool SCPILxiTransport::SendCommand(string cmd)
 {
 	LogTrace("Sending %s\n", cmd.c_str());
 
-	int result = lxi_send(m_device, cmd.c_str(), cmd.length(), m_timeout); 
+	int result = lxi_send(m_device, cmd.c_str(), cmd.length(), m_timeout);
 
 	m_data_in_staging_buf = 0;
 	m_data_offset = 0;
@@ -144,7 +144,7 @@ string SCPILxiTransport::ReadReply()
 void SCPILxiTransport::SendRawData(size_t len, const unsigned char* buf)
 {
 	// XXX: Should this reset m_data_depleted just like SendCommmand?
-	lxi_send(m_device, (const char *)buf, len, m_timeout); 
+	lxi_send(m_device, (const char *)buf, len, m_timeout);
 }
 
 void SCPILxiTransport::ReadRawData(size_t len, unsigned char* buf)
@@ -187,3 +187,8 @@ void SCPILxiTransport::ReadRawData(size_t len, unsigned char* buf)
 		LogDebug("ReadRawData: data depleted.\n");
 	}
 }
+
+bool SCPILxiTransport::IsCommandBatchingSupported()
+{
+	return false;
+}
diff --git a/scopehal/SCPILxiTransport.h b/scopehal/SCPILxiTransport.h
@@ -53,6 +53,8 @@ class SCPILxiTransport : public SCPITransport
 	virtual void ReadRawData(size_t len, unsigned char* buf);
 	virtual void SendRawData(size_t len, const unsigned char* buf);
 
+	virtual bool IsCommandBatchingSupported();
+
 	TRANSPORT_INITPROC(SCPILxiTransport)
 
 	std::string GetHostname()

diff --git a/scopehal/SCPISocketTransport.cpp b/scopehal/SCPISocketTransport.cpp
@@ -124,3 +124,8 @@ void SCPISocketTransport::ReadRawData(size_t len, unsigned char* buf)
 {
 	m_socket.RecvLooped(buf, len);
 }
+
+bool SCPISocketTransport::IsCommandBatchingSupported()
+{
+	return true;
+}
diff --git a/scopehal/SCPISocketTransport.h b/scopehal/SCPISocketTransport.h
@@ -55,6 +55,8 @@ class SCPISocketTransport : public SCPITransport
 	virtual void ReadRawData(size_t len, unsigned char* buf);
 	virtual void SendRawData(size_t len, const unsigned char* buf);
 
+	virtual bool IsCommandBatchingSupported();
+
 	TRANSPORT_INITPROC(SCPISocketTransport)
 
 	std::string GetHostname()

diff --git a/scopehal/SCPITransport.h b/scopehal/SCPITransport.h
@@ -53,6 +53,8 @@ class SCPITransport
 	virtual void ReadRawData(size_t len, unsigned char* buf) =0;
 	virtual void SendRawData(size_t len, const unsigned char* buf) =0;
 
+	virtual bool IsCommandBatchingSupported() =0;
+
 public:
 	typedef SCPITransport* (*CreateProcType)(std::string args);
 	static void DoAddTransportClass(std::string name, CreateProcType proc);

diff --git a/scopehal/VICPSocketTransport.cpp b/scopehal/VICPSocketTransport.cpp
@@ -202,3 +202,8 @@ void VICPSocketTransport::ReadRawData(size_t len, unsigned char* buf)
 {
 	m_socket.RecvLooped(buf, len);
 }
+
+bool VICPSocketTransport::IsCommandBatchingSupported()
+{
+	return true;
+}
diff --git a/scopehal/VICPSocketTransport.h b/scopehal/VICPSocketTransport.h
@@ -55,6 +55,8 @@ class VICPSocketTransport : public SCPITransport
 	virtual void ReadRawData(size_t len, unsigned char* buf);
 	virtual void SendRawData(size_t len, const unsigned char* buf);
 
+	virtual bool IsCommandBatchingSupported();
+
 	//VICP constant helpers
 	enum HEADER_OPS
 	{