? src/.exrc ? src/Module.symvers ? src/hal/drivers/mesa_5i2x/.5i2x_stepgen.o.cmd ? src/hal/drivers/mesa_5i2x/.hal_5i2x.o.cmd Index: src/Makefile =================================================================== RCS file: /cvs/emc2/src/Makefile,v retrieving revision 1.231 diff -u -p -r1.231 Makefile --- src/Makefile 20 May 2007 07:15:20 -0000 1.231 +++ src/Makefile 31 May 2007 01:04:05 -0000 @@ -127,7 +127,7 @@ Makefile: $(DEPS) endif # Each directory in $(INCLUDES) is passed as a -I directory when compiling. -INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include +INCLUDE := $(patsubst %,-I%, $(INCLUDES)) -I$(RTDIR)/include -I/usr/src/linux-2.6.20.12+magma/include ifeq ($(BUILD_PYTHON),yes) INCLUDE += -I$(INCLUDEPY) endif @@ -135,8 +135,8 @@ endif # Compilation options. Perhaps some of these should come from Makefile.inc? OPT := -O2 $(call cc-option,-fno-strict-aliasing) DEBUG := -g -Wall -CFLAGS := $(INCLUDE) $(OPT) $(DEBUG) -DULAPI $(call cc-option, -Wdeclaration-after-statement) $(BITOPS_DEFINE) -CXXFLAGS := $(INCLUDE) $(OPT) $(DEBUG) -DULAPI $(BITOPS_DEFINE) +CFLAGS := $(INCLUDE) $(OPT) $(DEBUG) -DULAPI $(call cc-option, -Wdeclaration-after-statement) $(BITOPS_DEFINE) -D__IN_RTAI__ +CXXFLAGS := $(INCLUDE) $(OPT) $(DEBUG) -DULAPI $(BITOPS_DEFINE) -D__IN_RTAI__ ifeq ($(RUN_IN_PLACE),yes) LDFLAGS := -L$(LIB_DIR) -Wl,-rpath,$(LIB_DIR) @@ -499,6 +499,7 @@ EXTRA_CFLAGS = $(RTFLAGS) -D__MODULE__ - -I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \ -I$(BASEPWD)/emc/nml_intf -I$(BASEPWD)/emc/kinematics -I$(BASEPWD)/emc/motion \ -DSEQUENTIAL_SUPPORT -DHAL_SUPPORT -DDYNAMIC_PLCSIZE -DRT_SUPPORT +EXTRA_CFLAGS += -msse -msse2 ifeq "$(USE_STUBS)" "1" MATHSTUB := rtapi/mathstubs.o Index: src/emc/kinematics/gantrykins.c =================================================================== RCS file: /cvs/emc2/src/emc/kinematics/gantrykins.c,v retrieving revision 1.1 diff -u -p -r1.1 gantrykins.c --- src/emc/kinematics/gantrykins.c 19 May 2007 11:40:28 -0000 1.1 +++ src/emc/kinematics/gantrykins.c 31 May 2007 01:04:05 -0000 @@ -12,6 +12,7 @@ #include "motion.h" /* these decls */ #include "hal.h" +#include "rtapi.h" #include "rtapi_math.h" #include "rtapi_string.h" Index: src/hal/Submakefile =================================================================== RCS file: /cvs/emc2/src/hal/Submakefile,v retrieving revision 1.10 diff -u -p -r1.10 Submakefile --- src/hal/Submakefile 6 Mar 2007 03:19:16 -0000 1.10 +++ src/hal/Submakefile 31 May 2007 01:04:07 -0000 @@ -23,5 +23,5 @@ $(HALMODULE): $(call TOOBJS, $(HALMODULE $(ECHO) Linking python module $(notdir $@) @$(CXX) $(LDFLAGS) -shared -o $@ $^ -TARGETS += $(HALLIB) +TARGETS += $(HALLIB) ../lib/libemchal.so.0 PYTARGETS += $(HALMODULE) Index: src/hal/hal_lib.c =================================================================== RCS file: /cvs/emc2/src/hal/hal_lib.c,v retrieving revision 1.56 diff -u -p -r1.56 hal_lib.c --- src/hal/hal_lib.c 13 May 2007 06:52:36 -0000 1.56 +++ src/hal/hal_lib.c 31 May 2007 01:04:07 -0000 @@ -71,7 +71,7 @@ MODULE_LICENSE("GPL"); #endif /* RTAPI */ #if defined(ULAPI) -#include /* pid_t */ +// #include /* pid_t */ #include /* getpid() */ #endif Index: src/hal/utils/halcmd_commands.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/halcmd_commands.c,v retrieving revision 1.16 diff -u -p -r1.16 halcmd_commands.c --- src/hal/utils/halcmd_commands.c 24 May 2007 12:18:51 -0000 1.16 +++ src/hal/utils/halcmd_commands.c 31 May 2007 01:04:07 -0000 @@ -37,12 +37,28 @@ * information, go to www.linuxcnc.org. */ +#define loff_t kernel_loff_t +#define dev_t kernel_dev_t +#define timer_t kernel_timer_t +#define int64_t kernel_int64_t +#define u_int64_t kernel_u_int64_t +#define fd_set kernel_fd_set +#define blkcnt_t kernel_blkcnt_t + #include "config.h" #include "rtapi.h" /* RTAPI realtime OS API */ #include "hal.h" /* HAL public API decls */ #include "../hal_priv.h" /* private HAL decls */ #include "halcmd_commands.h" +#undef loff_t +#undef dev_t +#undef timer_t +#undef int64_t +#undef u_int64_t +#undef fd_set +#undef blkcnt_t + #include #include #include Index: src/hal/utils/halcmd_commands.h =================================================================== RCS file: /cvs/emc2/src/hal/utils/halcmd_commands.h,v retrieving revision 1.4 diff -u -p -r1.4 halcmd_commands.h --- src/hal/utils/halcmd_commands.h 24 Mar 2007 13:42:42 -0000 1.4 +++ src/hal/utils/halcmd_commands.h 31 May 2007 01:04:07 -0000 @@ -40,8 +40,6 @@ #ifndef HALCMD_COMMANDS_H #define HALCMD_COMMANDS_H #include "halcmd.h" -#include -#include extern int do_addf_cmd(char *funct, char *thread, char *tokens[]); extern int do_delf_cmd(char *funct, char *thread); extern int do_linkps_cmd(char *pin, char *signal); Index: src/hal/utils/halcmd_main.c =================================================================== RCS file: /cvs/emc2/src/hal/utils/halcmd_main.c,v retrieving revision 1.5 diff -u -p -r1.5 halcmd_main.c --- src/hal/utils/halcmd_main.c 1 Apr 2007 02:54:55 -0000 1.5 +++ src/hal/utils/halcmd_main.c 31 May 2007 01:04:07 -0000 @@ -37,6 +37,14 @@ * information, go to www.linuxcnc.org. */ +#define loff_t kernel_loff_t +#define dev_t kernel_dev_t +#define timer_t kernel_timer_t +#define int64_t kernel_int64_t +#define u_int64_t kernel_u_int64_t +#define fd_set kernel_fd_set +#define blkcnt_t kernel_blkcnt_t + #include "config.h" #include "rtapi.h" #include "hal.h" @@ -44,6 +52,14 @@ #include "halcmd.h" #include "halcmd_commands.h" +#undef loff_t +#undef dev_t +#undef timer_t +#undef int64_t +#undef u_int64_t +#undef fd_set +#undef blkcnt_t + #include #include #include Index: src/module_helper/module_helper.c =================================================================== RCS file: /cvs/emc2/src/module_helper/module_helper.c,v retrieving revision 1.27 diff -u -p -r1.27 module_helper.c --- src/module_helper/module_helper.c 23 Dec 2006 23:05:31 -0000 1.27 +++ src/module_helper/module_helper.c 31 May 2007 01:04:07 -0000 @@ -24,7 +24,7 @@ think of a better way. * "rtai_math") then put the shorter name last. */ char *module_whitelist[] = { - "rtai_math", "rtai_sem", "rtai_shm", "rtai_fifos", "rtai_up", + "rtai_math", "rtai_sem", "rtai_shm", "rtai_fifos", "rtai_up", "rtai_lxrt", "rtai_hal", "rtai_sched", "rtai_smi", "rtai", "rt_mem_mgr", "adeos", "rtl_time", "rtl_sched", "rtl_posixio", "rtl_fifo", "rtl", "mbuff", Index: src/rtapi/rtai_rtapi.c =================================================================== RCS file: /cvs/emc2/src/rtapi/rtai_rtapi.c,v retrieving revision 1.34 diff -u -p -r1.34 rtai_rtapi.c --- src/rtapi/rtai_rtapi.c 6 May 2007 00:46:13 -0000 1.34 +++ src/rtapi/rtai_rtapi.c 31 May 2007 01:04:07 -0000 @@ -125,13 +125,7 @@ static long int max_delay = DEFAULT_MAX_ /* module parameters */ static int msg_level = RTAPI_MSG_INFO; /* message printing level */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) -MODULE_PARM(msg_level, "i"); -#else -#include -module_param(msg_level, int, S_IRUGO | S_IWUGO); -#endif -MODULE_PARM_DESC(msg_level, "debug message level (default=3)"); +RTAPI_MP_INT(msg_level, "debug message level (default=3)"); /* other module information */ MODULE_AUTHOR("John Kasunich, Fred Proctor, & Paul Corner"); Index: src/rtapi/rtapi_math.h =================================================================== RCS file: /cvs/emc2/src/rtapi/rtapi_math.h,v retrieving revision 1.6 diff -u -p -r1.6 rtapi_math.h --- src/rtapi/rtapi_math.h 23 Oct 2006 13:56:19 -0000 1.6 +++ src/rtapi/rtapi_math.h 31 May 2007 01:04:07 -0000 @@ -20,6 +20,10 @@ extern double floor(double); #include "rtapi_math_i386.h" #endif +#ifdef __amd64__ +# define HUGE_VAL (__builtin_huge_val()) +#endif + #else #include #endif Index: src/rtapi/rtapi_string.h =================================================================== RCS file: /cvs/emc2/src/rtapi/rtapi_string.h,v retrieving revision 1.2 diff -u -p -r1.2 rtapi_string.h --- src/rtapi/rtapi_string.h 1 Oct 2006 21:24:36 -0000 1.2 +++ src/rtapi/rtapi_string.h 31 May 2007 01:04:07 -0000 @@ -3,6 +3,7 @@ To be sure, see what has been implimented by looking in linux/string.h and {linux_src_dir}/lib/string.c */ #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) #ifndef __HAVE_ARCH_STRCMP /* This flag will be defined if we do */ #define __HAVE_ARCH_STRCMP /* have strcmp */ /* some kernels don't have strcmp */ @@ -17,6 +18,7 @@ static int strcmp(const char *cs, const return __res; } #endif /* __HAVE_ARCH_STRCMP */ +#endif /* linux 2.4 */ #else #include #endif