beb includes read, write functions, so that it doesnt have to go to locallink interface

slsDetectorSoftware/eigerDetectorServer/Beb.c

@@ -15,8 +15,12 @@
 #include <string.h>
 #include <unistd.h>
 
+
+
+
 #include "xfs_types.h"
 #include "xparameters.h"
+#include "FebRegisterDefs.h"
 
 #include "Beb.h"
 
@@ -26,7 +30,6 @@
 	 int bebInfoSize = 0;
 
 		struct LocalLinkInterface ll_beb_local,* ll_beb;
-		struct LocalLinkInterface ll_beb_new_memory_local,* ll_beb_new_memory;
 
 		 struct udp_header_type udp_header;
 
@@ -146,24 +149,24 @@ void Beb_GetModuleCopnfiguration(int* master, int* top){
 	*top = 0;
 	*master = 0;
 	  //mapping new memory to read master top module configuration
-	  ll_beb_new_memory = &ll_beb_new_memory_local;
+		u_int32_t baseaddr;
-	  Local_LocalLinkInterface(ll_beb_new_memory);
+		int ret;
-	  int ret  = Local_GetModuleConfiguration(ll_beb_new_memory,XPAR_PLB_GPIO_SYS_BASEADDR, MODULE_CONFIGURATION);
+		//open file pointer
-	  if(!ret)
+		int fd = Beb_open(XPAR_PLB_GPIO_SYS_BASEADDR,&baseaddr);
-		  printf("Module Configuration FAIL\n");
+		if(fd < 0){
-	  else{
+			 cprintf(RED,"Module Configuration FAIL\n");
-		  printf("Module Configuration OK\n");
+		}else{
-		  printf("Beb: value =0x%x\n",ret);
+			//read data
-		  if(ret&0xf){
+			ret = Beb_Read32(baseaddr, MODULE_CONFIGURATION_MASK);
-			  *top = 1;
+			printf("Module Configuration OK\n");
-			 // printf("Beb.c: TOP\n\n\n\n");
+			printf("Beb: value =0x%x\n",ret);
-		  }//else  printf("Beb.c: BOTTOM\n\n\n\n");
+			if(ret&TOP_BIT_MASK)
-
+				*top = 1;
-		  if(ret&0x200){
+			if(ret&MASTER_BIT_MASK)
-			  *master = 1;
+				*master = 1;
-			 // printf("Beb.c: MASTER\n\n\n\n");
+			//close file pointer
-		  }//else  printf("Beb.c: SLAVE\n\n\n\n");
+			Beb_close(fd);
-	  }
+		}
 }
 
 
@@ -542,33 +545,29 @@ int Beb_SetUpTransferParameters(short the_bit_mode){
 
 int Beb_StopAcquisition()
 {
+	u_int32_t baseaddr;
+	u_int32_t valuel,valuer;
+	//open file pointer
+	int fd = Beb_open(XPAR_STOP_ACQUISITION,&baseaddr);
+	if(fd < 0){
+		cprintf(RED,"Beb Stop Acquisition FAIL\n");
+		return 0;
+	}else{
+		//find value
+		valuel = Beb_Read32(baseaddr, STOP_ACQUISITION_LEFT_OFFSET);
+		valuer = Beb_Read32(baseaddr, STOP_ACQUISITION_RIGHT_OFFSET);
+		//high
+		Beb_Write32(baseaddr, STOP_ACQUISITION_LEFT_OFFSET,(valuel|STOP_ACQUISITION_BIT));
+		Beb_Write32(baseaddr, STOP_ACQUISITION_RIGHT_OFFSET,(valuer|STOP_ACQUISITION_BIT));
+		//low
+		Beb_Write32(baseaddr, STOP_ACQUISITION_LEFT_OFFSET,(valuel&(~STOP_ACQUISITION_BIT)));
+		Beb_Write32(baseaddr, STOP_ACQUISITION_RIGHT_OFFSET,(valuer&(~STOP_ACQUISITION_BIT)));
 
-  volatile u_int32_t* ptrl;
+		printf("Beb Stop Acquisition OK\n");
-  volatile u_int32_t* ptrr;
+		//close file pointer
-  // Mapping
+		Beb_close(fd);
-  int fd;
+	}
-  fd = open("/dev/mem", O_RDWR | O_SYNC, 0);
+	return 1;
-  if (fd == -1)
-  {
-	  printf("\nCan't find /dev/mem!\n");
-	  return 0;
-  }
-  u_int32_t CSP0BASE = (u_int32_t)mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, fd, 0xC5000000 );
-  if (CSP0BASE == (u_int32_t)MAP_FAILED)
-  {
-	  printf("\nCan't map memmory area!!\n");
-	  return 0;
-  }
-
-  ptrl = (u_int32_t*)(CSP0BASE);
-  ptrr = (u_int32_t*)(CSP0BASE+0x100);
-
-  *(ptrl+7) = (1 << 30);
-  *(ptrr+7) = (1 << 30);
-  *(ptrl+7) = 0;
-  *(ptrr+7) = 0;
-  close(fd);
-  return 1;
 }
 
 int Beb_RequestNImages(unsigned int beb_number, int ten_gig, unsigned int dst_number, unsigned int nimages, int test_just_send_out_packets_no_wait){
@@ -758,3 +757,41 @@ int Beb_GetBebFPGATemp()
 	return temperature;
 }
 
+
+
+
+
+int Beb_open(u_int32_t baseaddr, u_int32_t* csp0base){
+
+	int fd = open("/dev/mem", O_RDWR | O_SYNC, 0);
+	if (fd == -1)
+		cprintf(RED,"\nCan't find /dev/mem!\n");
+	else{
+		printf("/dev/mem opened\n");
+		*csp0base = (u_int32_t)mmap(0, 0x1000, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, fd, baseaddr);
+		if (*csp0base == (u_int32_t)MAP_FAILED) {
+			cprintf(RED,"\nCan't map memmory area!!\n");
+			fd = -1;
+		}else printf("CSP0 mapped\n");
+	}
+	return fd;
+}
+
+u_int32_t Beb_Read32 (u_int32_t baseaddr, u_int32_t offset){
+	volatile u_int32_t *ptr1;
+	ptr1=(u_int32_t*)(baseaddr + offset);
+	return *ptr1;
+}
+
+
+u_int32_t Beb_Write32 (u_int32_t baseaddr, u_int32_t offset, u_int32_t data){
+	volatile u_int32_t *ptr1;
+	ptr1=(u_int32_t*)(baseaddr + offset);
+	*ptr1 = data;
+	return *ptr1;
+}
+
+void Beb_close(int fd){
+	if(fd >= 0)
+		close(fd);
+}

slsDetectorSoftware/eigerDetectorServer/Beb.h

@@ -83,6 +83,10 @@ struct BebInfo{
 
   int Beb_GetBebFPGATemp();
 
+  int Beb_open(u_int32_t baseaddr, u_int32_t* csp0base);
+  u_int32_t Beb_Read32 (u_int32_t baseaddr, u_int32_t offset);
+  u_int32_t Beb_Write32 (u_int32_t baseaddr, u_int32_t offset, u_int32_t data);
+  void Beb_close(int fd);
 
 #endif 
 

slsDetectorSoftware/eigerDetectorServer/EigerRegisterDefs.h

@@ -109,3 +109,8 @@
 #define CHIP_DATA_OUT_DELAY_REG3           3
 #define CHIP_DATA_OUT_DELAY_REG4           4
 #define CHIP_DATA_OUT_DELAY_SET            0x20000000
+
+
+//module configuration
+#define TOP_BIT_MASK				0x00f
+#define MASTER_BIT_MASK				0x200

slsDetectorSoftware/eigerDetectorServer/FebRegisterDefs.h

@@ -109,3 +109,14 @@
 #define CHIP_DATA_OUT_DELAY_REG3           3
 #define CHIP_DATA_OUT_DELAY_REG4           4
 #define CHIP_DATA_OUT_DELAY_SET            0x20000000
+
+//module configuration
+#define TOP_BIT_MASK				0x00f
+#define MASTER_BIT_MASK				0x200
+// Master Slave Top Bottom Definition
+#define MODULE_CONFIGURATION_MASK 0x84
+//stop acquisition offsets
+#define STOP_ACQUISITION_LEFT_OFFSET 	0x01c
+#define STOP_ACQUISITION_RIGHT_OFFSET	0x11c
+#define STOP_ACQUISITION_BIT			0x40000000
+

slsDetectorSoftware/eigerDetectorServer/LocalLinkInterface.c

@@ -32,29 +32,6 @@ void Local_LocalLinkInterface(struct LocalLinkInterface* ll){
 	printf("Initializing new memory\n");
 }
 
-int Local_GetModuleConfiguration (struct LocalLinkInterface* ll, u_int32_t baseaddr, u_int32_t offset){
-	int fd = open("/dev/mem", O_RDWR | O_SYNC, 0);
-	if (fd == -1) {
-		printf("\nCan't find /dev/mem!\n");
-		return 0;
-	}
-	printf("/dev/mem opened\n");
-
-	u_int32_t CSP0BASE = (u_int32_t)mmap(0, 0x100000, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, fd, baseaddr);
-	if (CSP0BASE == (u_int32_t)MAP_FAILED) {
-		printf("\nCan't map memmory area!!\n");
-		return 0;
-	}
-	printf("CSP0 mapped\n");
-
-	volatile u_int32_t *ptr1;
-	ptr1=(u_int32_t*)(CSP0BASE + offset);
-	//printf("LocalLinkInterface:: value:%d\n",*ptr1);
-	close(fd);
-
-	return *ptr1;
-}
-
 
 
 int Local_Init(struct LocalLinkInterface* ll,unsigned int ll_fifo_badr){

slsDetectorSoftware/eigerDetectorServer/LocalLinkInterface.h

@@ -40,7 +40,6 @@ struct LocalLinkInterface{
   int  Local_Test(struct LocalLinkInterface* ll,unsigned int buffer_len, void *buffer);
 
   void Local_LocalLinkInterface(struct LocalLinkInterface* ll);
-  int Local_GetModuleConfiguration (struct LocalLinkInterface* ll, u_int32_t baseaddr, u_int32_t offset);
 
   /*
   int FiFoReset(unsigned int numb);

slsDetectorSoftware/eigerDetectorServer/xparameters.h

@@ -49,8 +49,8 @@ XPAR_PLB_LL_FIFO_AURORA_DUAL_CTRL_FEB_LEFT_BASEADDR
 #define XPAR_PLB_GPIO_SYS_BASEADDR 0xD1000000
 #define XPAR_PLB_GPIO_SYS_HIGHADDR 0xD100FFFF
 
-/* Master Slave Top Bottom Definition */
+/** Stop Acquisition */
-#define MODULE_CONFIGURATION 0x84
+#define XPAR_STOP_ACQUISITION 0xC5000000
 
 /* Definitions for peripheral PLB_GPIO_TEST */
 #define XPAR_PLB_GPIO_TEST_BASEADDR 0xD1010000