Commit bfdfc65a authored by Andrey Filippov's avatar Andrey Filippov
Browse files

fixed several warnings, removed unused files

parent 60f29555

src/drivers/elphel/circbuf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ 
//#include "circbuf.h"

//#include "circbuf.h"

#include "exif.h"

#include "exif.h"

#include "x393_macro.h"

#include "x393_macro.h"

#include "x393_helpers.h"

//#include "x393_helpers.h"





/** @brief Driver name displayed in system logs */

/** @brief Driver name displayed in system logs */

//#define CIRCBUF_DRIVER_NAME "circbuf driver"

//#define CIRCBUF_DRIVER_NAME "circbuf driver"

src/drivers/elphel/jpeghead.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -708,7 +708,7 @@ void jpeg_htable_fpga_pgm(unsigned int chn) 
                           TABLE_TYPE_HUFFMAN,

                           TABLE_TYPE_HUFFMAN,

                           0,

                           0,

                           len,

                           len,

                           (u32*) huff_tables->fpga_huffman_table );

                           huff_tables->fpga_huffman_table );









	jpeghead_priv[chn].fpga_programmed = 1;

	jpeghead_priv[chn].fpga_programmed = 1;

src/drivers/elphel/quantization_tables.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -358,7 +358,7 @@ int set_qtable_fpga(int quality2, ///< single byte (standard) or a pair of 
	int i,transpose,fpga_index,fpga_index_prev,q_type,quality,temp,tstart;

	int i,transpose,fpga_index,fpga_index_prev,q_type,quality,temp,tstart;

	unsigned short qtable_fpga[QTABLE_SIZE * 2];

	unsigned short qtable_fpga[QTABLE_SIZE * 2];

	unsigned short *tab;

	unsigned short *tab;

	unsigned long *qtable_fpga_dw = (unsigned long *)qtable_fpga;

	u32 *qtable_fpga_dw = (u32 *) qtable_fpga;

#if 0

#if 0

	x393_cmprs_table_addr_t table_addr;

	x393_cmprs_table_addr_t table_addr;

#endif

#endif
@@ -488,7 +488,7 @@ int set_qtable_fpga(int quality2, ///< single byte (standard) or a pair of 
 * min = 0, max = 10, step = 0.1;

 * min = 0, max = 10, step = 0.1;

 * see coring_filter_setup.php to generate this table (with parameter '?C').

 * see coring_filter_setup.php to generate this table (with parameter '?C').

 */

 */

static unsigned long coring_tables[] = {

static u32 coring_tables[] = {

		// filter=0

		// filter=0

		0x00000000, 0x11111111, 0x11111111, 0x22222222, 0x22222222, 0x33333333, 0x33333333, 0x44444444,

		0x00000000, 0x11111111, 0x11111111, 0x22222222, 0x22222222, 0x33333333, 0x33333333, 0x44444444,

		0x44444444, 0x55555555, 0x55555555, 0x66666666, 0x66666666, 0x77777777, 0x77777777, 0x88888888,

		0x44444444, 0x55555555, 0x55555555, 0x66666666, 0x66666666, 0x77777777, 0x77777777, 0x88888888,
@@ -1003,7 +1003,7 @@ void set_coring_fpga(unsigned int coring_number, ///< [in] 0..99 - function nu 
                     int fpga_tbl_num,           ///< [in]   0..15 - FPGA table number

                     int fpga_tbl_num,           ///< [in]   0..15 - FPGA table number

                     unsigned int chn)           ///< [in]   compressor channel number

                     unsigned int chn)           ///< [in]   compressor channel number

{

{

	int i;

//	int i;

//    unsigned long flags;

//    unsigned long flags;

//	x393_cmprs_table_addr_t table_addr;

//	x393_cmprs_table_addr_t table_addr;

src/drivers/elphel/sensor_common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include "quantization_tables.h"

#include "quantization_tables.h"

#include "x393_macro.h"

#include "x393_macro.h"

#include "x393.h"

#include "x393.h"

#include "x393_helpers.h"

//#include "x393_helpers.h"





#include <asm/delay.h> // just for usleep1000()

#include <asm/delay.h> // just for usleep1000()

src/drivers/elphel/x393_fpga_functions.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ int write_compressor_table(int chn, // compressor channel (0..3) 
                                    x393cmprs_tables_t type,     // table type (

                                    x393cmprs_tables_t type,     // table type (

                                    int index,

                                    int index,

                                    int num_items,

                                    int num_items,

                                    unsigned long * data )

                                    u32 * data )

{

{

    x393_cmprs_table_addr_t table_addr;

    x393_cmprs_table_addr_t table_addr;

    int i;

    int i;