diff options
Diffstat (limited to 'drivers/staging/media/atomisp/pci/isp2400_input_system_global.h')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/isp2400_input_system_global.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_global.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_global.h index b4142bdde51b..61f23814e2fd 100644 --- a/drivers/staging/media/atomisp/pci/isp2400_input_system_global.h +++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_global.h @@ -13,11 +13,6 @@ * more details. */ -#ifndef __INPUT_SYSTEM_GLOBAL_H_INCLUDED__ -#define __INPUT_SYSTEM_GLOBAL_H_INCLUDED__ - -#define IS_INPUT_SYSTEM_VERSION_2 - #include <type_support.h> //CSI reveiver has 3 ports. @@ -80,13 +75,13 @@ typedef enum { N_INPUT_SYSTEM_BUFFERING_MODE } buffering_mode_t; -typedef struct input_system_cfg_s input_system_cfg_t; +typedef struct isp2400_input_system_cfg_s input_system_cfg_t; typedef struct sync_generator_cfg_s sync_generator_cfg_t; typedef struct tpg_cfg_s tpg_cfg_t; typedef struct prbs_cfg_s prbs_cfg_t; /* MW: uint16_t should be sufficient */ -struct input_system_cfg_s { +struct isp2400_input_system_cfg_s { u32 no_side_band; u32 fmt_type; u32 ch_id; @@ -123,7 +118,7 @@ struct gpfifo_cfg_s { typedef struct gpfifo_cfg_s gpfifo_cfg_t; //ALX:Commented out to pass the compilation. -//typedef struct input_system_cfg_s input_system_cfg_t; +//typedef struct isp2400_input_system_cfg_s input_system_cfg_t; struct ib_buffer_s { u32 mem_reg_size; @@ -131,13 +126,13 @@ struct ib_buffer_s { u32 mem_reg_addr; }; -typedef struct ib_buffer_s ib_buffer_t; +typedef struct ib_buffer_s isp2400_ib_buffer_t; struct csi_cfg_s { u32 csi_port; buffering_mode_t buffering_mode; - ib_buffer_t csi_buffer; - ib_buffer_t acquisition_buffer; + isp2400_ib_buffer_t csi_buffer; + isp2400_ib_buffer_t acquisition_buffer; u32 nof_xmem_buffers; }; @@ -149,8 +144,6 @@ typedef enum { INPUT_SYSTEM_CFG_FLAG_BLOCKED = 1U << 1, INPUT_SYSTEM_CFG_FLAG_REQUIRED = 1U << 2, INPUT_SYSTEM_CFG_FLAG_CONFLICT = 1U << 3 // To mark a conflicting configuration. -} input_system_cfg_flag_t; +} isp2400_input_system_cfg_flag_t; typedef u32 input_system_config_flags_t; - -#endif /* __INPUT_SYSTEM_GLOBAL_H_INCLUDED__ */ |