[Emc-commit] emc2/src/rtapi rtapi.h,1.15,1.16

[EMC C. s. <cv...@cv...>]

Modified file emc2/src/rtapi/rtapi.h

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/rtapi/rtapi.h?rev=1.16>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/rtapi/rtapi.h.diff?r1=1.15;r2=1.16>

Branch: HEAD

Log:
revision 1.16
date: 2006/05/01 07:05:46;  author: jmkasunich;  state: Exp;  lines: +12 -14
one more try, array params for kernel 2.4

--- rtapi.h	2006/05/01 06:33:04	1.15
+++ rtapi.h	2006/05/01 07:05:46	1.16
@@ -15,9 +15,9 @@
 * Copyright (c) 2004 All rights reserved.
 *
 * Last change: 
-# $Revision: 1.15 $
+# $Revision: 1.16 $
 * $Author: jmkasunich $
-* $Date: 2006/05/01 06:33:04 $
+* $Date: 2006/05/01 07:05:46 $
 ********************************************************************/
 
 /** This file, 'rtapi.h', defines the RTAPI for both realtime and
@@ -723,6 +723,7 @@
     'var' is the name of the variable used for the parameter, which
     should be initialized with the default value(s) when it is declared.
     'descr' is a short description of the parameter.
+    'num' is the number of elements in an array.
 */
 
 #ifndef LINUX_VERSION_CODE
@@ -737,11 +738,8 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 
-#ifndef __MODULE_STRING_1
-#define __MODULE_STRING_1(x)    #x
-#endif
 #ifndef __MODULE_STRING
-#define __MODULE_STRING(x)      __MODULE_STRING_1(x)
+#define __MODULE_STRING(x)    #x
 #endif
 
 #define RTAPI_MP_INT(var,descr)    @@ -756,16 +754,16 @@
   MODULE_PARM(var,"s");               MODULE_PARM_DESC(var,descr);
 
-#define RTAPI_MP_ARRAY_INT(var,descr)          -  MODULE_PARM(var,"1-" __MODULE_STRING(ARRAY_SIZE(var)) "i");  +#define RTAPI_MP_ARRAY_INT(var,num,descr)          +  MODULE_PARM(var,"1-" __MODULE_STRING(num) "i");     MODULE_PARM_DESC(var,descr);
 
-#define RTAPI_MP_ARRAY_LONG(var,descr)         -  MODULE_PARM(var,"1-" __MODULE_STRING(ARRAY_SIZE(var)) "l");  +#define RTAPI_MP_ARRAY_LONG(var,num,descr)         +  MODULE_PARM(var,"1-" __MODULE_STRING(num) "l");     MODULE_PARM_DESC(var,descr);
 
-#define RTAPI_MP_ARRAY_STRING(var,descr)       -  MODULE_PARM(var,"1-" __MODULE_STRING(ARRAY_SIZE(var)) "s");  +#define RTAPI_MP_ARRAY_STRING(var,num,descr)       +  MODULE_PARM(var,"1-" __MODULE_STRING(num) "s");     MODULE_PARM_DESC(var,descr);
 
 #else /* version 2.6 */
@@ -784,12 +782,12 @@
   module_param(var, charp, 0);        MODULE_PARM_DESC(var,descr);
 
-#define RTAPI_MP_ARRAY_INT(var,descr)                    +#define RTAPI_MP_ARRAY_INT(var,num,descr)                   int __dummy_##var;                                        module_param_array(var, int, &(__dummy_##var), 0);        MODULE_PARM_DESC(var,descr);
 
-#define RTAPI_MP_ARRAY_LONG(var,descr)                   +#define RTAPI_MP_ARRAY_LONG(var,num,descr)                  int __dummy_##var;                                        module_param_array(var, long, &(__dummy_##var), 0);       MODULE_PARM_DESC(var,descr);