Skip to content

L
linux-elphel
Commit a40eed25 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

more porting pgm_functions and related files

parent 7a3e1480
Show whitespace changes
Inline Side-by-side
Showing with 531 additions and 202 deletions
src/drivers/elphel/gamma_tables.c
View file @ a40eed25
...@@ -117,6 +117,7 @@ ...@@ -117,6 +117,7 @@
#include <elphel/exifa.h> #include <elphel/exifa.h>
//#include "fpgactrl.h" // defines port_csp0_addr, port_csp4_addr //#include "fpgactrl.h" // defines port_csp0_addr, port_csp4_addr
#include "framepars.h" // for debug mask #include "framepars.h" // for debug mask
#include "sensor_common.h" // for FPGA_TABLE_CHUNK - or move it?
//#include "fpga_io.h"//fpga_table_write_nice //#include "fpga_io.h"//fpga_table_write_nice
...@@ -126,6 +127,7 @@ ...@@ -126,6 +127,7 @@
//#include "framepars.h" //#include "framepars.h"
//#include "quantization_tables.h" //#include "quantization_tables.h"
#include "gamma_tables.h" #include "gamma_tables.h"
#include "x393.h"
/** /**
* @brief optional debug output * @brief optional debug output
*/ */
...@@ -666,6 +668,35 @@ int set_gamma_table (unsigned short hash16, ///< 16-bit unique (non-scale ...@@ -666,6 +668,35 @@ int set_gamma_table (unsigned short hash16, ///< 16-bit unique (non-scale
return tmp_p1; return tmp_p1;
} }
/** Writing gamma table to FPGA (1 color, 1 sub-channel) enabling IRQ after transferring each FPGA_TABLE_CHUNK DWORDs */
void fpga_gamma_write_nice(int color, ///< Color (0..3)
int sensor_port, ///< sensor port (0..3)
int sensor_subchn, ///< sensor sub-channel (when several are connected through a multiplexer)
u32 * gamma) ///< Gamma table (256 DWORDs) in encoded FPGA format
{
x393_gamma_tbl_t gamma_tbl_a = {.d32=0};
x393_gamma_tbl_t gamma_tbl_d = {.d32=0};
const int gamma_size=256; // 18-bit entries
unsigned long flags;
int addr32, len32, i;
gamma_tbl_a.a_n_d = 1;
gamma_tbl_a.color = color;
gamma_tbl_a.sub_chn = sensor_subchn;
for (addr32 = 0; addr32 < gamma_size; addr32 += FPGA_TABLE_CHUNK){
len32 = FPGA_TABLE_CHUNK;
if (unlikely(addr32 + len32 > gamma_size))
len32 = gamma_size - addr32;
gamma_tbl_a.addr= addr32;
local_irq_save(flags);
x393_sens_gamma_tbl(gamma_tbl_a, sensor_port);
for (i = addr32; i < addr32 + len32; i++){
gamma_tbl_d.d32 = gamma[i];
x393_sens_gamma_tbl(gamma_tbl_d, sensor_port);
}
local_irq_restore(flags);
}
}
///====================================== ///======================================
// File operations: // File operations:
......
src/drivers/elphel/gamma_tables.h
View file @ a40eed25
...@@ -12,6 +12,8 @@ int unlock_gamma_node (int color, int sensor_port, int sensor_subchn); /// NOTE: ...@@ -12,6 +12,8 @@ int unlock_gamma_node (int color, int sensor_port, int sensor_subchn); /// NOTE:
/// return a pointer to the gamma table (single color) encoded in FPGA format (NULL if there is to table ready) /// return a pointer to the gamma table (single color) encoded in FPGA format (NULL if there is to table ready)
/// ///
unsigned long * get_gamma_fpga(int color, int sensor_port, int sensor_subchn); unsigned long * get_gamma_fpga(int color, int sensor_port, int sensor_subchn);
void fpga_gamma_write_nice (int color, int sensor_port, int sensor_subchn, u32 * gamma);
int gamma_new_node(void); int gamma_new_node(void);
void gamma_encode_fpga(unsigned short * gamma_in, unsigned long * gamma_out);///Hardware-dependent encoding of the FPGA "gamma" table. Converts unsigned short array of 257 16-bit values (only 10 msb-s are used) to 256 unsigned long words to be written to FPGA void gamma_encode_fpga(unsigned short * gamma_in, unsigned long * gamma_out);///Hardware-dependent encoding of the FPGA "gamma" table. Converts unsigned short array of 257 16-bit values (only 10 msb-s are used) to 256 unsigned long words to be written to FPGA
......
src/drivers/elphel/pgm_functions.c
View file @ a40eed25
...@@ -1113,6 +1113,10 @@ int pgm_sensorin (int sensor_port, ///< sensor port number (0..3 ...@@ -1113,6 +1113,10 @@ int pgm_sensorin (int sensor_port, ///< sensor port number (0..3
{ {
#ifndef NC353 #ifndef NC353
x393_sens_mode_t sens_mode = {.d32=0}; x393_sens_mode_t sens_mode = {.d32=0};
x393_sensio_width_t sensio_width = {.d32=0};
x393_sens_sync_mult_t sync_mult = {.d32=0};
x393_gamma_ctl_t gamma_ctl = {.d32=0};
int n_scan_lines, n_ph_lines;
MDF3(printk(" frame16=%d\n",frame16)); MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame if (frame16 >= PARS_FRAMES) return -1; // wrong frame
if (FRAMEPAR_MODIFIED(P_BITS)){ if (FRAMEPAR_MODIFIED(P_BITS)){
...@@ -1126,59 +1130,31 @@ int pgm_sensorin (int sensor_port, ///< sensor port number (0..3 ...@@ -1126,59 +1130,31 @@ int pgm_sensorin (int sensor_port, ///< sensor port number (0..3
//(thispars->pars[P_FPNM]), \ //(thispars->pars[P_FPNM]), \
//thispars->pars[P_SHIFTL])); //thispars->pars[P_SHIFTL]));
} }
// // Writing WOI width for internally generated HACT
int n_scan_lines, n_ph_lines, n_pixels; if (thispars->pars[P_FRAMESYNC_DLY] & 0x10000) { /// set enforced HACT length, if 0 - use HACT from sensor
sensio_width.sensor_width = thispars->pars[P_ACTUAL_WIDTH]+(2 * COLOR_MARGINS);
// New - writing WOI width for internally generated HACT }
n_pixels=((thispars->pars[P_ACTUAL_WIDTH]+(2 * COLOR_MARGINS)) & 0x3fff) | 0x4000; X393_SEQ_SEND1 (sensor_port, frame16, x393_sensio_width, sensio_width);
X3X3_SEQ_SEND1 (fpga_addr, X313_WA_NLINES, n_pixels); MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sensio_width, 0x%x)\n", sensor_port, frame16, sensio_width.d32));
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_NLINES, (int) n_pixels));
//#define P_FRAMESYNC_DLY 35 ///< maybe - temporary - delay of frame sync (vacts) by number of scan lines - for photofinish mode // not used anywhere?
///< Lower bits 16 will be used to delay frame sync, bit 16 - use internal HACT duration (0 - use from sensor) [*]
//#define P_PF_HEIGHT 36 ///< height of each strip in photofinish mode - normally 2 lines
///< also now includes timestamping mode +0x10000 - for normal frames, 0x20000 - for photo-finish
//#define P_BITS 37 ///< pixel depth - bits 10/8/4
/*
Change bit16 only without histograms
typedef union {
struct {
u32 hist_en: 4; // [ 3: 0] (0xf) Enable subchannel histogram modules (may be less than 4)
u32 hist_nrst: 4; // [ 7: 4] (0xf) Reset off for histograms subchannels (may be less than 4)
u32 hist_set: 1; // [ 8] (0) Apply values in hist_en and hist_nrst fields (0 - ignore)
u32 chn_en: 1; // [ 9] (1) Enable this sensor channel
u32 chn_en_set: 1; // [ 10] (1) Apply chn_en value (0 - ignore)
u32 bit16: 1; // [ 11] (0) 0 - 8 bpp mode, 1 - 16 bpp (bypass gamma). Gamma-processed data is still used for histograms
u32 bit16_set: 1; // [ 12] (0) Apply bit16 value (0 - ignore)
u32 :19;
};
struct {
u32 d32:32; // [31: 0] (0) cast to u32
};
} x393_sens_mode_t;
*/
// Program number of scan lines to acquire // Program number of scan lines to acquire
// Is PhotoFinish mode enabled? // **************** TODO: use ACTUAL_HEIGHT (and update it) not WOI_HEIGHT // Is PhotoFinish mode enabled? // **************** TODO: use ACTUAL_HEIGHT (and update it) not WOI_HEIGHT
if (((thispars->pars[P_PF_HEIGHT] & 0xffff)>0) && (thispars->pars[P_PF_HEIGHT]<=thispars->pars[P_ACTUAL_HEIGHT])){ if (((thispars->pars[P_PF_HEIGHT] & 0xffff)>0) && (thispars->pars[P_PF_HEIGHT]<=thispars->pars[P_ACTUAL_HEIGHT])){
n_ph_lines= thispars->pars[P_ACTUAL_HEIGHT]/(thispars->pars[P_PF_HEIGHT] & 0x3fff); sync_mult.mult_frames= thispars->pars[P_ACTUAL_HEIGHT]/(thispars->pars[P_PF_HEIGHT] & 0xffff) -1; // was 0x3fff in NC353 code
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_NLINES, (int) (n_ph_lines-1) | 0x8000));
X3X3_SEQ_SEND1 (fpga_addr, X313_WA_NLINES, (n_ph_lines-1) | 0x8000);
// n_scan_lines= thispars->pars[P_PF_HEIGHT];
n_scan_lines= thispars->pars[P_ACTUAL_HEIGHT]; // no margins here n_scan_lines= thispars->pars[P_ACTUAL_HEIGHT]; // no margins here
} else { } else {
// temporary hack trying to disable PH mode earlier // temporary hack trying to disable PH mode earlier
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", X313_SEQ_ASAP, X313_WA_NLINES, 0x8000));
X3X3_SEQ_SEND1 (X313_SEQ_ASAP, X313_WA_NLINES, 0x8000);
n_scan_lines= thispars->pars[P_ACTUAL_HEIGHT]+(2 * COLOR_MARGINS)+thispars->pars[P_OVERLAP]; n_scan_lines= thispars->pars[P_ACTUAL_HEIGHT]+(2 * COLOR_MARGINS)+thispars->pars[P_OVERLAP];
} }
n_scan_lines&=0x3fff; X393_SEQ_SEND1 (sensor_port, frame16, x393_sens_sync_mult, sync_mult);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_sync_mult, 0x%x)\n", sensor_port, frame16, x393_sens_sync_mult.d32));
// See if NC393 has n_scan_lines - no
/*
n_scan_lines&=0xffff; // was 0x3fff in NC353 code
X3X3_SEQ_SEND1 (fpga_addr, X313_WA_NLINES, n_scan_lines); X3X3_SEQ_SEND1 (fpga_addr, X313_WA_NLINES, n_scan_lines);
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_NLINES, (int) n_scan_lines)); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_NLINES, (int) n_scan_lines));
*/
// Bayer phase changed? // Bayer phase changed?
int flips=(thispars->pars[P_FLIPH] & 1) | ((thispars->pars[P_FLIPV] & 1)<<1); int flips=(thispars->pars[P_FLIPH] & 1) | ((thispars->pars[P_FLIPV] & 1)<<1);
...@@ -1192,10 +1168,13 @@ int pgm_sensorin (int sensor_port, ///< sensor port number (0..3 ...@@ -1192,10 +1168,13 @@ int pgm_sensorin (int sensor_port, ///< sensor port number (0..3
MDF3(printk(" composite mode - adjusted flips=%x\n", flips)); MDF3(printk(" composite mode - adjusted flips=%x\n", flips));
bayer_modified= bayer_modified || FRAMEPAR_MODIFIED(P_MULTI_FLIPH) || FRAMEPAR_MODIFIED(P_MULTI_FLIPV) || FRAMEPAR_MODIFIED(P_MULTI_TOPSENSOR); bayer_modified= bayer_modified || FRAMEPAR_MODIFIED(P_MULTI_FLIPH) || FRAMEPAR_MODIFIED(P_MULTI_FLIPV) || FRAMEPAR_MODIFIED(P_MULTI_TOPSENSOR);
} }
if (bayer_modified) {
X3X3_SEQ_SEND1(fpga_addr, X313_WA_DCR0, X353_DCR0(BAYER_PHASE,thispars->pars[P_BAYER] ^ flips ^ sensor->bayer)); ///NOTE: hardware bayer
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int)X313_WA_DCR0, (int)X353_DCR0(BAYER_PHASE,thispars->pars[P_BAYER] ^ ((thispars->pars[P_FLIPH] & 1) | ((thispars->pars[P_FLIPV] & 1)<<1)) ^ sensor->bayer) ));
// Change Bayer for gamma/histograms?
if (bayer_modified) {
gamma_ctl.bayer = thispars->pars[P_BAYER] ^ flips ^ sensor->bayer;
gamma_ctl.bayer_set = 1;
X393_SEQ_SEND1 (sensor_port, frame16, x393_sens_gamma_ctrl, gamma_ctl);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_gamma_ctrl, 0x%x)\n", sensor_port, frame16, gamma_ctl.d32));
} }
return 0; return 0;
#else #else
...@@ -1267,7 +1246,8 @@ int pgm_sensorin (int sensor_port, ///< sensor port number (0..3 ...@@ -1267,7 +1246,8 @@ int pgm_sensorin (int sensor_port, ///< sensor port number (0..3
} }
/** Start/single acquisition from the sensor to the FPGA (stop has latency of 1) /** Start/single acquisition from the sensor to the FPGA (stop has latency of 1)
* TODO: Implement for 393 */ * NC393 controls writing to memory. Also supports SINGLE and RESET */
int pgm_sensorrun (int sensor_port, ///< sensor port number (0..3) int pgm_sensorrun (int sensor_port, ///< sensor port number (0..3)
struct sensor_t * sensor, ///< sensor static parameters (capabilities) struct sensor_t * sensor, ///< sensor static parameters (capabilities)
struct framepars_t * thispars, ///< sensor current parameters struct framepars_t * thispars, ///< sensor current parameters
...@@ -1277,6 +1257,23 @@ int pgm_sensorrun (int sensor_port, ///< sensor port number (0..3 ...@@ -1277,6 +1257,23 @@ int pgm_sensorrun (int sensor_port, ///< sensor port number (0..3
///< @return OK - 0, <0 - error ///< @return OK - 0, <0 - error
{ {
#ifndef NC353
MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -EINVAL; // wrong frame
control_sensor_memory (sensor_port,
thispars->pars[P_SENSOR_RUN] & 3,
(frame16<0)? ASAP: ABSOLUTE, // how to apply commands - directly or through channel sequencer
frame16);
// Is it OK to process stop here too?
return 0;
/*
# Enable arbitration of sensor-to-memory controller
if exit_step == 12: return False
self.x393_axi_tasks.enable_memcntrl_en_dis(8 + num_sensor, True);
*/
#else
int fpga_data=0; int fpga_data=0;
MDF3(printk(" frame16=%d\n",frame16)); MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame if (frame16 >= PARS_FRAMES) return -1; // wrong frame
...@@ -1285,19 +1282,19 @@ int pgm_sensorrun (int sensor_port, ///< sensor port number (0..3 ...@@ -1285,19 +1282,19 @@ int pgm_sensorrun (int sensor_port, ///< sensor port number (0..3
case 2: case 2:
case 3: fpga_data=5; break; case 3: fpga_data=5; break;
} }
#if NC353
int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16); int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16);
// only start/single, stopping will be handled by the pgm_sensorstop // only start/single, stopping will be handled by the pgm_sensorstop
if (fpga_data) { if (fpga_data) {
X3X3_SEQ_SEND1(fpga_addr, X313_WA_TRIG, fpga_data); X3X3_SEQ_SEND1(fpga_addr, X313_WA_TRIG, fpga_data);
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_TRIG, (int) fpga_data)); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_TRIG, (int) fpga_data));
} }
#endif
return 0; return 0;
#endif
} }
/** Stop acquisition from the sensor to the FPGA (start/single have latency of 2) /** Stop acquisition from the sensor to the FPGA (start/single have latency of 2)
* TODO: Implement for 393 */ * NC393 - currently same as pgm_sensorrun*/
int pgm_sensorstop (int sensor_port, ///< sensor port number (0..3) int pgm_sensorstop (int sensor_port, ///< sensor port number (0..3)
struct sensor_t * sensor, ///< sensor static parameters (capabilities) struct sensor_t * sensor, ///< sensor static parameters (capabilities)
struct framepars_t * thispars, ///< sensor current parameters struct framepars_t * thispars, ///< sensor current parameters
...@@ -1307,6 +1304,16 @@ int pgm_sensorstop (int sensor_port, ///< sensor port number (0..3 ...@@ -1307,6 +1304,16 @@ int pgm_sensorstop (int sensor_port, ///< sensor port number (0..3
///< @return OK - 0, <0 - error ///< @return OK - 0, <0 - error
{ {
#ifndef NC353
MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -EINVAL; // wrong frame
// Do we need to filter for stop only ( if ((thispars->pars[P_SENSOR_RUN] & 3)==0){... ) ?
control_sensor_memory (sensor_port,
thispars->pars[P_SENSOR_RUN] & 3,
(frame16<0)? ASAP: ABSOLUTE, // how to apply commands - directly or through channel sequencer
frame16);
return 0;
#else
int fpga_data=0; int fpga_data=0;
MDF3(printk(" frame16=%d\n",frame16)); MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame if (frame16 >= PARS_FRAMES) return -1; // wrong frame
...@@ -1315,21 +1322,20 @@ int pgm_sensorstop (int sensor_port, ///< sensor port number (0..3 ...@@ -1315,21 +1322,20 @@ int pgm_sensorstop (int sensor_port, ///< sensor port number (0..3
case 2: case 2:
case 3: fpga_data=5; break; case 3: fpga_data=5; break;
} }
#if NC353
int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16); int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16);
// only start/single, stopping will be handled by the pgm_sensorstop // only start/single, stopping will be handled by the pgm_sensorstop
if ((thispars->pars[P_SENSOR_RUN] & 3)==0){ if ((thispars->pars[P_SENSOR_RUN] & 3)==0){
X3X3_SEQ_SEND1(fpga_addr, X313_WA_TRIG, fpga_data); X3X3_SEQ_SEND1(fpga_addr, X313_WA_TRIG, fpga_data);
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_TRIG, (int) fpga_data)); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_TRIG, (int) fpga_data));
} }
#endif
return 0; return 0;
#endif
} }
/** Program gamma table /** Program gamma table
* Table with the same hash should be available in cache. It is very unlikely * Table with the same hash should be available in cache. It is very unlikely
* but is still possible that it can be pushed out - TODO: make it guaranteed. So normally new gamma table is * but is still possible that it can be pushed out - TODO: make it guaranteed. So normally new gamma table is
* set through a charcter device driver (with FPGA bit set to get locked?) and then pgm_gamma is activated when * set through a character device driver (with FPGA bit set to get locked?) and then pgm_gamma is activated when
* the P_GTAB_R (*_G,*_GB, *_B) are updated * the P_GTAB_R (*_G,*_GB, *_B) are updated
* The scale part of these parameters (lower 16 bits) may be modified by white balancing code without loading a new table * The scale part of these parameters (lower 16 bits) may be modified by white balancing code without loading a new table
* *
...@@ -1629,8 +1635,6 @@ int pgm_memcompressor (int sensor_port, ///< sensor port number ( ...@@ -1629,8 +1635,6 @@ int pgm_memcompressor (int sensor_port, ///< sensor port number (
int cmprs_top = 0; // 1 for JPEG18 only, 0 for others int cmprs_top = 0; // 1 for JPEG18 only, 0 for others
int tile_width; // in bursts, 2 for those with overlap (height>16), 4 with heigh==16 int tile_width; // in bursts, 2 for those with overlap (height>16), 4 with heigh==16
int tile_height; // 16/18 (20 not yet implemented) int tile_height; // 16/18 (20 not yet implemented)
int extra_pages; // 1 with overlap, 0 w/o overlap
int disable_need = 1; // TODO: Use some G_* parameter
MDF3(printk(" frame16=%d\n",frame16)); MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame if (frame16 >= PARS_FRAMES) return -1; // wrong frame
width_marg = thispars->pars[P_ACTUAL_WIDTH]; width_marg = thispars->pars[P_ACTUAL_WIDTH];
...@@ -1650,10 +1654,8 @@ int pgm_memcompressor (int sensor_port, ///< sensor port number ( ...@@ -1650,10 +1654,8 @@ int pgm_memcompressor (int sensor_port, ///< sensor port number (
height_marg += (2 * COLOR_MARGINS); height_marg += (2 * COLOR_MARGINS);
} }
tile_width = 2; tile_width = 2;
extra_pages = 1;
} else { } else {
tile_width = 4; tile_width = 4;
extra_pages = 0;
} }
width_bursts = (width_marg >> 4) + ((width_marg & 0xf) ? 1 : 0); width_bursts = (width_marg >> 4) + ((width_marg & 0xf) ? 1 : 0);
// Adjusting for tile width. TODO: probably not needed, handled in FPGA - verify (and remove 2 next lines) // Adjusting for tile width. TODO: probably not needed, handled in FPGA - verify (and remove 2 next lines)
...@@ -1669,12 +1671,9 @@ int pgm_memcompressor (int sensor_port, ///< sensor port number ( ...@@ -1669,12 +1671,9 @@ int pgm_memcompressor (int sensor_port, ///< sensor port number (
tile_width, // tile width in bjursts (16-pixels each) tile_width, // tile width in bjursts (16-pixels each)
tile_height, // tile height: 18 for color JPEG, 16 for JP4 flavors // = 18 tile_height, // tile height: 18 for color JPEG, 16 for JP4 flavors // = 18
16, // tile vertical step in pixel rows (JPEG18/jp4 = 16) // = 16 16, // tile vertical step in pixel rows (JPEG18/jp4 = 16) // = 16
extra_pages, // extra pages needed (1) - number of previous pages to keep in a 4-page buffer
disable_need, // disable "need" (yield to sensor channels - they can not wait)
(frame16<0)? ASAP: ABSOLUTE, // how to apply commands - directly or through channel sequencer (frame16<0)? ASAP: ABSOLUTE, // how to apply commands - directly or through channel sequencer
frame16); // Frame number the command should be applied to (if not immediate mode) frame16); // Frame number the command should be applied to (if not immediate mode)
return 0; return 0;
// TODO: Do we need to maintain P_IMGSZMEM ? // TODO: Do we need to maintain P_IMGSZMEM ?
// #define P_PAGE_ACQ 18 ///< Number of image page buffer to acquire to (0.1?) // #define P_PAGE_ACQ 18 ///< Number of image page buffer to acquire to (0.1?)
...@@ -1778,13 +1777,11 @@ int pgm_compmode (int sensor_port, ///< sensor port number (0..3 ...@@ -1778,13 +1777,11 @@ int pgm_compmode (int sensor_port, ///< sensor port number (0..3
cmprs_mode.focus_set = 1; cmprs_mode.focus_set = 1;
} }
// enqueue it for the compressor
//#define X393_SEQ_SEND1(port,frame,func,data) {if ((frame) < 0) seqr_##func (0, (data), (port)); \
// else seqa_##func ((frame), (data), (port)); }
//if (frame16 < 0) seqr_x393_cmprs_control_reg (0, cmprs_mode, sensor_port);
//else seqa_x393_cmprs_control_reg (frame16, cmprs_mode, sensor_port);
if (cmprs_mode.d32) { if (cmprs_mode.d32) {
// Consider frames_in_buffer_minus_one() to be static (it can be actually changed over sysfs),
// Set it always but do not count as modified
cmprs_mode.multiframe = (frames_in_buffer_minus_one(sensor_port)>0)? 1:0;
cmprs_mode.multiframe_set = 1;
X393_SEQ_SEND1 (sensor_port, frame16, x393_cmprs_control_reg, cmprs_mode); X393_SEQ_SEND1 (sensor_port, frame16, x393_cmprs_control_reg, cmprs_mode);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n", sensor_port, frame16, cmprs_mode.d32)); MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n", sensor_port, frame16, cmprs_mode.d32));
} else { } else {
...@@ -1911,15 +1908,19 @@ int pgm_focusmode (int sensor_port, ///< sensor port number (0..3 ...@@ -1911,15 +1908,19 @@ int pgm_focusmode (int sensor_port, ///< sensor port number (0..3
///< be applied to, negative - ASAP ///< be applied to, negative - ASAP
///< @return OK - 0, <0 - error ///< @return OK - 0, <0 - error
{ {
unsigned long flags;
int i;
x393_cmprs_table_addr_t table_addr;
struct { struct {
long left; short left;
long right; short right;
long top; short top;
long bottom; short bottom;
long totalwidth; short totalwidth;
long filter_no; short filter_no;
long show1; short show1;
} focus_setup_data; } focus_setup_data;
u32 * focus_setup_data32 = (u32*) &focus_setup_data;
// struct frameparspair_t * pars_to_update[5]={ // struct frameparspair_t * pars_to_update[5]={
struct frameparspair_t pars_to_update[5]={ struct frameparspair_t pars_to_update[5]={
{P_FOCUS_TOTWIDTH, 0}, {P_FOCUS_TOTWIDTH, 0},
...@@ -1956,8 +1957,26 @@ int pgm_focusmode (int sensor_port, ///< sensor port number (0..3 ...@@ -1956,8 +1957,26 @@ int pgm_focusmode (int sensor_port, ///< sensor port number (0..3
(focus_setup_data.bottom != (focus_setup_data.top+thispars->pars[P_FOCUS_HEIGHT] -8)) || (focus_setup_data.bottom != (focus_setup_data.top+thispars->pars[P_FOCUS_HEIGHT] -8)) ||
FRAMEPAR_MODIFIED(P_FOCUS_FILTER) || FRAMEPAR_MODIFIED(P_FOCUS_FILTER) ||
FRAMEPAR_MODIFIED(P_FOCUS_SHOW1) ) { FRAMEPAR_MODIFIED(P_FOCUS_SHOW1) ) {
// TODO: Redo for nc393 // TODO: NC393 Focus functionality requires userland write tables (was in fpga_io.c). Other functions
#ifdef NC353 // from that file are replaced, but we still need table write with disabling IRQ
#ifndef NC353
table_addr.type = X393_TABLE_FOCUS_TYPE;
// Each focus page has 64 of 16-bit entries, total 16 pages (2KB). Configuration uses first 8 of 16-bit words in last page,
// And FPGA accepts 32-bit data (16-bit ones merged in pairs). So address is 32*15
table_addr.addr32 = 32*15;
//focus_setup_data32
local_irq_save(flags);
x393_cmprs_tables_address(table_addr, sensor_port);
for (i = 0; i < 4; i++) {
x393_cmprs_tables_data(focus_setup_data32[i], sensor_port);
}
local_irq_restore(flags);
print_hex_dump_bytes("", DUMP_PREFIX_NONE, &focus_setup_data32[0], sizeof (focus_setup_data));
#else
fpga_table_write_nice (CX313_FPGA_TABLES_FOCUSPARS, sizeof(focus_setup_data)/sizeof(focus_setup_data.left), (unsigned long *) &focus_setup_data); fpga_table_write_nice (CX313_FPGA_TABLES_FOCUSPARS, sizeof(focus_setup_data)/sizeof(focus_setup_data.left), (unsigned long *) &focus_setup_data);
#endif #endif
pars_to_update[0].val=focus_setup_data.totalwidth; pars_to_update[0].val=focus_setup_data.totalwidth;
...@@ -2136,7 +2155,7 @@ int pgm_recalcseq (int sensor_port, ///< sensor port number (0..3 ...@@ -2136,7 +2155,7 @@ int pgm_recalcseq (int sensor_port, ///< sensor port number (0..3
/** Restart after changing geometry (recognizes ASAP and programs memory channel 2 then) /** Restart after changing geometry (recognizes ASAP and programs memory channel 2 then)
* data for the CHN2 should be available (prepared) * data for the CHN2 should be available (prepared)
* TODO: 393 - reimplement */ * NC393 - same as pgm_compctl? */
int pgm_comprestart(int sensor_port, ///< sensor port number (0..3) int pgm_comprestart(int sensor_port, ///< sensor port number (0..3)
struct sensor_t * sensor, ///< sensor static parameters (capabilities) struct sensor_t * sensor, ///< sensor static parameters (capabilities)
struct framepars_t * thispars, ///< sensor current parameters struct framepars_t * thispars, ///< sensor current parameters
...@@ -2146,43 +2165,72 @@ int pgm_comprestart(int sensor_port, ///< sensor port number (0..3 ...@@ -2146,43 +2165,72 @@ int pgm_comprestart(int sensor_port, ///< sensor port number (0..3
///< @return OK - 0, <0 - error ///< @return OK - 0, <0 - error
{ {
#ifndef NC353
MDF3(printk(" frame16=%d\n",frame16)); MDF3(printk(" frame16=%d\n",frame16));
int extra_pages;
int disable_need = 1; // TODO: Use some G_* parameter
x393_cmprs_mode_t cmprs_mode = {.d32=0};
if (frame16 >= PARS_FRAMES) return -1; // wrong frame if (frame16 >= PARS_FRAMES) return -1; // wrong frame
// does it need to be be started (nothing do be done to stop) // does it need to be be started (nothing do be done to stop)
if (thispars->pars[P_COMPRESSOR_RUN]==0) return 0; // does not need comporessor to be started if (thispars->pars[P_COMPRESSOR_RUN]==0) return 0; // does not need compressor to be started
#ifdef NC353 // NC393: memory controller already set by pgm_memcompressor, but we'll need to setup dependent/from memory here
switch(thispars->pars[P_COLOR]){
case COLORMODE_COLOR:
case COLORMODE_COLOR20:
extra_pages = 1;
break;
default:
extra_pages = 0;
}
control_compressor_memory (sensor_port,
thispars->pars[P_SENSOR_RUN] & 3, // stop/single/run(/reset)
extra_pages,
disable_need,
(frame16<0)? ASAP: ABSOLUTE, // how to apply commands - directly or through channel sequencer
frame16);
// program compressor mode - normal run (3) or standalone(2)
switch (thispars->pars[P_COMPRESSOR_RUN]) {
case COMPRESSOR_RUN_STOP:
cmprs_mode.run = X393_CMPRS_CBIT_RUN_DISABLE;
break;
case COMPRESSOR_RUN_SINGLE:
case COMPRESSOR_RUN_CONT:
cmprs_mode.run = ((thispars->pars[P_SENSOR_RUN] & 3)==SENSOR_RUN_CONT)? X393_CMPRS_CBIT_RUN_ENABLE : X393_CMPRS_CBIT_RUN_STANDALONE;
break;
}
cmprs_mode.run_set = 1;
X393_SEQ_SEND1 (sensor_port, frame16, x393_cmprs_control_reg, cmprs_mode);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n", sensor_port, frame16, cmprs_mode.d32));
return 0;
#else
MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame
// does it need to be be started (nothing do be done to stop)
if (thispars->pars[P_COMPRESSOR_RUN]==0) return 0; // does not need compressor to be started
int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16); int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16);
#endif
// reset memory controller for the channel2 to the start of the frame // reset memory controller for the channel2 to the start of the frame
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL1, thispars->pars[P_SDRAM_CHN21]); X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL1, thispars->pars[P_SDRAM_CHN21]);
X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL2, thispars->pars[P_SDRAM_CHN22]); X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL2, thispars->pars[P_SDRAM_CHN22]);
X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL0, thispars->pars[P_SDRAM_CHN20]); X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL0, thispars->pars[P_SDRAM_CHN20]);
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_SDCH2_CTL1, (int) thispars->pars[P_SDRAM_CHN21])); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_SDCH2_CTL1, (int) thispars->pars[P_SDRAM_CHN21]));
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_SDCH2_CTL2, (int) thispars->pars[P_SDRAM_CHN22])); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_SDCH2_CTL2, (int) thispars->pars[P_SDRAM_CHN22]));
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_SDCH2_CTL0, (int) thispars->pars[P_SDRAM_CHN20])); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_SDCH2_CTL0, (int) thispars->pars[P_SDRAM_CHN20]));
// enable memory channel2 // enable memory channel2
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_SD_MODE, X313_CHN_EN_D(0)); X3X3_SEQ_SEND1(fpga_addr, X313_WA_SD_MODE, X313_CHN_EN_D(0));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_SD_MODE, (int) X313_CHN_EN_D(0))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_SD_MODE, (int) X313_CHN_EN_D(0)));
// set number of tiles to compressor // set number of tiles to compressor
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_MCUNUM, thispars->pars[P_TILES]-1); X3X3_SEQ_SEND1(fpga_addr, X313_WA_MCUNUM, thispars->pars[P_TILES]-1);
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_MCUNUM, (int) thispars->pars[P_TILES]-1)); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_MCUNUM, (int) thispars->pars[P_TILES]-1));
// start the compressor // start the compressor
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, (thispars->pars[P_COMPRESSOR_RUN]==2) ? COMPCMD_RUN : COMPCMD_SINGLE); X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, (thispars->pars[P_COMPRESSOR_RUN]==2) ? COMPCMD_RUN : COMPCMD_SINGLE);
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_COMP_CMD, (int) ((thispars->pars[P_COMPRESSOR_RUN]==2) ? COMPCMD_RUN : COMPCMD_SINGLE))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_COMP_CMD, (int) ((thispars->pars[P_COMPRESSOR_RUN]==2) ? COMPCMD_RUN : COMPCMD_SINGLE)));
return 0; return 0;
#endif
} }
/** Stop compressor when changing geometry /** Stop compressor when changing geometry
* TODO: 353 - reimplement * NC393 - stopping compressor memory or compressor should also be stopped? Doing both
*/ */
int pgm_compstop (int sensor_port, ///< sensor port number (0..3) int pgm_compstop (int sensor_port, ///< sensor port number (0..3)
struct sensor_t * sensor, ///< sensor static parameters (capabilities) struct sensor_t * sensor, ///< sensor static parameters (capabilities)
...@@ -2192,21 +2240,46 @@ int pgm_compstop (int sensor_port, ///< sensor port number (0..3 ...@@ -2192,21 +2240,46 @@ int pgm_compstop (int sensor_port, ///< sensor port number (0..3
///< be applied to, negative - ASAP ///< be applied to, negative - ASAP
///< @return OK - 0, <0 - error ///< @return OK - 0, <0 - error
{ {
#ifdef NC353 #ifndef NC353
int extra_pages;
int disable_need = 1; // TODO: Use some G_* parameter
x393_cmprs_mode_t cmprs_mode = {.d32=0};
MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -EINVAL; // wrong frame
switch(thispars->pars[P_COLOR]){
case COLORMODE_COLOR:
case COLORMODE_COLOR20:
extra_pages = 1;
break;
default:
extra_pages = 0;
}
// Stop memory -> compressor
control_compressor_memory (sensor_port,
X393_CMPRS_CBIT_RUN_DISABLE,
extra_pages,
disable_need,
(frame16<0)? ASAP: ABSOLUTE, // how to apply commands - directly or through channel sequencer
frame16);
// Stop compressor (do not propagate frame sync late, finish current frame)
cmprs_mode.run = X393_CMPRS_CBIT_RUN_DISABLE;
cmprs_mode.run_set = 1;
X393_SEQ_SEND1 (sensor_port, frame16, x393_cmprs_control_reg, cmprs_mode);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n", sensor_port, frame16, cmprs_mode.d32));
return 0;
#else
int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16); int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16);
#endif
MDF3(printk(" frame16=%d\n",frame16)); MDF3(printk(" frame16=%d\n",frame16));
// if (frame16 & ~PARS_FRAMES_MASK) return -1; // wrong frame (can be only -1 or 0..7) // if (frame16 & ~PARS_FRAMES_MASK) return -1; // wrong frame (can be only -1 or 0..7)
if (frame16 >= PARS_FRAMES) return -1; // wrong frame (can be only -1 or 0..7) if (frame16 >= PARS_FRAMES) return -1; // wrong frame (can be only -1 or 0..7)
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, COMPCMD_STOP); X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, COMPCMD_STOP);
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_COMP_CMD, (int) COMPCMD_STOP)); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_COMP_CMD, (int) COMPCMD_STOP));
return 0; return 0;
#endif
} }
/** Compressor control: only start/stop/single (after explicitly changed, not when geometry was changed) /** Compressor control: only start/stop/single (after explicitly changed, not when geometry was changed) */
* TODO: 393 - reimplement*/
int pgm_compctl (int sensor_port, ///< sensor port number (0..3) int pgm_compctl (int sensor_port, ///< sensor port number (0..3)
struct sensor_t * sensor, ///< sensor static parameters (capabilities) struct sensor_t * sensor, ///< sensor static parameters (capabilities)
struct framepars_t * thispars, ///< sensor current parameters struct framepars_t * thispars, ///< sensor current parameters
...@@ -2215,27 +2288,64 @@ int pgm_compctl (int sensor_port, ///< sensor port number (0..3 ...@@ -2215,27 +2288,64 @@ int pgm_compctl (int sensor_port, ///< sensor port number (0..3
///< be applied to, negative - ASAP ///< be applied to, negative - ASAP
///< @return OK - 0, <0 - error ///< @return OK - 0, <0 - error
{ {
#ifndef NC353
int extra_pages;
int disable_need = 1; // TODO: Use some G_* parameter
x393_cmprs_mode_t cmprs_mode = {.d32=0};
MDF3(printk(" frame16=%d, prevpars->pars[P_COMPRESSOR_RUN]=%d, thispars->pars[P_COMPRESSOR_RUN]=%d \n",frame16, (int) prevpars->pars[P_COMPRESSOR_RUN], (int) thispars->pars[P_COMPRESSOR_RUN]));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame
if ((prevpars->pars[P_COMPRESSOR_RUN]==0) && (thispars->pars[P_COMPRESSOR_RUN]!=0)) { // just started
// Was for NC353
// reset memory controller for the channel2 to the start of the frame
// enable memory channel2 (NOTE: when is it disabled? does it need to be disabled?)
// set number of tiles to compressor
// NC393: memory controller already set by pgm_memcompressor, but we'll need to setup dependent/from memory here
//Seems nothing here?
// Or is there?
}
switch(thispars->pars[P_COLOR]){
case COLORMODE_COLOR:
case COLORMODE_COLOR20:
extra_pages = 1;
break;
default:
extra_pages = 0;
}
control_compressor_memory (sensor_port,
thispars->pars[P_SENSOR_RUN] & 3, // stop/single/run(/reset)
extra_pages,
disable_need,
(frame16<0)? ASAP: ABSOLUTE, // how to apply commands - directly or through channel sequencer
frame16);
// program compressor mode - normal run (3) or standalone(2)
switch (thispars->pars[P_COMPRESSOR_RUN]) {
case COMPRESSOR_RUN_STOP:
cmprs_mode.run = X393_CMPRS_CBIT_RUN_DISABLE;
break;
case COMPRESSOR_RUN_SINGLE:
case COMPRESSOR_RUN_CONT:
cmprs_mode.run = ((thispars->pars[P_SENSOR_RUN] & 3)==SENSOR_RUN_CONT)? X393_CMPRS_CBIT_RUN_ENABLE : X393_CMPRS_CBIT_RUN_STANDALONE;
break;
}
cmprs_mode.run_set = 1;
X393_SEQ_SEND1 (sensor_port, frame16, x393_cmprs_control_reg, cmprs_mode);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n", sensor_port, frame16, cmprs_mode.d32));
return 0;
#else
MDF3(printk(" frame16=%d, prevpars->pars[P_COMPRESSOR_RUN]=%d, thispars->pars[P_COMPRESSOR_RUN]=%d \n",frame16, (int) prevpars->pars[P_COMPRESSOR_RUN], (int) thispars->pars[P_COMPRESSOR_RUN])); MDF3(printk(" frame16=%d, prevpars->pars[P_COMPRESSOR_RUN]=%d, thispars->pars[P_COMPRESSOR_RUN]=%d \n",frame16, (int) prevpars->pars[P_COMPRESSOR_RUN], (int) thispars->pars[P_COMPRESSOR_RUN]));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame if (frame16 >= PARS_FRAMES) return -1; // wrong frame
#ifdef NC353
int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16); int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16);
#endif
if ((prevpars->pars[P_COMPRESSOR_RUN]==0) && (thispars->pars[P_COMPRESSOR_RUN]!=0)) { // just started if ((prevpars->pars[P_COMPRESSOR_RUN]==0) && (thispars->pars[P_COMPRESSOR_RUN]!=0)) { // just started
// reset memory controller for the channel2 to the start of the frame // reset memory controller for the channel2 to the start of the frame
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL1, thispars->pars[P_SDRAM_CHN21]); X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL1, thispars->pars[P_SDRAM_CHN21]);
X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL2, thispars->pars[P_SDRAM_CHN22]); X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL2, thispars->pars[P_SDRAM_CHN22]);
X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL0, thispars->pars[P_SDRAM_CHN20]); X3X3_SEQ_SEND1(fpga_addr, X313_WA_SDCH2_CTL0, thispars->pars[P_SDRAM_CHN20]);
#endif
// enable memory channel2 (NOTE: wnen is it disabled? does it need to be disabled?) // enable memory channel2 (NOTE: wnen is it disabled? does it need to be disabled?)
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_SD_MODE, X313_CHN_EN_D(2)); X3X3_SEQ_SEND1(fpga_addr, X313_WA_SD_MODE, X313_CHN_EN_D(2));
#endif
// set number of tiles to compressor // set number of tiles to compressor
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_MCUNUM, thispars->pars[P_TILES]-1); X3X3_SEQ_SEND1(fpga_addr, X313_WA_MCUNUM, thispars->pars[P_TILES]-1);
#endif
MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int)X313_WA_SDCH2_CTL1, (int)thispars->pars[P_SDRAM_CHN21])); MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int)X313_WA_SDCH2_CTL1, (int)thispars->pars[P_SDRAM_CHN21]));
MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int)X313_WA_SDCH2_CTL2, (int)thispars->pars[P_SDRAM_CHN22])); MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int)X313_WA_SDCH2_CTL2, (int)thispars->pars[P_SDRAM_CHN22]));
MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int)X313_WA_SDCH2_CTL0, (int)thispars->pars[P_SDRAM_CHN20])); MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int)X313_WA_SDCH2_CTL0, (int)thispars->pars[P_SDRAM_CHN20]));
...@@ -2245,32 +2355,23 @@ int pgm_compctl (int sensor_port, ///< sensor port number (0..3 ...@@ -2245,32 +2355,23 @@ int pgm_compctl (int sensor_port, ///< sensor port number (0..3
if ((prevpars->pars[P_COMPRESSOR_RUN] != thispars->pars[P_COMPRESSOR_RUN]) || (thispars->pars[P_COMPRESSOR_RUN]==COMPRESSOR_RUN_SINGLE)) // changed or single if ((prevpars->pars[P_COMPRESSOR_RUN] != thispars->pars[P_COMPRESSOR_RUN]) || (thispars->pars[P_COMPRESSOR_RUN]==COMPRESSOR_RUN_SINGLE)) // changed or single
switch (thispars->pars[P_COMPRESSOR_RUN]) { switch (thispars->pars[P_COMPRESSOR_RUN]) {
case COMPRESSOR_RUN_STOP: case COMPRESSOR_RUN_STOP:
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, COMPCMD_STOP); X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, COMPCMD_STOP);
#endif
MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int) X313_WA_COMP_CMD, (int) COMPCMD_STOP)); MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int) X313_WA_COMP_CMD, (int) COMPCMD_STOP));
break; break;
case COMPRESSOR_RUN_SINGLE: case COMPRESSOR_RUN_SINGLE:
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, COMPCMD_SINGLE); X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, COMPCMD_SINGLE);
#endif
//TODO: Update for NC393 //TODO: Update for NC393
#ifdef NC353
if (!x313_is_dma_on()) x313_dma_start(); if (!x313_is_dma_on()) x313_dma_start();
#endif
MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int) X313_WA_COMP_CMD, (int) COMPCMD_SINGLE)); MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int) X313_WA_COMP_CMD, (int) COMPCMD_SINGLE));
break; break;
case COMPRESSOR_RUN_CONT: case COMPRESSOR_RUN_CONT:
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, COMPCMD_RUN); X3X3_SEQ_SEND1(fpga_addr, X313_WA_COMP_CMD, COMPCMD_RUN);
#endif
#ifdef NC353
if (!x313_is_dma_on()) x313_dma_start(); if (!x313_is_dma_on()) x313_dma_start();
#endif
MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int) X313_WA_COMP_CMD, (int) COMPCMD_RUN)); MDF9(printk(" X3X3_SEQ_SEND1(0x%x, 0x%x, 0x%x)\n", (int)fpga_addr, (int) X313_WA_COMP_CMD, (int) COMPCMD_RUN));
break; break;
} }
return 0; return 0;
#endif
} }
...@@ -2286,6 +2387,7 @@ int pgm_gammaload (int sensor_port, ///< sensor port number (0..3 ...@@ -2286,6 +2387,7 @@ int pgm_gammaload (int sensor_port, ///< sensor port number (0..3
///< @return OK - 0, <0 - error ///< @return OK - 0, <0 - error
{ {
//TODO: make multi-subchannel, for now using the same gamma for all //TODO: make multi-subchannel, for now using the same gamma for all
int sub_chn;
struct frameparspair_t pars_to_update[4]; // 4 needed, increase if more entries will be added struct frameparspair_t pars_to_update[4]; // 4 needed, increase if more entries will be added
int nupdate=0; int nupdate=0;
MDF3(printk(" frame16=%d, (getThisFrameNumber() & PARS_FRAMES_MASK)= %ld, thispars->pars[P_GTAB_R]=0x%lx, thispars->pars[P_FRAME]=0x%lx\n",frame16, getThisFrameNumber() & PARS_FRAMES_MASK, thispars->pars[P_GTAB_R],thispars->pars[P_FRAME])); MDF3(printk(" frame16=%d, (getThisFrameNumber() & PARS_FRAMES_MASK)= %ld, thispars->pars[P_GTAB_R]=0x%lx, thispars->pars[P_FRAME]=0x%lx\n",frame16, getThisFrameNumber() & PARS_FRAMES_MASK, thispars->pars[P_GTAB_R],thispars->pars[P_FRAME]));
...@@ -2308,6 +2410,7 @@ int pgm_gammaload (int sensor_port, ///< sensor port number (0..3 ...@@ -2308,6 +2410,7 @@ int pgm_gammaload (int sensor_port, ///< sensor port number (0..3
for (color=0; color<4; color++) if (get_locked_hash32(color,sensor_port, 0)!=thispars->pars[P_GTAB_R+color]) need_pgm++; for (color=0; color<4; color++) if (get_locked_hash32(color,sensor_port, 0)!=thispars->pars[P_GTAB_R+color]) need_pgm++;
// code currently does not allow to overwrite just 1 table - only all 4 // code currently does not allow to overwrite just 1 table - only all 4
if (need_pgm) { if (need_pgm) {
for (sub_chn = 0; sub_chn< MAX_SENSORS;sub_chn++) {
for (color=0; color<4; color++) { for (color=0; color<4; color++) {
*pgamma32=thispars->pars[P_GTAB_R+color]; *pgamma32=thispars->pars[P_GTAB_R+color];
// Normally, nothing will be calculated in the next set_gamma_table() call // Normally, nothing will be calculated in the next set_gamma_table() call
...@@ -2319,12 +2422,22 @@ int pgm_gammaload (int sensor_port, ///< sensor port number (0..3 ...@@ -2319,12 +2422,22 @@ int pgm_gammaload (int sensor_port, ///< sensor port number (0..3
sensor_port, sensor_port,
0); // frame16 - one ahead of the current TODO 393 multisensor - split gamma tables to subchannels 0); // frame16 - one ahead of the current TODO 393 multisensor - split gamma tables to subchannels
// now gtable will be old one if result <=0 get_gamma_fpga(color) can return 0 only if nothing yet was programmed // now gtable will be old one if result <=0 get_gamma_fpga(color) can return 0 only if nothing yet was programmed
//TODO: Update for NC393 //TODO: Update for NC393
#ifdef NC353 #ifndef NC353
if ((gtable= get_gamma_fpga(color,sensor_port,sub_chn))) // missing channels return NULL
{
fpga_gamma_write_nice(color, // Color (0..3)
sensor_port, // sensor port (0..3)
sub_chn, // sensor sub-channel (when several are connected through a multiplexer)
gtable); // Gamma table (256 DWORDs) in encoded FPGA format
}
#else
if ((gtable= get_gamma_fpga(color))) fpga_table_write_nice (CX313_FPGA_TABLES_GAMMA + (color * 256), 256, gtable); if ((gtable= get_gamma_fpga(color))) fpga_table_write_nice (CX313_FPGA_TABLES_GAMMA + (color * 256), 256, gtable);
#endif #endif
if (rslt <= 0) SETFRAMEPARS_SET(P_GTAB_R+color, get_locked_hash32(color,sensor_port,0)); // restore to the locked table if (rslt <= 0) SETFRAMEPARS_SET(P_GTAB_R+color, get_locked_hash32(color,sensor_port,0)); // restore to the locked table
} }
}
MDF3(printk("need_pgm=%d, get_locked_hash32(*)=0x%lx 0x%lx 0x%lx 0x%lx\n",need_pgm,get_locked_hash32(0),get_locked_hash32(1),get_locked_hash32(2),get_locked_hash32(3))); MDF3(printk("need_pgm=%d, get_locked_hash32(*)=0x%lx 0x%lx 0x%lx 0x%lx\n",need_pgm,get_locked_hash32(0),get_locked_hash32(1),get_locked_hash32(2),get_locked_hash32(3)));
} }
if (nupdate) { if (nupdate) {
...@@ -2378,82 +2491,173 @@ int pgm_prescal (int sensor_port, ///< sensor port number ( ...@@ -2378,82 +2491,173 @@ int pgm_prescal (int sensor_port, ///< sensor port number (
///< be applied to, negative - ASAP ///< be applied to, negative - ASAP
///< @return OK - 0, <0 - error ///< @return OK - 0, <0 - error
{ {
#ifndef NC353
int sub_chn;
int par_index, poffs;
x393_lens_corr_t lens_corr = {.d32=0};
// In 393 there can be multiple subchannels, with proportional offsets. Initially offset == 0, so the same parameters will
// be applied to all active subchannels.
MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame
for (sub_chn = 0; sub_chn < MAX_SENSORS; sub_chn++) if (GLOBALPARS(sensor_port, G_SUBCHANNELS) & (1 << sub_chn)){
poffs = VIGNET_SUBCHN_OFFSET * sub_chn;
par_index = P_VIGNET_AX + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_AX;
lens_corr.ax = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_VIGNET_AY + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_AY;
lens_corr.ay = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_VIGNET_C + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_C;
lens_corr.c = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_VIGNET_BX + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_BX;
lens_corr.bx = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_VIGNET_BY + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_BY;
lens_corr.by = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_SCALE_ZERO_IN + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_FAT0_IN;
lens_corr.fatzero_in = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_SCALE_ZERO_OUT + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_FAT0_OUT;
lens_corr.fatzero_out = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_VIGNET_SHL + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_POST_SCALE;
lens_corr.post_scale = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_DGAINR + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_SCALE0;
lens_corr.scale = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_DGAING + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_SCALE1;
lens_corr.scale = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_DGAINGB + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_SCALE2;
lens_corr.scale = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
par_index = P_DGAINB + poffs;
if (FRAMEPAR_MODIFIED(par_index)) {
lens_corr.sub_chn = sub_chn;
lens_corr.addr = X393_LENS_SCALE3;
lens_corr.scale = thispars->pars[par_index];
X393_SEQ_SEND1 (sensor_port, frame16, x393_lens_corr_cnh_addr_data, lens_corr);
MDF3(printk(" X393_SEQ_SEND1(0x%x, 0x%x, x393_sens_mode, 0x%x)\n", sensor_port, frame16, lens_corr.d32));
}
}
return 0;
#else
MDF3(printk(" frame16=%d\n",frame16)); MDF3(printk(" frame16=%d\n",frame16));
if (frame16 >= PARS_FRAMES) return -1; // wrong frame if (frame16 >= PARS_FRAMES) return -1; // wrong frame
#ifdef NC353
int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16); int fpga_addr=(frame16 <0) ? X313_SEQ_ASAP : (X313_SEQ_FRAME0+frame16);
#endif
if (FRAMEPAR_MODIFIED(P_VIGNET_AX)) { if (FRAMEPAR_MODIFIED(P_VIGNET_AX)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_AX(thispars->pars[P_VIGNET_AX])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_AX(thispars->pars[P_VIGNET_AX]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_AX(thispars->pars[P_VIGNET_AX]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_AX(thispars->pars[P_VIGNET_AX])));
} }
if (FRAMEPAR_MODIFIED(P_VIGNET_AY)) { if (FRAMEPAR_MODIFIED(P_VIGNET_AY)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_AY(thispars->pars[P_VIGNET_AY])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_AY(thispars->pars[P_VIGNET_AY]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_AY(thispars->pars[P_VIGNET_AY]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_AY(thispars->pars[P_VIGNET_AY])));
} }
if (FRAMEPAR_MODIFIED(P_VIGNET_C)) { if (FRAMEPAR_MODIFIED(P_VIGNET_C)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_C(thispars->pars[P_VIGNET_C])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_C(thispars->pars[P_VIGNET_C]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_C(thispars->pars[P_VIGNET_C]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_C(thispars->pars[P_VIGNET_C])));
} }
if (FRAMEPAR_MODIFIED(P_VIGNET_BX)) { if (FRAMEPAR_MODIFIED(P_VIGNET_BX)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_BX(thispars->pars[P_VIGNET_BX])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_BX(thispars->pars[P_VIGNET_BX]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_BX(thispars->pars[P_VIGNET_BX]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_BX(thispars->pars[P_VIGNET_BX])));
} }
if (FRAMEPAR_MODIFIED(P_VIGNET_BY)) { if (FRAMEPAR_MODIFIED(P_VIGNET_BY)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_BY(thispars->pars[P_VIGNET_BY])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_BY(thispars->pars[P_VIGNET_BY]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_BY(thispars->pars[P_VIGNET_BY]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_BY(thispars->pars[P_VIGNET_BY])));
} }
if (FRAMEPAR_MODIFIED(P_SCALE_ZERO_IN)) { if (FRAMEPAR_MODIFIED(P_SCALE_ZERO_IN)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_FATZERO_IN(thispars->pars[P_SCALE_ZERO_IN])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_FATZERO_IN(thispars->pars[P_SCALE_ZERO_IN]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_FATZERO_IN(thispars->pars[P_SCALE_ZERO_IN]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_FATZERO_IN(thispars->pars[P_SCALE_ZERO_IN])));
} }
if (FRAMEPAR_MODIFIED(P_SCALE_ZERO_OUT)) { if (FRAMEPAR_MODIFIED(P_SCALE_ZERO_OUT)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_FATZERO_OUT(thispars->pars[P_SCALE_ZERO_OUT])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_FATZERO_OUT(thispars->pars[P_SCALE_ZERO_OUT]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_FATZERO_OUT(thispars->pars[P_SCALE_ZERO_OUT]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_FATZERO_OUT(thispars->pars[P_SCALE_ZERO_OUT])));
} }
if (FRAMEPAR_MODIFIED(P_VIGNET_SHL)) { if (FRAMEPAR_MODIFIED(P_VIGNET_SHL)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_POSTSCALE(thispars->pars[P_VIGNET_SHL])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_POSTSCALE(thispars->pars[P_VIGNET_SHL]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_POSTSCALE(thispars->pars[P_VIGNET_SHL]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_POSTSCALE(thispars->pars[P_VIGNET_SHL])));
} }
if (FRAMEPAR_MODIFIED(P_DGAINR)) { if (FRAMEPAR_MODIFIED(P_DGAINR)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_SCALES(0, thispars->pars[P_DGAINR])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_SCALES(0, thispars->pars[P_DGAINR]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_SCALES(0,thispars->pars[P_DGAINR]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_SCALES(0,thispars->pars[P_DGAINR])));
} }
if (FRAMEPAR_MODIFIED(P_DGAING)) { if (FRAMEPAR_MODIFIED(P_DGAING)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_SCALES(1, thispars->pars[P_DGAING])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_SCALES(1, thispars->pars[P_DGAING]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_SCALES(1,thispars->pars[P_DGAING]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_SCALES(1,thispars->pars[P_DGAING])));
} }
if (FRAMEPAR_MODIFIED(P_DGAINGB)) { if (FRAMEPAR_MODIFIED(P_DGAINGB)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_SCALES(2, thispars->pars[P_DGAINGB])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_SCALES(2, thispars->pars[P_DGAINGB]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_SCALES(2,thispars->pars[P_DGAINGB]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_SCALES(2,thispars->pars[P_DGAINGB])));
} }
if (FRAMEPAR_MODIFIED(P_DGAINB)) { if (FRAMEPAR_MODIFIED(P_DGAINB)) {
#ifdef NC353
X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_SCALES(3, thispars->pars[P_DGAINB])); X3X3_SEQ_SEND1(fpga_addr, X313_WA_LENSCORR, X313_LENS_SCALES(3, thispars->pars[P_DGAINB]));
#endif
MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_SCALES(3,thispars->pars[P_DGAINB]))); MDF3(printk(" X3X3_SEQ_SEND1(0x%x,0x%x, 0x%x)\n", fpga_addr, (int) X313_WA_LENSCORR, (int)X313_LENS_SCALES(3,thispars->pars[P_DGAINB])));
} }
return 0; return 0;
#endif
} }
src/drivers/elphel/quantization_tables.c
View file @ a40eed25
...@@ -993,14 +993,13 @@ static unsigned long coring_tables[] = { ...@@ -993,14 +993,13 @@ static unsigned long coring_tables[] = {
/** /**
* @brief Directly set one of the coring LUTs (currently 100: 0.0 to 9.9 with 0.1 step) * @brief Directly set one of the coring LUTs (currently 100: 0.0 to 9.9 with 0.1 step)
* to one of 16 FPGA tables (even - for Y, odd - for C) * to one of 16 FPGA tables (even - for Y, odd - for C)
* @param[in] coring_number 0..99 - function number * Table is rather small, so turn off IRQ for the whole duration */
* @param[in] fpga_tbl_num 0..15 - FPGA table number void set_coring_fpga(unsigned int coring_number, ///< [in] 0..99 - function number
* @param[in] chn compressor channel number int fpga_tbl_num, ///< [in] 0..15 - FPGA table number
* @return None unsigned int chn) ///< [in] compressor channel number
*/
void set_coring_fpga(unsigned int coring_number, int fpga_tbl_num, unsigned int chn)
{ {
int i; int i;
unsigned long flags;
x393_cmprs_table_addr_t table_addr; x393_cmprs_table_addr_t table_addr;
if (coring_number >= sizeof(coring_tables) / (4 * CORING_SIZE)) if (coring_number >= sizeof(coring_tables) / (4 * CORING_SIZE))
...@@ -1010,11 +1009,12 @@ void set_coring_fpga(unsigned int coring_number, int fpga_tbl_num, unsigned int ...@@ -1010,11 +1009,12 @@ void set_coring_fpga(unsigned int coring_number, int fpga_tbl_num, unsigned int
table_addr.type = TABLE_TYPE_CORING; table_addr.type = TABLE_TYPE_CORING;
table_addr.addr32 = fpga_tbl_num * CORING_SIZE; table_addr.addr32 = fpga_tbl_num * CORING_SIZE;
local_irq_save(flags);
x393_cmprs_tables_address(table_addr, chn); x393_cmprs_tables_address(table_addr, chn);
for (i = 0; i < CORING_SIZE; i++) { for (i = 0; i < CORING_SIZE; i++) {
x393_cmprs_tables_data(coring_tables[coring_number * CORING_SIZE], chn); x393_cmprs_tables_data(coring_tables[coring_number * CORING_SIZE + i], chn);
} }
local_irq_restore(flags);
print_hex_dump_bytes("", DUMP_PREFIX_NONE, &coring_tables[coring_number * CORING_SIZE], CORING_SIZE * 4); print_hex_dump_bytes("", DUMP_PREFIX_NONE, &coring_tables[coring_number * CORING_SIZE], CORING_SIZE * 4);
} }
......
src/drivers/elphel/x393_fpga_functions.c
View file @ a40eed25
...@@ -17,7 +17,4 @@ ...@@ -17,7 +17,4 @@
#include "x393.h" #include "x393.h"
#include "x393_fpga_functions.h" #include "x393_fpga_functions.h"
/*
*/
src/drivers/elphel/x393_fpga_functions.h
View file @ a40eed25
...@@ -16,3 +16,4 @@ ...@@ -16,3 +16,4 @@
*******************************************************************************/ *******************************************************************************/
//typedef enum {DIRECT,ABSOLUTE,RELATIVE} x393cmd_t; //typedef enum {DIRECT,ABSOLUTE,RELATIVE} x393cmd_t;
#include "x393.h" #include "x393.h"
void fpga_table_write_nice (int addr, int len, unsigned long * data);
src/drivers/elphel/x393_videomem.c
View file @ a40eed25
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h>
#include <asm/outercache.h> // TODO: Implement cache operations for the membridge !!!! #include <asm/outercache.h> // TODO: Implement cache operations for the membridge !!!!
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
#include "x393.h" #include "x393.h"
#include "x393_videomem.h" #include "x393_videomem.h"
#include <elphel/driver_numbers.h> #include <elphel/driver_numbers.h>
#include <elphel/c313a.h>
...@@ -45,7 +47,6 @@ static struct elphel_video_buf_t buffer_settings = { ///< some default settings, ...@@ -45,7 +47,6 @@ static struct elphel_video_buf_t buffer_settings = { ///< some default settings,
}; };
/* Programming mdemory channel access to video memory */
/** Setup memory controller for a sensor channel */ /** Setup memory controller for a sensor channel */
int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3) int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3)
int window_width, ///< 13-bit - in 8*16=128 bit bursts int window_width, ///< 13-bit - in 8*16=128 bit bursts
...@@ -62,18 +63,6 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3) ...@@ -62,18 +63,6 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3)
int frame_sa_inc = frame_full_width * (buffer_settings.frame_height[num_sensor] >>3); int frame_sa_inc = frame_full_width * (buffer_settings.frame_height[num_sensor] >>3);
int last_frame_num = buffer_settings.frames_in_buffer[num_sensor] - 1; int last_frame_num = buffer_settings.frames_in_buffer[num_sensor] - 1;
x393_mcntrl_mode_scan_t mcntrl_mode = {.enable = 1, // [ 0] (1) enable requests from this channel ( 0 will let current to finish, but not raise want/need)
.chn_nreset = 0, // [ 1] (1) 0: immediately reset all the internal circuitry
.write_mem = 1, // [ 2] (0) 0 - read from memory, 1 - write to memory
.extra_pages = 0, // [ 4: 3] (0) 2-bit number of extra pages that need to stay (not to be overwritten) in the buffer
.keep_open = 0, // [ 5] (0) (NA in linescan) for 8 or less rows - do not close page between accesses (not used in scanline mode)
.byte32 = 0, // [ 6] (1) (NA in linescan) 32-byte columns (0 - 16-byte), not used in scanline mode
.reset_frame = 0, // [ 8] (0) reset frame number
.single = 0, // [ 9] (0) run single frame
.repetitive = 1, // [ 10] (1) run repetitive frames
.disable_need = 0, // [ 11] (0) disable 'need' generation, only 'want' (compressor channels)
.skip_too_late = 1}; // [ 12] (0) Skip over missed blocks to preserve frame structure (increment pointers)
x393_mcntrl_window_frame_sa_t window_frame_sa = {.d32=0}; x393_mcntrl_window_frame_sa_t window_frame_sa = {.d32=0};
x393_mcntrl_window_frame_sa_inc_t window_frame_sa_inc = {.d32=0}; x393_mcntrl_window_frame_sa_inc_t window_frame_sa_inc = {.d32=0};
x393_mcntrl_window_last_frame_num_t window_last_frame_num = {.d32=0}; x393_mcntrl_window_last_frame_num_t window_last_frame_num = {.d32=0};
...@@ -101,7 +90,6 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3) ...@@ -101,7 +90,6 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3)
seqr_x393_sens_mcntrl_scanline_frame_full_width (frame16, window_full_width, num_sensor); // Set frame full(padded) width seqr_x393_sens_mcntrl_scanline_frame_full_width (frame16, window_full_width, num_sensor); // Set frame full(padded) width
seqr_x393_sens_mcntrl_scanline_window_wh (frame16, window_width_height, num_sensor); // Set frame window size seqr_x393_sens_mcntrl_scanline_window_wh (frame16, window_width_height, num_sensor); // Set frame window size
seqr_x393_sens_mcntrl_scanline_window_x0y0 (frame16, window_left_top, num_sensor); // Set frame position seqr_x393_sens_mcntrl_scanline_window_x0y0 (frame16, window_left_top, num_sensor); // Set frame position
seqr_x393_sens_mcntrl_scanline_mode (frame16, mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break; break;
case ABSOLUTE: case ABSOLUTE:
seqa_x393_sens_mcntrl_scanline_startaddr (frame16, window_frame_sa, num_sensor); // Set frame start address seqa_x393_sens_mcntrl_scanline_startaddr (frame16, window_frame_sa, num_sensor); // Set frame start address
...@@ -110,7 +98,6 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3) ...@@ -110,7 +98,6 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3)
seqa_x393_sens_mcntrl_scanline_frame_full_width (frame16, window_full_width, num_sensor); // Set frame full(padded) width seqa_x393_sens_mcntrl_scanline_frame_full_width (frame16, window_full_width, num_sensor); // Set frame full(padded) width
seqa_x393_sens_mcntrl_scanline_window_wh (frame16, window_width_height, num_sensor); // Set frame window size seqa_x393_sens_mcntrl_scanline_window_wh (frame16, window_width_height, num_sensor); // Set frame window size
seqa_x393_sens_mcntrl_scanline_window_x0y0 (frame16, window_left_top, num_sensor); // Set frame position seqa_x393_sens_mcntrl_scanline_window_x0y0 (frame16, window_left_top, num_sensor); // Set frame position
seqa_x393_sens_mcntrl_scanline_mode (frame16, mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break; break;
case DIRECT: case DIRECT:
x393_sens_mcntrl_scanline_startaddr (window_frame_sa, num_sensor); // Set frame start address x393_sens_mcntrl_scanline_startaddr (window_frame_sa, num_sensor); // Set frame start address
...@@ -119,6 +106,59 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3) ...@@ -119,6 +106,59 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3)
x393_sens_mcntrl_scanline_frame_full_width (window_full_width, num_sensor); // Set frame full(padded) width x393_sens_mcntrl_scanline_frame_full_width (window_full_width, num_sensor); // Set frame full(padded) width
x393_sens_mcntrl_scanline_window_wh (window_width_height, num_sensor); // Set frame window size x393_sens_mcntrl_scanline_window_wh (window_width_height, num_sensor); // Set frame window size
x393_sens_mcntrl_scanline_window_x0y0 (window_left_top, num_sensor); // Set frame position x393_sens_mcntrl_scanline_window_x0y0 (window_left_top, num_sensor); // Set frame position
break;
}
return 0;
}
/** Control (stop/single/run/reset) memory controller for a sensor channel */
int control_sensor_memory (int num_sensor, ///< sensor port number (0..3)
int cmd, ///< command: 0 stop, 1 - single, 2 - repetitive, 3 - reset
x393cmd_t x393cmd, ///< how to apply commands - directly or through channel sequencer
int frame16) ///< Frame number the command should be applied to (if not immediate mode)
///< @return 0 -OK
{
x393_mcntrl_mode_scan_t mcntrl_mode = {.enable = 1, // [ 0] (1) enable requests from this channel ( 0 will let current to finish, but not raise want/need)
.chn_nreset = 1, // [ 1] (1) 0: immediately reset all the internal circuitry
.write_mem = 1, // [ 2] (0) 0 - read from memory, 1 - write to memory
.extra_pages = 0, // [ 4: 3] (0) 2-bit number of extra pages that need to stay (not to be overwritten) in the buffer
.keep_open = 0, // [ 5] (0) (NA in linescan) for 8 or less rows - do not close page between accesses (not used in scanline mode)
.byte32 = 0, // [ 6] (1) (NA in linescan) 32-byte columns (0 - 16-byte), not used in scanline mode
.reset_frame = 0, // [ 8] (0) reset frame number
.single = 0, // [ 9] (0) run single frame
.repetitive = 1, // [ 10] (1) run repetitive frames
.disable_need = 0, // [ 11] (0) disable 'need' generation, only 'want' (compressor channels)
.skip_too_late = 1}; // [ 12] (0) Skip over missed blocks to preserve frame structure (increment pointers)
switch (cmd){
case SENSOR_RUN_STOP:
mcntrl_mode.enable = 0;
break;
case SENSOR_RUN_SINGLE:
mcntrl_mode.single = 1;
mcntrl_mode.repetitive = 0;
break;
case SENSOR_RUN_CONT:
break;
case SENSOR_RUN_RESET:
mcntrl_mode.chn_nreset = 0;
break;
default:
return -EINVAL;
}
switch (x393cmd){
case ASAP:
frame16 = 0;
// no break
case RELATIVE:
seqr_x393_sens_mcntrl_scanline_mode (frame16, mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break;
case ABSOLUTE:
seqa_x393_sens_mcntrl_scanline_mode (frame16, mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break;
case DIRECT:
x393_sens_mcntrl_scanline_mode (mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set) x393_sens_mcntrl_scanline_mode (mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break; break;
} }
...@@ -126,17 +166,16 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3) ...@@ -126,17 +166,16 @@ int setup_sensor_memory (int num_sensor, ///< sensor port number (0..3)
return 0; return 0;
} }
/** Setup memory controller for a compressor channel */ /** Setup memory controller for a compressor channel */
int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3) int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3)
int window_width, ///< 13-bit - in 8*16=128 bit bursts int window_width, ///< 13-bit - in 8*16=128 bit bursts
int window_height, ///< 16-bit window height (in scan lines) int window_height, ///< 16-bit window height (in scan lines)
int window_left, ///< 13-bit window left margin in 8-bursts (16 bytes) int window_left, ///< 13-bit window left margin in 8-bursts (16 bytes)
int window_top, ///< 16-bit window top margin (in scan lines int window_top, ///< 16-bit window top margin (in scan lines
int tile_width, ///< tile width in bjursts (16-pixels each) int tile_width, ///< tile width in bursts (16-pixels each)
int tile_height, ///< tile height: 18 for color JPEG, 16 for JP4 flavors // = 18 int tile_height, ///< tile height: 18 for color JPEG, 16 for JP4 flavors // = 18
int tile_vstep, ///< tile vertical step in pixel rows (JPEG18/jp4 = 16) // = 16 int tile_vstep, ///< tile vertical step in pixel rows (JPEG18/jp4 = 16) // = 16
int extra_pages, ///< extra pages needed (1) - number of previous pages to keep in a 4-page buffer
int disable_need, ///< disable "need" (yield to sensor channels - they can not wait)
x393cmd_t x393cmd, ///< how to apply commands - directly or through channel sequencer x393cmd_t x393cmd, ///< how to apply commands - directly or through channel sequencer
int frame16) ///< Frame number the command should be applied to (if not immediate mode) int frame16) ///< Frame number the command should be applied to (if not immediate mode)
///< @return 0 - OK ///< @return 0 - OK
...@@ -147,17 +186,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3 ...@@ -147,17 +186,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3
int last_frame_num = buffer_settings.frames_in_buffer[num_sensor] - 1; int last_frame_num = buffer_settings.frames_in_buffer[num_sensor] - 1;
int byte32 = 1; ///< 1 - 32-byte columns (currently used), 0 - 16 byte columns int byte32 = 1; ///< 1 - 32-byte columns (currently used), 0 - 16 byte columns
x393_mcntrl_mode_scan_t mcntrl_mode = {.enable = 1, // [ 0] (1) enable requests from this channel ( 0 will let current to finish, but not raise want/need)
.chn_nreset = 0, // [ 1] (1) 0: immediately reset all the internal circuitry
.write_mem = 0, // [ 2] (0) 0 - read from memory, 1 - write to memory
.extra_pages = 1, // [ 4: 3] (0) 2-bit number of extra pages that need to stay (not to be overwritten) in the buffer
.keep_open = 0, // [ 5] (0) (NA in linescan) for 8 or less rows - do not close page between accesses (not used in scanline mode)
.byte32 = 1, // [ 6] (1) (NA in linescan) 32-byte columns (0 - 16-byte), not used in scanline mode
.reset_frame = 0, // [ 8] (0) reset frame number
.single = 0, // [ 9] (0) run single frame
.repetitive = 1, // [ 10] (1) run repetitive frames
.disable_need = 1, // [ 11] (0) disable 'need' generation, only 'want' (compressor channels)
.skip_too_late = 1};// [ 12] (0) Skip over missed blocks to preserve frame structure (increment pointers)
x393_mcntrl_window_frame_sa_t window_frame_sa = {.d32=0}; x393_mcntrl_window_frame_sa_t window_frame_sa = {.d32=0};
x393_mcntrl_window_frame_sa_inc_t window_frame_sa_inc = {.d32=0}; x393_mcntrl_window_frame_sa_inc_t window_frame_sa_inc = {.d32=0};
x393_mcntrl_window_last_frame_num_t window_last_frame_num = {.d32=0}; x393_mcntrl_window_last_frame_num_t window_last_frame_num = {.d32=0};
...@@ -178,9 +206,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3 ...@@ -178,9 +206,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3
window_tile_whs.vert_step = tile_vstep; window_tile_whs.vert_step = tile_vstep;
window_tile_whs.tile_height = tile_height; window_tile_whs.tile_height = tile_height;
mcntrl_mode.disable_need = disable_need; // non-constant parameter
mcntrl_mode.extra_pages = extra_pages; // non-constant parameter
switch (x393cmd){ switch (x393cmd){
case ASAP: case ASAP:
frame16 = 0; frame16 = 0;
...@@ -193,7 +218,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3 ...@@ -193,7 +218,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3
seqr_x393_sens_mcntrl_tiled_window_wh (frame16, window_width_height, num_sensor); // Set frame window size seqr_x393_sens_mcntrl_tiled_window_wh (frame16, window_width_height, num_sensor); // Set frame window size
seqr_x393_sens_mcntrl_tiled_window_x0y0 (frame16, window_left_top, num_sensor); // Set frame position seqr_x393_sens_mcntrl_tiled_window_x0y0 (frame16, window_left_top, num_sensor); // Set frame position
seqr_x393_sens_mcntrl_tiled_tile_whs (frame16, window_tile_whs, num_sensor); // Set tile size/step (tiled mode only) seqr_x393_sens_mcntrl_tiled_tile_whs (frame16, window_tile_whs, num_sensor); // Set tile size/step (tiled mode only)
seqr_x393_sens_mcntrl_tiled_mode (frame16, mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break; break;
case ABSOLUTE: case ABSOLUTE:
seqa_x393_sens_mcntrl_tiled_startaddr (frame16, window_frame_sa, num_sensor); // Set frame start address seqa_x393_sens_mcntrl_tiled_startaddr (frame16, window_frame_sa, num_sensor); // Set frame start address
...@@ -203,7 +227,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3 ...@@ -203,7 +227,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3
seqa_x393_sens_mcntrl_tiled_window_wh (frame16, window_width_height, num_sensor); // Set frame window size seqa_x393_sens_mcntrl_tiled_window_wh (frame16, window_width_height, num_sensor); // Set frame window size
seqa_x393_sens_mcntrl_tiled_window_x0y0 (frame16, window_left_top, num_sensor); // Set frame position seqa_x393_sens_mcntrl_tiled_window_x0y0 (frame16, window_left_top, num_sensor); // Set frame position
seqa_x393_sens_mcntrl_tiled_tile_whs (frame16, window_tile_whs, num_sensor); // Set tile size/step (tiled mode only) seqa_x393_sens_mcntrl_tiled_tile_whs (frame16, window_tile_whs, num_sensor); // Set tile size/step (tiled mode only)
seqa_x393_sens_mcntrl_tiled_mode (frame16, mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break; break;
case DIRECT: case DIRECT:
x393_sens_mcntrl_tiled_startaddr (window_frame_sa, num_sensor); // Set frame start address x393_sens_mcntrl_tiled_startaddr (window_frame_sa, num_sensor); // Set frame start address
...@@ -213,7 +236,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3 ...@@ -213,7 +236,6 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3
x393_sens_mcntrl_tiled_window_wh (window_width_height, num_sensor); // Set frame window size x393_sens_mcntrl_tiled_window_wh (window_width_height, num_sensor); // Set frame window size
x393_sens_mcntrl_tiled_window_x0y0 (window_left_top, num_sensor); // Set frame position x393_sens_mcntrl_tiled_window_x0y0 (window_left_top, num_sensor); // Set frame position
x393_sens_mcntrl_tiled_tile_whs (window_tile_whs, num_sensor); // Set tile size/step (tiled mode only) x393_sens_mcntrl_tiled_tile_whs (window_tile_whs, num_sensor); // Set tile size/step (tiled mode only)
x393_sens_mcntrl_tiled_mode (mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break; break;
} }
...@@ -221,7 +243,71 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3 ...@@ -221,7 +243,71 @@ int setup_compressor_memory (int num_sensor, ///< sensor port number (0..3
} }
/** Control memory controller (stop/single/run/reset) for a compressor channel */
int control_compressor_memory (int num_sensor, ///< sensor port number (0..3)
int cmd, ///< command: 0 stop, 1 - single, 2 - repetitive, 3 - reset
int extra_pages, ///< extra pages needed (1) - number of previous pages to keep in a 4-page buffer
int disable_need, ///< disable "need" (yield to sensor channels - they can not wait)
x393cmd_t x393cmd, ///< how to apply commands - directly or through channel sequencer
int frame16) ///< Frame number the command should be applied to (if not immediate mode)
///< @return 0 - OK
{
x393_mcntrl_mode_scan_t mcntrl_mode = {.enable = 1, // [ 0] (1) enable requests from this channel ( 0 will let current to finish, but not raise want/need)
.chn_nreset = 1, // [ 1] (1) 0: immediately reset all the internal circuitry
.write_mem = 0, // [ 2] (0) 0 - read from memory, 1 - write to memory
.extra_pages = 1, // [ 4: 3] (0) 2-bit number of extra pages that need to stay (not to be overwritten) in the buffer
.keep_open = 0, // [ 5] (0) (NA in linescan) for 8 or less rows - do not close page between accesses (not used in scanline mode)
.byte32 = 1, // [ 6] (1) (NA in linescan) 32-byte columns (0 - 16-byte), not used in scanline mode
.reset_frame = 0, // [ 8] (0) reset frame number
.single = 0, // [ 9] (0) run single frame
.repetitive = 1, // [ 10] (1) run repetitive frames
.disable_need = 1, // [ 11] (0) disable 'need' generation, only 'want' (compressor channels)
.skip_too_late = 1};// [ 12] (0) Skip over missed blocks to preserve frame structure (increment pointers)
mcntrl_mode.disable_need = disable_need; // non-constant parameter
mcntrl_mode.extra_pages = extra_pages; // non-constant parameter
switch (cmd){
case SENSOR_RUN_STOP:
mcntrl_mode.enable = 0;
break;
case SENSOR_RUN_SINGLE:
mcntrl_mode.single = 1;
mcntrl_mode.repetitive = 0;
break;
case SENSOR_RUN_CONT:
break;
case SENSOR_RUN_RESET:
mcntrl_mode.chn_nreset = 0;
break;
default:
return -EINVAL;
}
switch (x393cmd){
case ASAP:
frame16 = 0;
// no break
case RELATIVE:
seqr_x393_sens_mcntrl_tiled_mode (frame16, mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break;
case ABSOLUTE:
seqa_x393_sens_mcntrl_tiled_mode (frame16, mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break;
case DIRECT:
x393_sens_mcntrl_tiled_mode (mcntrl_mode, num_sensor); // Set mode register (write last after other channel registers are set)
break;
}
return 0;
}
/** Return number of rames in videobuffer for the sesnor port minus 1 (0 means single frame buffer) */
int frames_in_buffer_minus_one(int num_sensor) ///< sensor port number (0..3)
///< @return number of frames in buffer - 1 (<0 for disabled channels ?)
{
return buffer_settings.frames_in_buffer[num_sensor] - 1;
}
......
src/drivers/elphel/x393_videomem.h
View file @ a40eed25
...@@ -25,7 +25,11 @@ struct elphel_video_buf_t ...@@ -25,7 +25,11 @@ struct elphel_video_buf_t
}; };
int setup_sensor_memory (int num_sensor, int window_width, int window_height, int window_left, int setup_sensor_memory (int num_sensor, int window_width, int window_height, int window_left,
int window_top, x393cmd_t x393cmd, int frame16); int window_top, x393cmd_t x393cmd, int frame16);
int control_sensor_memory (int num_sensor, int cmd, x393cmd_t x393cmd, int frame16);
int setup_compressor_memory (int num_sensor, int window_width, int window_height, int window_left, int setup_compressor_memory (int num_sensor, int window_width, int window_height, int window_left,
int window_top, int tile_width, int tile_height, int tile_vstep, int window_top, int tile_width, int tile_height, int tile_vstep,
int extra_pages, int disable_need, x393cmd_t x393cmd, int frame16); x393cmd_t x393cmd, int frame16);
int control_compressor_memory (int num_sensor, int cmd, int extra_pages, int disable_need, x393cmd_t x393cmd, int frame16);
int frames_in_buffer_minus_one(int num_sensor);
src/include/elphel/c313a.h
View file @ a40eed25
...@@ -269,12 +269,14 @@ ...@@ -269,12 +269,14 @@
#define P_SENSOR_RUN 4 ///< Sensor acquisition mode 0 - stop, 1 - single, 2 - run #define P_SENSOR_RUN 4 ///< Sensor acquisition mode 0 - stop, 1 - single, 2 - run
#define SENSOR_RUN_STOP 0 ///< Sensor acquisition mode: STOP #define SENSOR_RUN_STOP 0 ///< Sensor acquisition mode: STOP
#define SENSOR_RUN_SINGLE 1 ///< Sensor acquisition mode: SINGLE FRAME #define SENSOR_RUN_SINGLE 1 ///< Sensor acquisition mode: SINGLE FRAME
#define SENSOR_RUN_CONT 2 ///< Sensor acquisition mode: RUN continjuously #define SENSOR_RUN_CONT 2 ///< Sensor acquisition mode: RUN continuously
#define SENSOR_RUN_RESET 3 ///< Sensor acquisition mode: RESET
#define P_COMPRESSOR_RUN 5 ///< Compressor mode 0 - stop, 1 - single, 2 - run #define P_COMPRESSOR_RUN 5 ///< Compressor mode 0 - stop, 1 - single, 2 - run
#define COMPRESSOR_RUN_STOP 0 ///< Compressor mode: STOP #define COMPRESSOR_RUN_STOP 0 ///< Compressor mode: STOP
#define COMPRESSOR_RUN_SINGLE 1 ///< Compressor mode: SINGLE #define COMPRESSOR_RUN_SINGLE 1 ///< Compressor mode: SINGLE
#define COMPRESSOR_RUN_CONT 2 ///< Compressor mode: RUN #define COMPRESSOR_RUN_CONT 2 ///< Compressor mode: RUN
#define COMPRESSOR_RUN_RESET 2 ///< Compressor mode: RESET
#define P_BAYER 6 ///< filter number at (0,0) 0-R, 1-G(R), 2-G(B), 3 - B. Write enabled at first, move to WindowSize later #define P_BAYER 6 ///< filter number at (0,0) 0-R, 1-G(R), 2-G(B), 3 - B. Write enabled at first, move to WindowSize later
#define P_TRIGGERED 7 ///< when trigger occured - 4 LSBs - pixel in DMA word, higher bits - number of DMA word OBSOLETE #define P_TRIGGERED 7 ///< when trigger occured - 4 LSBs - pixel in DMA word, higher bits - number of DMA word OBSOLETE
...@@ -343,6 +345,8 @@ ...@@ -343,6 +345,8 @@
#define P_COLOR_SATURATION_RED 55 ///< 100*realtive saturation red #define P_COLOR_SATURATION_RED 55 ///< 100*realtive saturation red
/// Vignetting control, AX*X^2+BX*X+AY*Y^2+BY*Y+C *** 393: These will need to be split for each subchannel /// Vignetting control, AX*X^2+BX*X+AY*Y^2+BY*Y+C *** 393: These will need to be split for each subchannel
#define VIGNET_SUBCHN_OFFSET 0 ///< for individual per-subchannel vignetting parameters (add num_sub_chn * VIGNET_SUBCHN_OFFSET)
///< set for NC393 when define, meanwhile will use the same for all sub-channels
#define P_VIGNET_AX 56 ///< AX in Vignetting control, AX*X^2+BX*X+AY*Y^2+BY*Y+C. 393: These will need to be split for each subchannel #define P_VIGNET_AX 56 ///< AX in Vignetting control, AX*X^2+BX*X+AY*Y^2+BY*Y+C. 393: These will need to be split for each subchannel
#define P_VIGNET_AY 57 ///< AY in Vignetting control, AX*X^2+BX*X+AY*Y^2+BY*Y+C. 393: These will need to be split for each subchannel #define P_VIGNET_AY 57 ///< AY in Vignetting control, AX*X^2+BX*X+AY*Y^2+BY*Y+C. 393: These will need to be split for each subchannel
#define P_VIGNET_BX 58 ///< BX in Vignetting control, AX*X^2+BX*X+AY*Y^2+BY*Y+C. 393: These will need to be split for each subchannel #define P_VIGNET_BX 58 ///< BX in Vignetting control, AX*X^2+BX*X+AY*Y^2+BY*Y+C. 393: These will need to be split for each subchannel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment