Fixed some erros for ECOS compilation

ProjetoEcos/comando.c

@@ -140,39 +140,39 @@ void cmd_rc (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_sc (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n= 5, i;
 	unsigned char bufw[6];
 	unsigned char *bufr;
 
 	do{
-	bufw[0]=SOM;
-	bufw[1]=SCLK;
-	if ((n=argc) == 4) {
-		unsigned int x;
-		sscanf(argv[1], "%x", &x); 
-		bufw[2]=(unsigned char)x;
-		sscanf(argv[2], "%x", &x); 
-		bufw[3]=(unsigned char)x;
-		sscanf(argv[3], "%x", &x); 
-		bufw[4]=(unsigned char)x;
-	}else{
+		bufw[0]=SOM;
+		bufw[1]=SCLK;
+		if ((n=argc) == 4) {
+			unsigned int x;
+			sscanf(argv[1], "%x", &x); 
+			bufw[2]=(unsigned char)x;
+			sscanf(argv[2], "%x", &x); 
+			bufw[3]=(unsigned char)x;
+			sscanf(argv[3], "%x", &x); 
+			bufw[4]=(unsigned char)x;
+		}else{
+			cyg_mutex_lock(&cliblock);
+			printf("Wrong arguments for sc");
+			cyg_mutex_unlock(&cliblock);
+			return;
+		}
+		bufw[5]=EOM;
+
+		cyg_mbox_put( mbxSh, bufw );
+
 		cyg_mutex_lock(&cliblock);
-		printf("Wrong arguments for sc");
+		for (i=0; i<n; i++)
+		  printf("buf[%d]=%x\n", i, bufw[i]);
 		cyg_mutex_unlock(&cliblock);
-		return;
-	}
-	bufw[5]=EOM;
-
-	cyg_mbox_put( mbxSh, bufw );
-
-	cyg_mutex_lock(&cliblock);
-    for (i=0; i<n; i++)
-      printf("buf[%d]=%x\n", i, bufw[i]);
-	cyg_mutex_unlock(&cliblock);
-
-	bufr = (unsigned char *)cyg_mbox_get(mbxRh);
-	//obter error message
-	}while(bufr[1]!=CMD_OK)
+
+		bufr = (unsigned char *)cyg_mbox_get(mbxRh);
+		//obter error message
+	}while(bufr[1]!=CMD_OK);
 
 }
 
@@ -231,7 +231,7 @@ void cmd_rp (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_mmp (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n = 4, i;
 	unsigned char bufw[4];
 	unsigned char *bufr;
 
@@ -262,7 +262,7 @@ void cmd_mmp (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_mta (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n = 4, i;
 	unsigned char bufw[4];
 	unsigned char *bufr;
 
@@ -293,7 +293,7 @@ void cmd_mta (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_ra (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n = 3, i;
 	unsigned char bufw[3];
 	unsigned char *bufr;
 
@@ -316,7 +316,7 @@ void cmd_ra (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_dtl (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n = 5, i;
 	unsigned char bufw[5];
 	unsigned char *bufr;
 
@@ -349,7 +349,7 @@ void cmd_dtl (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_aa (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n = 3, i;
 	unsigned char bufw[4];
 	unsigned char *bufr;
 
@@ -380,7 +380,7 @@ void cmd_aa (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_rmm (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n= 3, i;
 	unsigned char bufw[3];
 	unsigned char *bufr;
 
@@ -409,7 +409,7 @@ void cmd_rmm (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_cmm (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n=3, i;
 	unsigned char bufw[3];
 	unsigned char *bufr;
 
@@ -432,7 +432,7 @@ void cmd_cmm (int argc, char** argv)
 +--------------------------------------------------------------------------*/
 void cmd_ir (int argc, char** argv)
 {
-	unsigned int n, i;
+	unsigned int n=3, i;
 	unsigned char bufw[3];
 	unsigned char *bufr;
 

ProjetoEcos/globalvariables.h

@@ -16,6 +16,9 @@ extern "C" {
 }
 #endif
 
+#include <cyg/kernel/kapi.h>
+#include <cyg/io/io.h>
+
 #define SOM 0xFD /* start of message */
 #define EOM 0xFE /* end of message */
 #define RCLK 0xC0 /* read clock */
@@ -37,30 +40,27 @@ extern "C" {
 #define CMD_ERROR 0xFF /* error in command */
 
 //Variáveis globais de controlo
-volatile int registerRequest = 0;
-volatile int makeCalculations = 0;
-volatile int LumThreshold = 2, TempThreshold = 30;
-volatile int exitControl = 0;
-volatile int p = 10;
+extern volatile int registerRequest;
+extern volatile int makeCalculations;
+extern volatile int LumThreshold, TempThreshold;
+extern volatile int exitControl;
+extern volatile int p;
 
 //Variáveis dos registos
-volatile int iread = 0, iwrite = -1; nr = 0;
-int NRBUF = 100;
-volatile int registers[NRBUF][5]; 
+extern volatile int iread, iwrite, nr;
+extern int NRBUF;
+extern volatile int registers[100][5]; 
 
 /*error variable*/
-volatile Cyg_ErrNo err;
-volatile cyg_io_handle_t serH;
-
-#include <cyg/kernel/kapi.h>
-#include <cyg/io/io.h>
+extern volatile Cyg_ErrNo err;
+extern volatile cyg_io_handle_t serH;
 
 /*Mail boxes handlers and objects for receiver and sender*/
-cyg_handle_t mbxSh, mbxRh, mbxIPh, mbxPIh;
-cyg_mbox mbxS, mbxR, mbxIP, mbxPI;
+extern cyg_handle_t mbxSh, mbxRh, mbxIPh, mbxPIh;
+extern cyg_mbox mbxS, mbxR, mbxIP, mbxPI;
 
 /* and now a mutex to protect calls to the C library */
-cyg_mutex_t cliblock;
+extern cyg_mutex_t cliblock;
 
  struct cloc_{
 	int hours;

ProjetoEcos/main.c

@@ -30,6 +30,29 @@ extern void cmd_ini(int argc, char **argv);
 extern void checkThresholds(int n);
 extern int saveRegister(int registo[5]);
 
+//Variáveis globais de controlo
+volatile int registerRequest = 0;
+volatile int makeCalculations = 0;
+volatile int LumThreshold = 2, TempThreshold = 30;
+volatile int exitControl = 0;
+volatile int p = 10;
+
+//Variáveis dos registos
+volatile int iread = 0, iwrite = -1, nr = 0;
+int NRBUF = 100;
+volatile int registers[100][5]; 
+
+/*error variable*/
+volatile Cyg_ErrNo err;
+volatile cyg_io_handle_t serH;
+
+/*Mail boxes handlers and objects for receiver and sender*/
+cyg_handle_t mbxSh, mbxRh, mbxIPh, mbxPIh;
+cyg_mbox mbxS, mbxR, mbxIP, mbxPI;
+
+/* and now a mutex to protect calls to the C library */
+cyg_mutex_t cliblock;
+
 /* we install our own startup routine which sets up threads */
 void cyg_user_start(void)
 {

ProjetoEcos/processing.c

@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include <malloc.h>
 #include "globalvariables.h"
 
 int ** vector;
@@ -12,8 +11,9 @@ int date_calculator(cloc start, cloc end,cloc to_check);
 void calc(cloc start_time,cloc end_time,int *results){
 	int maxL=0,minL=0,maxT=0,minT=0,mediaL=0,mediaT=0,values_to_mean=0;
 	cloc curr_sample_time=malloc(sizeof(cloc));
-
-	for (int i =0;i<nmbr_reg;i++){
+	int i = 0;
+
+	for (i =0;i<nmbr_reg;i++){
 		if(vector[i][6]!=0){//new entry
 			checker(&minL,&maxL,&minT,&maxT,vector[i]);
 			vector[i][6]=0;