added prgoramfpga functionality, currently gpio definitions required in /etc/rc file, will rectify in later commits

slsDetectorSoftware/jungfrauDetectorServer/README.txt

@@ -0,0 +1,11 @@
+add the following to /etc/rc before using programfpga command before cat motd
+
+
+#registering 7th and 9th pin to linux kernel
+echo 7 > /sys/class/gpio/export
+echo 9 > /sys/class/gpio/export
+#define direction for the linux kernel
+echo in  > /sys/class/gpio/gpio7/direction
+echo out > /sys/class/gpio/gpio9/direction
+#needed, else all write errors when server starts up, because linux tries to take control fof gpio
+echo 1 > /sys/class/gpio/gpio9/value

slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c

@@ -114,6 +114,8 @@ int masterMode=NO_MASTER, syncMode=NO_SYNCHRONIZATION, timingMode=AUTO_TIMING;
 enum externalSignalFlag  signals[4]={EXT_SIG_OFF, EXT_SIG_OFF, EXT_SIG_OFF, EXT_SIG_OFF};
 
 int withGotthard = 0;
+char mtdvalue[10];
+
 
 /**is not const because this value will change after initDetector, is removed from mcb_funcs.c cuz its not used anywhere
  * why is this used anywhere instead of macro*/
@@ -3377,4 +3379,120 @@ int setDac(int dacnum,int dacvalue){
 }
 
 
+void eraseFlash(){
+#ifdef VERY_VERBOSE
+	printf("\n at eraseFlash \n");
+#endif
+
+	char command[255];
+	sprintf(command,"flash_eraseall %s",mtdvalue);
+	system(command);
+	printf("flash erased\n");
+}
+
+
+int startWritingFPGAprogram(FILE** filefp){
+#ifdef VERY_VERBOSE
+	printf("\n at startWritingFPGAprogram \n");
+#endif
+
+	//getting the drive
+	char output[255];
+	FILE* fp = popen("awk \'$4== \"\\\"bitfile(spi)\\\"\" {print $1}\' /proc/mtd", "r");
+	fgets(output, sizeof(output), fp);
+	pclose(fp);
+	strcpy(mtdvalue,"/dev/");
+	char* pch = strtok(output,":");
+	if(pch == NULL){
+		cprintf(RED,"Could not get mtd value\n");
+		return FAIL;
+	}
+	strcat(mtdvalue,pch);
+	printf ("\nWriting FPGA program to flash.\nThe drive is %s\n",mtdvalue);
+
+
+	//tell FPGA to not touch flash
+	system("echo 0 > /sys/class/gpio/gpio9/value");
+	/*
+	char output2[255];
+	fp = popen("echo 0 > /sys/class/gpio/gpio9/value","r");
+	fgets(output2, sizeof(output2), fp);
+	pclose(fp);
+	printf("strlen output %d\n", strlen(output2)); //always 1
+	printf("output got:%s\n",output2);
+	if(strstr (output2,"No such file or directory")!= NULL){ //doesnt notice
+		printf("matched!\n");
+		return -1;
+	}
+	printf("not matched\n");
+*/
+
+
+	//writing the program to flash
+	*filefp = fopen(mtdvalue, "w");
+	if(*filefp == NULL){
+		cprintf(RED,"Unable to open %s in write mode\n",mtdvalue);
+		return FAIL;
+	}
+	printf("flash ready for writing\n");
+
+	return OK;
+}
+
+int stopWritingFPGAprogram(FILE* filefp){
+#ifdef VERY_VERBOSE
+	printf("\n at stopWritingFPGAprogram \n");
+#endif
+
+	int wait = 0;
+	if(filefp!= NULL){
+		fclose(filefp);
+		wait = 1;
+	}
+
+
+	//tell FPGA to touch flash to program itself
+	system("echo 1 > /sys/class/gpio/gpio9/value");
+
+	if(wait){
+#ifdef VERY_VERBOSE
+		printf("Waiting for FPGA to program from flash\n");
+#endif
+		//waiting for success or done
+		char output[255];
+		int res=0;
+		while(res == 0){
+			FILE* sysFile = popen("cat /sys/class/gpio/gpio7/value", "r");
+			fgets(output, sizeof(output), sysFile);
+			pclose(sysFile);
+			sscanf(output,"%d",&res);
+#ifdef VERY_VERBOSE
+			printf("gpi07 returned %d\n",res);
+#endif
+		}
+	}
+	printf("FPGA has picked up the program from flash\n\n");
+
+	return OK;
+}
+
+int writeFPGAProgram(char* fpgasrc, size_t fsize, FILE* filefp){
+#ifdef VERY_VERBOSE
+	printf("\n at writeFPGAProgram \n");
+	cprintf(BLUE,"address of fpgasrc:%p\n",(void *)fpgasrc);
+	cprintf(BLUE,"fsize:%d\n",fsize);
+	cprintf(BLUE,"pointer:%p\n",(void*)filefp);
+#endif
+
+	if(fwrite((void*)fpgasrc , sizeof(char) , fsize , filefp )!= fsize){
+		cprintf(RED,"Could not write FPGA source to flash\n");
+		return FAIL;
+	}
+#ifdef VERY_VERBOSE
+	cprintf(BLUE,"program written to flash\n");
+#endif
+	return OK;
+}
+
+
 

slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.h

@@ -184,6 +184,11 @@ int setDac(int dacnum,int dacvalue);
 ROI *setROI(int nroi,ROI* arg,int *retvalsize, int *ret);
 int getChannels();
 
+void eraseFlash();
+int startWritingFPGAprogram(FILE** filefp);
+int stopWritingFPGAprogram(FILE* filefp);
+int writeFPGAProgram(char* fpgasrc, size_t fsize, FILE* filefp);
+
 /*
 
 u_int32_t setNBits(u_int32_t);

slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c

@@ -331,6 +331,7 @@ int function_table() {
   flist[F_CALIBRATE_PEDESTAL]=&calibrate_pedestal;
   flist[F_SET_CTB_PATTERN]=&set_ctb_pattern;
   flist[F_WRITE_ADC_REG]=&write_adc_register;
+  flist[F_PROGRAM_FPGA]=&program_fpga;
   return OK;
 }
 
@@ -3501,3 +3502,136 @@ int write_adc_register(int file_des) {
   return ret; 
 
 }
+
+
+
+
+
+int program_fpga(int file_des) {
+	int ret=OK;
+	int n;
+	const size_t maxprogramsize = 2 * 1024 *1024;
+	size_t unitprogramsize = 0;
+	int currentPointer = 0;
+
+	char* fpgasrc = (char*)malloc(maxprogramsize);
+	size_t filesize = 0;
+	size_t totalsize = 0;
+
+	FILE* fp = NULL;
+
+	sprintf(mess,"Program FPGA\n");
+
+	//filesize
+	n = receiveDataOnly(file_des,&filesize,sizeof(filesize));
+	if (n < 0) {
+		sprintf(mess,"Error reading from socket\n");
+		ret=FAIL;
+	}
+	totalsize = filesize;
+#ifdef VERY_VERBOSE
+	printf("\n\n Total size is:%d\n",totalsize);
+#endif
+
+	//opening file pointer to flash and telling FPGA to not touch flash
+	int startret = startWritingFPGAprogram(&fp);
+	/*printf("startret:%d\n",startret);*/
+	if(startret != OK){
+		if(startret == FAIL){
+		sprintf(mess,"Could not write to flash. Error at startup.\n");
+		cprintf(RED,"%s",mess);
+		}/*else if (startret == -1){
+			cprintf(RED,"Error: Please define the gpio pins and their direction in /etc/rc before rebooting\n");
+			cprintf(RED,"%s",mess);
+		}*/
+		ret=FAIL;
+		filesize = 0;
+	}
+	n = sendDataOnly(file_des,&ret,sizeof(ret));
+	if (ret==FAIL)
+		n += sendDataOnly(file_des,mess,sizeof(mess));
+
+
+	//erasing flash
+	if(ret != FAIL)
+		eraseFlash();
+
+
+	//writing to flash part by part
+	while(filesize){
+
+		unitprogramsize = maxprogramsize;  //2mb
+		if(unitprogramsize > filesize) //less than 2mb
+			unitprogramsize = filesize;
+#ifdef VERY_VERBOSE
+		printf("unit size to receive is:%d\n",unitprogramsize);
+		printf("filesize:%d currentpointer:%d\n",filesize,currentPointer);
+#endif
+		//receive
+		n = receiveDataOnly(file_des,fpgasrc,unitprogramsize);
+		if (n < 0) {
+			sprintf(mess,"Error reading from socket\n");
+			ret=FAIL;
+		}
+
+
+		if(!(unitprogramsize - filesize)){
+			fpgasrc[unitprogramsize]='\0';
+			filesize-=unitprogramsize;
+			unitprogramsize++;
+		}else
+			filesize-=unitprogramsize;
+
+
+		if (ret==OK) {
+			if (differentClients==1 && lockStatus==1) {
+				ret=FAIL;
+				sprintf(mess,"Detector locked by %s\n",lastClientIP);
+			} else{
+				ret = writeFPGAProgram(fpgasrc,unitprogramsize,fp);
+			}
+		}
+
+		if(ret!=FAIL){
+			if (differentClients)
+				ret=FORCE_UPDATE;
+		}
+
+		/* send answer */
+		/* send OK/failed */
+		n = sendDataOnly(file_des,&ret,sizeof(ret));
+		if (ret==FAIL) {
+			n += sendDataOnly(file_des,mess,sizeof(mess));
+			cprintf(RED,"Failure: Breaking out of program receiving\n");
+			break;
+		}
+
+		//print progress
+		printf("Writing to Flash:%d%%\r",(int) (((double)(totalsize-filesize)/totalsize)*100) );
+		fflush(stdout);
+
+	}
+	printf("\n");
+
+	//closing file pointer to flash and informing FPGA
+	if(stopWritingFPGAprogram(fp) == FAIL){
+		sprintf(mess,"Could not write to flash. Error at end.\n");
+		cprintf(RED,"%s",mess);
+		ret=FAIL;
+	}
+
+	n = sendDataOnly(file_des,&ret,sizeof(ret));
+	if (ret==FAIL)
+		n += sendDataOnly(file_des,mess,sizeof(mess));
+
+
+	//free resources
+	free(fpgasrc);
+	if(fp!=NULL)
+		fclose(fp);
+#ifdef VERY_VERBOSE
+	printf("Done with program receiving command\n");
+#endif
+	/*return ok/fail*/
+	return ret;
+}

slsDetectorSoftware/jungfrauDetectorServer/server_funcs.h

@@ -95,4 +95,6 @@ int set_roi(int);
 int set_ctb_pattern(int);
 
 int write_adc_register(int);;
+
+int program_fpga(int);
 #endif