lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Fixed problem: IP ports were being created with NoAutoConnect flag, so they did not autoconnect when XPS was power-cycled

Browse Source
This commit is contained in:
MarkRivers
2012-02-17 20:20:59 +00:00
parent 6fcffdd57a
commit 285dd4a1c3
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/asynOctetSocket.cpp
+2 -10
View File
@@ -73,8 +73,8 @@ int ConnectToServer(char *IpAddress, int IpPort, double timeout)
/* Create a new asyn port */
epicsSnprintf(ipString, PORT_NAME_SIZE, "%s:%d TCP", IpAddress, IpPort);
epicsSnprintf(portName, PORT_NAME_SIZE, "%s:%d:%d", IpAddress, IpPort, nextSocket);
/* Create port with noAutoConnect and noProcessEos options */
drvAsynIPPortConfigure(portName, ipString, 0, 1, 1);
/* Create port with autoConnect and noProcessEos options */
drvAsynIPPortConfigure(portName, ipString, 0, 0, 1);
/* Connect to driver with asynOctet interface */
status = pasynOctetSyncIO->connect(portName, 0, &pasynUser, NULL);
@@ -93,14 +93,6 @@ int ConnectToServer(char *IpAddress, int IpPort, double timeout)
return -1;
}
psock->pasynUserCommon = pasynUserCommon;
/* Connect to controller */
status = pasynCommonSyncIO->connectDevice(pasynUserCommon);
if (status != asynSuccess) {
printf("ConnectToServer, error calling pasynCommonSyncIO->connectDevice port=%s error=%s\n",
portName, pasynUserCommon->errorMessage);
return -1;
}
/* Create a mutex to prevent more than 1 thread using socket at once
* Normally the SyncIO-.writeRead function takes care of this, but for long responses