Cleaning up comments a bit, and making the include base start at src/drv/

src/epics/util/lib/createKernelMakefile.pm

@@ -19,7 +19,7 @@ print OUTM "KBUILD_EXTRA_SYMBOLS += $::cpuisolatorfile\n";
 print OUTM "KBUILD_EXTRA_SYMBOLS += \$(PWD)/ModuleIOP.symvers\n";
 print OUTM "ALL \+= user_mmap \$(TARGET_RTL)\n";
 print OUTM "EXTRA_CFLAGS += -O -w -I../../include\n";
-print OUTM "EXTRA_CFLAGS += -I$::rcg_src_dir/src\n";
+print OUTM "EXTRA_CFLAGS += -I$::rcg_src_dir/src/drv/\n";
 
 print OUTM "EXTRA_CFLAGS += $::servoflag \n";
 

src/fe/moduleLoad.c

@@ -5,12 +5,7 @@
 #include <linux/ctype.h>
 #include <linux/spinlock_types.h>
 
-//From the src/drv/rts-cpu-isolator/module
-//    set_fe_code_idle()
-//    is_cpu_taken_by_rcg_model()
-//    rts_isolator_exec()
-//    rts_isolator_cleanup()
-#include <drv/rts-cpu-isolator/rts-cpu-isolator.h>
+#include "rts-cpu-isolator/rts-cpu-isolator.h"
 
 // These externs and "16" need to go to a header file (mbuf.h)
 extern void* kmalloc_area[ 16 ];
@@ -32,10 +27,14 @@ extern int need_to_load_IOP_first;
 #include "verify_card_count.c"
 #include "print_io_info.c"
 
-static int  fe_start_controller_kthread( void * arg)
+/// @breif Wrapper function so kthread_create()
+///        can have a function with the expected
+///        prototype in the NO_CPU_SHUTDOWN case.
+///
+static int  fe_start_controller_kthread( void * arg )
 {
-    (void)arg; //Ignore argument
-    fe_start_controller();//Call original handler
+    (void)arg;
+    fe_start_controller();
     return 0;
 }
 

src/pcie_switch/kmod/Makefile

@@ -8,7 +8,7 @@ KBUILD_EXTRA_SYMBOLS += $CPUISOSYM
 EXTRA_CFLAGS += -O3
 DISDIR = /opt/srcdis
 KBUILD_EXTRA_SYMBOLS += $(DISDIR)/src/SCI_SOCKET/ksocket/LINUX/Module.symvers
-EXTRA_CFLAGS += -DOS_IS_LINUX=1 -D_DIS_KERNEL_=1 -I$(DISDIR)/src/IRM_GX/drv/src -I$(DISDIR)/src/IRM_GX/drv/src/LINUX -I$(DISDIR)/src/include -I$(DISDIR)/src/include/dis -I$(DISDIR)/src/COMMON/osif/kernel/include -I$(DISDIR)/src/COMMON/osif/kernel/include/LINUX -I$M/../../ -DDOLPHIN_TEST=1  -DDIS_BROADCAST=0x80000000
+EXTRA_CFLAGS += -DOS_IS_LINUX=1 -D_DIS_KERNEL_=1 -I$(DISDIR)/src/IRM_GX/drv/src -I$(DISDIR)/src/IRM_GX/drv/src/LINUX -I$(DISDIR)/src/include -I$(DISDIR)/src/include/dis -I$(DISDIR)/src/COMMON/osif/kernel/include -I$(DISDIR)/src/COMMON/osif/kernel/include/LINUX -I$M/../../drv/ -DDOLPHIN_TEST=1  -DDIS_BROADCAST=0x80000000
 
 
 obj-m += cdsrfmswitch.o

src/pcie_switch/kmod/cdsrfmswitch.c

@@ -16,12 +16,7 @@
 #include <linux/timer.h>
 #include <linux/ctype.h>
 
-//From the src/drv/rts-cpu-isolator/module
-//    set_fe_code_idle()
-//    is_cpu_taken_by_rcg_model()
-//    rts_isolator_exec()
-//    rts_isolator_cleanup()
-#include "drv/rts-cpu-isolator/rts-cpu-isolator.h"
+#include "rts-cpu-isolator/rts-cpu-isolator.h"
 
 #define MAX_UDELAY    19999
 #define ENTRY_NAME "cdsrfm"