mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-09 11:30:43 +02:00
included registers.h in server_funcs.c
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@311 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
parent
da5759bed6
commit
9b323c9e7e
@ -8,6 +8,7 @@
|
|||||||
#include "firmware_funcs.h"
|
#include "firmware_funcs.h"
|
||||||
#include "mcb_funcs.h"
|
#include "mcb_funcs.h"
|
||||||
#include "trimming_funcs.h"
|
#include "trimming_funcs.h"
|
||||||
|
#include "registers_g.h"
|
||||||
|
|
||||||
#define FIFO_DATA_REG_OFF 0x50<<11
|
#define FIFO_DATA_REG_OFF 0x50<<11
|
||||||
#define CONTROL_REG 0x24<<11
|
#define CONTROL_REG 0x24<<11
|
||||||
@ -2617,67 +2618,67 @@ int lock_server(int file_des) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int set_port(int file_des) {
|
int set_port(int file_des) {
|
||||||
int n;
|
int n;
|
||||||
int ret=OK;
|
int ret=OK;
|
||||||
int sd=-1;
|
int sd=-1;
|
||||||
|
|
||||||
enum portType p_type; /** data? control? stop? Unused! */
|
enum portType p_type; /** data? control? stop? Unused! */
|
||||||
int p_number; /** new port number */
|
int p_number; /** new port number */
|
||||||
|
|
||||||
n = receiveDataOnly(file_des,&p_type,sizeof(p_type));
|
n = receiveDataOnly(file_des,&p_type,sizeof(p_type));
|
||||||
if (n < 0) {
|
if (n < 0) {
|
||||||
sprintf(mess,"Error reading from socket\n");
|
sprintf(mess,"Error reading from socket\n");
|
||||||
printf("Error reading from socket (ptype)\n");
|
printf("Error reading from socket (ptype)\n");
|
||||||
ret=FAIL;
|
ret=FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
n = receiveDataOnly(file_des,&p_number,sizeof(p_number));
|
n = receiveDataOnly(file_des,&p_number,sizeof(p_number));
|
||||||
if (n < 0) {
|
if (n < 0) {
|
||||||
sprintf(mess,"Error reading from socket\n");
|
sprintf(mess,"Error reading from socket\n");
|
||||||
printf("Error reading from socket (pnum)\n");
|
printf("Error reading from socket (pnum)\n");
|
||||||
ret=FAIL;
|
ret=FAIL;
|
||||||
}
|
}
|
||||||
if (differentClients==1 && lockStatus==1 ) {
|
if (differentClients==1 && lockStatus==1 ) {
|
||||||
ret=FAIL;
|
ret=FAIL;
|
||||||
sprintf(mess,"Detector locked by %s\n",lastClientIP);
|
sprintf(mess,"Detector locked by %s\n",lastClientIP);
|
||||||
} else {
|
} else {
|
||||||
if (p_number<1024) {
|
if (p_number<1024) {
|
||||||
sprintf(mess,"Too low port number %d\n", p_number);
|
sprintf(mess,"Too low port number %d\n", p_number);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
ret=FAIL;
|
ret=FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("set port %d to %d\n",p_type, p_number);
|
printf("set port %d to %d\n",p_type, p_number);
|
||||||
|
|
||||||
sd=bindSocket(p_number);
|
sd=bindSocket(p_number);
|
||||||
}
|
}
|
||||||
if (sd>=0) {
|
if (sd>=0) {
|
||||||
ret=OK;
|
ret=OK;
|
||||||
if (differentClients )
|
if (differentClients )
|
||||||
ret=FORCE_UPDATE;
|
ret=FORCE_UPDATE;
|
||||||
} else {
|
} else {
|
||||||
ret=FAIL;
|
ret=FAIL;
|
||||||
sprintf(mess,"Could not bind port %d\n", p_number);
|
sprintf(mess,"Could not bind port %d\n", p_number);
|
||||||
printf("Could not bind port %d\n", p_number);
|
printf("Could not bind port %d\n", p_number);
|
||||||
if (sd==-10) {
|
if (sd==-10) {
|
||||||
sprintf(mess,"Port %d already set\n", p_number);
|
sprintf(mess,"Port %d already set\n", p_number);
|
||||||
printf("Port %d already set\n", p_number);
|
printf("Port %d already set\n", p_number);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
n = sendDataOnly(file_des,&ret,sizeof(ret));
|
n = sendDataOnly(file_des,&ret,sizeof(ret));
|
||||||
if (ret==FAIL) {
|
if (ret==FAIL) {
|
||||||
n = sendDataOnly(file_des,mess,sizeof(mess));
|
n = sendDataOnly(file_des,mess,sizeof(mess));
|
||||||
} else {
|
} else {
|
||||||
n = sendDataOnly(file_des,&p_number,sizeof(p_number));
|
n = sendDataOnly(file_des,&p_number,sizeof(p_number));
|
||||||
closeConnection(file_des);
|
closeConnection(file_des);
|
||||||
exitServer(sockfd);
|
exitServer(sockfd);
|
||||||
sockfd=sd;
|
sockfd=sd;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user