Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
接近 2 年 前同步成功

通知 170
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 d929fb4e 编写于 作者: M Mauro Carvalho Chehab
浏览文件
操作

media: atomisp: stop producing hundreds of kernel-doc warnings 

A recent change on Kernel 4.15-rc1 causes all tags with
/** to be handled as kernel-doc markups. Well, several
atomisp modules, it doesn't use kernel-doc, but some other
documentation markup (doxygen?).

So, suppress all those warns by:
	- replacing /**< by /**.
	- replacing /** by /*.

The core changes were done with:

	for i in $(find drivers/staging/media/atomisp -type f); do sed 's,/\*\* ,/\*, ' -i $i; done
	for i in $(find drivers/staging/media/atomisp -type f); do sed 's,/\*\*<,/\**,' -i $i; done
	for i in drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c; do perl -ne 's,\/\*\*$,/*,g; print $_'  $i > a && mv a $i; done;

A few manual adjustments were made, where needed.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>
Acked-by: NSakari Ailus <sakari.ailus@linux.intel.com>
上级 04226916
展开全部 隐藏空白更改
内联 并排
Showing with 1746 addition and 1746 deletion
drivers/staging/media/atomisp/include/linux/atomisp.h
浏览文件 @ d929fb4e
......@@ -208,14 +208,14 @@ struct atomisp_dis_vector {
};
/** DVS 2.0 Coefficient types. This structure contains 4 pointers to
/* DVS 2.0 Coefficient types. This structure contains 4 pointers to
* arrays that contain the coeffients for each type.
*/
struct atomisp_dvs2_coef_types {
short __user *odd_real; /**< real part of the odd coefficients*/
short __user *odd_imag; /**< imaginary part of the odd coefficients*/
short __user *even_real;/**< real part of the even coefficients*/
short __user *even_imag;/**< imaginary part of the even coefficients*/
short __user *odd_real; /** real part of the odd coefficients*/
short __user *odd_imag; /** imaginary part of the odd coefficients*/
short __user *even_real;/** real part of the even coefficients*/
short __user *even_imag;/** imaginary part of the even coefficients*/
};
/*
......@@ -223,10 +223,10 @@ struct atomisp_dvs2_coef_types {
* arrays that contain the statistics for each type.
*/
struct atomisp_dvs2_stat_types {
int __user *odd_real; /**< real part of the odd statistics*/
int __user *odd_imag; /**< imaginary part of the odd statistics*/
int __user *even_real;/**< real part of the even statistics*/
int __user *even_imag;/**< imaginary part of the even statistics*/
int __user *odd_real; /** real part of the odd statistics*/
int __user *odd_imag; /** imaginary part of the odd statistics*/
int __user *even_real;/** real part of the even statistics*/
int __user *even_imag;/** imaginary part of the even statistics*/
};
struct atomisp_dis_coefficients {
......@@ -390,16 +390,16 @@ struct atomisp_metadata_config {
* Generic resolution structure.
*/
struct atomisp_resolution {
uint32_t width; /**< Width */
uint32_t height; /**< Height */
uint32_t width; /** Width */
uint32_t height; /** Height */
};
/*
* This specifies the coordinates (x,y)
*/
struct atomisp_zoom_point {
int32_t x; /**< x coordinate */
int32_t y; /**< y coordinate */
int32_t x; /** x coordinate */
int32_t y; /** y coordinate */
};
/*
......@@ -411,9 +411,9 @@ struct atomisp_zoom_region {
};
struct atomisp_dz_config {
uint32_t dx; /**< Horizontal zoom factor */
uint32_t dy; /**< Vertical zoom factor */
struct atomisp_zoom_region zoom_region; /**< region for zoom */
uint32_t dx; /** Horizontal zoom factor */
uint32_t dy; /** Vertical zoom factor */
struct atomisp_zoom_region zoom_region; /** region for zoom */
};
struct atomisp_parm {
......@@ -758,7 +758,7 @@ enum atomisp_acc_arg_type {
ATOMISP_ACC_ARG_FRAME /* Frame argument */
};
/** ISP memories, isp2400 */
/* ISP memories, isp2400 */
enum atomisp_acc_memory {
ATOMISP_ACC_MEMORY_PMEM0 = 0,
ATOMISP_ACC_MEMORY_DMEM0,
......
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
浏览文件 @ d929fb4e
......@@ -5187,7 +5187,7 @@ int get_frame_info_nop(struct atomisp_sub_device *asd,
return 0;
}
/**
/*
* Resets CSS parameters that depend on input resolution.
*
* Update params like CSS RAW binning, 2ppc mode and pp_input
......
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c
浏览文件 @ d929fb4e
......@@ -4051,7 +4051,7 @@ int atomisp_css_get_formats_config(struct atomisp_sub_device *asd,
int atomisp_css_get_zoom_factor(struct atomisp_sub_device *asd,
unsigned int *zoom)
{
struct ia_css_dz_config dz_config; /**< Digital Zoom */
struct ia_css_dz_config dz_config; /** Digital Zoom */
struct ia_css_isp_config isp_config;
struct atomisp_device *isp = asd->isp;
......
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.h
浏览文件 @ d929fb4e
......@@ -28,17 +28,17 @@ struct atomisp_histogram32 {
};
struct atomisp_dvs2_stat_types32 {
compat_uptr_t odd_real; /**< real part of the odd statistics*/
compat_uptr_t odd_imag; /**< imaginary part of the odd statistics*/
compat_uptr_t even_real;/**< real part of the even statistics*/
compat_uptr_t even_imag;/**< imaginary part of the even statistics*/
compat_uptr_t odd_real; /** real part of the odd statistics*/
compat_uptr_t odd_imag; /** imaginary part of the odd statistics*/
compat_uptr_t even_real;/** real part of the even statistics*/
compat_uptr_t even_imag;/** imaginary part of the even statistics*/
};
struct atomisp_dvs2_coef_types32 {
compat_uptr_t odd_real; /**< real part of the odd coefficients*/
compat_uptr_t odd_imag; /**< imaginary part of the odd coefficients*/
compat_uptr_t even_real;/**< real part of the even coefficients*/
compat_uptr_t even_imag;/**< imaginary part of the even coefficients*/
compat_uptr_t odd_real; /** real part of the odd coefficients*/
compat_uptr_t odd_imag; /** imaginary part of the odd coefficients*/
compat_uptr_t even_real;/** real part of the even coefficients*/
compat_uptr_t even_imag;/** imaginary part of the even coefficients*/
};
struct atomisp_dvs2_statistics32 {
......
drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h
浏览文件 @ d929fb4e
......@@ -223,7 +223,7 @@ struct atomisp_subdev_params {
bool dis_proj_data_valid;
struct ia_css_dz_config dz_config; /**< Digital Zoom */
struct ia_css_dz_config dz_config; /** Digital Zoom */
struct ia_css_capture_config capture_config;
struct atomisp_css_isp_config config;
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/src/circbuf.c
浏览文件 @ d929fb4e
......@@ -21,7 +21,7 @@
* Forward declarations.
*
**********************************************************************/
/**
/*
* @brief Read the oldest element from the circular buffer.
* Read the oldest element WITHOUT checking whehter the
* circular buffer is empty or not. The oldest element is
......@@ -34,7 +34,7 @@
static inline ia_css_circbuf_elem_t
ia_css_circbuf_read(ia_css_circbuf_t *cb);
/**
/*
* @brief Shift a chunk of elements in the circular buffer.
* A chunk of elements (i.e. the ones from the "start" position
* to the "chunk_src" position) are shifted in the circular buffer,
......@@ -48,7 +48,7 @@ static inline void ia_css_circbuf_shift_chunk(ia_css_circbuf_t *cb,
uint32_t chunk_src,
uint32_t chunk_dest);
/**
/*
* @brief Get the "val" field in the element.
*
* @param elem The pointer to the element.
......@@ -63,7 +63,7 @@ ia_css_circbuf_elem_get_val(ia_css_circbuf_elem_t *elem);
* Non-inline functions.
*
**********************************************************************/
/**
/*
* @brief Create the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
......@@ -88,7 +88,7 @@ ia_css_circbuf_create(ia_css_circbuf_t *cb,
cb->elems = elems;
}
/**
/*
* @brief Destroy the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
......@@ -99,7 +99,7 @@ void ia_css_circbuf_destroy(ia_css_circbuf_t *cb)
cb->elems = NULL;
}
/**
/*
* @brief Pop a value out of the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
......@@ -116,7 +116,7 @@ uint32_t ia_css_circbuf_pop(ia_css_circbuf_t *cb)
return ret;
}
/**
/*
* @brief Extract a value out of the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
......@@ -166,7 +166,7 @@ uint32_t ia_css_circbuf_extract(ia_css_circbuf_t *cb, int offset)
return val;
}
/**
/*
* @brief Peek an element from the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
......@@ -180,7 +180,7 @@ uint32_t ia_css_circbuf_peek(ia_css_circbuf_t *cb, int offset)
return cb->elems[pos].val;
}
/**
/*
* @brief Get the value of an element from the circular buffer.
* Refer to "ia_css_circbuf.h" for details.
*/
......@@ -194,7 +194,7 @@ uint32_t ia_css_circbuf_peek_from_start(ia_css_circbuf_t *cb, int offset)
return cb->elems[pos].val;
}
/** @brief increase size of a circular buffer.
/* @brief increase size of a circular buffer.
* Use 'CAUTION' before using this function. This was added to
* support / fix issue with increasing size for tagger only
* Please refer to "ia_css_circbuf.h" for details.
......@@ -252,7 +252,7 @@ bool ia_css_circbuf_increase_size(
* Inline functions.
*
****************************************************************/
/**
/*
* @brief Get the "val" field in the element.
* Refer to "Forward declarations" for details.
*/
......@@ -262,7 +262,7 @@ ia_css_circbuf_elem_get_val(ia_css_circbuf_elem_t *elem)
return elem->val;
}
/**
/*
* @brief Read the oldest element from the circular buffer.
* Refer to "Forward declarations" for details.
*/
......@@ -282,7 +282,7 @@ ia_css_circbuf_read(ia_css_circbuf_t *cb)
return elem;
}
/**
/*
* @brief Shift a chunk of elements in the circular buffer.
* Refer to "Forward declarations" for details.
*/
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_binarydesc.h
浏览文件 @ d929fb4e
......@@ -19,7 +19,7 @@
#include <ia_css_frame_public.h> /* ia_css_frame_info */
#include <ia_css_binary.h> /* ia_css_binary_descr */
/** @brief Get a binary descriptor for copy.
/* @brief Get a binary descriptor for copy.
*
* @param[in] pipe
* @param[out] copy_desc
......@@ -36,7 +36,7 @@ extern void ia_css_pipe_get_copy_binarydesc(
struct ia_css_frame_info *out_info,
struct ia_css_frame_info *vf_info);
/** @brief Get a binary descriptor for vfpp.
/* @brief Get a binary descriptor for vfpp.
*
* @param[in] pipe
* @param[out] vfpp_descr
......@@ -51,7 +51,7 @@ extern void ia_css_pipe_get_vfpp_binarydesc(
struct ia_css_frame_info *in_info,
struct ia_css_frame_info *out_info);
/** @brief Get numerator and denominator of bayer downscaling factor.
/* @brief Get numerator and denominator of bayer downscaling factor.
*
* @param[in] bds_factor: The bayer downscaling factor.
* (= The bds_factor member in the sh_css_bds_factor structure.)
......@@ -67,7 +67,7 @@ extern enum ia_css_err sh_css_bds_factor_get_numerator_denominator(
unsigned int *bds_factor_numerator,
unsigned int *bds_factor_denominator);
/** @brief Get a binary descriptor for preview stage.
/* @brief Get a binary descriptor for preview stage.
*
* @param[in] pipe
* @param[out] preview_descr
......@@ -86,7 +86,7 @@ extern enum ia_css_err ia_css_pipe_get_preview_binarydesc(
struct ia_css_frame_info *out_info,
struct ia_css_frame_info *vf_info);
/** @brief Get a binary descriptor for video stage.
/* @brief Get a binary descriptor for video stage.
*
* @param[in/out] pipe
* @param[out] video_descr
......@@ -105,7 +105,7 @@ extern enum ia_css_err ia_css_pipe_get_video_binarydesc(
struct ia_css_frame_info *vf_info,
int stream_config_left_padding);
/** @brief Get a binary descriptor for yuv scaler stage.
/* @brief Get a binary descriptor for yuv scaler stage.
*
* @param[in/out] pipe
* @param[out] yuv_scaler_descr
......@@ -124,7 +124,7 @@ void ia_css_pipe_get_yuvscaler_binarydesc(
struct ia_css_frame_info *internal_out_info,
struct ia_css_frame_info *vf_info);
/** @brief Get a binary descriptor for capture pp stage.
/* @brief Get a binary descriptor for capture pp stage.
*
* @param[in/out] pipe
* @param[out] capture_pp_descr
......@@ -140,7 +140,7 @@ extern void ia_css_pipe_get_capturepp_binarydesc(
struct ia_css_frame_info *out_info,
struct ia_css_frame_info *vf_info);
/** @brief Get a binary descriptor for primary capture.
/* @brief Get a binary descriptor for primary capture.
*
* @param[in] pipe
* @param[out] prim_descr
......@@ -158,7 +158,7 @@ extern void ia_css_pipe_get_primary_binarydesc(
struct ia_css_frame_info *vf_info,
unsigned int stage_idx);
/** @brief Get a binary descriptor for pre gdc stage.
/* @brief Get a binary descriptor for pre gdc stage.
*
* @param[in] pipe
* @param[out] pre_gdc_descr
......@@ -173,7 +173,7 @@ extern void ia_css_pipe_get_pre_gdc_binarydesc(
struct ia_css_frame_info *in_info,
struct ia_css_frame_info *out_info);
/** @brief Get a binary descriptor for gdc stage.
/* @brief Get a binary descriptor for gdc stage.
*
* @param[in] pipe
* @param[out] gdc_descr
......@@ -188,7 +188,7 @@ extern void ia_css_pipe_get_gdc_binarydesc(
struct ia_css_frame_info *in_info,
struct ia_css_frame_info *out_info);
/** @brief Get a binary descriptor for post gdc.
/* @brief Get a binary descriptor for post gdc.
*
* @param[in] pipe
* @param[out] post_gdc_descr
......@@ -205,7 +205,7 @@ extern void ia_css_pipe_get_post_gdc_binarydesc(
struct ia_css_frame_info *out_info,
struct ia_css_frame_info *vf_info);
/** @brief Get a binary descriptor for de.
/* @brief Get a binary descriptor for de.
*
* @param[in] pipe
* @param[out] pre_de_descr
......@@ -220,7 +220,7 @@ extern void ia_css_pipe_get_pre_de_binarydesc(
struct ia_css_frame_info *in_info,
struct ia_css_frame_info *out_info);
/** @brief Get a binary descriptor for pre anr stage.
/* @brief Get a binary descriptor for pre anr stage.
*
* @param[in] pipe
* @param[out] pre_anr_descr
......@@ -235,7 +235,7 @@ extern void ia_css_pipe_get_pre_anr_binarydesc(
struct ia_css_frame_info *in_info,
struct ia_css_frame_info *out_info);
/** @brief Get a binary descriptor for ANR stage.
/* @brief Get a binary descriptor for ANR stage.
*
* @param[in] pipe
* @param[out] anr_descr
......@@ -250,7 +250,7 @@ extern void ia_css_pipe_get_anr_binarydesc(
struct ia_css_frame_info *in_info,
struct ia_css_frame_info *out_info);
/** @brief Get a binary descriptor for post anr stage.
/* @brief Get a binary descriptor for post anr stage.
*
* @param[in] pipe
* @param[out] post_anr_descr
......@@ -267,7 +267,7 @@ extern void ia_css_pipe_get_post_anr_binarydesc(
struct ia_css_frame_info *out_info,
struct ia_css_frame_info *vf_info);
/** @brief Get a binary descriptor for ldc stage.
/* @brief Get a binary descriptor for ldc stage.
*
* @param[in/out] pipe
* @param[out] capture_pp_descr
......@@ -282,7 +282,7 @@ extern void ia_css_pipe_get_ldc_binarydesc(
struct ia_css_frame_info *in_info,
struct ia_css_frame_info *out_info);
/** @brief Calculates the required BDS factor
/* @brief Calculates the required BDS factor
*
* @param[in] input_res
* @param[in] output_res
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_util.h
浏览文件 @ d929fb4e
......@@ -18,7 +18,7 @@
#include <ia_css_types.h>
#include <ia_css_frame_public.h>
/** @brief Get Input format bits per pixel based on stream configuration of this
/* @brief Get Input format bits per pixel based on stream configuration of this
* pipe.
*
* @param[in] pipe
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h
浏览文件 @ d929fb4e
......@@ -22,7 +22,7 @@
#include <ia_css_stream_public.h>
#include <ia_css_stream_format.h>
/** @brief convert "errno" error code to "ia_css_err" error code
/* @brief convert "errno" error code to "ia_css_err" error code
*
* @param[in] "errno" error code
* @return "ia_css_err" error code
......@@ -31,7 +31,7 @@
enum ia_css_err ia_css_convert_errno(
int in_err);
/** @brief check vf frame info.
/* @brief check vf frame info.
*
* @param[in] info
* @return IA_CSS_SUCCESS or error code upon error.
......@@ -40,7 +40,7 @@ enum ia_css_err ia_css_convert_errno(
extern enum ia_css_err ia_css_util_check_vf_info(
const struct ia_css_frame_info * const info);
/** @brief check input configuration.
/* @brief check input configuration.
*
* @param[in] stream_config
* @param[in] must_be_raw
......@@ -52,7 +52,7 @@ extern enum ia_css_err ia_css_util_check_input(
bool must_be_raw,
bool must_be_yuv);
/** @brief check vf and out frame info.
/* @brief check vf and out frame info.
*
* @param[in] out_info
* @param[in] vf_info
......@@ -63,7 +63,7 @@ extern enum ia_css_err ia_css_util_check_vf_out_info(
const struct ia_css_frame_info * const out_info,
const struct ia_css_frame_info * const vf_info);
/** @brief check width and height
/* @brief check width and height
*
* @param[in] width
* @param[in] height
......@@ -75,7 +75,7 @@ extern enum ia_css_err ia_css_util_check_res(
unsigned int height);
#ifdef ISP2401
/** @brief compare resolutions (less or equal)
/* @brief compare resolutions (less or equal)
*
* @param[in] a resolution
* @param[in] b resolution
......@@ -108,7 +108,7 @@ extern bool ia_css_util_resolution_is_even(
const struct ia_css_resolution resolution);
#endif
/** @brief check width and height
/* @brief check width and height
*
* @param[in] stream_format
* @param[in] two_ppc
......@@ -119,7 +119,7 @@ extern unsigned int ia_css_util_input_format_bpp(
enum ia_css_stream_format stream_format,
bool two_ppc);
/** @brief check if input format it raw
/* @brief check if input format it raw
*
* @param[in] stream_format
* @return true if the input format is raw or false otherwise
......@@ -128,7 +128,7 @@ extern unsigned int ia_css_util_input_format_bpp(
extern bool ia_css_util_is_input_format_raw(
enum ia_css_stream_format stream_format);
/** @brief check if input format it yuv
/* @brief check if input format it yuv
*
* @param[in] stream_format
* @return true if the input format is yuv or false otherwise
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_private.h
浏览文件 @ d929fb4e
......@@ -277,6 +277,6 @@ static inline void csi_rx_be_ctrl_reg_store(
ia_css_device_store_uint32(CSI_RX_BE_CTRL_BASE[ID] + reg*sizeof(hrt_data), value);
}
/** end of DLI */
/* end of DLI */
#endif /* __CSI_RX_PRIVATE_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_private.h
浏览文件 @ d929fb4e
......@@ -192,7 +192,7 @@ STORAGE_CLASS_IBUF_CTRL_C void ibuf_ctrl_dump_state(
ia_css_print("IBUF controller ID %d Process ID %d isp_sync_state 0x%x\n", ID, i, state->proc_state[i].isp_sync_state);
}
}
/** end of NCI */
/* end of NCI */
/*****************************************************
*
......@@ -227,7 +227,7 @@ STORAGE_CLASS_IBUF_CTRL_C void ibuf_ctrl_reg_store(
ia_css_device_store_uint32(IBUF_CTRL_BASE[ID] + reg*sizeof(hrt_data), value);
}
/** end of DLI */
/* end of DLI */
#endif /* __IBUF_CTRL_PRIVATE_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq.c
浏览文件 @ d929fb4e
......@@ -26,7 +26,7 @@
#include "isys_irq_private.h"
#endif
/** Public interface */
/* Public interface */
STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_status_enable(
const isys_irq_ID_t isys_irqc_id)
{
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_private.h
浏览文件 @ d929fb4e
......@@ -59,7 +59,7 @@ STORAGE_CLASS_ISYS2401_IRQ_C void isys_irqc_state_dump(
state->status, state->edge, state->mask, state->enable, state->level_no);
}
/** end of NCI */
/* end of NCI */
/* -------------------------------------------------------+
| Device level interface (DLI) |
......@@ -101,7 +101,7 @@ STORAGE_CLASS_ISYS2401_IRQ_C hrt_data isys_irqc_reg_load(
return value;
}
/** end of DLI */
/* end of DLI */
#endif /* defined(USE_INPUT_SYSTEM_VERSION_2401) */
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_private.h
浏览文件 @ d929fb4e
......@@ -122,7 +122,7 @@ STORAGE_CLASS_STREAM2MMIO_C void stream2mmio_dump_state(
stream2mmio_print_sid_state(&(state->sid_state[i]));
}
}
/** end of NCI */
/* end of NCI */
/*****************************************************
*
......@@ -163,6 +163,6 @@ STORAGE_CLASS_STREAM2MMIO_C void stream2mmio_reg_store(
ia_css_device_store_uint32(STREAM2MMIO_CTRL_BASE[ID] +
reg * sizeof(hrt_data), value);
}
/** end of DLI */
/* end of DLI */
#endif /* __ISYS_STREAM2MMIO_PRIVATE_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_private.h
浏览文件 @ d929fb4e
......@@ -160,5 +160,5 @@ STORAGE_CLASS_PIXELGEN_C void pixelgen_ctrl_reg_store(
ia_css_device_store_uint32(PIXELGEN_CTRL_BASE[ID] + reg*sizeof(hrt_data), value);
}
/** end of DLI */
/* end of DLI */
#endif /* __PIXELGEN_PRIVATE_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_dma_global.h
浏览文件 @ d929fb4e
......@@ -46,7 +46,7 @@ struct isys2401_dma_port_cfg_s {
uint32_t cropping;
uint32_t width;
};
/** end of DMA Port */
/* end of DMA Port */
/************************************************
*
......@@ -79,7 +79,7 @@ struct isys2401_dma_cfg_s {
isys2401_dma_extension extension;
uint32_t height;
};
/** end of DMA Device */
/* end of DMA Device */
/* isys2401_dma_channel limits per DMA ID */
extern const isys2401_dma_channel N_ISYS2401_DMA_CHANNEL_PROCS[N_ISYS2401_DMA_ID];
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/pixelgen_global.h
浏览文件 @ d929fb4e
......@@ -86,6 +86,6 @@ struct pixelgen_prbs_cfg_s {
sync_generator_cfg_t sync_gen_cfg;
};
/** end of Pixel-generator: TPG. ("pixelgen_global.h") */
/* end of Pixel-generator: TPG. ("pixelgen_global.h") */
#endif /* __PIXELGEN_GLOBAL_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/system_global.h
浏览文件 @ d929fb4e
......@@ -331,7 +331,7 @@ typedef enum {
IBUF_CTRL2_ID, /* map ISYS2401_IBUF_CNTRL_C */
N_IBUF_CTRL_ID
} ibuf_ctrl_ID_t;
/** end of Input-buffer Controller */
/* end of Input-buffer Controller */
/*
* Stream2MMIO.
......@@ -364,7 +364,7 @@ typedef enum {
STREAM2MMIO_SID7_ID,
N_STREAM2MMIO_SID_ID
} stream2mmio_sid_ID_t;
/** end of Stream2MMIO */
/* end of Stream2MMIO */
/**
* Input System 2401: CSI-MIPI recevier.
......@@ -390,7 +390,7 @@ typedef enum {
CSI_RX_DLANE3_ID, /* map to DLANE3 in CSI RX */
N_CSI_RX_DLANE_ID
} csi_rx_fe_dlane_ID_t;
/** end of CSI-MIPI receiver */
/* end of CSI-MIPI receiver */
typedef enum {
ISYS2401_DMA0_ID = 0,
......@@ -406,7 +406,7 @@ typedef enum {
PIXELGEN2_ID,
N_PIXELGEN_ID
} pixelgen_ID_t;
/** end of pixel-generator. ("system_global.h") */
/* end of pixel-generator. ("system_global.h") */
typedef enum {
INPUT_SYSTEM_CSI_PORT0_ID = 0,
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/css_api_version.h
浏览文件 @ d929fb4e
......@@ -31,7 +31,7 @@ more details.
#ifndef __CSS_API_VERSION_H
#define __CSS_API_VERSION_H
/** @file
/* @file
* CSS API version file. This file contains the version number of the CSS-API.
*
* This file is generated from a set of input files describing the CSS-API
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c
浏览文件 @ d929fb4e
......@@ -21,7 +21,7 @@
#endif /* __INLINE_GP_TIMER__ */
#include "system_local.h"
/** FIXME: not sure if reg_load(), reg_store() should be API.
/* FIXME: not sure if reg_load(), reg_store() should be API.
*/
static uint32_t
gp_timer_reg_load(uint32_t reg);
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/csi_rx_public.h
浏览文件 @ d929fb4e
......@@ -73,7 +73,7 @@ extern void csi_rx_be_ctrl_get_state(
extern void csi_rx_be_ctrl_dump_state(
const csi_rx_backend_ID_t ID,
csi_rx_be_ctrl_state_t *state);
/** end of NCI */
/* end of NCI */
/*****************************************************
*
......@@ -130,6 +130,6 @@ extern void csi_rx_be_ctrl_reg_store(
const csi_rx_backend_ID_t ID,
const hrt_address reg,
const hrt_data value);
/** end of DLI */
/* end of DLI */
#endif /* USE_INPUT_SYSTEM_VERSION_2401 */
#endif /* __CSI_RX_PUBLIC_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ibuf_ctrl_public.h
浏览文件 @ d929fb4e
......@@ -54,7 +54,7 @@ STORAGE_CLASS_IBUF_CTRL_H void ibuf_ctrl_get_proc_state(
STORAGE_CLASS_IBUF_CTRL_H void ibuf_ctrl_dump_state(
const ibuf_ctrl_ID_t ID,
ibuf_ctrl_state_t *state);
/** end of NCI */
/* end of NCI */
/*****************************************************
*
......@@ -87,7 +87,7 @@ STORAGE_CLASS_IBUF_CTRL_H void ibuf_ctrl_reg_store(
const ibuf_ctrl_ID_t ID,
const hrt_address reg,
const hrt_data value);
/** end of DLI */
/* end of DLI */
#endif /* USE_INPUT_SYSTEM_VERSION_2401 */
#endif /* __IBUF_CTRL_PUBLIC_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w.h
浏览文件 @ d929fb4e
......@@ -49,7 +49,7 @@
/* Arithmetic */
/** @brief bitwise AND
/* @brief bitwise AND
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -63,7 +63,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_and(
const tvector1w _a,
const tvector1w _b);
/** @brief bitwise OR
/* @brief bitwise OR
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -77,7 +77,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_or(
const tvector1w _a,
const tvector1w _b);
/** @brief bitwise XOR
/* @brief bitwise XOR
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -91,7 +91,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_xor(
const tvector1w _a,
const tvector1w _b);
/** @brief bitwise inverse
/* @brief bitwise inverse
*
* @param[in] _a first argument
*
......@@ -105,7 +105,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_inv(
/* Additive */
/** @brief addition
/* @brief addition
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -120,7 +120,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_add(
const tvector1w _a,
const tvector1w _b);
/** @brief subtraction
/* @brief subtraction
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -135,7 +135,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_sub(
const tvector1w _a,
const tvector1w _b);
/** @brief saturated addition
/* @brief saturated addition
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -150,7 +150,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_addsat(
const tvector1w _a,
const tvector1w _b);
/** @brief saturated subtraction
/* @brief saturated subtraction
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -166,7 +166,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_subsat(
const tvector1w _b);
#ifdef ISP2401
/** @brief Unsigned saturated subtraction
/* @brief Unsigned saturated subtraction
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -182,7 +182,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w_unsigned OP_1w_subsat_u(
const tvector1w_unsigned _b);
#endif
/** @brief subtraction with shift right and rounding
/* @brief subtraction with shift right and rounding
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -202,7 +202,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_subasr1(
const tvector1w _a,
const tvector1w _b);
/** @brief Subtraction with shift right and rounding
/* @brief Subtraction with shift right and rounding
*
* @param[in] _a first operand
* @param[in] _b second operand
......@@ -217,7 +217,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_subhalfrnd(
const tvector1w _a,
const tvector1w _b);
/** @brief Subtraction with shift right and no rounding
/* @brief Subtraction with shift right and no rounding
*
* @param[in] _a first operand
* @param[in] _b second operand
......@@ -233,7 +233,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_subhalf(
const tvector1w _b);
/** @brief saturated absolute value
/* @brief saturated absolute value
*
* @param[in] _a input
*
......@@ -247,7 +247,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_subhalf(
STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_abs(
const tvector1w _a);
/** @brief saturated absolute difference
/* @brief saturated absolute difference
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -264,7 +264,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_subabssat(
/* Multiplicative */
/** @brief doubling multiply
/* @brief doubling multiply
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -281,7 +281,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector2w OP_1w_muld(
const tvector1w _a,
const tvector1w _b);
/** @brief integer multiply
/* @brief integer multiply
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -298,7 +298,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_mul(
const tvector1w _a,
const tvector1w _b);
/** @brief fractional saturating multiply
/* @brief fractional saturating multiply
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -316,7 +316,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_qmul(
const tvector1w _a,
const tvector1w _b);
/** @brief fractional saturating multiply with rounding
/* @brief fractional saturating multiply with rounding
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -337,7 +337,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_qrmul(
/* Comparative */
/** @brief equal
/* @brief equal
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -351,7 +351,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tflags OP_1w_eq(
const tvector1w _a,
const tvector1w _b);
/** @brief not equal
/* @brief not equal
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -365,7 +365,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tflags OP_1w_ne(
const tvector1w _a,
const tvector1w _b);
/** @brief less or equal
/* @brief less or equal
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -379,7 +379,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tflags OP_1w_le(
const tvector1w _a,
const tvector1w _b);
/** @brief less then
/* @brief less then
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -393,7 +393,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tflags OP_1w_lt(
const tvector1w _a,
const tvector1w _b);
/** @brief greater or equal
/* @brief greater or equal
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -407,7 +407,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tflags OP_1w_ge(
const tvector1w _a,
const tvector1w _b);
/** @brief greater than
/* @brief greater than
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -423,7 +423,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tflags OP_1w_gt(
/* Shift */
/** @brief aritmetic shift right
/* @brief aritmetic shift right
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -441,7 +441,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_asr(
const tvector1w _a,
const tvector1w _b);
/** @brief aritmetic shift right with rounding
/* @brief aritmetic shift right with rounding
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -460,7 +460,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_asrrnd(
const tvector1w _a,
const tvector1w _b);
/** @brief saturating arithmetic shift left
/* @brief saturating arithmetic shift left
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -480,7 +480,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_asl(
const tvector1w _a,
const tvector1w _b);
/** @brief saturating aritmetic shift left
/* @brief saturating aritmetic shift left
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -493,7 +493,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_aslsat(
const tvector1w _a,
const tvector1w _b);
/** @brief logical shift left
/* @brief logical shift left
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -510,7 +510,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_lsl(
const tvector1w _a,
const tvector1w _b);
/** @brief logical shift right
/* @brief logical shift right
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -528,7 +528,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_lsr(
const tvector1w _b);
#ifdef ISP2401
/** @brief bidirectional saturating arithmetic shift
/* @brief bidirectional saturating arithmetic shift
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -546,7 +546,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_ashift_sat(
const tvector1w _a,
const tvector1w _b);
/** @brief bidirectional non-saturating arithmetic shift
/* @brief bidirectional non-saturating arithmetic shift
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -565,7 +565,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_ashift(
const tvector1w _b);
/** @brief bidirectional logical shift
/* @brief bidirectional logical shift
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -588,7 +588,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_lshift(
#endif
/* Cast */
/** @brief Cast from int to 1w
/* @brief Cast from int to 1w
*
* @param[in] _a input
*
......@@ -601,7 +601,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_lshift(
STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_int_cast_to_1w(
const int _a);
/** @brief Cast from 1w to int
/* @brief Cast from 1w to int
*
* @param[in] _a input
*
......@@ -614,7 +614,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_int_cast_to_1w(
STORAGE_CLASS_ISP_OP1W_FUNC_H int OP_1w_cast_to_int(
const tvector1w _a);
/** @brief Cast from 1w to 2w
/* @brief Cast from 1w to 2w
*
* @param[in] _a input
*
......@@ -627,7 +627,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H int OP_1w_cast_to_int(
STORAGE_CLASS_ISP_OP1W_FUNC_H tvector2w OP_1w_cast_to_2w(
const tvector1w _a);
/** @brief Cast from 2w to 1w
/* @brief Cast from 2w to 1w
*
* @param[in] _a input
*
......@@ -641,7 +641,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_2w_cast_to_1w(
const tvector2w _a);
/** @brief Cast from 2w to 1w with saturation
/* @brief Cast from 2w to 1w with saturation
*
* @param[in] _a input
*
......@@ -657,7 +657,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_2w_sat_cast_to_1w(
/* clipping */
/** @brief Clip asymmetrical
/* @brief Clip asymmetrical
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -673,7 +673,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_clip_asym(
const tvector1w _a,
const tvector1w _b);
/** @brief Clip zero
/* @brief Clip zero
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -691,7 +691,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_clipz(
/* division */
/** @brief Truncated division
/* @brief Truncated division
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -708,7 +708,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_div(
const tvector1w _a,
const tvector1w _b);
/** @brief Fractional saturating divide
/* @brief Fractional saturating divide
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -726,7 +726,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_qdiv(
const tvector1w _a,
const tvector1w _b);
/** @brief Modulo
/* @brief Modulo
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -741,7 +741,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_mod(
const tvector1w _a,
const tvector1w _b);
/** @brief Unsigned integer Square root
/* @brief Unsigned integer Square root
*
* @param[in] _a input
*
......@@ -754,7 +754,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w_unsigned OP_1w_sqrt_u(
/* Miscellaneous */
/** @brief Multiplexer
/* @brief Multiplexer
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -770,7 +770,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_mux(
const tvector1w _b,
const tflags _c);
/** @brief Average without rounding
/* @brief Average without rounding
*
* @param[in] _a first operand
* @param[in] _b second operand
......@@ -786,7 +786,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_avg(
const tvector1w _a,
const tvector1w _b);
/** @brief Average with rounding
/* @brief Average with rounding
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -802,7 +802,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_avgrnd(
const tvector1w _a,
const tvector1w _b);
/** @brief Minimum
/* @brief Minimum
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -816,7 +816,7 @@ STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_min(
const tvector1w _a,
const tvector1w _b);
/** @brief Maximum
/* @brief Maximum
*
* @param[in] _a first argument
* @param[in] _b second argument
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w.h
浏览文件 @ d929fb4e
......@@ -48,7 +48,7 @@
/* Arithmetic */
/** @brief bitwise AND
/* @brief bitwise AND
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -62,7 +62,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_and(
const tvector2w _a,
const tvector2w _b);
/** @brief bitwise OR
/* @brief bitwise OR
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -76,7 +76,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_or(
const tvector2w _a,
const tvector2w _b);
/** @brief bitwise XOR
/* @brief bitwise XOR
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -90,7 +90,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_xor(
const tvector2w _a,
const tvector2w _b);
/** @brief bitwise inverse
/* @brief bitwise inverse
*
* @param[in] _a first argument
*
......@@ -104,7 +104,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_inv(
/* Additive */
/** @brief addition
/* @brief addition
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -119,7 +119,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_add(
const tvector2w _a,
const tvector2w _b);
/** @brief subtraction
/* @brief subtraction
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -134,7 +134,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_sub(
const tvector2w _a,
const tvector2w _b);
/** @brief saturated addition
/* @brief saturated addition
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -149,7 +149,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_addsat(
const tvector2w _a,
const tvector2w _b);
/** @brief saturated subtraction
/* @brief saturated subtraction
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -164,7 +164,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_subsat(
const tvector2w _a,
const tvector2w _b);
/** @brief subtraction with shift right and rounding
/* @brief subtraction with shift right and rounding
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -184,7 +184,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_subasr1(
const tvector2w _a,
const tvector2w _b);
/** @brief Subtraction with shift right and rounding
/* @brief Subtraction with shift right and rounding
*
* @param[in] _a first operand
* @param[in] _b second operand
......@@ -199,7 +199,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_subhalfrnd(
const tvector2w _a,
const tvector2w _b);
/** @brief Subtraction with shift right and no rounding
/* @brief Subtraction with shift right and no rounding
*
* @param[in] _a first operand
* @param[in] _b second operand
......@@ -214,7 +214,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_subhalf(
const tvector2w _a,
const tvector2w _b);
/** @brief saturated absolute value
/* @brief saturated absolute value
*
* @param[in] _a input
*
......@@ -228,7 +228,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_subhalf(
STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_abs(
const tvector2w _a);
/** @brief saturated absolute difference
/* @brief saturated absolute difference
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -245,7 +245,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_subabssat(
/* Multiplicative */
/** @brief integer multiply
/* @brief integer multiply
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -262,7 +262,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_mul(
const tvector2w _a,
const tvector2w _b);
/** @brief fractional saturating multiply
/* @brief fractional saturating multiply
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -279,7 +279,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_qmul(
const tvector2w _a,
const tvector2w _b);
/** @brief fractional saturating multiply with rounding
/* @brief fractional saturating multiply with rounding
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -301,7 +301,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_qrmul(
/* Comparative */
/** @brief equal
/* @brief equal
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -315,7 +315,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tflags OP_2w_eq(
const tvector2w _a,
const tvector2w _b);
/** @brief not equal
/* @brief not equal
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -329,7 +329,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tflags OP_2w_ne(
const tvector2w _a,
const tvector2w _b);
/** @brief less or equal
/* @brief less or equal
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -343,7 +343,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tflags OP_2w_le(
const tvector2w _a,
const tvector2w _b);
/** @brief less then
/* @brief less then
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -357,7 +357,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tflags OP_2w_lt(
const tvector2w _a,
const tvector2w _b);
/** @brief greater or equal
/* @brief greater or equal
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -371,7 +371,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tflags OP_2w_ge(
const tvector2w _a,
const tvector2w _b);
/** @brief greater than
/* @brief greater than
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -387,7 +387,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tflags OP_2w_gt(
/* Shift */
/** @brief aritmetic shift right
/* @brief aritmetic shift right
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -404,7 +404,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_asr(
const tvector2w _a,
const tvector2w _b);
/** @brief aritmetic shift right with rounding
/* @brief aritmetic shift right with rounding
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -423,7 +423,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_asrrnd(
const tvector2w _a,
const tvector2w _b);
/** @brief saturating aritmetic shift left
/* @brief saturating aritmetic shift left
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -443,7 +443,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_asl(
const tvector2w _a,
const tvector2w _b);
/** @brief saturating aritmetic shift left
/* @brief saturating aritmetic shift left
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -456,7 +456,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_aslsat(
const tvector2w _a,
const tvector2w _b);
/** @brief logical shift left
/* @brief logical shift left
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -473,7 +473,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_lsl(
const tvector2w _a,
const tvector2w _b);
/** @brief logical shift right
/* @brief logical shift right
*
* @param[in] _a input
* @param[in] _b shift amount
......@@ -492,7 +492,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_lsr(
/* clipping */
/** @brief Clip asymmetrical
/* @brief Clip asymmetrical
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -507,7 +507,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_clip_asym(
const tvector2w _a,
const tvector2w _b);
/** @brief Clip zero
/* @brief Clip zero
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -524,7 +524,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_clipz(
/* division */
/** @brief Truncated division
/* @brief Truncated division
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -541,7 +541,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_div(
const tvector2w _a,
const tvector2w _b);
/** @brief Saturating truncated division
/* @brief Saturating truncated division
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -559,7 +559,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector1w OP_2w_divh(
const tvector2w _a,
const tvector1w _b);
/** @brief Modulo
/* @brief Modulo
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -572,7 +572,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_mod(
const tvector2w _a,
const tvector2w _b);
/** @brief Unsigned Integer Square root
/* @brief Unsigned Integer Square root
*
* @param[in] _a input
*
......@@ -585,7 +585,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector1w_unsigned OP_2w_sqrt_u(
/* Miscellaneous */
/** @brief Multiplexer
/* @brief Multiplexer
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -601,7 +601,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_mux(
const tvector2w _b,
const tflags _c);
/** @brief Average without rounding
/* @brief Average without rounding
*
* @param[in] _a first operand
* @param[in] _b second operand
......@@ -617,7 +617,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_avg(
const tvector2w _a,
const tvector2w _b);
/** @brief Average with rounding
/* @brief Average with rounding
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -633,7 +633,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_avgrnd(
const tvector2w _a,
const tvector2w _b);
/** @brief Minimum
/* @brief Minimum
*
* @param[in] _a first argument
* @param[in] _b second argument
......@@ -647,7 +647,7 @@ STORAGE_CLASS_ISP_OP2W_FUNC_H tvector2w OP_2w_min(
const tvector2w _a,
const tvector2w _b);
/** @brief Maximum
/* @brief Maximum
*
* @param[in] _a first argument
* @param[in] _b second argument
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_stream2mmio_public.h
浏览文件 @ d929fb4e
......@@ -43,7 +43,7 @@ STORAGE_CLASS_STREAM2MMIO_H void stream2mmio_get_sid_state(
const stream2mmio_ID_t ID,
const stream2mmio_sid_ID_t sid_id,
stream2mmio_sid_state_t *state);
/** end of NCI */
/* end of NCI */
/*****************************************************
*
......@@ -96,6 +96,6 @@ STORAGE_CLASS_STREAM2MMIO_H void stream2mmio_reg_store(
const stream2mmio_ID_t ID,
const hrt_address reg,
const hrt_data value);
/** end of DLI */
/* end of DLI */
#endif /* __ISYS_STREAM2MMIO_PUBLIC_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pixelgen_public.h
浏览文件 @ d929fb4e
......@@ -41,7 +41,7 @@ STORAGE_CLASS_PIXELGEN_H void pixelgen_ctrl_get_state(
STORAGE_CLASS_PIXELGEN_H void pixelgen_ctrl_dump_state(
const pixelgen_ID_t ID,
pixelgen_ctrl_state_t *state);
/** end of NCI */
/* end of NCI */
/*****************************************************
*
......@@ -73,7 +73,7 @@ STORAGE_CLASS_PIXELGEN_H void pixelgen_ctrl_reg_store(
const pixelgen_ID_t ID,
const hrt_address reg,
const hrt_data value);
/** end of DLI */
/* end of DLI */
#endif /* USE_INPUT_SYSTEM_VERSION_2401 */
#endif /* __PIXELGEN_PUBLIC_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h
浏览文件 @ d929fb4e
......@@ -168,7 +168,7 @@ static inline unsigned int round_half_down_mul(unsigned int a, unsigned int b)
}
#endif
/** @brief Next Power of Two
/* @brief Next Power of Two
*
* @param[in] unsigned number
*
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h
浏览文件 @ d929fb4e
......@@ -23,7 +23,7 @@
*/
/** @brief Copy from src_buf to dest_buf.
/* @brief Copy from src_buf to dest_buf.
*
* @param[out] dest_buf. Destination buffer to copy to
* @param[in] dest_size. The size of the destination buffer in bytes
......@@ -53,7 +53,7 @@ static inline int memcpy_s(
return 0;
}
/** @brief Get the length of the string, excluding the null terminator
/* @brief Get the length of the string, excluding the null terminator
*
* @param[in] src_str. The source string
* @param[in] max_len. Look only for max_len bytes in the string
......@@ -78,7 +78,7 @@ static size_t strnlen_s(
return ix;
}
/** @brief Copy string from src_str to dest_str
/* @brief Copy string from src_str to dest_str
*
* @param[out] dest_str. Destination buffer to copy to
* @param[in] dest_size. The size of the destination buffer in bytes
......@@ -120,7 +120,7 @@ static inline int strncpy_s(
return 0;
}
/** @brief Copy string from src_str to dest_str
/* @brief Copy string from src_str to dest_str
*
* @param[out] dest_str. Destination buffer to copy to
* @param[in] dest_size. The size of the destination buffer in bytes
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag.c
浏览文件 @ d929fb4e
......@@ -17,7 +17,7 @@
#include <assert_support.h>
#include "tag_local.h"
/**
/*
* @brief Creates the tag description from the given parameters.
* @param[in] num_captures
* @param[in] skip
......@@ -39,7 +39,7 @@ sh_css_create_tag_descr(int num_captures,
tag_descr->exp_id = exp_id;
}
/**
/*
* @brief Encodes the members of tag description into a 32-bit value.
* @param[in] tag Pointer to the tag description
* @return (unsigned int) Encoded 32-bit tag-info
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h
浏览文件 @ d929fb4e
......@@ -16,7 +16,7 @@
#ifndef _IA_CSS_H_
#define _IA_CSS_H_
/** @file
/* @file
* This file is the starting point of the CSS-API. It includes all CSS-API
* header files.
*/
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_3a.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_3A_H
#define __IA_CSS_3A_H
/** @file
/* @file
* This file contains types used for 3A statistics
*/
......@@ -31,7 +31,7 @@ enum ia_css_3a_tables {
IA_CSS_NUM_3A_TABLES
};
/** Structure that holds 3A statistics in the ISP internal
/* Structure that holds 3A statistics in the ISP internal
* format. Use ia_css_get_3a_statistics() to translate
* this to the format used on the host (3A library).
* */
......@@ -48,13 +48,13 @@ struct ia_css_isp_3a_statistics {
struct {
ia_css_ptr rgby_tbl;
} data_hmem;
uint32_t exp_id; /**< exposure id, to match statistics to a frame,
uint32_t exp_id; /** exposure id, to match statistics to a frame,
see ia_css_event_public.h for more detail. */
uint32_t isp_config_id;/**< Unique ID to track which config was actually applied to a particular frame */
ia_css_ptr data_ptr; /**< pointer to base of all data */
uint32_t size; /**< total size of all data */
uint32_t isp_config_id;/** Unique ID to track which config was actually applied to a particular frame */
ia_css_ptr data_ptr; /** pointer to base of all data */
uint32_t size; /** total size of all data */
uint32_t dmem_size;
uint32_t vmem_size; /**< both lo and hi have this size */
uint32_t vmem_size; /** both lo and hi have this size */
uint32_t hmem_size;
};
#define SIZE_OF_DMEM_STRUCT \
......@@ -77,7 +77,7 @@ struct ia_css_isp_3a_statistics {
SIZE_OF_IA_CSS_PTR + \
4 * sizeof(uint32_t))
/** Map with host-side pointers to ISP-format statistics.
/* Map with host-side pointers to ISP-format statistics.
* These pointers can either be copies of ISP data or memory mapped
* ISP pointers.
* All of the data behind these pointers is allocated contiguously, the
......@@ -85,17 +85,17 @@ struct ia_css_isp_3a_statistics {
* point into this one block of data.
*/
struct ia_css_isp_3a_statistics_map {
void *data_ptr; /**< Pointer to start of memory */
void *data_ptr; /** Pointer to start of memory */
struct ia_css_3a_output *dmem_stats;
uint16_t *vmem_stats_hi;
uint16_t *vmem_stats_lo;
struct ia_css_bh_table *hmem_stats;
uint32_t size; /**< total size in bytes of data_ptr */
uint32_t data_allocated; /**< indicate whether data_ptr
uint32_t size; /** total size in bytes of data_ptr */
uint32_t data_allocated; /** indicate whether data_ptr
was allocated or not. */
};
/** @brief Copy and translate 3A statistics from an ISP buffer to a host buffer
/* @brief Copy and translate 3A statistics from an ISP buffer to a host buffer
* @param[out] host_stats Host buffer.
* @param[in] isp_stats ISP buffer.
* @return error value if temporary memory cannot be allocated
......@@ -109,7 +109,7 @@ enum ia_css_err
ia_css_get_3a_statistics(struct ia_css_3a_statistics *host_stats,
const struct ia_css_isp_3a_statistics *isp_stats);
/** @brief Translate 3A statistics from ISP format to host format.
/* @brief Translate 3A statistics from ISP format to host format.
* @param[out] host_stats host-format statistics
* @param[in] isp_stats ISP-format statistics
* @return None
......@@ -125,35 +125,35 @@ ia_css_translate_3a_statistics(
/* Convenience functions for alloc/free of certain datatypes */
/** @brief Allocate memory for the 3a statistics on the ISP
/* @brief Allocate memory for the 3a statistics on the ISP
* @param[in] grid The grid.
* @return Pointer to the allocated 3a statistics buffer on the ISP
*/
struct ia_css_isp_3a_statistics *
ia_css_isp_3a_statistics_allocate(const struct ia_css_3a_grid_info *grid);
/** @brief Free the 3a statistics memory on the isp
/* @brief Free the 3a statistics memory on the isp
* @param[in] me Pointer to the 3a statistics buffer on the ISP.
* @return None
*/
void
ia_css_isp_3a_statistics_free(struct ia_css_isp_3a_statistics *me);
/** @brief Allocate memory for the 3a statistics on the host
/* @brief Allocate memory for the 3a statistics on the host
* @param[in] grid The grid.
* @return Pointer to the allocated 3a statistics buffer on the host
*/
struct ia_css_3a_statistics *
ia_css_3a_statistics_allocate(const struct ia_css_3a_grid_info *grid);
/** @brief Free the 3a statistics memory on the host
/* @brief Free the 3a statistics memory on the host
* @param[in] me Pointer to the 3a statistics buffer on the host.
* @return None
*/
void
ia_css_3a_statistics_free(struct ia_css_3a_statistics *me);
/** @brief Allocate a 3a statistics map structure
/* @brief Allocate a 3a statistics map structure
* @param[in] isp_stats pointer to ISP 3a statistis struct
* @param[in] data_ptr host-side pointer to ISP 3a statistics.
* @return Pointer to the allocated 3a statistics map
......@@ -174,7 +174,7 @@ ia_css_isp_3a_statistics_map_allocate(
const struct ia_css_isp_3a_statistics *isp_stats,
void *data_ptr);
/** @brief Free the 3a statistics map
/* @brief Free the 3a statistics map
* @param[in] me Pointer to the 3a statistics map
* @return None
*
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef _IA_CSS_ACC_TYPES_H
#define _IA_CSS_ACC_TYPES_H
/** @file
/* @file
* This file contains types used for acceleration
*/
......@@ -40,16 +40,16 @@
* in the kernel and HAL.
*/
/** Type of acceleration.
/* Type of acceleration.
*/
enum ia_css_acc_type {
IA_CSS_ACC_NONE, /**< Normal binary */
IA_CSS_ACC_OUTPUT, /**< Accelerator stage on output frame */
IA_CSS_ACC_VIEWFINDER, /**< Accelerator stage on viewfinder frame */
IA_CSS_ACC_STANDALONE, /**< Stand-alone acceleration */
IA_CSS_ACC_NONE, /** Normal binary */
IA_CSS_ACC_OUTPUT, /** Accelerator stage on output frame */
IA_CSS_ACC_VIEWFINDER, /** Accelerator stage on viewfinder frame */
IA_CSS_ACC_STANDALONE, /** Stand-alone acceleration */
};
/** Cells types
/* Cells types
*/
enum ia_css_cell_type {
IA_CSS_SP0 = 0,
......@@ -58,45 +58,45 @@ enum ia_css_cell_type {
MAX_NUM_OF_CELLS
};
/** Firmware types.
/* Firmware types.
*/
enum ia_css_fw_type {
ia_css_sp_firmware, /**< Firmware for the SP */
ia_css_isp_firmware, /**< Firmware for the ISP */
ia_css_bootloader_firmware, /**< Firmware for the BootLoader */
ia_css_acc_firmware /**< Firmware for accelrations */
ia_css_sp_firmware, /** Firmware for the SP */
ia_css_isp_firmware, /** Firmware for the ISP */
ia_css_bootloader_firmware, /** Firmware for the BootLoader */
ia_css_acc_firmware /** Firmware for accelrations */
};
struct ia_css_blob_descr;
/** Blob descriptor.
/* Blob descriptor.
* This structure describes an SP or ISP blob.
* It describes the test, data and bss sections as well as position in a
* firmware file.
* For convenience, it contains dynamic data after loading.
*/
struct ia_css_blob_info {
/**< Static blob data */
uint32_t offset; /**< Blob offset in fw file */
struct ia_css_isp_param_memory_offsets memory_offsets; /**< offset wrt hdr in bytes */
uint32_t prog_name_offset; /**< offset wrt hdr in bytes */
uint32_t size; /**< Size of blob */
uint32_t padding_size; /**< total cummulative of bytes added due to section alignment */
uint32_t icache_source; /**< Position of icache in blob */
uint32_t icache_size; /**< Size of icache section */
uint32_t icache_padding;/**< bytes added due to icache section alignment */
uint32_t text_source; /**< Position of text in blob */
uint32_t text_size; /**< Size of text section */
uint32_t text_padding; /**< bytes added due to text section alignment */
uint32_t data_source; /**< Position of data in blob */
uint32_t data_target; /**< Start of data in SP dmem */
uint32_t data_size; /**< Size of text section */
uint32_t data_padding; /**< bytes added due to data section alignment */
uint32_t bss_target; /**< Start position of bss in SP dmem */
uint32_t bss_size; /**< Size of bss section */
/**< Dynamic data filled by loader */
CSS_ALIGN(const void *code, 8); /**< Code section absolute pointer within fw, code = icache + text */
CSS_ALIGN(const void *data, 8); /**< Data section absolute pointer within fw, data = data + bss */
/** Static blob data */
uint32_t offset; /** Blob offset in fw file */
struct ia_css_isp_param_memory_offsets memory_offsets; /** offset wrt hdr in bytes */
uint32_t prog_name_offset; /** offset wrt hdr in bytes */
uint32_t size; /** Size of blob */
uint32_t padding_size; /** total cummulative of bytes added due to section alignment */
uint32_t icache_source; /** Position of icache in blob */
uint32_t icache_size; /** Size of icache section */
uint32_t icache_padding;/** bytes added due to icache section alignment */
uint32_t text_source; /** Position of text in blob */
uint32_t text_size; /** Size of text section */
uint32_t text_padding; /** bytes added due to text section alignment */
uint32_t data_source; /** Position of data in blob */
uint32_t data_target; /** Start of data in SP dmem */
uint32_t data_size; /** Size of text section */
uint32_t data_padding; /** bytes added due to data section alignment */
uint32_t bss_target; /** Start position of bss in SP dmem */
uint32_t bss_size; /** Size of bss section */
/** Dynamic data filled by loader */
CSS_ALIGN(const void *code, 8); /** Code section absolute pointer within fw, code = icache + text */
CSS_ALIGN(const void *data, 8); /** Data section absolute pointer within fw, data = data + bss */
};
struct ia_css_binary_input_info {
......@@ -140,9 +140,9 @@ struct ia_css_binary_s3a_info {
uint32_t fixed_s3a_deci_log;
};
/** DPC related binary info */
/* DPC related binary info */
struct ia_css_binary_dpc_info {
uint32_t bnr_lite; /**< bnr lite enable flag */
uint32_t bnr_lite; /** bnr lite enable flag */
};
struct ia_css_binary_iterator_info {
......@@ -193,7 +193,7 @@ struct ia_css_binary_block_info {
uint32_t output_block_height;
};
/** Structure describing an ISP binary.
/* Structure describing an ISP binary.
* It describes the capabilities of a binary, like the maximum resolution,
* support features, dma channels, uds features, etc.
* This part is to be used by the SP.
......@@ -210,7 +210,7 @@ struct ia_css_binary_info {
struct ia_css_binary_dvs_info dvs;
struct ia_css_binary_vf_dec_info vf_dec;
struct ia_css_binary_s3a_info s3a;
struct ia_css_binary_dpc_info dpc_bnr; /**< DPC related binary info */
struct ia_css_binary_dpc_info dpc_bnr; /** DPC related binary info */
struct ia_css_binary_iterator_info iterator;
struct ia_css_binary_address_info addresses;
struct ia_css_binary_uds_info uds;
......@@ -269,7 +269,7 @@ struct ia_css_binary_info {
} dma;
};
/** Structure describing an ISP binary.
/* Structure describing an ISP binary.
* It describes the capabilities of a binary, like the maximum resolution,
* support features, dma channels, uds features, etc.
*/
......@@ -281,8 +281,8 @@ struct ia_css_binary_xinfo {
enum ia_css_acc_type type;
CSS_ALIGN(int32_t num_output_formats, 8);
enum ia_css_frame_format output_formats[IA_CSS_FRAME_FORMAT_NUM];
CSS_ALIGN(int32_t num_vf_formats, 8); /**< number of supported vf formats */
enum ia_css_frame_format vf_formats[IA_CSS_FRAME_FORMAT_NUM]; /**< types of supported vf formats */
CSS_ALIGN(int32_t num_vf_formats, 8); /** number of supported vf formats */
enum ia_css_frame_format vf_formats[IA_CSS_FRAME_FORMAT_NUM]; /** types of supported vf formats */
uint8_t num_output_pins;
ia_css_ptr xmem_addr;
CSS_ALIGN(const struct ia_css_blob_descr *blob, 8);
......@@ -291,55 +291,55 @@ struct ia_css_binary_xinfo {
CSS_ALIGN(struct ia_css_binary_xinfo *next, 8);
};
/** Structure describing the Bootloader (an ISP binary).
/* Structure describing the Bootloader (an ISP binary).
* It contains several address, either in ddr, isp_dmem or
* the entry function in icache.
*/
struct ia_css_bl_info {
uint32_t num_dma_cmds; /**< Number of cmds sent by CSS */
uint32_t dma_cmd_list; /**< Dma command list sent by CSS */
uint32_t sw_state; /**< Polled from css */
uint32_t num_dma_cmds; /** Number of cmds sent by CSS */
uint32_t dma_cmd_list; /** Dma command list sent by CSS */
uint32_t sw_state; /** Polled from css */
/* Entry functions */
uint32_t bl_entry; /**< The SP entry function */
uint32_t bl_entry; /** The SP entry function */
};
/** Structure describing the SP binary.
/* Structure describing the SP binary.
* It contains several address, either in ddr, sp_dmem or
* the entry function in pmem.
*/
struct ia_css_sp_info {
uint32_t init_dmem_data; /**< data sect config, stored to dmem */
uint32_t per_frame_data; /**< Per frame data, stored to dmem */
uint32_t group; /**< Per pipeline data, loaded by dma */
uint32_t output; /**< SP output data, loaded by dmem */
uint32_t host_sp_queue; /**< Host <-> SP queues */
uint32_t host_sp_com;/**< Host <-> SP commands */
uint32_t isp_started; /**< Polled from sensor thread, csim only */
uint32_t sw_state; /**< Polled from css */
uint32_t host_sp_queues_initialized; /**< Polled from the SP */
uint32_t sleep_mode; /**< different mode to halt SP */
uint32_t invalidate_tlb; /**< inform SP to invalidate mmu TLB */
uint32_t init_dmem_data; /** data sect config, stored to dmem */
uint32_t per_frame_data; /** Per frame data, stored to dmem */
uint32_t group; /** Per pipeline data, loaded by dma */
uint32_t output; /** SP output data, loaded by dmem */
uint32_t host_sp_queue; /** Host <-> SP queues */
uint32_t host_sp_com;/** Host <-> SP commands */
uint32_t isp_started; /** Polled from sensor thread, csim only */
uint32_t sw_state; /** Polled from css */
uint32_t host_sp_queues_initialized; /** Polled from the SP */
uint32_t sleep_mode; /** different mode to halt SP */
uint32_t invalidate_tlb; /** inform SP to invalidate mmu TLB */
#ifndef ISP2401
uint32_t stop_copy_preview; /**< suspend copy and preview pipe when capture */
uint32_t stop_copy_preview; /** suspend copy and preview pipe when capture */
#endif
uint32_t debug_buffer_ddr_address; /**< inform SP the address
uint32_t debug_buffer_ddr_address; /** inform SP the address
of DDR debug queue */
uint32_t perf_counter_input_system_error; /**< input system perf
uint32_t perf_counter_input_system_error; /** input system perf
counter array */
#ifdef HAS_WATCHDOG_SP_THREAD_DEBUG
uint32_t debug_wait; /**< thread/pipe post mortem debug */
uint32_t debug_stage; /**< thread/pipe post mortem debug */
uint32_t debug_stripe; /**< thread/pipe post mortem debug */
uint32_t debug_wait; /** thread/pipe post mortem debug */
uint32_t debug_stage; /** thread/pipe post mortem debug */
uint32_t debug_stripe; /** thread/pipe post mortem debug */
#endif
uint32_t threads_stack; /**< sp thread's stack pointers */
uint32_t threads_stack_size; /**< sp thread's stack sizes */
uint32_t curr_binary_id; /**< current binary id */
uint32_t raw_copy_line_count; /**< raw copy line counter */
uint32_t ddr_parameter_address; /**< acc param ddrptr, sp dmem */
uint32_t ddr_parameter_size; /**< acc param size, sp dmem */
uint32_t threads_stack; /** sp thread's stack pointers */
uint32_t threads_stack_size; /** sp thread's stack sizes */
uint32_t curr_binary_id; /** current binary id */
uint32_t raw_copy_line_count; /** raw copy line counter */
uint32_t ddr_parameter_address; /** acc param ddrptr, sp dmem */
uint32_t ddr_parameter_size; /** acc param size, sp dmem */
/* Entry functions */
uint32_t sp_entry; /**< The SP entry function */
uint32_t tagger_frames_addr; /**< Base address of tagger state */
uint32_t sp_entry; /** The SP entry function */
uint32_t tagger_frames_addr; /** Base address of tagger state */
};
/* The following #if is there because this header file is also included
......@@ -348,37 +348,37 @@ struct ia_css_sp_info {
More permanent solution will be to refactor this include.
*/
#if !defined(__ISP)
/** Accelerator firmware information.
/* Accelerator firmware information.
*/
struct ia_css_acc_info {
uint32_t per_frame_data; /**< Dummy for now */
uint32_t per_frame_data; /** Dummy for now */
};
/** Firmware information.
/* Firmware information.
*/
union ia_css_fw_union {
struct ia_css_binary_xinfo isp; /**< ISP info */
struct ia_css_sp_info sp; /**< SP info */
struct ia_css_bl_info bl; /**< Bootloader info */
struct ia_css_acc_info acc; /**< Accelerator info */
struct ia_css_binary_xinfo isp; /** ISP info */
struct ia_css_sp_info sp; /** SP info */
struct ia_css_bl_info bl; /** Bootloader info */
struct ia_css_acc_info acc; /** Accelerator info */
};
/** Firmware information.
/* Firmware information.
*/
struct ia_css_fw_info {
size_t header_size; /**< size of fw header */
size_t header_size; /** size of fw header */
CSS_ALIGN(uint32_t type, 8);
union ia_css_fw_union info; /**< Binary info */
struct ia_css_blob_info blob; /**< Blob info */
union ia_css_fw_union info; /** Binary info */
struct ia_css_blob_info blob; /** Blob info */
/* Dynamic part */
struct ia_css_fw_info *next;
CSS_ALIGN(uint32_t loaded, 8); /**< Firmware has been loaded */
CSS_ALIGN(const uint8_t *isp_code, 8); /**< ISP pointer to code */
/**< Firmware handle between user space and kernel */
CSS_ALIGN(uint32_t loaded, 8); /** Firmware has been loaded */
CSS_ALIGN(const uint8_t *isp_code, 8); /** ISP pointer to code */
/** Firmware handle between user space and kernel */
CSS_ALIGN(uint32_t handle, 8);
/**< Sections to copy from/to ISP */
/** Sections to copy from/to ISP */
struct ia_css_isp_param_css_segments mem_initializers;
/**< Initializer for local ISP memories */
/** Initializer for local ISP memories */
};
struct ia_css_blob_descr {
......@@ -390,39 +390,39 @@ struct ia_css_blob_descr {
struct ia_css_acc_fw;
/** Structure describing the SP binary of a stand-alone accelerator.
/* Structure describing the SP binary of a stand-alone accelerator.
*/
struct ia_css_acc_sp {
void (*init)(struct ia_css_acc_fw *); /**< init for crun */
uint32_t sp_prog_name_offset; /**< program name offset wrt hdr in bytes */
uint32_t sp_blob_offset; /**< blob offset wrt hdr in bytes */
void *entry; /**< Address of sp entry point */
uint32_t *css_abort; /**< SP dmem abort flag */
void *isp_code; /**< SP dmem address holding xmem
void (*init)(struct ia_css_acc_fw *); /** init for crun */
uint32_t sp_prog_name_offset; /** program name offset wrt hdr in bytes */
uint32_t sp_blob_offset; /** blob offset wrt hdr in bytes */
void *entry; /** Address of sp entry point */
uint32_t *css_abort; /** SP dmem abort flag */
void *isp_code; /** SP dmem address holding xmem
address of isp code */
struct ia_css_fw_info fw; /**< SP fw descriptor */
const uint8_t *code; /**< ISP pointer of allocated SP code */
struct ia_css_fw_info fw; /** SP fw descriptor */
const uint8_t *code; /** ISP pointer of allocated SP code */
};
/** Acceleration firmware descriptor.
/* Acceleration firmware descriptor.
* This descriptor descibes either SP code (stand-alone), or
* ISP code (a separate pipeline stage).
*/
struct ia_css_acc_fw_hdr {
enum ia_css_acc_type type; /**< Type of accelerator */
uint32_t isp_prog_name_offset; /**< program name offset wrt
enum ia_css_acc_type type; /** Type of accelerator */
uint32_t isp_prog_name_offset; /** program name offset wrt
header in bytes */
uint32_t isp_blob_offset; /**< blob offset wrt header
uint32_t isp_blob_offset; /** blob offset wrt header
in bytes */
uint32_t isp_size; /**< Size of isp blob */
const uint8_t *isp_code; /**< ISP pointer to code */
struct ia_css_acc_sp sp; /**< Standalone sp code */
/**< Firmware handle between user space and kernel */
uint32_t isp_size; /** Size of isp blob */
const uint8_t *isp_code; /** ISP pointer to code */
struct ia_css_acc_sp sp; /** Standalone sp code */
/** Firmware handle between user space and kernel */
uint32_t handle;
struct ia_css_data parameters; /**< Current SP parameters */
struct ia_css_data parameters; /** Current SP parameters */
};
/** Firmware structure.
/* Firmware structure.
* This contains the header and actual blobs.
* For standalone, it contains SP and ISP blob.
* For a pipeline stage accelerator, it contains ISP code only.
......@@ -430,7 +430,7 @@ struct ia_css_acc_fw_hdr {
* header and computed using the access macros below.
*/
struct ia_css_acc_fw {
struct ia_css_acc_fw_hdr header; /**< firmware header */
struct ia_css_acc_fw_hdr header; /** firmware header */
/*
int8_t isp_progname[]; **< ISP program name
int8_t sp_progname[]; **< SP program name, stand-alone only
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_BUFFER_H
#define __IA_CSS_BUFFER_H
/** @file
/* @file
* This file contains datastructures and types for buffers used in CSS
*/
......@@ -23,7 +23,7 @@
#include "ia_css_types.h"
#include "ia_css_timer.h"
/** Enumeration of buffer types. Buffers can be queued and de-queued
/* Enumeration of buffer types. Buffers can be queued and de-queued
* to hand them over between IA and ISP.
*/
enum ia_css_buffer_type {
......@@ -48,28 +48,28 @@ enum ia_css_buffer_type {
/* Driver API is not SP/ISP visible, 64 bit types not supported on hivecc */
#if !defined(__ISP)
/** Buffer structure. This is a container structure that enables content
/* Buffer structure. This is a container structure that enables content
* independent buffer queues and access functions.
*/
struct ia_css_buffer {
enum ia_css_buffer_type type; /**< Buffer type. */
enum ia_css_buffer_type type; /** Buffer type. */
unsigned int exp_id;
/**< exposure id for this buffer; 0 = not available
/** exposure id for this buffer; 0 = not available
see ia_css_event_public.h for more detail. */
union {
struct ia_css_isp_3a_statistics *stats_3a; /**< 3A statistics & optionally RGBY statistics. */
struct ia_css_isp_dvs_statistics *stats_dvs; /**< DVS statistics. */
struct ia_css_isp_skc_dvs_statistics *stats_skc_dvs; /**< SKC DVS statistics. */
struct ia_css_frame *frame; /**< Frame buffer. */
struct ia_css_acc_param *custom_data; /**< Custom buffer. */
struct ia_css_metadata *metadata; /**< Sensor metadata. */
} data; /**< Buffer data pointer. */
uint64_t driver_cookie; /**< cookie for the driver */
struct ia_css_time_meas timing_data; /**< timing data (readings from the timer) */
struct ia_css_clock_tick isys_eof_clock_tick; /**< ISYS's end of frame timer tick*/
struct ia_css_isp_3a_statistics *stats_3a; /** 3A statistics & optionally RGBY statistics. */
struct ia_css_isp_dvs_statistics *stats_dvs; /** DVS statistics. */
struct ia_css_isp_skc_dvs_statistics *stats_skc_dvs; /** SKC DVS statistics. */
struct ia_css_frame *frame; /** Frame buffer. */
struct ia_css_acc_param *custom_data; /** Custom buffer. */
struct ia_css_metadata *metadata; /** Sensor metadata. */
} data; /** Buffer data pointer. */
uint64_t driver_cookie; /** cookie for the driver */
struct ia_css_time_meas timing_data; /** timing data (readings from the timer) */
struct ia_css_clock_tick isys_eof_clock_tick; /** ISYS's end of frame timer tick*/
};
/** @brief Dequeue param buffers from sp2host_queue
/* @brief Dequeue param buffers from sp2host_queue
*
* @return None
*
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_control.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_CONTROL_H
#define __IA_CSS_CONTROL_H
/** @file
/* @file
* This file contains functionality for starting and controlling CSS
*/
......@@ -24,7 +24,7 @@
#include <ia_css_firmware.h>
#include <ia_css_irq.h>
/** @brief Initialize the CSS API.
/* @brief Initialize the CSS API.
* @param[in] env Environment, provides functions to access the
* environment in which the CSS code runs. This is
* used for host side memory access and message
......@@ -51,7 +51,7 @@ enum ia_css_err ia_css_init(
uint32_t l1_base,
enum ia_css_irq_type irq_type);
/** @brief Un-initialize the CSS API.
/* @brief Un-initialize the CSS API.
* @return None
*
* This function deallocates all memory that has been allocated by the CSS API
......@@ -66,7 +66,7 @@ enum ia_css_err ia_css_init(
void
ia_css_uninit(void);
/** @brief Suspend CSS API for power down
/* @brief Suspend CSS API for power down
* @return success or faulure code
*
* suspend shuts down the system by:
......@@ -80,7 +80,7 @@ ia_css_uninit(void);
enum ia_css_err
ia_css_suspend(void);
/** @brief Resume CSS API from power down
/* @brief Resume CSS API from power down
* @return success or failure code
*
* After a power cycle, this function will bring the CSS API back into
......@@ -91,7 +91,7 @@ ia_css_suspend(void);
enum ia_css_err
ia_css_resume(void);
/** @brief Enable use of a separate queue for ISYS events.
/* @brief Enable use of a separate queue for ISYS events.
*
* @param[in] enable: enable or disable use of separate ISYS event queues.
* @return error if called when SP is running.
......@@ -105,7 +105,7 @@ ia_css_resume(void);
enum ia_css_err
ia_css_enable_isys_event_queue(bool enable);
/** @brief Test whether the ISP has started.
/* @brief Test whether the ISP has started.
*
* @return Boolean flag true if the ISP has started or false otherwise.
*
......@@ -114,7 +114,7 @@ ia_css_enable_isys_event_queue(bool enable);
bool
ia_css_isp_has_started(void);
/** @brief Test whether the SP has initialized.
/* @brief Test whether the SP has initialized.
*
* @return Boolean flag true if the SP has initialized or false otherwise.
*
......@@ -123,7 +123,7 @@ ia_css_isp_has_started(void);
bool
ia_css_sp_has_initialized(void);
/** @brief Test whether the SP has terminated.
/* @brief Test whether the SP has terminated.
*
* @return Boolean flag true if the SP has terminated or false otherwise.
*
......@@ -132,7 +132,7 @@ ia_css_sp_has_initialized(void);
bool
ia_css_sp_has_terminated(void);
/** @brief start SP hardware
/* @brief start SP hardware
*
* @return IA_CSS_SUCCESS or error code upon error.
*
......@@ -144,7 +144,7 @@ enum ia_css_err
ia_css_start_sp(void);
/** @brief stop SP hardware
/* @brief stop SP hardware
*
* @return IA_CSS_SUCCESS or error code upon error.
*
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef _IA_CSS_DEVICE_ACCESS_H
#define _IA_CSS_DEVICE_ACCESS_H
/** @file
/* @file
* File containing internal functions for the CSS-API to access the CSS device.
*/
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_dvs.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_DVS_H
#define __IA_CSS_DVS_H
/** @file
/* @file
* This file contains types for DVS statistics
*/
......@@ -31,7 +31,7 @@ enum dvs_statistics_type {
};
/** Structure that holds DVS statistics in the ISP internal
/* Structure that holds DVS statistics in the ISP internal
* format. Use ia_css_get_dvs_statistics() to translate
* this to the format used on the host (DVS engine).
* */
......@@ -40,12 +40,12 @@ struct ia_css_isp_dvs_statistics {
ia_css_ptr ver_proj;
uint32_t hor_size;
uint32_t ver_size;
uint32_t exp_id; /**< see ia_css_event_public.h for more detail */
uint32_t exp_id; /** see ia_css_event_public.h for more detail */
ia_css_ptr data_ptr; /* base pointer containing all memory */
uint32_t size; /* size of allocated memory in data_ptr */
};
/** Structure that holds SKC DVS statistics in the ISP internal
/* Structure that holds SKC DVS statistics in the ISP internal
* format. Use ia_css_dvs_statistics_get() to translate this to
* the format used on the host.
* */
......@@ -82,7 +82,7 @@ union ia_css_dvs_statistics_host {
struct ia_css_skc_dvs_statistics *p_skc_dvs_statistics_host;
};
/** @brief Copy DVS statistics from an ISP buffer to a host buffer.
/* @brief Copy DVS statistics from an ISP buffer to a host buffer.
* @param[in] host_stats Host buffer
* @param[in] isp_stats ISP buffer
* @return error value if temporary memory cannot be allocated
......@@ -100,7 +100,7 @@ enum ia_css_err
ia_css_get_dvs_statistics(struct ia_css_dvs_statistics *host_stats,
const struct ia_css_isp_dvs_statistics *isp_stats);
/** @brief Translate DVS statistics from ISP format to host format
/* @brief Translate DVS statistics from ISP format to host format
* @param[in] host_stats Host buffer
* @param[in] isp_stats ISP buffer
* @return None
......@@ -116,7 +116,7 @@ ia_css_translate_dvs_statistics(
struct ia_css_dvs_statistics *host_stats,
const struct ia_css_isp_dvs_statistics_map *isp_stats);
/** @brief Copy DVS 2.0 statistics from an ISP buffer to a host buffer.
/* @brief Copy DVS 2.0 statistics from an ISP buffer to a host buffer.
* @param[in] host_stats Host buffer
* @param[in] isp_stats ISP buffer
* @return error value if temporary memory cannot be allocated
......@@ -134,7 +134,7 @@ enum ia_css_err
ia_css_get_dvs2_statistics(struct ia_css_dvs2_statistics *host_stats,
const struct ia_css_isp_dvs_statistics *isp_stats);
/** @brief Translate DVS2 statistics from ISP format to host format
/* @brief Translate DVS2 statistics from ISP format to host format
* @param[in] host_stats Host buffer
* @param[in] isp_stats ISP buffer
* @return None
......@@ -150,7 +150,7 @@ ia_css_translate_dvs2_statistics(
struct ia_css_dvs2_statistics *host_stats,
const struct ia_css_isp_dvs_statistics_map *isp_stats);
/** @brief Copy DVS statistics from an ISP buffer to a host buffer.
/* @brief Copy DVS statistics from an ISP buffer to a host buffer.
* @param[in] type - DVS statistics type
* @param[in] host_stats Host buffer
* @param[in] isp_stats ISP buffer
......@@ -161,105 +161,105 @@ ia_css_dvs_statistics_get(enum dvs_statistics_type type,
union ia_css_dvs_statistics_host *host_stats,
const union ia_css_dvs_statistics_isp *isp_stats);
/** @brief Allocate the DVS statistics memory on the ISP
/* @brief Allocate the DVS statistics memory on the ISP
* @param[in] grid The grid.
* @return Pointer to the allocated DVS statistics buffer on the ISP
*/
struct ia_css_isp_dvs_statistics *
ia_css_isp_dvs_statistics_allocate(const struct ia_css_dvs_grid_info *grid);
/** @brief Free the DVS statistics memory on the ISP
/* @brief Free the DVS statistics memory on the ISP
* @param[in] me Pointer to the DVS statistics buffer on the ISP.
* @return None
*/
void
ia_css_isp_dvs_statistics_free(struct ia_css_isp_dvs_statistics *me);
/** @brief Allocate the DVS 2.0 statistics memory
/* @brief Allocate the DVS 2.0 statistics memory
* @param[in] grid The grid.
* @return Pointer to the allocated DVS statistics buffer on the ISP
*/
struct ia_css_isp_dvs_statistics *
ia_css_isp_dvs2_statistics_allocate(const struct ia_css_dvs_grid_info *grid);
/** @brief Free the DVS 2.0 statistics memory
/* @brief Free the DVS 2.0 statistics memory
* @param[in] me Pointer to the DVS statistics buffer on the ISP.
* @return None
*/
void
ia_css_isp_dvs2_statistics_free(struct ia_css_isp_dvs_statistics *me);
/** @brief Allocate the DVS statistics memory on the host
/* @brief Allocate the DVS statistics memory on the host
* @param[in] grid The grid.
* @return Pointer to the allocated DVS statistics buffer on the host
*/
struct ia_css_dvs_statistics *
ia_css_dvs_statistics_allocate(const struct ia_css_dvs_grid_info *grid);
/** @brief Free the DVS statistics memory on the host
/* @brief Free the DVS statistics memory on the host
* @param[in] me Pointer to the DVS statistics buffer on the host.
* @return None
*/
void
ia_css_dvs_statistics_free(struct ia_css_dvs_statistics *me);
/** @brief Allocate the DVS coefficients memory
/* @brief Allocate the DVS coefficients memory
* @param[in] grid The grid.
* @return Pointer to the allocated DVS coefficients buffer
*/
struct ia_css_dvs_coefficients *
ia_css_dvs_coefficients_allocate(const struct ia_css_dvs_grid_info *grid);
/** @brief Free the DVS coefficients memory
/* @brief Free the DVS coefficients memory
* @param[in] me Pointer to the DVS coefficients buffer.
* @return None
*/
void
ia_css_dvs_coefficients_free(struct ia_css_dvs_coefficients *me);
/** @brief Allocate the DVS 2.0 statistics memory on the host
/* @brief Allocate the DVS 2.0 statistics memory on the host
* @param[in] grid The grid.
* @return Pointer to the allocated DVS 2.0 statistics buffer on the host
*/
struct ia_css_dvs2_statistics *
ia_css_dvs2_statistics_allocate(const struct ia_css_dvs_grid_info *grid);
/** @brief Free the DVS 2.0 statistics memory
/* @brief Free the DVS 2.0 statistics memory
* @param[in] me Pointer to the DVS 2.0 statistics buffer on the host.
* @return None
*/
void
ia_css_dvs2_statistics_free(struct ia_css_dvs2_statistics *me);
/** @brief Allocate the DVS 2.0 coefficients memory
/* @brief Allocate the DVS 2.0 coefficients memory
* @param[in] grid The grid.
* @return Pointer to the allocated DVS 2.0 coefficients buffer
*/
struct ia_css_dvs2_coefficients *
ia_css_dvs2_coefficients_allocate(const struct ia_css_dvs_grid_info *grid);
/** @brief Free the DVS 2.0 coefficients memory
/* @brief Free the DVS 2.0 coefficients memory
* @param[in] me Pointer to the DVS 2.0 coefficients buffer.
* @return None
*/
void
ia_css_dvs2_coefficients_free(struct ia_css_dvs2_coefficients *me);
/** @brief Allocate the DVS 2.0 6-axis config memory
/* @brief Allocate the DVS 2.0 6-axis config memory
* @param[in] stream The stream.
* @return Pointer to the allocated DVS 6axis configuration buffer
*/
struct ia_css_dvs_6axis_config *
ia_css_dvs2_6axis_config_allocate(const struct ia_css_stream *stream);
/** @brief Free the DVS 2.0 6-axis config memory
/* @brief Free the DVS 2.0 6-axis config memory
* @param[in] dvs_6axis_config Pointer to the DVS 6axis configuration buffer
* @return None
*/
void
ia_css_dvs2_6axis_config_free(struct ia_css_dvs_6axis_config *dvs_6axis_config);
/** @brief Allocate a dvs statistics map structure
/* @brief Allocate a dvs statistics map structure
* @param[in] isp_stats pointer to ISP dvs statistis struct
* @param[in] data_ptr host-side pointer to ISP dvs statistics.
* @return Pointer to the allocated dvs statistics map
......@@ -280,7 +280,7 @@ ia_css_isp_dvs_statistics_map_allocate(
const struct ia_css_isp_dvs_statistics *isp_stats,
void *data_ptr);
/** @brief Free the dvs statistics map
/* @brief Free the dvs statistics map
* @param[in] me Pointer to the dvs statistics map
* @return None
*
......@@ -291,7 +291,7 @@ ia_css_isp_dvs_statistics_map_allocate(
void
ia_css_isp_dvs_statistics_map_free(struct ia_css_isp_dvs_statistics_map *me);
/** @brief Allocate memory for the SKC DVS statistics on the ISP
/* @brief Allocate memory for the SKC DVS statistics on the ISP
* @return Pointer to the allocated ACC DVS statistics buffer on the ISP
*/
struct ia_css_isp_skc_dvs_statistics *ia_css_skc_dvs_statistics_allocate(void);
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_env.h
浏览文件 @ d929fb4e
......@@ -20,12 +20,12 @@
#include "ia_css_types.h"
#include "ia_css_acc_types.h"
/** @file
/* @file
* This file contains prototypes for functions that need to be provided to the
* CSS-API host-code by the environment in which the CSS-API code runs.
*/
/** Memory allocation attributes, for use in ia_css_css_mem_env. */
/* Memory allocation attributes, for use in ia_css_css_mem_env. */
enum ia_css_mem_attr {
IA_CSS_MEM_ATTR_CACHED = 1 << 0,
IA_CSS_MEM_ATTR_ZEROED = 1 << 1,
......@@ -33,62 +33,62 @@ enum ia_css_mem_attr {
IA_CSS_MEM_ATTR_CONTIGUOUS = 1 << 3,
};
/** Environment with function pointers for local IA memory allocation.
/* Environment with function pointers for local IA memory allocation.
* This provides the CSS code with environment specific functionality
* for memory allocation of small local buffers such as local data structures.
* This is never expected to allocate more than one page of memory (4K bytes).
*/
struct ia_css_cpu_mem_env {
void (*flush)(struct ia_css_acc_fw *fw);
/**< Flush function to flush the cache for given accelerator. */
/** Flush function to flush the cache for given accelerator. */
};
/** Environment with function pointers to access the CSS hardware. This includes
/* Environment with function pointers to access the CSS hardware. This includes
* registers and local memories.
*/
struct ia_css_hw_access_env {
void (*store_8)(hrt_address addr, uint8_t data);
/**< Store an 8 bit value into an address in the CSS HW address space.
/** Store an 8 bit value into an address in the CSS HW address space.
The address must be an 8 bit aligned address. */
void (*store_16)(hrt_address addr, uint16_t data);
/**< Store a 16 bit value into an address in the CSS HW address space.
/** Store a 16 bit value into an address in the CSS HW address space.
The address must be a 16 bit aligned address. */
void (*store_32)(hrt_address addr, uint32_t data);
/**< Store a 32 bit value into an address in the CSS HW address space.
/** Store a 32 bit value into an address in the CSS HW address space.
The address must be a 32 bit aligned address. */
uint8_t (*load_8)(hrt_address addr);
/**< Load an 8 bit value from an address in the CSS HW address
/** Load an 8 bit value from an address in the CSS HW address
space. The address must be an 8 bit aligned address. */
uint16_t (*load_16)(hrt_address addr);
/**< Load a 16 bit value from an address in the CSS HW address
/** Load a 16 bit value from an address in the CSS HW address
space. The address must be a 16 bit aligned address. */
uint32_t (*load_32)(hrt_address addr);
/**< Load a 32 bit value from an address in the CSS HW address
/** Load a 32 bit value from an address in the CSS HW address
space. The address must be a 32 bit aligned address. */
void (*store)(hrt_address addr, const void *data, uint32_t bytes);
/**< Store a number of bytes into a byte-aligned address in the CSS HW address space. */
/** Store a number of bytes into a byte-aligned address in the CSS HW address space. */
void (*load)(hrt_address addr, void *data, uint32_t bytes);
/**< Load a number of bytes from a byte-aligned address in the CSS HW address space. */
/** Load a number of bytes from a byte-aligned address in the CSS HW address space. */
};
/** Environment with function pointers to print error and debug messages.
/* Environment with function pointers to print error and debug messages.
*/
struct ia_css_print_env {
int (*debug_print)(const char *fmt, va_list args);
/**< Print a debug message. */
/** Print a debug message. */
int (*error_print)(const char *fmt, va_list args);
/**< Print an error message.*/
/** Print an error message.*/
};
/** Environment structure. This includes function pointers to access several
/* Environment structure. This includes function pointers to access several
* features provided by the environment in which the CSS API is used.
* This is used to run the camera IP in multiple platforms such as Linux,
* Windows and several simulation environments.
*/
struct ia_css_env {
struct ia_css_cpu_mem_env cpu_mem_env; /**< local flush. */
struct ia_css_hw_access_env hw_access_env; /**< CSS HW access functions */
struct ia_css_print_env print_env; /**< Message printing env. */
struct ia_css_cpu_mem_env cpu_mem_env; /** local flush. */
struct ia_css_hw_access_env hw_access_env; /** CSS HW access functions */
struct ia_css_print_env print_env; /** Message printing env. */
};
#endif /* __IA_CSS_ENV_H */
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_err.h
浏览文件 @ d929fb4e
......@@ -15,12 +15,12 @@
#ifndef __IA_CSS_ERR_H
#define __IA_CSS_ERR_H
/** @file
/* @file
* This file contains possible return values for most
* functions in the CSS-API.
*/
/** Errors, these values are used as the return value for most
/* Errors, these values are used as the return value for most
* functions in this API.
*/
enum ia_css_err {
......@@ -41,22 +41,22 @@ enum ia_css_err {
IA_CSS_ERR_NOT_SUPPORTED
};
/** FW warnings. This enum contains a value for each warning that
/* FW warnings. This enum contains a value for each warning that
* the SP FW could indicate potential performance issue
*/
enum ia_css_fw_warning {
IA_CSS_FW_WARNING_NONE,
IA_CSS_FW_WARNING_ISYS_QUEUE_FULL, /** < CSS system delayed because of insufficient space in the ISys queue.
IA_CSS_FW_WARNING_ISYS_QUEUE_FULL, /* < CSS system delayed because of insufficient space in the ISys queue.
This warning can be avoided by de-queing ISYS buffers more timely. */
IA_CSS_FW_WARNING_PSYS_QUEUE_FULL, /** < CSS system delayed because of insufficient space in the PSys queue.
IA_CSS_FW_WARNING_PSYS_QUEUE_FULL, /* < CSS system delayed because of insufficient space in the PSys queue.
This warning can be avoided by de-queing PSYS buffers more timely. */
IA_CSS_FW_WARNING_CIRCBUF_ALL_LOCKED, /** < CSS system delayed because of insufficient available buffers.
IA_CSS_FW_WARNING_CIRCBUF_ALL_LOCKED, /* < CSS system delayed because of insufficient available buffers.
This warning can be avoided by unlocking locked frame-buffers more timely. */
IA_CSS_FW_WARNING_EXP_ID_LOCKED, /** < Exposure ID skipped because the frame associated to it was still locked.
IA_CSS_FW_WARNING_EXP_ID_LOCKED, /* < Exposure ID skipped because the frame associated to it was still locked.
This warning can be avoided by unlocking locked frame-buffers more timely. */
IA_CSS_FW_WARNING_TAG_EXP_ID_FAILED, /** < Exposure ID cannot be found on the circular buffer.
IA_CSS_FW_WARNING_TAG_EXP_ID_FAILED, /* < Exposure ID cannot be found on the circular buffer.
This warning can be avoided by unlocking locked frame-buffers more timely. */
IA_CSS_FW_WARNING_FRAME_PARAM_MISMATCH, /** < Frame and param pair mismatched in tagger.
IA_CSS_FW_WARNING_FRAME_PARAM_MISMATCH, /* < Frame and param pair mismatched in tagger.
This warning can be avoided by providing a param set for each frame. */
};
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_event_public.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_EVENT_PUBLIC_H
#define __IA_CSS_EVENT_PUBLIC_H
/** @file
/* @file
* This file contains CSS-API events functionality
*/
......@@ -24,7 +24,7 @@
#include <ia_css_types.h> /* ia_css_pipe */
#include <ia_css_timer.h> /* ia_css_timer */
/** The event type, distinguishes the kind of events that
/* The event type, distinguishes the kind of events that
* can are generated by the CSS system.
*
* !!!IMPORTANT!!! KEEP THE FOLLOWING IN SYNC:
......@@ -35,43 +35,43 @@
*/
enum ia_css_event_type {
IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = 1 << 0,
/**< Output frame ready. */
/** Output frame ready. */
IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = 1 << 1,
/**< Second output frame ready. */
/** Second output frame ready. */
IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = 1 << 2,
/**< Viewfinder Output frame ready. */
/** Viewfinder Output frame ready. */
IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = 1 << 3,
/**< Second viewfinder Output frame ready. */
/** Second viewfinder Output frame ready. */
IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = 1 << 4,
/**< Indication that 3A statistics are available. */
/** Indication that 3A statistics are available. */
IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = 1 << 5,
/**< Indication that DIS statistics are available. */
/** Indication that DIS statistics are available. */
IA_CSS_EVENT_TYPE_PIPELINE_DONE = 1 << 6,
/**< Pipeline Done event, sent after last pipeline stage. */
/** Pipeline Done event, sent after last pipeline stage. */
IA_CSS_EVENT_TYPE_FRAME_TAGGED = 1 << 7,
/**< Frame tagged. */
/** Frame tagged. */
IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = 1 << 8,
/**< Input frame ready. */
/** Input frame ready. */
IA_CSS_EVENT_TYPE_METADATA_DONE = 1 << 9,
/**< Metadata ready. */
/** Metadata ready. */
IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = 1 << 10,
/**< Indication that LACE statistics are available. */
/** Indication that LACE statistics are available. */
IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = 1 << 11,
/**< Extension stage complete. */
/** Extension stage complete. */
IA_CSS_EVENT_TYPE_TIMER = 1 << 12,
/**< Timer event for measuring the SP side latencies. It contains the
/** Timer event for measuring the SP side latencies. It contains the
32-bit timer value from the SP */
IA_CSS_EVENT_TYPE_PORT_EOF = 1 << 13,
/**< End Of Frame event, sent when in buffered sensor mode. */
/** End Of Frame event, sent when in buffered sensor mode. */
IA_CSS_EVENT_TYPE_FW_WARNING = 1 << 14,
/**< Performance warning encounter by FW */
/** Performance warning encounter by FW */
IA_CSS_EVENT_TYPE_FW_ASSERT = 1 << 15,
/**< Assertion hit by FW */
/** Assertion hit by FW */
};
#define IA_CSS_EVENT_TYPE_NONE 0
/** IA_CSS_EVENT_TYPE_ALL is a mask for all pipe related events.
/* IA_CSS_EVENT_TYPE_ALL is a mask for all pipe related events.
* The other events (such as PORT_EOF) cannot be enabled/disabled
* and are hence excluded from this macro.
*/
......@@ -89,7 +89,7 @@ enum ia_css_event_type {
IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE | \
IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE)
/** The event struct, container for the event type and its related values.
/* The event struct, container for the event type and its related values.
* Depending on the event type, either pipe or port will be filled.
* Pipeline related events (like buffer/frame events) will return a valid and filled pipe handle.
* For non pipeline related events (but i.e. stream specific, like EOF event), the port will be
......@@ -97,14 +97,14 @@ enum ia_css_event_type {
*/
struct ia_css_event {
struct ia_css_pipe *pipe;
/**< Pipe handle on which event happened, NULL for non pipe related
/** Pipe handle on which event happened, NULL for non pipe related
events. */
enum ia_css_event_type type;
/**< Type of Event, always valid/filled. */
/** Type of Event, always valid/filled. */
uint8_t port;
/**< Port number for EOF event (not valid for other events). */
/** Port number for EOF event (not valid for other events). */
uint8_t exp_id;
/**< Exposure id for EOF/FRAME_TAGGED/FW_WARNING event (not valid for other events)
/** Exposure id for EOF/FRAME_TAGGED/FW_WARNING event (not valid for other events)
The exposure ID is unique only within a logical stream and it is
only generated on systems that have an input system (such as 2400
and 2401).
......@@ -120,26 +120,26 @@ struct ia_css_event {
in the exposure IDs. Therefor applications should not use this
to detect frame drops. */
uint32_t fw_handle;
/**< Firmware Handle for ACC_STAGE_COMPLETE event (not valid for other
/** Firmware Handle for ACC_STAGE_COMPLETE event (not valid for other
events). */
enum ia_css_fw_warning fw_warning;
/**< Firmware warning code, only for WARNING events. */
/** Firmware warning code, only for WARNING events. */
uint8_t fw_assert_module_id;
/**< Firmware module id, only for ASSERT events, should be logged by driver. */
/** Firmware module id, only for ASSERT events, should be logged by driver. */
uint16_t fw_assert_line_no;
/**< Firmware line number, only for ASSERT events, should be logged by driver. */
/** Firmware line number, only for ASSERT events, should be logged by driver. */
clock_value_t timer_data;
/**< For storing the full 32-bit of the timer value. Valid only for TIMER
/** For storing the full 32-bit of the timer value. Valid only for TIMER
event */
uint8_t timer_code;
/**< For storing the code of the TIMER event. Valid only for
/** For storing the code of the TIMER event. Valid only for
TIMER event */
uint8_t timer_subcode;
/**< For storing the subcode of the TIMER event. Valid only
/** For storing the subcode of the TIMER event. Valid only
for TIMER event */
};
/** @brief Dequeue a PSYS event from the CSS system.
/* @brief Dequeue a PSYS event from the CSS system.
*
* @param[out] event Pointer to the event struct which will be filled by
* this function if an event is available.
......@@ -156,7 +156,7 @@ struct ia_css_event {
enum ia_css_err
ia_css_dequeue_psys_event(struct ia_css_event *event);
/** @brief Dequeue an event from the CSS system.
/* @brief Dequeue an event from the CSS system.
*
* @param[out] event Pointer to the event struct which will be filled by
* this function if an event is available.
......@@ -171,7 +171,7 @@ ia_css_dequeue_psys_event(struct ia_css_event *event);
enum ia_css_err
ia_css_dequeue_event(struct ia_css_event *event);
/** @brief Dequeue an ISYS event from the CSS system.
/* @brief Dequeue an ISYS event from the CSS system.
*
* @param[out] event Pointer to the event struct which will be filled by
* this function if an event is available.
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_firmware.h
浏览文件 @ d929fb4e
......@@ -15,21 +15,21 @@
#ifndef __IA_CSS_FIRMWARE_H
#define __IA_CSS_FIRMWARE_H
/** @file
/* @file
* This file contains firmware loading/unloading support functionality
*/
#include "ia_css_err.h"
#include "ia_css_env.h"
/** CSS firmware package structure.
/* CSS firmware package structure.
*/
struct ia_css_fw {
void *data; /**< pointer to the firmware data */
unsigned int bytes; /**< length in bytes of firmware data */
void *data; /** pointer to the firmware data */
unsigned int bytes; /** length in bytes of firmware data */
};
/** @brief Loads the firmware
/* @brief Loads the firmware
* @param[in] env Environment, provides functions to access the
* environment in which the CSS code runs. This is
* used for host side memory access and message
......@@ -51,7 +51,7 @@ enum ia_css_err
ia_css_load_firmware(const struct ia_css_env *env,
const struct ia_css_fw *fw);
/** @brief Unloads the firmware
/* @brief Unloads the firmware
* @return None
*
* This function unloads the firmware loaded by ia_css_load_firmware.
......@@ -61,7 +61,7 @@ ia_css_load_firmware(const struct ia_css_env *env,
void
ia_css_unload_firmware(void);
/** @brief Checks firmware version
/* @brief Checks firmware version
* @param[in] fw Firmware package containing the firmware for all
* predefined ISP binaries.
* @return Returns true when the firmware version matches with the CSS
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frac.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef _IA_CSS_FRAC_H
#define _IA_CSS_FRAC_H
/** @file
/* @file
* This file contains typedefs used for fractional numbers
*/
......@@ -25,13 +25,13 @@
* NOTE: the 16 bit fixed point types actually occupy 32 bits
* to save on extension operations in the ISP code.
*/
/** Unsigned fixed point value, 0 integer bits, 16 fractional bits */
/* Unsigned fixed point value, 0 integer bits, 16 fractional bits */
typedef uint32_t ia_css_u0_16;
/** Unsigned fixed point value, 5 integer bits, 11 fractional bits */
/* Unsigned fixed point value, 5 integer bits, 11 fractional bits */
typedef uint32_t ia_css_u5_11;
/** Unsigned fixed point value, 8 integer bits, 8 fractional bits */
/* Unsigned fixed point value, 8 integer bits, 8 fractional bits */
typedef uint32_t ia_css_u8_8;
/** Signed fixed point value, 0 integer bits, 15 fractional bits */
/* Signed fixed point value, 0 integer bits, 15 fractional bits */
typedef int32_t ia_css_s0_15;
#endif /* _IA_CSS_FRAC_H */
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_format.h
浏览文件 @ d929fb4e
......@@ -15,11 +15,11 @@
#ifndef __IA_CSS_FRAME_FORMAT_H
#define __IA_CSS_FRAME_FORMAT_H
/** @file
/* @file
* This file contains information about formats supported in the ISP
*/
/** Frame formats, some of these come from fourcc.org, others are
/* Frame formats, some of these come from fourcc.org, others are
better explained by video4linux2. The NV11 seems to be described only
on MSDN pages, but even those seem to be gone now.
Frames can come in many forms, the main categories are RAW, RGB and YUV
......@@ -48,45 +48,45 @@
- css/bxt_sandbox/isysapi/interface/ia_css_isysapi_fw_types.h
*/
enum ia_css_frame_format {
IA_CSS_FRAME_FORMAT_NV11 = 0, /**< 12 bit YUV 411, Y, UV plane */
IA_CSS_FRAME_FORMAT_NV12, /**< 12 bit YUV 420, Y, UV plane */
IA_CSS_FRAME_FORMAT_NV12_16, /**< 16 bit YUV 420, Y, UV plane */
IA_CSS_FRAME_FORMAT_NV12_TILEY, /**< 12 bit YUV 420, Intel proprietary tiled format, TileY */
IA_CSS_FRAME_FORMAT_NV16, /**< 16 bit YUV 422, Y, UV plane */
IA_CSS_FRAME_FORMAT_NV21, /**< 12 bit YUV 420, Y, VU plane */
IA_CSS_FRAME_FORMAT_NV61, /**< 16 bit YUV 422, Y, VU plane */
IA_CSS_FRAME_FORMAT_YV12, /**< 12 bit YUV 420, Y, V, U plane */
IA_CSS_FRAME_FORMAT_YV16, /**< 16 bit YUV 422, Y, V, U plane */
IA_CSS_FRAME_FORMAT_YUV420, /**< 12 bit YUV 420, Y, U, V plane */
IA_CSS_FRAME_FORMAT_YUV420_16, /**< yuv420, 16 bits per subpixel */
IA_CSS_FRAME_FORMAT_YUV422, /**< 16 bit YUV 422, Y, U, V plane */
IA_CSS_FRAME_FORMAT_YUV422_16, /**< yuv422, 16 bits per subpixel */
IA_CSS_FRAME_FORMAT_UYVY, /**< 16 bit YUV 422, UYVY interleaved */
IA_CSS_FRAME_FORMAT_YUYV, /**< 16 bit YUV 422, YUYV interleaved */
IA_CSS_FRAME_FORMAT_YUV444, /**< 24 bit YUV 444, Y, U, V plane */
IA_CSS_FRAME_FORMAT_YUV_LINE, /**< Internal format, 2 y lines followed
IA_CSS_FRAME_FORMAT_NV11 = 0, /** 12 bit YUV 411, Y, UV plane */
IA_CSS_FRAME_FORMAT_NV12, /** 12 bit YUV 420, Y, UV plane */
IA_CSS_FRAME_FORMAT_NV12_16, /** 16 bit YUV 420, Y, UV plane */
IA_CSS_FRAME_FORMAT_NV12_TILEY, /** 12 bit YUV 420, Intel proprietary tiled format, TileY */
IA_CSS_FRAME_FORMAT_NV16, /** 16 bit YUV 422, Y, UV plane */
IA_CSS_FRAME_FORMAT_NV21, /** 12 bit YUV 420, Y, VU plane */
IA_CSS_FRAME_FORMAT_NV61, /** 16 bit YUV 422, Y, VU plane */
IA_CSS_FRAME_FORMAT_YV12, /** 12 bit YUV 420, Y, V, U plane */
IA_CSS_FRAME_FORMAT_YV16, /** 16 bit YUV 422, Y, V, U plane */
IA_CSS_FRAME_FORMAT_YUV420, /** 12 bit YUV 420, Y, U, V plane */
IA_CSS_FRAME_FORMAT_YUV420_16, /** yuv420, 16 bits per subpixel */
IA_CSS_FRAME_FORMAT_YUV422, /** 16 bit YUV 422, Y, U, V plane */
IA_CSS_FRAME_FORMAT_YUV422_16, /** yuv422, 16 bits per subpixel */
IA_CSS_FRAME_FORMAT_UYVY, /** 16 bit YUV 422, UYVY interleaved */
IA_CSS_FRAME_FORMAT_YUYV, /** 16 bit YUV 422, YUYV interleaved */
IA_CSS_FRAME_FORMAT_YUV444, /** 24 bit YUV 444, Y, U, V plane */
IA_CSS_FRAME_FORMAT_YUV_LINE, /** Internal format, 2 y lines followed
by a uvinterleaved line */
IA_CSS_FRAME_FORMAT_RAW, /**< RAW, 1 plane */
IA_CSS_FRAME_FORMAT_RGB565, /**< 16 bit RGB, 1 plane. Each 3 sub
IA_CSS_FRAME_FORMAT_RAW, /** RAW, 1 plane */
IA_CSS_FRAME_FORMAT_RGB565, /** 16 bit RGB, 1 plane. Each 3 sub
pixels are packed into one 16 bit
value, 5 bits for R, 6 bits for G
and 5 bits for B. */
IA_CSS_FRAME_FORMAT_PLANAR_RGB888, /**< 24 bit RGB, 3 planes */
IA_CSS_FRAME_FORMAT_RGBA888, /**< 32 bit RGBA, 1 plane, A=Alpha
IA_CSS_FRAME_FORMAT_PLANAR_RGB888, /** 24 bit RGB, 3 planes */
IA_CSS_FRAME_FORMAT_RGBA888, /** 32 bit RGBA, 1 plane, A=Alpha
(alpha is unused) */
IA_CSS_FRAME_FORMAT_QPLANE6, /**< Internal, for advanced ISP */
IA_CSS_FRAME_FORMAT_BINARY_8, /**< byte stream, used for jpeg. For
IA_CSS_FRAME_FORMAT_QPLANE6, /** Internal, for advanced ISP */
IA_CSS_FRAME_FORMAT_BINARY_8, /** byte stream, used for jpeg. For
frames of this type, we set the
height to 1 and the width to the
number of allocated bytes. */
IA_CSS_FRAME_FORMAT_MIPI, /**< MIPI frame, 1 plane */
IA_CSS_FRAME_FORMAT_RAW_PACKED, /**< RAW, 1 plane, packed */
IA_CSS_FRAME_FORMAT_CSI_MIPI_YUV420_8, /**< 8 bit per Y/U/V.
IA_CSS_FRAME_FORMAT_MIPI, /** MIPI frame, 1 plane */
IA_CSS_FRAME_FORMAT_RAW_PACKED, /** RAW, 1 plane, packed */
IA_CSS_FRAME_FORMAT_CSI_MIPI_YUV420_8, /** 8 bit per Y/U/V.
Y odd line; UYVY
interleaved even line */
IA_CSS_FRAME_FORMAT_CSI_MIPI_LEGACY_YUV420_8, /**< Legacy YUV420. UY odd
IA_CSS_FRAME_FORMAT_CSI_MIPI_LEGACY_YUV420_8, /** Legacy YUV420. UY odd
line; VY even line */
IA_CSS_FRAME_FORMAT_CSI_MIPI_YUV420_10 /**< 10 bit per Y/U/V. Y odd
IA_CSS_FRAME_FORMAT_CSI_MIPI_YUV420_10 /** 10 bit per Y/U/V. Y odd
line; UYVY interleaved
even line */
};
......@@ -95,7 +95,7 @@ enum ia_css_frame_format {
/* because of issues this would cause with the Clockwork code checking tool. */
#define IA_CSS_FRAME_FORMAT_NUM (IA_CSS_FRAME_FORMAT_CSI_MIPI_YUV420_10 + 1)
/** Number of valid output frame formats for ISP **/
/* Number of valid output frame formats for ISP **/
#define IA_CSS_FRAME_OUT_FORMAT_NUM (IA_CSS_FRAME_FORMAT_RGBA888 + 1)
#endif /* __IA_CSS_FRAME_FORMAT_H */
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_FRAME_PUBLIC_H
#define __IA_CSS_FRAME_PUBLIC_H
/** @file
/* @file
* This file contains structs to describe various frame-formats supported by the ISP.
*/
......@@ -25,73 +25,73 @@
#include "ia_css_frame_format.h"
#include "ia_css_buffer.h"
/** For RAW input, the bayer order needs to be specified separately. There
/* For RAW input, the bayer order needs to be specified separately. There
* are 4 possible orders. The name is constructed by taking the first two
* colors on the first line and the first two colors from the second line.
*/
enum ia_css_bayer_order {
IA_CSS_BAYER_ORDER_GRBG, /**< GRGRGRGRGR .. BGBGBGBGBG */
IA_CSS_BAYER_ORDER_RGGB, /**< RGRGRGRGRG .. GBGBGBGBGB */
IA_CSS_BAYER_ORDER_BGGR, /**< BGBGBGBGBG .. GRGRGRGRGR */
IA_CSS_BAYER_ORDER_GBRG, /**< GBGBGBGBGB .. RGRGRGRGRG */
IA_CSS_BAYER_ORDER_GRBG, /** GRGRGRGRGR .. BGBGBGBGBG */
IA_CSS_BAYER_ORDER_RGGB, /** RGRGRGRGRG .. GBGBGBGBGB */
IA_CSS_BAYER_ORDER_BGGR, /** BGBGBGBGBG .. GRGRGRGRGR */
IA_CSS_BAYER_ORDER_GBRG, /** GBGBGBGBGB .. RGRGRGRGRG */
};
#define IA_CSS_BAYER_ORDER_NUM (IA_CSS_BAYER_ORDER_GBRG + 1)
/** Frame plane structure. This describes one plane in an image
/* Frame plane structure. This describes one plane in an image
* frame buffer.
*/
struct ia_css_frame_plane {
unsigned int height; /**< height of a plane in lines */
unsigned int width; /**< width of a line, in DMA elements, note that
unsigned int height; /** height of a plane in lines */
unsigned int width; /** width of a line, in DMA elements, note that
for RGB565 the three subpixels are stored in
one element. For all other formats this is
the number of subpixels per line. */
unsigned int stride; /**< stride of a line in bytes */
unsigned int offset; /**< offset in bytes to start of frame data.
unsigned int stride; /** stride of a line in bytes */
unsigned int offset; /** offset in bytes to start of frame data.
offset is wrt data field in ia_css_frame */
};
/** Binary "plane". This is used to story binary streams such as jpeg
/* Binary "plane". This is used to story binary streams such as jpeg
* images. This is not actually a real plane.
*/
struct ia_css_frame_binary_plane {
unsigned int size; /**< number of bytes in the stream */
struct ia_css_frame_plane data; /**< plane */
unsigned int size; /** number of bytes in the stream */
struct ia_css_frame_plane data; /** plane */
};
/** Container for planar YUV frames. This contains 3 planes.
/* Container for planar YUV frames. This contains 3 planes.
*/
struct ia_css_frame_yuv_planes {
struct ia_css_frame_plane y; /**< Y plane */
struct ia_css_frame_plane u; /**< U plane */
struct ia_css_frame_plane v; /**< V plane */
struct ia_css_frame_plane y; /** Y plane */
struct ia_css_frame_plane u; /** U plane */
struct ia_css_frame_plane v; /** V plane */
};
/** Container for semi-planar YUV frames.
/* Container for semi-planar YUV frames.
*/
struct ia_css_frame_nv_planes {
struct ia_css_frame_plane y; /**< Y plane */
struct ia_css_frame_plane uv; /**< UV plane */
struct ia_css_frame_plane y; /** Y plane */
struct ia_css_frame_plane uv; /** UV plane */
};
/** Container for planar RGB frames. Each color has its own plane.
/* Container for planar RGB frames. Each color has its own plane.
*/
struct ia_css_frame_rgb_planes {
struct ia_css_frame_plane r; /**< Red plane */
struct ia_css_frame_plane g; /**< Green plane */
struct ia_css_frame_plane b; /**< Blue plane */
struct ia_css_frame_plane r; /** Red plane */
struct ia_css_frame_plane g; /** Green plane */
struct ia_css_frame_plane b; /** Blue plane */
};
/** Container for 6-plane frames. These frames are used internally
/* Container for 6-plane frames. These frames are used internally
* in the advanced ISP only.
*/
struct ia_css_frame_plane6_planes {
struct ia_css_frame_plane r; /**< Red plane */
struct ia_css_frame_plane r_at_b; /**< Red at blue plane */
struct ia_css_frame_plane gr; /**< Red-green plane */
struct ia_css_frame_plane gb; /**< Blue-green plane */
struct ia_css_frame_plane b; /**< Blue plane */
struct ia_css_frame_plane b_at_r; /**< Blue at red plane */
struct ia_css_frame_plane r; /** Red plane */
struct ia_css_frame_plane r_at_b; /** Red at blue plane */
struct ia_css_frame_plane gr; /** Red-green plane */
struct ia_css_frame_plane gb; /** Blue-green plane */
struct ia_css_frame_plane b; /** Blue plane */
struct ia_css_frame_plane b_at_r; /** Blue at red plane */
};
/* Crop info struct - stores the lines to be cropped in isp */
......@@ -103,15 +103,15 @@ struct ia_css_crop_info {
unsigned int start_line;
};
/** Frame info struct. This describes the contents of an image frame buffer.
/* Frame info struct. This describes the contents of an image frame buffer.
*/
struct ia_css_frame_info {
struct ia_css_resolution res; /**< Frame resolution (valid data) */
unsigned int padded_width; /**< stride of line in memory (in pixels) */
enum ia_css_frame_format format; /**< format of the frame data */
unsigned int raw_bit_depth; /**< number of valid bits per pixel,
struct ia_css_resolution res; /** Frame resolution (valid data) */
unsigned int padded_width; /** stride of line in memory (in pixels) */
enum ia_css_frame_format format; /** format of the frame data */
unsigned int raw_bit_depth; /** number of valid bits per pixel,
only valid for RAW bayer frames */
enum ia_css_bayer_order raw_bayer_order; /**< bayer order, only valid
enum ia_css_bayer_order raw_bayer_order; /** bayer order, only valid
for RAW bayer frames */
/* the params below are computed based on bayer_order
* we can remove the raw_bayer_order if it is redundant
......@@ -136,9 +136,9 @@ struct ia_css_frame_info {
* Specifies the DVS loop delay in "frame periods"
*/
enum ia_css_frame_delay {
IA_CSS_FRAME_DELAY_0, /**< Frame delay = 0 */
IA_CSS_FRAME_DELAY_1, /**< Frame delay = 1 */
IA_CSS_FRAME_DELAY_2 /**< Frame delay = 2 */
IA_CSS_FRAME_DELAY_0, /** Frame delay = 0 */
IA_CSS_FRAME_DELAY_1, /** Frame delay = 1 */
IA_CSS_FRAME_DELAY_2 /** Frame delay = 2 */
};
enum ia_css_frame_flash_state {
......@@ -147,13 +147,13 @@ enum ia_css_frame_flash_state {
IA_CSS_FRAME_FLASH_STATE_FULL
};
/** Frame structure. This structure describes an image buffer or frame.
/* Frame structure. This structure describes an image buffer or frame.
* This is the main structure used for all input and output images.
*/
struct ia_css_frame {
struct ia_css_frame_info info; /**< info struct describing the frame */
ia_css_ptr data; /**< pointer to start of image data */
unsigned int data_bytes; /**< size of image data in bytes */
struct ia_css_frame_info info; /** info struct describing the frame */
ia_css_ptr data; /** pointer to start of image data */
unsigned int data_bytes; /** size of image data in bytes */
/* LA: move this to ia_css_buffer */
/*
* -1 if data address is static during life time of pipeline
......@@ -171,10 +171,10 @@ struct ia_css_frame {
enum ia_css_buffer_type buf_type;
enum ia_css_frame_flash_state flash_state;
unsigned int exp_id;
/**< exposure id, see ia_css_event_public.h for more detail */
uint32_t isp_config_id; /**< Unique ID to track which config was actually applied to a particular frame */
bool valid; /**< First video output frame is not valid */
bool contiguous; /**< memory is allocated physically contiguously */
/** exposure id, see ia_css_event_public.h for more detail */
uint32_t isp_config_id; /** Unique ID to track which config was actually applied to a particular frame */
bool valid; /** First video output frame is not valid */
bool contiguous; /** memory is allocated physically contiguously */
union {
unsigned int _initialisation_dummy;
struct ia_css_frame_plane raw;
......@@ -185,7 +185,7 @@ struct ia_css_frame {
struct ia_css_frame_nv_planes nv;
struct ia_css_frame_plane6_planes plane6;
struct ia_css_frame_binary_plane binary;
} planes; /**< frame planes, select the right one based on
} planes; /** frame planes, select the right one based on
info.format */
};
......@@ -204,7 +204,7 @@ struct ia_css_frame {
{ 0 } /* planes */ \
}
/** @brief Fill a frame with zeros
/* @brief Fill a frame with zeros
*
* @param frame The frame.
* @return None
......@@ -213,7 +213,7 @@ struct ia_css_frame {
*/
void ia_css_frame_zero(struct ia_css_frame *frame);
/** @brief Allocate a CSS frame structure
/* @brief Allocate a CSS frame structure
*
* @param frame The allocated frame.
* @param width The width (in pixels) of the frame.
......@@ -234,7 +234,7 @@ ia_css_frame_allocate(struct ia_css_frame **frame,
unsigned int stride,
unsigned int raw_bit_depth);
/** @brief Allocate a CSS frame structure using a frame info structure.
/* @brief Allocate a CSS frame structure using a frame info structure.
*
* @param frame The allocated frame.
* @param[in] info The frame info structure.
......@@ -247,7 +247,7 @@ ia_css_frame_allocate(struct ia_css_frame **frame,
enum ia_css_err
ia_css_frame_allocate_from_info(struct ia_css_frame **frame,
const struct ia_css_frame_info *info);
/** @brief Free a CSS frame structure.
/* @brief Free a CSS frame structure.
*
* @param[in] frame Pointer to the frame.
* @return None
......@@ -258,7 +258,7 @@ ia_css_frame_allocate_from_info(struct ia_css_frame **frame,
void
ia_css_frame_free(struct ia_css_frame *frame);
/** @brief Allocate a contiguous CSS frame structure
/* @brief Allocate a contiguous CSS frame structure
*
* @param frame The allocated frame.
* @param width The width (in pixels) of the frame.
......@@ -280,7 +280,7 @@ ia_css_frame_allocate_contiguous(struct ia_css_frame **frame,
unsigned int stride,
unsigned int raw_bit_depth);
/** @brief Allocate a contiguous CSS frame from a frame info structure.
/* @brief Allocate a contiguous CSS frame from a frame info structure.
*
* @param frame The allocated frame.
* @param[in] info The frame info structure.
......@@ -296,7 +296,7 @@ enum ia_css_err
ia_css_frame_allocate_contiguous_from_info(struct ia_css_frame **frame,
const struct ia_css_frame_info *info);
/** @brief Allocate a CSS frame structure using a frame info structure.
/* @brief Allocate a CSS frame structure using a frame info structure.
*
* @param frame The allocated frame.
* @param[in] info The frame info structure.
......@@ -309,7 +309,7 @@ enum ia_css_err
ia_css_frame_create_from_info(struct ia_css_frame **frame,
const struct ia_css_frame_info *info);
/** @brief Set a mapped data buffer to a CSS frame
/* @brief Set a mapped data buffer to a CSS frame
*
* @param[in] frame Valid CSS frame pointer
* @param[in] mapped_data Mapped data buffer to be assigned to the CSS frame
......@@ -327,7 +327,7 @@ ia_css_frame_set_data(struct ia_css_frame *frame,
const ia_css_ptr mapped_data,
size_t data_size_bytes);
/** @brief Map an existing frame data pointer to a CSS frame.
/* @brief Map an existing frame data pointer to a CSS frame.
*
* @param frame Pointer to the frame to be initialized
* @param[in] info The frame info.
......@@ -350,7 +350,7 @@ ia_css_frame_map(struct ia_css_frame **frame,
uint16_t attribute,
void *context);
/** @brief Unmap a CSS frame structure.
/* @brief Unmap a CSS frame structure.
*
* @param[in] frame Pointer to the CSS frame.
* @return None
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h
浏览文件 @ d929fb4e
......@@ -15,11 +15,11 @@
#ifndef __IA_CSS_INPUT_PORT_H
#define __IA_CSS_INPUT_PORT_H
/** @file
/* @file
* This file contains information about the possible input ports for CSS
*/
/** Enumeration of the physical input ports on the CSS hardware.
/* Enumeration of the physical input ports on the CSS hardware.
* There are 3 MIPI CSI-2 ports.
*/
enum ia_css_csi2_port {
......@@ -28,39 +28,39 @@ enum ia_css_csi2_port {
IA_CSS_CSI2_PORT2 /* Implicitly map to MIPI_PORT2_ID */
};
/** Backward compatible for CSS API 2.0 only
/* Backward compatible for CSS API 2.0 only
* TO BE REMOVED when all drivers move to CSS API 2.1
*/
#define IA_CSS_CSI2_PORT_4LANE IA_CSS_CSI2_PORT0
#define IA_CSS_CSI2_PORT_1LANE IA_CSS_CSI2_PORT1
#define IA_CSS_CSI2_PORT_2LANE IA_CSS_CSI2_PORT2
/** The CSI2 interface supports 2 types of compression or can
/* The CSI2 interface supports 2 types of compression or can
* be run without compression.
*/
enum ia_css_csi2_compression_type {
IA_CSS_CSI2_COMPRESSION_TYPE_NONE, /**< No compression */
IA_CSS_CSI2_COMPRESSION_TYPE_1, /**< Compression scheme 1 */
IA_CSS_CSI2_COMPRESSION_TYPE_2 /**< Compression scheme 2 */
IA_CSS_CSI2_COMPRESSION_TYPE_NONE, /** No compression */
IA_CSS_CSI2_COMPRESSION_TYPE_1, /** Compression scheme 1 */
IA_CSS_CSI2_COMPRESSION_TYPE_2 /** Compression scheme 2 */
};
struct ia_css_csi2_compression {
enum ia_css_csi2_compression_type type;
/**< Compression used */
/** Compression used */
unsigned int compressed_bits_per_pixel;
/**< Compressed bits per pixel (only when compression is enabled) */
/** Compressed bits per pixel (only when compression is enabled) */
unsigned int uncompressed_bits_per_pixel;
/**< Uncompressed bits per pixel (only when compression is enabled) */
/** Uncompressed bits per pixel (only when compression is enabled) */
};
/** Input port structure.
/* Input port structure.
*/
struct ia_css_input_port {
enum ia_css_csi2_port port; /**< Physical CSI-2 port */
unsigned int num_lanes; /**< Number of lanes used (4-lane port only) */
unsigned int timeout; /**< Timeout value */
unsigned int rxcount; /**< Register value, should include all lanes */
struct ia_css_csi2_compression compression; /**< Compression used */
enum ia_css_csi2_port port; /** Physical CSI-2 port */
unsigned int num_lanes; /** Number of lanes used (4-lane port only) */
unsigned int timeout; /** Timeout value */
unsigned int rxcount; /** Register value, should include all lanes */
struct ia_css_csi2_compression compression; /** Compression used */
};
#endif /* __IA_CSS_INPUT_PORT_H */
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_irq.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_IRQ_H
#define __IA_CSS_IRQ_H
/** @file
/* @file
* This file contains information for Interrupts/IRQs from CSS
*/
......@@ -23,14 +23,14 @@
#include "ia_css_pipe_public.h"
#include "ia_css_input_port.h"
/** Interrupt types, these enumerate all supported interrupt types.
/* Interrupt types, these enumerate all supported interrupt types.
*/
enum ia_css_irq_type {
IA_CSS_IRQ_TYPE_EDGE, /**< Edge (level) sensitive interrupt */
IA_CSS_IRQ_TYPE_PULSE /**< Pulse-shaped interrupt */
IA_CSS_IRQ_TYPE_EDGE, /** Edge (level) sensitive interrupt */
IA_CSS_IRQ_TYPE_PULSE /** Pulse-shaped interrupt */
};
/** Interrupt request type.
/* Interrupt request type.
* When the CSS hardware generates an interrupt, a function in this API
* needs to be called to retrieve information about the interrupt.
* This interrupt type is part of this information and indicates what
......@@ -46,55 +46,55 @@ enum ia_css_irq_type {
*/
enum ia_css_irq_info {
IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = 1 << 0,
/**< the css receiver has encountered an error */
/** the css receiver has encountered an error */
IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = 1 << 1,
/**< the FIFO in the csi receiver has overflown */
/** the FIFO in the csi receiver has overflown */
IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = 1 << 2,
/**< the css receiver received the start of frame */
/** the css receiver received the start of frame */
IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = 1 << 3,
/**< the css receiver received the end of frame */
/** the css receiver received the end of frame */
IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = 1 << 4,
/**< the css receiver received the start of line */
/** the css receiver received the start of line */
IA_CSS_IRQ_INFO_PSYS_EVENTS_READY = 1 << 5,
/**< One or more events are available in the PSYS event queue */
/** One or more events are available in the PSYS event queue */
IA_CSS_IRQ_INFO_EVENTS_READY = IA_CSS_IRQ_INFO_PSYS_EVENTS_READY,
/**< deprecated{obsolete version of IA_CSS_IRQ_INFO_PSYS_EVENTS_READY,
/** deprecated{obsolete version of IA_CSS_IRQ_INFO_PSYS_EVENTS_READY,
* same functionality.} */
IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = 1 << 6,
/**< the css receiver received the end of line */
/** the css receiver received the end of line */
IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = 1 << 7,
/**< the css receiver received a change in side band signals */
/** the css receiver received a change in side band signals */
IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = 1 << 8,
/**< generic short packets (0) */
/** generic short packets (0) */
IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = 1 << 9,
/**< generic short packets (1) */
/** generic short packets (1) */
IA_CSS_IRQ_INFO_IF_PRIM_ERROR = 1 << 10,
/**< the primary input formatter (A) has encountered an error */
/** the primary input formatter (A) has encountered an error */
IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = 1 << 11,
/**< the primary input formatter (B) has encountered an error */
/** the primary input formatter (B) has encountered an error */
IA_CSS_IRQ_INFO_IF_SEC_ERROR = 1 << 12,
/**< the secondary input formatter has encountered an error */
/** the secondary input formatter has encountered an error */
IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = 1 << 13,
/**< the stream-to-memory device has encountered an error */
/** the stream-to-memory device has encountered an error */
IA_CSS_IRQ_INFO_SW_0 = 1 << 14,
/**< software interrupt 0 */
/** software interrupt 0 */
IA_CSS_IRQ_INFO_SW_1 = 1 << 15,
/**< software interrupt 1 */
/** software interrupt 1 */
IA_CSS_IRQ_INFO_SW_2 = 1 << 16,
/**< software interrupt 2 */
/** software interrupt 2 */
IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = 1 << 17,
/**< ISP binary statistics are ready */
/** ISP binary statistics are ready */
IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = 1 << 18,
/**< the input system in in error */
/** the input system in in error */
IA_CSS_IRQ_INFO_IF_ERROR = 1 << 19,
/**< the input formatter in in error */
/** the input formatter in in error */
IA_CSS_IRQ_INFO_DMA_ERROR = 1 << 20,
/**< the dma in in error */
/** the dma in in error */
IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = 1 << 21,
/**< end-of-frame events are ready in the isys_event queue */
/** end-of-frame events are ready in the isys_event queue */
};
/** CSS receiver error types. Whenever the CSS receiver has encountered
/* CSS receiver error types. Whenever the CSS receiver has encountered
* an error, this enumeration is used to indicate which errors have occurred.
*
* Note that multiple error flags can be enabled at once and that this is in
......@@ -105,39 +105,39 @@ enum ia_css_irq_info {
* different receiver types, or possibly none in case of tests systems.
*/
enum ia_css_rx_irq_info {
IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /**< buffer overrun */
IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /**< entering sleep mode */
IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /**< exited sleep mode */
IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /**< ECC corrected */
IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /** buffer overrun */
IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /** entering sleep mode */
IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /** exited sleep mode */
IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /** ECC corrected */
IA_CSS_RX_IRQ_INFO_ERR_SOT = 1U << 4,
/**< Start of transmission */
IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /**< SOT sync (??) */
IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /**< Control (??) */
IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /**< Double ECC */
IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /**< CRC error */
IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /**< Unknown ID */
IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/**< Frame sync error */
IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/**< Frame data error */
IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/**< Timeout occurred */
IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/**< Unknown escape seq. */
IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/**< Line Sync error */
/** Start of transmission */
IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /** SOT sync (??) */
IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /** Control (??) */
IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /** Double ECC */
IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /** CRC error */
IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /** Unknown ID */
IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/** Frame sync error */
IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/** Frame data error */
IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/** Timeout occurred */
IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/** Unknown escape seq. */
IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/** Line Sync error */
IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = 1U << 15,
};
/** Interrupt info structure. This structure contains information about an
/* Interrupt info structure. This structure contains information about an
* interrupt. This needs to be used after an interrupt is received on the IA
* to perform the correct action.
*/
struct ia_css_irq {
enum ia_css_irq_info type; /**< Interrupt type. */
unsigned int sw_irq_0_val; /**< In case of SW interrupt 0, value. */
unsigned int sw_irq_1_val; /**< In case of SW interrupt 1, value. */
unsigned int sw_irq_2_val; /**< In case of SW interrupt 2, value. */
enum ia_css_irq_info type; /** Interrupt type. */
unsigned int sw_irq_0_val; /** In case of SW interrupt 0, value. */
unsigned int sw_irq_1_val; /** In case of SW interrupt 1, value. */
unsigned int sw_irq_2_val; /** In case of SW interrupt 2, value. */
struct ia_css_pipe *pipe;
/**< The image pipe that generated the interrupt. */
/** The image pipe that generated the interrupt. */
};
/** @brief Obtain interrupt information.
/* @brief Obtain interrupt information.
*
* @param[out] info Pointer to the interrupt info. The interrupt
* information wil be written to this info.
......@@ -154,7 +154,7 @@ struct ia_css_irq {
enum ia_css_err
ia_css_irq_translate(unsigned int *info);
/** @brief Get CSI receiver error info.
/* @brief Get CSI receiver error info.
*
* @param[out] irq_bits Pointer to the interrupt bits. The interrupt
* bits will be written this info.
......@@ -172,7 +172,7 @@ ia_css_irq_translate(unsigned int *info);
void
ia_css_rx_get_irq_info(unsigned int *irq_bits);
/** @brief Get CSI receiver error info.
/* @brief Get CSI receiver error info.
*
* @param[in] port Input port identifier.
* @param[out] irq_bits Pointer to the interrupt bits. The interrupt
......@@ -188,7 +188,7 @@ ia_css_rx_get_irq_info(unsigned int *irq_bits);
void
ia_css_rx_port_get_irq_info(enum ia_css_csi2_port port, unsigned int *irq_bits);
/** @brief Clear CSI receiver error info.
/* @brief Clear CSI receiver error info.
*
* @param[in] irq_bits The bits that should be cleared from the CSI receiver
* interrupt bits register.
......@@ -205,7 +205,7 @@ ia_css_rx_port_get_irq_info(enum ia_css_csi2_port port, unsigned int *irq_bits);
void
ia_css_rx_clear_irq_info(unsigned int irq_bits);
/** @brief Clear CSI receiver error info.
/* @brief Clear CSI receiver error info.
*
* @param[in] port Input port identifier.
* @param[in] irq_bits The bits that should be cleared from the CSI receiver
......@@ -220,7 +220,7 @@ ia_css_rx_clear_irq_info(unsigned int irq_bits);
void
ia_css_rx_port_clear_irq_info(enum ia_css_csi2_port port, unsigned int irq_bits);
/** @brief Enable or disable specific interrupts.
/* @brief Enable or disable specific interrupts.
*
* @param[in] type The interrupt type that will be enabled/disabled.
* @param[in] enable enable or disable.
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_METADATA_H
#define __IA_CSS_METADATA_H
/** @file
/* @file
* This file contains structure for processing sensor metadata.
*/
......@@ -23,32 +23,32 @@
#include "ia_css_types.h"
#include "ia_css_stream_format.h"
/** Metadata configuration. This data structure contains necessary info
/* Metadata configuration. This data structure contains necessary info
* to process sensor metadata.
*/
struct ia_css_metadata_config {
enum ia_css_stream_format data_type; /**< Data type of CSI-2 embedded
enum ia_css_stream_format data_type; /** Data type of CSI-2 embedded
data. The default value is IA_CSS_STREAM_FORMAT_EMBEDDED. For
certain sensors, user can choose non-default data type for embedded
data. */
struct ia_css_resolution resolution; /**< Resolution */
struct ia_css_resolution resolution; /** Resolution */
};
struct ia_css_metadata_info {
struct ia_css_resolution resolution; /**< Resolution */
uint32_t stride; /**< Stride in bytes */
uint32_t size; /**< Total size in bytes */
struct ia_css_resolution resolution; /** Resolution */
uint32_t stride; /** Stride in bytes */
uint32_t size; /** Total size in bytes */
};
struct ia_css_metadata {
struct ia_css_metadata_info info; /**< Layout info */
ia_css_ptr address; /**< CSS virtual address */
struct ia_css_metadata_info info; /** Layout info */
ia_css_ptr address; /** CSS virtual address */
uint32_t exp_id;
/**< Exposure ID, see ia_css_event_public.h for more detail */
/** Exposure ID, see ia_css_event_public.h for more detail */
};
#define SIZE_OF_IA_CSS_METADATA_STRUCT sizeof(struct ia_css_metadata)
/** @brief Allocate a metadata buffer.
/* @brief Allocate a metadata buffer.
* @param[in] metadata_info Metadata info struct, contains details on metadata buffers.
* @return Pointer of metadata buffer or NULL (if error)
*
......@@ -58,7 +58,7 @@ struct ia_css_metadata {
struct ia_css_metadata *
ia_css_metadata_allocate(const struct ia_css_metadata_info *metadata_info);
/** @brief Free a metadata buffer.
/* @brief Free a metadata buffer.
*
* @param[in] metadata Pointer of metadata buffer.
* @return None
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_MIPI_H
#define __IA_CSS_MIPI_H
/** @file
/* @file
* This file contains MIPI support functionality
*/
......@@ -24,10 +24,10 @@
#include "ia_css_stream_format.h"
#include "ia_css_input_port.h"
/** Backward compatible for CSS API 2.0 only
/* Backward compatible for CSS API 2.0 only
* TO BE REMOVED when all drivers move to CSS API 2.1.
*/
/** @brief Specify a CSS MIPI frame buffer.
/* @brief Specify a CSS MIPI frame buffer.
*
* @param[in] size_mem_words The frame size in memory words (32B).
* @param[in] contiguous Allocate memory physically contiguously or not.
......@@ -42,7 +42,7 @@ ia_css_mipi_frame_specify(const unsigned int size_mem_words,
const bool contiguous);
#if !defined(HAS_NO_INPUT_SYSTEM)
/** @brief Register size of a CSS MIPI frame for check during capturing.
/* @brief Register size of a CSS MIPI frame for check during capturing.
*
* @param[in] port CSI-2 port this check is registered.
* @param[in] size_mem_words The frame size in memory words (32B).
......@@ -59,7 +59,7 @@ ia_css_mipi_frame_enable_check_on_size(const enum ia_css_csi2_port port,
const unsigned int size_mem_words);
#endif
/** @brief Calculate the size of a mipi frame.
/* @brief Calculate the size of a mipi frame.
*
* @param[in] width The width (in pixels) of the frame.
* @param[in] height The height (in lines) of the frame.
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu.h
浏览文件 @ d929fb4e
......@@ -15,11 +15,11 @@
#ifndef __IA_CSS_MMU_H
#define __IA_CSS_MMU_H
/** @file
/* @file
* This file contains one support function for invalidating the CSS MMU cache
*/
/** @brief Invalidate the MMU internal cache.
/* @brief Invalidate the MMU internal cache.
* @return None
*
* This function triggers an invalidation of the translate-look-aside
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h
浏览文件 @ d929fb4e
......@@ -15,13 +15,13 @@
#ifndef __IA_CSS_MORPH_H
#define __IA_CSS_MORPH_H
/** @file
/* @file
* This file contains supporting for morphing table
*/
#include <ia_css_types.h>
/** @brief Morphing table
/* @brief Morphing table
* @param[in] width Width of the morphing table.
* @param[in] height Height of the morphing table.
* @return Pointer to the morphing table
......@@ -29,7 +29,7 @@
struct ia_css_morph_table *
ia_css_morph_table_allocate(unsigned int width, unsigned int height);
/** @brief Free the morph table
/* @brief Free the morph table
* @param[in] me Pointer to the morph table.
* @return None
*/
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_PIPE_PUBLIC_H
#define __IA_CSS_PIPE_PUBLIC_H
/** @file
/* @file
* This file contains the public interface for CSS pipes.
*/
......@@ -34,7 +34,7 @@ enum {
IA_CSS_PIPE_MAX_OUTPUT_STAGE,
};
/** Enumeration of pipe modes. This mode can be used to create
/* Enumeration of pipe modes. This mode can be used to create
* an image pipe for this mode. These pipes can be combined
* to configure and run streams on the ISP.
*
......@@ -42,12 +42,12 @@ enum {
* create a continuous capture stream.
*/
enum ia_css_pipe_mode {
IA_CSS_PIPE_MODE_PREVIEW, /**< Preview pipe */
IA_CSS_PIPE_MODE_VIDEO, /**< Video pipe */
IA_CSS_PIPE_MODE_CAPTURE, /**< Still capture pipe */
IA_CSS_PIPE_MODE_ACC, /**< Accelerated pipe */
IA_CSS_PIPE_MODE_COPY, /**< Copy pipe, only used for embedded/image data copying */
IA_CSS_PIPE_MODE_YUVPP, /**< YUV post processing pipe, used for all use cases with YUV input,
IA_CSS_PIPE_MODE_PREVIEW, /** Preview pipe */
IA_CSS_PIPE_MODE_VIDEO, /** Video pipe */
IA_CSS_PIPE_MODE_CAPTURE, /** Still capture pipe */
IA_CSS_PIPE_MODE_ACC, /** Accelerated pipe */
IA_CSS_PIPE_MODE_COPY, /** Copy pipe, only used for embedded/image data copying */
IA_CSS_PIPE_MODE_YUVPP, /** YUV post processing pipe, used for all use cases with YUV input,
for SoC sensor and external ISP */
};
/* Temporary define */
......@@ -58,10 +58,10 @@ enum ia_css_pipe_mode {
* the order should match with definition in sh_css_defs.h
*/
enum ia_css_pipe_version {
IA_CSS_PIPE_VERSION_1 = 1, /**< ISP1.0 pipe */
IA_CSS_PIPE_VERSION_2_2 = 2, /**< ISP2.2 pipe */
IA_CSS_PIPE_VERSION_2_6_1 = 3, /**< ISP2.6.1 pipe */
IA_CSS_PIPE_VERSION_2_7 = 4 /**< ISP2.7 pipe */
IA_CSS_PIPE_VERSION_1 = 1, /** ISP1.0 pipe */
IA_CSS_PIPE_VERSION_2_2 = 2, /** ISP2.2 pipe */
IA_CSS_PIPE_VERSION_2_6_1 = 3, /** ISP2.6.1 pipe */
IA_CSS_PIPE_VERSION_2_7 = 4 /** ISP2.7 pipe */
};
/**
......@@ -71,79 +71,79 @@ enum ia_css_pipe_version {
*/
struct ia_css_pipe_config {
enum ia_css_pipe_mode mode;
/**< mode, indicates which mode the pipe should use. */
/** mode, indicates which mode the pipe should use. */
enum ia_css_pipe_version isp_pipe_version;
/**< pipe version, indicates which imaging pipeline the pipe should use. */
/** pipe version, indicates which imaging pipeline the pipe should use. */
struct ia_css_resolution input_effective_res;
/**< input effective resolution */
/** input effective resolution */
struct ia_css_resolution bayer_ds_out_res;
/**< bayer down scaling */
/** bayer down scaling */
struct ia_css_resolution capt_pp_in_res;
#ifndef ISP2401
/**< bayer down scaling */
/** bayer down scaling */
#else
/**< capture post processing input resolution */
/** capture post processing input resolution */
#endif
struct ia_css_resolution vf_pp_in_res;
#ifndef ISP2401
/**< bayer down scaling */
/** bayer down scaling */
#else
/**< view finder post processing input resolution */
/** view finder post processing input resolution */
struct ia_css_resolution output_system_in_res;
/**< For IPU3 only: use output_system_in_res to specify what input resolution
/** For IPU3 only: use output_system_in_res to specify what input resolution
will OSYS receive, this resolution is equal to the output resolution of GDC
if not determined CSS will set output_system_in_res with main osys output pin resolution
All other IPUs may ignore this property */
#endif
struct ia_css_resolution dvs_crop_out_res;
/**< dvs crop, video only, not in use yet. Use dvs_envelope below. */
/** dvs crop, video only, not in use yet. Use dvs_envelope below. */
struct ia_css_frame_info output_info[IA_CSS_PIPE_MAX_OUTPUT_STAGE];
/**< output of YUV scaling */
/** output of YUV scaling */
struct ia_css_frame_info vf_output_info[IA_CSS_PIPE_MAX_OUTPUT_STAGE];
/**< output of VF YUV scaling */
/** output of VF YUV scaling */
struct ia_css_fw_info *acc_extension;
/**< Pipeline extension accelerator */
/** Pipeline extension accelerator */
struct ia_css_fw_info **acc_stages;
/**< Standalone accelerator stages */
/** Standalone accelerator stages */
uint32_t num_acc_stages;
/**< Number of standalone accelerator stages */
/** Number of standalone accelerator stages */
struct ia_css_capture_config default_capture_config;
/**< Default capture config for initial capture pipe configuration. */
struct ia_css_resolution dvs_envelope; /**< temporary */
/** Default capture config for initial capture pipe configuration. */
struct ia_css_resolution dvs_envelope; /** temporary */
enum ia_css_frame_delay dvs_frame_delay;
/**< indicates the DVS loop delay in frame periods */
/** indicates the DVS loop delay in frame periods */
int acc_num_execs;
/**< For acceleration pipes only: determine how many times the pipe
/** For acceleration pipes only: determine how many times the pipe
should be run. Setting this to -1 means it will run until
stopped. */
bool enable_dz;
/**< Disabling digital zoom for a pipeline, if this is set to false,
/** Disabling digital zoom for a pipeline, if this is set to false,
then setting a zoom factor will have no effect.
In some use cases this provides better performance. */
bool enable_dpc;
/**< Disabling "Defect Pixel Correction" for a pipeline, if this is set
/** Disabling "Defect Pixel Correction" for a pipeline, if this is set
to false. In some use cases this provides better performance. */
bool enable_vfpp_bci;
/**< Enabling BCI mode will cause yuv_scale binary to be picked up
/** Enabling BCI mode will cause yuv_scale binary to be picked up
instead of vf_pp. This only applies to viewfinder post
processing stages. */
#ifdef ISP2401
bool enable_luma_only;
/**< Enabling of monochrome mode for a pipeline. If enabled only luma processing
/** Enabling of monochrome mode for a pipeline. If enabled only luma processing
will be done. */
bool enable_tnr;
/**< Enabling of TNR (temporal noise reduction). This is only applicable to video
/** Enabling of TNR (temporal noise reduction). This is only applicable to video
pipes. Non video-pipes should always set this parameter to false. */
#endif
struct ia_css_isp_config *p_isp_config;
/**< Pointer to ISP configuration */
/** Pointer to ISP configuration */
struct ia_css_resolution gdc_in_buffer_res;
/**< GDC in buffer resolution. */
/** GDC in buffer resolution. */
struct ia_css_point gdc_in_buffer_offset;
/**< GDC in buffer offset - indicates the pixel coordinates of the first valid pixel inside the buffer */
/** GDC in buffer offset - indicates the pixel coordinates of the first valid pixel inside the buffer */
#ifdef ISP2401
struct ia_css_coordinate internal_frame_origin_bqs_on_sctbl;
/**< Origin of internal frame positioned on shading table at shading correction in ISP.
/** Origin of internal frame positioned on shading table at shading correction in ISP.
NOTE: Shading table is larger than or equal to internal frame.
Shading table has shading gains and internal frame has bayer data.
The origin of internal frame is used in shading correction in ISP
......@@ -228,20 +228,20 @@ struct ia_css_pipe_config {
#endif
/** Pipe info, this struct describes properties of a pipe after it's stream has
/* Pipe info, this struct describes properties of a pipe after it's stream has
* been created.
* ~~~** DO NOT ADD NEW FIELD **~~~ This structure will be deprecated.
* - On the Behalf of CSS-API Committee.
*/
struct ia_css_pipe_info {
struct ia_css_frame_info output_info[IA_CSS_PIPE_MAX_OUTPUT_STAGE];
/**< Info about output resolution. This contains the stride which
/** Info about output resolution. This contains the stride which
should be used for memory allocation. */
struct ia_css_frame_info vf_output_info[IA_CSS_PIPE_MAX_OUTPUT_STAGE];
/**< Info about viewfinder output resolution (optional). This contains
/** Info about viewfinder output resolution (optional). This contains
the stride that should be used for memory allocation. */
struct ia_css_frame_info raw_output_info;
/**< Raw output resolution. This indicates the resolution of the
/** Raw output resolution. This indicates the resolution of the
RAW bayer output for pipes that support this. Currently, only the
still capture pipes support this feature. When this resolution is
smaller than the input resolution, cropping will be performed by
......@@ -252,17 +252,17 @@ struct ia_css_pipe_info {
the input resolution - 8x8. */
#ifdef ISP2401
struct ia_css_resolution output_system_in_res_info;
/**< For IPU3 only. Info about output system in resolution which is considered
/** For IPU3 only. Info about output system in resolution which is considered
as gdc out resolution. */
#endif
struct ia_css_shading_info shading_info;
/**< After an image pipe is created, this field will contain the info
/** After an image pipe is created, this field will contain the info
for the shading correction. */
struct ia_css_grid_info grid_info;
/**< After an image pipe is created, this field will contain the grid
/** After an image pipe is created, this field will contain the grid
info for 3A and DVS. */
int num_invalid_frames;
/**< The very first frames in a started stream do not contain valid data.
/** The very first frames in a started stream do not contain valid data.
In this field, the CSS-firmware communicates to the host-driver how
many initial frames will contain invalid data; this allows the
host-driver to discard those initial invalid frames and start it's
......@@ -299,7 +299,7 @@ struct ia_css_pipe_info {
#endif
/** @brief Load default pipe configuration
/* @brief Load default pipe configuration
* @param[out] pipe_config The pipe configuration.
* @return None
*
......@@ -334,7 +334,7 @@ struct ia_css_pipe_info {
*/
void ia_css_pipe_config_defaults(struct ia_css_pipe_config *pipe_config);
/** @brief Create a pipe
/* @brief Create a pipe
* @param[in] config The pipe configuration.
* @param[out] pipe The pipe.
* @return IA_CSS_SUCCESS or the error code.
......@@ -346,7 +346,7 @@ enum ia_css_err
ia_css_pipe_create(const struct ia_css_pipe_config *config,
struct ia_css_pipe **pipe);
/** @brief Destroy a pipe
/* @brief Destroy a pipe
* @param[in] pipe The pipe.
* @return IA_CSS_SUCCESS or the error code.
*
......@@ -355,7 +355,7 @@ ia_css_pipe_create(const struct ia_css_pipe_config *config,
enum ia_css_err
ia_css_pipe_destroy(struct ia_css_pipe *pipe);
/** @brief Provides information about a pipe
/* @brief Provides information about a pipe
* @param[in] pipe The pipe.
* @param[out] pipe_info The pipe information.
* @return IA_CSS_SUCCESS or IA_CSS_ERR_INVALID_ARGUMENTS.
......@@ -366,7 +366,7 @@ enum ia_css_err
ia_css_pipe_get_info(const struct ia_css_pipe *pipe,
struct ia_css_pipe_info *pipe_info);
/** @brief Configure a pipe with filter coefficients.
/* @brief Configure a pipe with filter coefficients.
* @param[in] pipe The pipe.
* @param[in] config The pointer to ISP configuration.
* @return IA_CSS_SUCCESS or error code upon error.
......@@ -378,7 +378,7 @@ enum ia_css_err
ia_css_pipe_set_isp_config(struct ia_css_pipe *pipe,
struct ia_css_isp_config *config);
/** @brief Controls when the Event generator raises an IRQ to the Host.
/* @brief Controls when the Event generator raises an IRQ to the Host.
*
* @param[in] pipe The pipe.
* @param[in] or_mask Binary or of enum ia_css_event_irq_mask_type. Each pipe
......@@ -455,7 +455,7 @@ ia_css_pipe_set_irq_mask(struct ia_css_pipe *pipe,
unsigned int or_mask,
unsigned int and_mask);
/** @brief Reads the current event IRQ mask from the CSS.
/* @brief Reads the current event IRQ mask from the CSS.
*
* @param[in] pipe The pipe.
* @param[out] or_mask Current or_mask. The bits in this mask are a binary or
......@@ -476,7 +476,7 @@ ia_css_event_get_irq_mask(const struct ia_css_pipe *pipe,
unsigned int *or_mask,
unsigned int *and_mask);
/** @brief Queue a buffer for an image pipe.
/* @brief Queue a buffer for an image pipe.
*
* @param[in] pipe The pipe that will own the buffer.
* @param[in] buffer Pointer to the buffer.
......@@ -498,7 +498,7 @@ enum ia_css_err
ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe,
const struct ia_css_buffer *buffer);
/** @brief Dequeue a buffer from an image pipe.
/* @brief Dequeue a buffer from an image pipe.
*
* @param[in] pipe The pipeline that the buffer queue belongs to.
* @param[in,out] buffer The buffer is used to lookup the type which determines
......@@ -519,7 +519,7 @@ ia_css_pipe_dequeue_buffer(struct ia_css_pipe *pipe,
struct ia_css_buffer *buffer);
/** @brief Set the state (Enable or Disable) of the Extension stage in the
/* @brief Set the state (Enable or Disable) of the Extension stage in the
* given pipe.
* @param[in] pipe Pipe handle.
* @param[in] fw_handle Extension firmware Handle (ia_css_fw_info.handle)
......@@ -546,7 +546,7 @@ ia_css_pipe_set_qos_ext_state (struct ia_css_pipe *pipe,
uint32_t fw_handle,
bool enable);
/** @brief Get the state (Enable or Disable) of the Extension stage in the
/* @brief Get the state (Enable or Disable) of the Extension stage in the
* given pipe.
* @param[in] pipe Pipe handle.
* @param[in] fw_handle Extension firmware Handle (ia_css_fw_info.handle)
......@@ -573,7 +573,7 @@ ia_css_pipe_get_qos_ext_state (struct ia_css_pipe *pipe,
bool * enable);
#ifdef ISP2401
/** @brief Update mapped CSS and ISP arguments for QoS pipe during SP runtime.
/* @brief Update mapped CSS and ISP arguments for QoS pipe during SP runtime.
* @param[in] pipe Pipe handle.
* @param[in] fw_handle Extension firmware Handle (ia_css_fw_info.handle).
* @param[in] css_seg Parameter memory descriptors for CSS segments.
......@@ -595,7 +595,7 @@ ia_css_pipe_update_qos_ext_mapped_arg(struct ia_css_pipe *pipe, uint32_t fw_hand
struct ia_css_isp_param_isp_segments *isp_seg);
#endif
/** @brief Get selected configuration settings
/* @brief Get selected configuration settings
* @param[in] pipe The pipe.
* @param[out] config Configuration settings.
* @return None
......@@ -604,7 +604,7 @@ void
ia_css_pipe_get_isp_config(struct ia_css_pipe *pipe,
struct ia_css_isp_config *config);
/** @brief Set the scaler lut on this pipe. A copy of lut is made in the inuit
/* @brief Set the scaler lut on this pipe. A copy of lut is made in the inuit
* address space. So the LUT can be freed by caller.
* @param[in] pipe Pipe handle.
* @param[in] lut Look up tabel
......@@ -623,7 +623,7 @@ ia_css_pipe_get_isp_config(struct ia_css_pipe *pipe,
enum ia_css_err
ia_css_pipe_set_bci_scaler_lut( struct ia_css_pipe *pipe,
const void *lut);
/** @brief Checking of DVS statistics ability
/* @brief Checking of DVS statistics ability
* @param[in] pipe_info The pipe info.
* @return true - has DVS statistics ability
* false - otherwise
......@@ -631,7 +631,7 @@ ia_css_pipe_set_bci_scaler_lut( struct ia_css_pipe *pipe,
bool ia_css_pipe_has_dvs_stats(struct ia_css_pipe_info *pipe_info);
#ifdef ISP2401
/** @brief Override the frameformat set on the output pins.
/* @brief Override the frameformat set on the output pins.
* @param[in] pipe Pipe handle.
* @param[in] output_pin Pin index to set the format on
* 0 - main output pin
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_prbs.h
浏览文件 @ d929fb4e
......@@ -15,11 +15,11 @@
#ifndef __IA_CSS_PRBS_H
#define __IA_CSS_PRBS_H
/** @file
/* @file
* This file contains support for Pseudo Random Bit Sequence (PRBS) inputs
*/
/** Enumerate the PRBS IDs.
/* Enumerate the PRBS IDs.
*/
enum ia_css_prbs_id {
IA_CSS_PRBS_ID0,
......@@ -44,10 +44,10 @@ enum ia_css_prbs_id {
*/
struct ia_css_prbs_config {
enum ia_css_prbs_id id;
unsigned int h_blank; /**< horizontal blank */
unsigned int v_blank; /**< vertical blank */
int seed; /**< random seed for the 1st 2-pixel-components/clock */
int seed1; /**< random seed for the 2nd 2-pixel-components/clock */
unsigned int h_blank; /** horizontal blank */
unsigned int v_blank; /** vertical blank */
int seed; /** random seed for the 1st 2-pixel-components/clock */
int seed1; /** random seed for the 2nd 2-pixel-components/clock */
};
#endif /* __IA_CSS_PRBS_H */
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_PROPERTIES_H
#define __IA_CSS_PROPERTIES_H
/** @file
/* @file
* This file contains support for retrieving properties of some hardware the CSS system
*/
......@@ -24,12 +24,12 @@
struct ia_css_properties {
int gdc_coord_one;
bool l1_base_is_index; /**< Indicate whether the L1 page base
bool l1_base_is_index; /** Indicate whether the L1 page base
is a page index or a byte address. */
enum ia_css_vamem_type vamem_type;
};
/** @brief Get hardware properties
/* @brief Get hardware properties
* @param[in,out] properties The hardware properties
* @return None
*
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_shading.h
浏览文件 @ d929fb4e
......@@ -15,13 +15,13 @@
#ifndef __IA_CSS_SHADING_H
#define __IA_CSS_SHADING_H
/** @file
/* @file
* This file contains support for setting the shading table for CSS
*/
#include <ia_css_types.h>
/** @brief Shading table
/* @brief Shading table
* @param[in] width Width of the shading table.
* @param[in] height Height of the shading table.
* @return Pointer to the shading table
......@@ -30,7 +30,7 @@ struct ia_css_shading_table *
ia_css_shading_table_alloc(unsigned int width,
unsigned int height);
/** @brief Free shading table
/* @brief Free shading table
* @param[in] table Pointer to the shading table.
* @return None
*/
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream.h
浏览文件 @ d929fb4e
......@@ -48,7 +48,7 @@ struct ia_css_stream {
bool started;
};
/** @brief Get a binary in the stream, which binary has the shading correction.
/* @brief Get a binary in the stream, which binary has the shading correction.
*
* @param[in] stream: The stream.
* @return The binary which has the shading correction.
......@@ -76,7 +76,7 @@ sh_css_invalidate_params(struct ia_css_stream *stream);
const struct ia_css_fpn_table *
ia_css_get_fpn_table(struct ia_css_stream *stream);
/** @brief Get a pointer to the shading table.
/* @brief Get a pointer to the shading table.
*
* @param[in] stream: The stream.
* @return The pointer to the shading table.
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h
浏览文件 @ d929fb4e
......@@ -15,74 +15,74 @@
#ifndef __IA_CSS_STREAM_FORMAT_H
#define __IA_CSS_STREAM_FORMAT_H
/** @file
/* @file
* This file contains formats usable for ISP streaming input
*/
#include <type_support.h> /* bool */
/** The ISP streaming input interface supports the following formats.
/* The ISP streaming input interface supports the following formats.
* These match the corresponding MIPI formats.
*/
enum ia_css_stream_format {
IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY, /**< 8 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV420_8, /**< 8 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV420_10, /**< 10 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV420_16, /**< 16 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV422_8, /**< UYVY..UYVY, 8 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV422_10, /**< UYVY..UYVY, 10 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV422_16, /**< UYVY..UYVY, 16 bits per subpixel */
IA_CSS_STREAM_FORMAT_RGB_444, /**< BGR..BGR, 4 bits per subpixel */
IA_CSS_STREAM_FORMAT_RGB_555, /**< BGR..BGR, 5 bits per subpixel */
IA_CSS_STREAM_FORMAT_RGB_565, /**< BGR..BGR, 5 bits B and R, 6 bits G */
IA_CSS_STREAM_FORMAT_RGB_666, /**< BGR..BGR, 6 bits per subpixel */
IA_CSS_STREAM_FORMAT_RGB_888, /**< BGR..BGR, 8 bits per subpixel */
IA_CSS_STREAM_FORMAT_RAW_6, /**< RAW data, 6 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_7, /**< RAW data, 7 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_8, /**< RAW data, 8 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_10, /**< RAW data, 10 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_12, /**< RAW data, 12 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_14, /**< RAW data, 14 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_16, /**< RAW data, 16 bits per pixel, which is
IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY, /** 8 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV420_8, /** 8 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV420_10, /** 10 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV420_16, /** 16 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV422_8, /** UYVY..UYVY, 8 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV422_10, /** UYVY..UYVY, 10 bits per subpixel */
IA_CSS_STREAM_FORMAT_YUV422_16, /** UYVY..UYVY, 16 bits per subpixel */
IA_CSS_STREAM_FORMAT_RGB_444, /** BGR..BGR, 4 bits per subpixel */
IA_CSS_STREAM_FORMAT_RGB_555, /** BGR..BGR, 5 bits per subpixel */
IA_CSS_STREAM_FORMAT_RGB_565, /** BGR..BGR, 5 bits B and R, 6 bits G */
IA_CSS_STREAM_FORMAT_RGB_666, /** BGR..BGR, 6 bits per subpixel */
IA_CSS_STREAM_FORMAT_RGB_888, /** BGR..BGR, 8 bits per subpixel */
IA_CSS_STREAM_FORMAT_RAW_6, /** RAW data, 6 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_7, /** RAW data, 7 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_8, /** RAW data, 8 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_10, /** RAW data, 10 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_12, /** RAW data, 12 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_14, /** RAW data, 14 bits per pixel */
IA_CSS_STREAM_FORMAT_RAW_16, /** RAW data, 16 bits per pixel, which is
not specified in CSI-MIPI standard*/
IA_CSS_STREAM_FORMAT_BINARY_8, /**< Binary byte stream, which is target at
IA_CSS_STREAM_FORMAT_BINARY_8, /** Binary byte stream, which is target at
JPEG. */
/** CSI2-MIPI specific format: Generic short packet data. It is used to
/* CSI2-MIPI specific format: Generic short packet data. It is used to
* keep the timing information for the opening/closing of shutters,
* triggering of flashes and etc.
*/
IA_CSS_STREAM_FORMAT_GENERIC_SHORT1, /**< Generic Short Packet Code 1 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT2, /**< Generic Short Packet Code 2 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT3, /**< Generic Short Packet Code 3 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT4, /**< Generic Short Packet Code 4 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT5, /**< Generic Short Packet Code 5 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT6, /**< Generic Short Packet Code 6 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT7, /**< Generic Short Packet Code 7 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT8, /**< Generic Short Packet Code 8 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT1, /** Generic Short Packet Code 1 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT2, /** Generic Short Packet Code 2 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT3, /** Generic Short Packet Code 3 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT4, /** Generic Short Packet Code 4 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT5, /** Generic Short Packet Code 5 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT6, /** Generic Short Packet Code 6 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT7, /** Generic Short Packet Code 7 */
IA_CSS_STREAM_FORMAT_GENERIC_SHORT8, /** Generic Short Packet Code 8 */
/** CSI2-MIPI specific format: YUV data.
/* CSI2-MIPI specific format: YUV data.
*/
IA_CSS_STREAM_FORMAT_YUV420_8_SHIFT, /**< YUV420 8-bit (Chroma Shifted Pixel Sampling) */
IA_CSS_STREAM_FORMAT_YUV420_10_SHIFT, /**< YUV420 8-bit (Chroma Shifted Pixel Sampling) */
IA_CSS_STREAM_FORMAT_YUV420_8_SHIFT, /** YUV420 8-bit (Chroma Shifted Pixel Sampling) */
IA_CSS_STREAM_FORMAT_YUV420_10_SHIFT, /** YUV420 8-bit (Chroma Shifted Pixel Sampling) */
/** CSI2-MIPI specific format: Generic long packet data
/* CSI2-MIPI specific format: Generic long packet data
*/
IA_CSS_STREAM_FORMAT_EMBEDDED, /**< Embedded 8-bit non Image Data */
IA_CSS_STREAM_FORMAT_EMBEDDED, /** Embedded 8-bit non Image Data */
/** CSI2-MIPI specific format: User defined byte-based data. For example,
/* CSI2-MIPI specific format: User defined byte-based data. For example,
* the data transmitter (e.g. the SoC sensor) can keep the JPEG data as
* the User Defined Data Type 4 and the MPEG data as the
* User Defined Data Type 7.
*/
IA_CSS_STREAM_FORMAT_USER_DEF1, /**< User defined 8-bit data type 1 */
IA_CSS_STREAM_FORMAT_USER_DEF2, /**< User defined 8-bit data type 2 */
IA_CSS_STREAM_FORMAT_USER_DEF3, /**< User defined 8-bit data type 3 */
IA_CSS_STREAM_FORMAT_USER_DEF4, /**< User defined 8-bit data type 4 */
IA_CSS_STREAM_FORMAT_USER_DEF5, /**< User defined 8-bit data type 5 */
IA_CSS_STREAM_FORMAT_USER_DEF6, /**< User defined 8-bit data type 6 */
IA_CSS_STREAM_FORMAT_USER_DEF7, /**< User defined 8-bit data type 7 */
IA_CSS_STREAM_FORMAT_USER_DEF8, /**< User defined 8-bit data type 8 */
IA_CSS_STREAM_FORMAT_USER_DEF1, /** User defined 8-bit data type 1 */
IA_CSS_STREAM_FORMAT_USER_DEF2, /** User defined 8-bit data type 2 */
IA_CSS_STREAM_FORMAT_USER_DEF3, /** User defined 8-bit data type 3 */
IA_CSS_STREAM_FORMAT_USER_DEF4, /** User defined 8-bit data type 4 */
IA_CSS_STREAM_FORMAT_USER_DEF5, /** User defined 8-bit data type 5 */
IA_CSS_STREAM_FORMAT_USER_DEF6, /** User defined 8-bit data type 6 */
IA_CSS_STREAM_FORMAT_USER_DEF7, /** User defined 8-bit data type 7 */
IA_CSS_STREAM_FORMAT_USER_DEF8, /** User defined 8-bit data type 8 */
};
#define IA_CSS_STREAM_FORMAT_NUM IA_CSS_STREAM_FORMAT_USER_DEF8
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_STREAM_PUBLIC_H
#define __IA_CSS_STREAM_PUBLIC_H
/** @file
/* @file
* This file contains support for configuring and controlling streams
*/
......@@ -27,26 +27,26 @@
#include "ia_css_prbs.h"
#include "ia_css_input_port.h"
/** Input modes, these enumerate all supported input modes.
/* Input modes, these enumerate all supported input modes.
* Note that not all ISP modes support all input modes.
*/
enum ia_css_input_mode {
IA_CSS_INPUT_MODE_SENSOR, /**< data from sensor */
IA_CSS_INPUT_MODE_FIFO, /**< data from input-fifo */
IA_CSS_INPUT_MODE_TPG, /**< data from test-pattern generator */
IA_CSS_INPUT_MODE_PRBS, /**< data from pseudo-random bit stream */
IA_CSS_INPUT_MODE_MEMORY, /**< data from a frame in memory */
IA_CSS_INPUT_MODE_BUFFERED_SENSOR /**< data is sent through mipi buffer */
IA_CSS_INPUT_MODE_SENSOR, /** data from sensor */
IA_CSS_INPUT_MODE_FIFO, /** data from input-fifo */
IA_CSS_INPUT_MODE_TPG, /** data from test-pattern generator */
IA_CSS_INPUT_MODE_PRBS, /** data from pseudo-random bit stream */
IA_CSS_INPUT_MODE_MEMORY, /** data from a frame in memory */
IA_CSS_INPUT_MODE_BUFFERED_SENSOR /** data is sent through mipi buffer */
};
/** Structure of the MIPI buffer configuration
/* Structure of the MIPI buffer configuration
*/
struct ia_css_mipi_buffer_config {
unsigned int size_mem_words; /**< The frame size in the system memory
unsigned int size_mem_words; /** The frame size in the system memory
words (32B) */
bool contiguous; /**< Allocated memory physically
bool contiguous; /** Allocated memory physically
contiguously or not. \deprecated{Will be false always.}*/
unsigned int nof_mipi_buffers; /**< The number of MIPI buffers required for this
unsigned int nof_mipi_buffers; /** The number of MIPI buffers required for this
stream */
};
......@@ -57,44 +57,44 @@ enum {
IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH
};
/** This is input data configuration for one MIPI data type. We can have
/* This is input data configuration for one MIPI data type. We can have
* multiple of this in one virtual channel.
*/
struct ia_css_stream_isys_stream_config {
struct ia_css_resolution input_res; /**< Resolution of input data */
enum ia_css_stream_format format; /**< Format of input stream. This data
struct ia_css_resolution input_res; /** Resolution of input data */
enum ia_css_stream_format format; /** Format of input stream. This data
format will be mapped to MIPI data
type internally. */
int linked_isys_stream_id; /**< default value is -1, other value means
int linked_isys_stream_id; /** default value is -1, other value means
current isys_stream shares the same buffer with
indicated isys_stream*/
bool valid; /**< indicate whether other fields have valid value */
bool valid; /** indicate whether other fields have valid value */
};
struct ia_css_stream_input_config {
struct ia_css_resolution input_res; /**< Resolution of input data */
struct ia_css_resolution effective_res; /**< Resolution of input data.
struct ia_css_resolution input_res; /** Resolution of input data */
struct ia_css_resolution effective_res; /** Resolution of input data.
Used for CSS 2400/1 System and deprecated for other
systems (replaced by input_effective_res in
ia_css_pipe_config) */
enum ia_css_stream_format format; /**< Format of input stream. This data
enum ia_css_stream_format format; /** Format of input stream. This data
format will be mapped to MIPI data
type internally. */
enum ia_css_bayer_order bayer_order; /**< Bayer order for RAW streams */
enum ia_css_bayer_order bayer_order; /** Bayer order for RAW streams */
};
/** Input stream description. This describes how input will flow into the
/* Input stream description. This describes how input will flow into the
* CSS. This is used to program the CSS hardware.
*/
struct ia_css_stream_config {
enum ia_css_input_mode mode; /**< Input mode */
enum ia_css_input_mode mode; /** Input mode */
union {
struct ia_css_input_port port; /**< Port, for sensor only. */
struct ia_css_tpg_config tpg; /**< TPG configuration */
struct ia_css_prbs_config prbs; /**< PRBS configuration */
} source; /**< Source of input data */
unsigned int channel_id; /**< Channel on which input data
struct ia_css_input_port port; /** Port, for sensor only. */
struct ia_css_tpg_config tpg; /** TPG configuration */
struct ia_css_prbs_config prbs; /** PRBS configuration */
} source; /** Source of input data */
unsigned int channel_id; /** Channel on which input data
will arrive. Use this field
to specify virtual channel id.
Valid values are: 0, 1, 2, 3 */
......@@ -110,29 +110,29 @@ struct ia_css_stream_config {
* and will be deprecated. In the future,all platforms will use the N*N method
*/
#endif
unsigned int sensor_binning_factor; /**< Binning factor used by sensor
unsigned int sensor_binning_factor; /** Binning factor used by sensor
to produce image data. This is
used for shading correction. */
unsigned int pixels_per_clock; /**< Number of pixels per clock, which can be
unsigned int pixels_per_clock; /** Number of pixels per clock, which can be
1, 2 or 4. */
bool online; /**< offline will activate RAW copy on SP, use this for
bool online; /** offline will activate RAW copy on SP, use this for
continuous capture. */
/* ISYS2401 usage: ISP receives data directly from sensor, no copy. */
unsigned init_num_cont_raw_buf; /**< initial number of raw buffers to
unsigned init_num_cont_raw_buf; /** initial number of raw buffers to
allocate */
unsigned target_num_cont_raw_buf; /**< total number of raw buffers to
unsigned target_num_cont_raw_buf; /** total number of raw buffers to
allocate */
bool pack_raw_pixels; /**< Pack pixels in the raw buffers */
bool continuous; /**< Use SP copy feature to continuously capture frames
bool pack_raw_pixels; /** Pack pixels in the raw buffers */
bool continuous; /** Use SP copy feature to continuously capture frames
to system memory and run pipes in offline mode */
bool disable_cont_viewfinder; /**< disable continous viewfinder for ZSL use case */
int32_t flash_gpio_pin; /**< pin on which the flash is connected, -1 for no flash */
int left_padding; /**< The number of input-formatter left-paddings, -1 for default from binary.*/
struct ia_css_mipi_buffer_config mipi_buffer_config; /**< mipi buffer configuration */
struct ia_css_metadata_config metadata_config; /**< Metadata configuration. */
bool ia_css_enable_raw_buffer_locking; /**< Enable Raw Buffer Locking for HALv3 Support */
bool disable_cont_viewfinder; /** disable continous viewfinder for ZSL use case */
int32_t flash_gpio_pin; /** pin on which the flash is connected, -1 for no flash */
int left_padding; /** The number of input-formatter left-paddings, -1 for default from binary.*/
struct ia_css_mipi_buffer_config mipi_buffer_config; /** mipi buffer configuration */
struct ia_css_metadata_config metadata_config; /** Metadata configuration. */
bool ia_css_enable_raw_buffer_locking; /** Enable Raw Buffer Locking for HALv3 Support */
bool lock_all;
/**< Lock all RAW buffers (true) or lock only buffers processed by
/** Lock all RAW buffers (true) or lock only buffers processed by
video or preview pipe (false).
This setting needs to be enabled to allow raw buffer locking
without continuous viewfinder. */
......@@ -140,15 +140,15 @@ struct ia_css_stream_config {
struct ia_css_stream;
/** Stream info, this struct describes properties of a stream after it has been
/* Stream info, this struct describes properties of a stream after it has been
* created.
*/
struct ia_css_stream_info {
struct ia_css_metadata_info metadata_info;
/**< Info about the metadata layout, this contains the stride. */
/** Info about the metadata layout, this contains the stride. */
};
/** @brief Load default stream configuration
/* @brief Load default stream configuration
* @param[in,out] stream_config The stream configuration.
* @return None
*
......@@ -165,7 +165,7 @@ void ia_css_stream_config_defaults(struct ia_css_stream_config *stream_config);
* create the internal structures and fill in the configuration data and pipes
*/
/** @brief Creates a stream
/* @brief Creates a stream
* @param[in] stream_config The stream configuration.
* @param[in] num_pipes The number of pipes to incorporate in the stream.
* @param[in] pipes The pipes.
......@@ -180,7 +180,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
struct ia_css_pipe *pipes[],
struct ia_css_stream **stream);
/** @brief Destroys a stream
/* @brief Destroys a stream
* @param[in] stream The stream.
* @return IA_CSS_SUCCESS or the error code.
*
......@@ -189,7 +189,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
enum ia_css_err
ia_css_stream_destroy(struct ia_css_stream *stream);
/** @brief Provides information about a stream
/* @brief Provides information about a stream
* @param[in] stream The stream.
* @param[out] stream_info The information about the stream.
* @return IA_CSS_SUCCESS or the error code.
......@@ -200,7 +200,7 @@ enum ia_css_err
ia_css_stream_get_info(const struct ia_css_stream *stream,
struct ia_css_stream_info *stream_info);
/** @brief load (rebuild) a stream that was unloaded.
/* @brief load (rebuild) a stream that was unloaded.
* @param[in] stream The stream
* @return IA_CSS_SUCCESS or the error code
*
......@@ -210,7 +210,7 @@ ia_css_stream_get_info(const struct ia_css_stream *stream,
enum ia_css_err
ia_css_stream_load(struct ia_css_stream *stream);
/** @brief Starts the stream.
/* @brief Starts the stream.
* @param[in] stream The stream.
* @return IA_CSS_SUCCESS or the error code.
*
......@@ -223,7 +223,7 @@ ia_css_stream_load(struct ia_css_stream *stream);
enum ia_css_err
ia_css_stream_start(struct ia_css_stream *stream);
/** @brief Stop the stream.
/* @brief Stop the stream.
* @param[in] stream The stream.
* @return IA_CSS_SUCCESS or the error code.
*
......@@ -233,7 +233,7 @@ ia_css_stream_start(struct ia_css_stream *stream);
enum ia_css_err
ia_css_stream_stop(struct ia_css_stream *stream);
/** @brief Check if a stream has stopped
/* @brief Check if a stream has stopped
* @param[in] stream The stream.
* @return boolean flag
*
......@@ -242,7 +242,7 @@ ia_css_stream_stop(struct ia_css_stream *stream);
bool
ia_css_stream_has_stopped(struct ia_css_stream *stream);
/** @brief destroy a stream according to the stream seed previosly saved in the seed array.
/* @brief destroy a stream according to the stream seed previosly saved in the seed array.
* @param[in] stream The stream.
* @return IA_CSS_SUCCESS (no other errors are generated now)
*
......@@ -251,7 +251,7 @@ ia_css_stream_has_stopped(struct ia_css_stream *stream);
enum ia_css_err
ia_css_stream_unload(struct ia_css_stream *stream);
/** @brief Returns stream format
/* @brief Returns stream format
* @param[in] stream The stream.
* @return format of the string
*
......@@ -260,7 +260,7 @@ ia_css_stream_unload(struct ia_css_stream *stream);
enum ia_css_stream_format
ia_css_stream_get_format(const struct ia_css_stream *stream);
/** @brief Check if the stream is configured for 2 pixels per clock
/* @brief Check if the stream is configured for 2 pixels per clock
* @param[in] stream The stream.
* @return boolean flag
*
......@@ -270,7 +270,7 @@ ia_css_stream_get_format(const struct ia_css_stream *stream);
bool
ia_css_stream_get_two_pixels_per_clock(const struct ia_css_stream *stream);
/** @brief Sets the output frame stride (at the last pipe)
/* @brief Sets the output frame stride (at the last pipe)
* @param[in] stream The stream
* @param[in] output_padded_width - the output buffer stride.
* @return ia_css_err
......@@ -280,7 +280,7 @@ ia_css_stream_get_two_pixels_per_clock(const struct ia_css_stream *stream);
enum ia_css_err
ia_css_stream_set_output_padded_width(struct ia_css_stream *stream, unsigned int output_padded_width);
/** @brief Return max number of continuous RAW frames.
/* @brief Return max number of continuous RAW frames.
* @param[in] stream The stream.
* @param[out] buffer_depth The maximum number of continuous RAW frames.
* @return IA_CSS_SUCCESS or IA_CSS_ERR_INVALID_ARGUMENTS
......@@ -291,7 +291,7 @@ ia_css_stream_set_output_padded_width(struct ia_css_stream *stream, unsigned int
enum ia_css_err
ia_css_stream_get_max_buffer_depth(struct ia_css_stream *stream, int *buffer_depth);
/** @brief Set nr of continuous RAW frames to use.
/* @brief Set nr of continuous RAW frames to use.
*
* @param[in] stream The stream.
* @param[in] buffer_depth Number of frames to set.
......@@ -302,7 +302,7 @@ ia_css_stream_get_max_buffer_depth(struct ia_css_stream *stream, int *buffer_dep
enum ia_css_err
ia_css_stream_set_buffer_depth(struct ia_css_stream *stream, int buffer_depth);
/** @brief Get number of continuous RAW frames to use.
/* @brief Get number of continuous RAW frames to use.
* @param[in] stream The stream.
* @param[out] buffer_depth The number of frames to use
* @return IA_CSS_SUCCESS or IA_CSS_ERR_INVALID_ARGUMENTS
......@@ -315,7 +315,7 @@ ia_css_stream_get_buffer_depth(struct ia_css_stream *stream, int *buffer_depth);
/* ===== CAPTURE ===== */
/** @brief Configure the continuous capture
/* @brief Configure the continuous capture
*
* @param[in] stream The stream.
* @param[in] num_captures The number of RAW frames to be processed to
......@@ -347,7 +347,7 @@ ia_css_stream_capture(struct ia_css_stream *stream,
unsigned int skip,
int offset);
/** @brief Specify which raw frame to tag based on exp_id found in frame info
/* @brief Specify which raw frame to tag based on exp_id found in frame info
*
* @param[in] stream The stream.
* @param[in] exp_id The exposure id of the raw frame to tag.
......@@ -363,7 +363,7 @@ ia_css_stream_capture_frame(struct ia_css_stream *stream,
/* ===== VIDEO ===== */
/** @brief Send streaming data into the css input FIFO
/* @brief Send streaming data into the css input FIFO
*
* @param[in] stream The stream.
* @param[in] data Pointer to the pixels to be send.
......@@ -395,7 +395,7 @@ ia_css_stream_send_input_frame(const struct ia_css_stream *stream,
unsigned int width,
unsigned int height);
/** @brief Start an input frame on the CSS input FIFO.
/* @brief Start an input frame on the CSS input FIFO.
*
* @param[in] stream The stream.
* @return None
......@@ -411,7 +411,7 @@ ia_css_stream_send_input_frame(const struct ia_css_stream *stream,
void
ia_css_stream_start_input_frame(const struct ia_css_stream *stream);
/** @brief Send a line of input data into the CSS input FIFO.
/* @brief Send a line of input data into the CSS input FIFO.
*
* @param[in] stream The stream.
* @param[in] data Array of the first line of image data.
......@@ -435,7 +435,7 @@ ia_css_stream_send_input_line(const struct ia_css_stream *stream,
const unsigned short *data2,
unsigned int width2);
/** @brief Send a line of input embedded data into the CSS input FIFO.
/* @brief Send a line of input embedded data into the CSS input FIFO.
*
* @param[in] stream Pointer of the stream.
* @param[in] format Format of the embedded data.
......@@ -457,7 +457,7 @@ ia_css_stream_send_input_embedded_line(const struct ia_css_stream *stream,
const unsigned short *data,
unsigned int width);
/** @brief End an input frame on the CSS input FIFO.
/* @brief End an input frame on the CSS input FIFO.
*
* @param[in] stream The stream.
* @return None
......@@ -467,7 +467,7 @@ ia_css_stream_send_input_embedded_line(const struct ia_css_stream *stream,
void
ia_css_stream_end_input_frame(const struct ia_css_stream *stream);
/** @brief send a request flash command to SP
/* @brief send a request flash command to SP
*
* @param[in] stream The stream.
* @return None
......@@ -481,7 +481,7 @@ ia_css_stream_end_input_frame(const struct ia_css_stream *stream);
void
ia_css_stream_request_flash(struct ia_css_stream *stream);
/** @brief Configure a stream with filter coefficients.
/* @brief Configure a stream with filter coefficients.
* @deprecated {Replaced by
* ia_css_pipe_set_isp_config_on_pipe()}
*
......@@ -503,7 +503,7 @@ ia_css_stream_set_isp_config_on_pipe(struct ia_css_stream *stream,
const struct ia_css_isp_config *config,
struct ia_css_pipe *pipe);
/** @brief Configure a stream with filter coefficients.
/* @brief Configure a stream with filter coefficients.
* @deprecated {Replaced by
* ia_css_pipe_set_isp_config()}
* @param[in] stream The stream.
......@@ -523,7 +523,7 @@ ia_css_stream_set_isp_config(
struct ia_css_stream *stream,
const struct ia_css_isp_config *config);
/** @brief Get selected configuration settings
/* @brief Get selected configuration settings
* @param[in] stream The stream.
* @param[out] config Configuration settings.
* @return None
......@@ -532,7 +532,7 @@ void
ia_css_stream_get_isp_config(const struct ia_css_stream *stream,
struct ia_css_isp_config *config);
/** @brief allocate continuous raw frames for continuous capture
/* @brief allocate continuous raw frames for continuous capture
* @param[in] stream The stream.
* @return IA_CSS_SUCCESS or error code.
*
......@@ -544,7 +544,7 @@ ia_css_stream_get_isp_config(const struct ia_css_stream *stream,
enum ia_css_err
ia_css_alloc_continuous_frame_remain(struct ia_css_stream *stream);
/** @brief allocate continuous raw frames for continuous capture
/* @brief allocate continuous raw frames for continuous capture
* @param[in] stream The stream.
* @return IA_CSS_SUCCESS or error code.
*
......@@ -555,7 +555,7 @@ ia_css_alloc_continuous_frame_remain(struct ia_css_stream *stream);
enum ia_css_err
ia_css_update_continuous_frames(struct ia_css_stream *stream);
/** @brief ia_css_unlock_raw_frame . unlock a raw frame (HALv3 Support)
/* @brief ia_css_unlock_raw_frame . unlock a raw frame (HALv3 Support)
* @param[in] stream The stream.
* @param[in] exp_id exposure id that uniquely identifies the locked Raw Frame Buffer
* @return ia_css_err IA_CSS_SUCCESS or error code
......@@ -567,7 +567,7 @@ ia_css_update_continuous_frames(struct ia_css_stream *stream);
enum ia_css_err
ia_css_unlock_raw_frame(struct ia_css_stream *stream, uint32_t exp_id);
/** @brief ia_css_en_dz_capt_pipe . Enable/Disable digital zoom for capture pipe
/* @brief ia_css_en_dz_capt_pipe . Enable/Disable digital zoom for capture pipe
* @param[in] stream The stream.
* @param[in] enable - true, disable - false
* @return None
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_timer.h
浏览文件 @ d929fb4e
......@@ -31,47 +31,47 @@ more details.
#ifndef __IA_CSS_TIMER_H
#define __IA_CSS_TIMER_H
/** @file
/* @file
* Timer interface definitions
*/
#include <type_support.h> /* for uint32_t */
#include "ia_css_err.h"
/** @brief timer reading definition */
/* @brief timer reading definition */
typedef uint32_t clock_value_t;
/** @brief 32 bit clock tick,(timestamp based on timer-value of CSS-internal timer)*/
/* @brief 32 bit clock tick,(timestamp based on timer-value of CSS-internal timer)*/
struct ia_css_clock_tick {
clock_value_t ticks; /**< measured time in ticks.*/
clock_value_t ticks; /** measured time in ticks.*/
};
/** @brief TIMER event codes */
/* @brief TIMER event codes */
enum ia_css_tm_event {
IA_CSS_TM_EVENT_AFTER_INIT,
/**< Timer Event after Initialization */
/** Timer Event after Initialization */
IA_CSS_TM_EVENT_MAIN_END,
/**< Timer Event after end of Main */
/** Timer Event after end of Main */
IA_CSS_TM_EVENT_THREAD_START,
/**< Timer Event after thread start */
/** Timer Event after thread start */
IA_CSS_TM_EVENT_FRAME_PROC_START,
/**< Timer Event after Frame Process Start */
/** Timer Event after Frame Process Start */
IA_CSS_TM_EVENT_FRAME_PROC_END
/**< Timer Event after Frame Process End */
/** Timer Event after Frame Process End */
};
/** @brief code measurement common struct */
/* @brief code measurement common struct */
struct ia_css_time_meas {
clock_value_t start_timer_value; /**< measured time in ticks */
clock_value_t end_timer_value; /**< measured time in ticks */
clock_value_t start_timer_value; /** measured time in ticks */
clock_value_t end_timer_value; /** measured time in ticks */
};
/**@brief SIZE_OF_IA_CSS_CLOCK_TICK_STRUCT checks to ensure correct alignment for struct ia_css_clock_tick. */
#define SIZE_OF_IA_CSS_CLOCK_TICK_STRUCT sizeof(clock_value_t)
/** @brief checks to ensure correct alignment for ia_css_time_meas. */
/* @brief checks to ensure correct alignment for ia_css_time_meas. */
#define SIZE_OF_IA_CSS_TIME_MEAS_STRUCT (sizeof(clock_value_t) \
+ sizeof(clock_value_t))
/** @brief API to fetch timer count directly
/* @brief API to fetch timer count directly
*
* @param curr_ts [out] measured count value
* @return IA_CSS_SUCCESS if success
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_tpg.h
浏览文件 @ d929fb4e
......@@ -15,11 +15,11 @@
#ifndef __IA_CSS_TPG_H
#define __IA_CSS_TPG_H
/** @file
/* @file
* This file contains support for the test pattern generator (TPG)
*/
/** Enumerate the TPG IDs.
/* Enumerate the TPG IDs.
*/
enum ia_css_tpg_id {
IA_CSS_TPG_ID0,
......@@ -35,7 +35,7 @@ enum ia_css_tpg_id {
*/
#define N_CSS_TPG_IDS (IA_CSS_TPG_ID2+1)
/** Enumerate the TPG modes.
/* Enumerate the TPG modes.
*/
enum ia_css_tpg_mode {
IA_CSS_TPG_MODE_RAMP,
......@@ -44,7 +44,7 @@ enum ia_css_tpg_mode {
IA_CSS_TPG_MODE_MONO
};
/** @brief Configure the test pattern generator.
/* @brief Configure the test pattern generator.
*
* Configure the Test Pattern Generator, the way these values are used to
* generate the pattern can be seen in the HRT extension for the test pattern
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version.h
浏览文件 @ d929fb4e
......@@ -15,16 +15,16 @@
#ifndef __IA_CSS_VERSION_H
#define __IA_CSS_VERSION_H
/** @file
/* @file
* This file contains functions to retrieve CSS-API version information
*/
#include <ia_css_err.h>
/** a common size for the version arrays */
/* a common size for the version arrays */
#define MAX_VERSION_SIZE 500
/** @brief Retrieves the current CSS version
/* @brief Retrieves the current CSS version
* @param[out] version A pointer to a buffer where to put the generated
* version string. NULL is ignored.
* @param[in] max_size Size of the version buffer. If version string
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h
浏览文件 @ d929fb4e
......@@ -15,12 +15,12 @@
#ifndef __IA_CSS_AA2_TYPES_H
#define __IA_CSS_AA2_TYPES_H
/** @file
/* @file
* CSS-API header file for Anti-Aliasing parameters.
*/
/** Anti-Aliasing configuration.
/* Anti-Aliasing configuration.
*
* This structure is used both for YUV AA and Bayer AA.
*
......@@ -39,7 +39,7 @@
* ISP2: BAA2 is used.
*/
struct ia_css_aa_config {
uint16_t strength; /**< Strength of the filter.
uint16_t strength; /** Strength of the filter.
u0.13, [0,8191],
default/ineffective 0 */
};
......
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h
浏览文件 @ d929fb4e
......@@ -15,7 +15,7 @@
#ifndef __IA_CSS_ANR_TYPES_H
#define __IA_CSS_ANR_TYPES_H
/** @file
/* @file
* CSS-API header file for Advanced Noise Reduction kernel v1
*/
......@@ -23,11 +23,11 @@
#define ANR_BPP 10
#define ANR_ELEMENT_BITS ((CEIL_DIV(ANR_BPP, 8))*8)
/** Advanced Noise Reduction configuration.
/* Advanced Noise Reduction configuration.
* This is also known as Low-Light.
*/
struct ia_css_anr_config {
int32_t threshold; /**< Threshold */
int32_t threshold; /** Threshold */
int32_t thresholds[4*4*4];
int32_t factors[3];
};
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或