edits related to moving includes to include/uapi

src/drivers/elphel/circbuf-jtag.c

@@ -59,7 +59,7 @@
 //#include <asm/delay.h>
 #include <asm/uaccess.h>
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 #include <elphel/elphel393-mem.h>
 
 #include "framepars.h" // just for ELPHEL_DEBUG bit mask

src/drivers/elphel/circbuf.c

@@ -35,7 +35,7 @@
 #include <linux/of_device.h>
 #include <asm/uaccess.h>
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 #include <elphel/elphel393-mem.h>
 
 #include "framepars.h"

src/drivers/elphel/command_sequencer.c

@@ -16,7 +16,7 @@
 *******************************************************************************/
 #include <linux/errno.h>
 #include <linux/spinlock.h>
-#include <elphel/c313a.h> // PARS_FRAMES_MASK
+#include <uapi/elphel/c313a.h> // PARS_FRAMES_MASK
 #include "x393.h"
 static DEFINE_SPINLOCK(lock);
  

src/drivers/elphel/cxi2c.c

@@ -97,7 +97,7 @@
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 #include "x393.h"
 
 //#include "fpgactrl.h"  // defines port_csp0_addr, port_csp4_addr

src/drivers/elphel/detect_sensors.c

@@ -33,7 +33,7 @@
 #include "x393.h"
 //#include "x393_detect_sensors.h"
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 #include "mt9x001.h"
 #include "multi10359.h"
 #include "detect_sensors.h"

src/drivers/elphel/exif393.c

@@ -40,8 +40,8 @@
 #include <asm/uaccess.h>
 
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
-#include <elphel/exifa.h>
+#include <uapi/elphel/c313a.h>
+#include <uapi/elphel/exifa.h>
 
 //#include "fpgactrl.h"  // defines port_csp0_addr, port_csp4_addr
 //

src/drivers/elphel/framepars.c

@@ -48,8 +48,8 @@
 //#include <asm/delay.h>
 #include <asm/uaccess.h>
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
-#include <elphel/exifa.h>
+#include <uapi/elphel/c313a.h>
+#include <uapi/elphel/exifa.h>
 //#include "fpgactrl.h"  // defines port_csp0_adsensor_common.hdr, port_csp4_addr
 //#include "cc3x3.h"
 //#include "x3x3.h"           // hardware definitions

src/drivers/elphel/framepars.h

 #ifndef _FRAMEPARS_H
 #define _FRAMEPARS_H
 #ifndef SENSOR_PORTS
-	#include <elphel/c313a.h> // to get SENSOR_PORTS
+	#include <uapi/elphel/c313a.h> // to get SENSOR_PORTS
 #endif
 //extern struct framepars_t (*framepars)[PARS_FRAMES];
 extern struct framepars_t      *aframepars[SENSOR_PORTS];

src/drivers/elphel/gamma_tables.c

@@ -113,8 +113,8 @@
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
-#include <elphel/exifa.h>
+#include <uapi/elphel/c313a.h>
+#include <uapi/elphel/exifa.h>
 //#include "fpgactrl.h"  // defines port_csp0_addr, port_csp4_addr
 #include "framepars.h"        // for debug mask
 #include "sensor_common.h"  // for FPGA_TABLE_CHUNK - or move it?

src/drivers/elphel/histograms.c

@@ -107,8 +107,8 @@
 // ##include <asm/dma-mapping.h>
 
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
-#include <elphel/exifa.h>
+#include <uapi/elphel/c313a.h>
+#include <uapi/elphel/exifa.h>
 //#include "fpgactrl.h"  // defines port_csp0_addr, port_csp4_addr
 //#include "fpga_io.h"//fpga_table_write_nice
 #include "framepars.h"        // for debug mask

src/drivers/elphel/imu_log393.c

@@ -50,7 +50,7 @@
 #include <asm/delay.h>
 #include <asm/uaccess.h> // copy_*_user
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 #include <elphel/elphel393-mem.h>
 #include "imu_log393.h"
 #include "x393.h"

src/drivers/elphel/jpeghead.c

@@ -51,7 +51,7 @@
 
 //#include <asm/delay.h>
 #include <asm/uaccess.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 //#include "fpga_io.h"//fpga_table_write_nice
 #include "jpeghead.h"
 //#include "fpgactrl.h"  // defines port_csp0_addr, port_csp4_addr

src/drivers/elphel/mt9x001.c

@@ -341,7 +341,7 @@
 #include <asm/irq.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 //#include "fpgactrl.h"  // defines port_csp0_addr, port_csp4_addr
 //#include "x3x3.h" // detect sensor
 //#include "cci2c.h"

src/drivers/elphel/multi10359.c

@@ -102,7 +102,7 @@
 //#include <asm/delay.h>
 #include <linux/delay.h>
 #include <asm/uaccess.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 
 //#include "fpgactrl.h"  // defines port_csp0_addr, port_csp4_addr
 //#include "x3x3.h" // detect sensor

src/drivers/elphel/pgm_functions.c

@@ -199,7 +199,7 @@
 #include <asm/irq.h>
 #include <linux/delay.h>
 #include <asm/uaccess.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 #include "framepars.h"
 #include "sensor_common.h"
 #include "multi10359.h"

src/drivers/elphel/quantization_tables.c

@@ -56,8 +56,8 @@
 
 //#include <asm/delay.h>
 //#include <asm/uaccess.h>
-#include <elphel/c313a.h>
-#include <elphel/exifa.h>
+#include <uapi/elphel/c313a.h>
+#include <uapi/elphel/exifa.h>
 //#include "fpgactrl.h"  // defines port_csp0_addr, port_csp4_addr
 //#include "cc3x3.h"
 //#include "fpga_io.h"

src/drivers/elphel/sensor_common.c

@@ -35,8 +35,8 @@
 #include <asm/cacheflush.h>
 
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
-#include <elphel/exifa.h>
+#include <uapi/elphel/c313a.h>
+#include <uapi/elphel/exifa.h>
 
 #include "framepars.h"
 #include "sensor_common.h"

src/drivers/elphel/sensor_i2c.c

@@ -34,7 +34,7 @@
 #include <asm/uaccess.h>
 #include "x393.h"
 #include "sensor_i2c.h"
-#include <elphel/c313a.h> // PARS_FRAMES_MASK
+#include <uapi/elphel/c313a.h> // PARS_FRAMES_MASK
 
 //------------------
 

src/drivers/elphel/x393_videomem.c

@@ -28,7 +28,7 @@
 #include "x393.h"
 #include "x393_videomem.h"
 #include <elphel/driver_numbers.h>
-#include <elphel/c313a.h>
+#include <uapi/elphel/c313a.h>
 
 
 

src/include/uapi/Kbuild

+# UAPI Header export list
+# Top-level Makefile calls into asm-$(ARCH)
+# List only non-arch directories below
+
+
+header-y += asm-generic/
+header-y += linux/
+header-y += sound/
+header-y += mtd/
+header-y += rdma/
+header-y += video/
+header-y += drm/
+header-y += xen/
+header-y += scsi/
+header-y += misc/
+header-y += elphel/

src/include/uapi/elphel/Kbuild

+# UAPI Header export list
+# Top-level Makefile calls into asm-$(ARCH)
+# List only non-arch directories below
+
+header-y += exifa.h
+header-y += c313a.h
+ 

src/include/uapi/elphel/c313a.h

@@ -1769,9 +1769,9 @@ struct gamma_stuct_t {
                 };
              };
           };
-          u64 valid;      /// 0 - table invalid, 1 - table valid +2 for table locked (until sent to FPGA)
+          unsigned long long valid;      /// 0 - table invalid, 1 - table valid +2 for table locked (until sent to FPGA)
 //          int locked;     /// bit frame+ (color<<3) locked for color/frame
-          u64 locked;     /// NOTE: Changed to just color locked for color
+          unsigned long long locked;     /// NOTE: Changed to just color locked for color
           int this_non_scaled;      // 0 for non-scaled, others - (for scaled) - pointer to the corresponding non-scaled 
           union { /// used in head (element 0) and non-scaled chain (not used in scaled)
             struct { /// element 0 - heads of the chains