[Emc-commit] emc2/src/rtapi rtai_rtapi.c,1.21,1.22 rtai_ulapi.c,1.11,1.12

[Jeff E. <je...@us...>]

Update of /cvsroot/emc/emc2/src/rtapi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28189

Modified Files:
	rtai_rtapi.c rtai_ulapi.c 
Log Message:
now that the right copy of the rtapi is being loaded, the version check is safe again (but the version is always 0 when $Version$ is not substituted, so it is of limited value)


Index: rtai_ulapi.c
===================================================================
RCS file: /cvsroot/emc/emc2/src/rtapi/rtai_ulapi.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rtai_ulapi.c	31 Jan 2006 04:28:31 -0000	1.11
+++ rtai_ulapi.c	31 Jan 2006 20:17:38 -0000	1.12
@@ -120,8 +120,8 @@
     if (rtapi_data->rev_code != rev_code) {
 	/* mismatch - release master shared memory block */
 	rtapi_print_msg(RTAPI_MSG_ERR, "RTAPI: ERROR: version mismatch %d vs %d\n", rtapi_data->rev_code, rev_code);
-	// rtai_free(RTAPI_KEY, rtapi_data);
-	// return RTAPI_FAIL;
+	rtai_free(RTAPI_KEY, rtapi_data);
+	return RTAPI_FAIL;
     }
     /* set up local pointers to global data */
     module_array = rtapi_data->module_array;

Index: rtai_rtapi.c
===================================================================
RCS file: /cvsroot/emc/emc2/src/rtapi/rtai_rtapi.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- rtai_rtapi.c	31 Jan 2006 04:28:31 -0000	1.21
+++ rtai_rtapi.c	31 Jan 2006 20:17:38 -0000	1.22
@@ -178,8 +178,8 @@
     if (rtapi_data->rev_code != rev_code) {
 	/* mismatch - release master shared memory block */
 	rtapi_print_msg(RTAPI_MSG_ERR, "RTAPI: ERROR: version mismatch %d vs %d\n", rtapi_data->rev_code, rev_code);
-	// rtai_kfree(RTAPI_KEY);
-	// return RTAPI_FAIL;
+	rtai_kfree(RTAPI_KEY);
+	return RTAPI_FAIL;
     }
     /* set up local pointers to global data */
     module_array = rtapi_data->module_array;