mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 09:31:50 +00:00
24095e7660
A recent patch broke the msp3400 driver when CONFIG_MEDIA_CONTROLLER
is not set:
drivers/media/i2c/msp3400-driver.h:107:5: error: "CONFIG_MEDIA_CONTROLLER" is not defined [-Werror=undef]
It was clearly a typo, and this patch changes the
"#if CONFIG_MEDIA_CONTROLLER" to a working IS_ENABLED() check.
Fixes: fb49328217 ("[media] msp3400: initialize MC data")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
143 lines
3.5 KiB
C
143 lines
3.5 KiB
C
/*
|
|
*/
|
|
|
|
#ifndef MSP3400_DRIVER_H
|
|
#define MSP3400_DRIVER_H
|
|
|
|
#include <media/drv-intf/msp3400.h>
|
|
#include <media/v4l2-device.h>
|
|
#include <media/v4l2-ctrls.h>
|
|
#include <media/v4l2-mc.h>
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* This macro is allowed for *constants* only, gcc must calculate it
|
|
at compile time. Remember -- no floats in kernel mode */
|
|
#define MSP_CARRIER(freq) ((int)((float)(freq / 18.432) * (1 << 24)))
|
|
|
|
#define MSP_MODE_AM_DETECT 0
|
|
#define MSP_MODE_FM_RADIO 2
|
|
#define MSP_MODE_FM_TERRA 3
|
|
#define MSP_MODE_FM_SAT 4
|
|
#define MSP_MODE_FM_NICAM1 5
|
|
#define MSP_MODE_FM_NICAM2 6
|
|
#define MSP_MODE_AM_NICAM 7
|
|
#define MSP_MODE_BTSC 8
|
|
#define MSP_MODE_EXTERN 9
|
|
|
|
#define SCART_IN1 0
|
|
#define SCART_IN2 1
|
|
#define SCART_IN3 2
|
|
#define SCART_IN4 3
|
|
#define SCART_IN1_DA 4
|
|
#define SCART_IN2_DA 5
|
|
#define SCART_MONO 6
|
|
#define SCART_MUTE 7
|
|
|
|
#define SCART_DSP_IN 0
|
|
#define SCART1_OUT 1
|
|
#define SCART2_OUT 2
|
|
|
|
#define OPMODE_AUTO -1
|
|
#define OPMODE_MANUAL 0
|
|
#define OPMODE_AUTODETECT 1 /* use autodetect (>= msp3410 only) */
|
|
#define OPMODE_AUTOSELECT 2 /* use autodetect & autoselect (>= msp34xxG) */
|
|
|
|
/* module parameters */
|
|
extern int msp_debug;
|
|
extern bool msp_once;
|
|
extern bool msp_amsound;
|
|
extern int msp_standard;
|
|
extern bool msp_dolby;
|
|
extern int msp_stereo_thresh;
|
|
|
|
struct msp_state {
|
|
struct v4l2_subdev sd;
|
|
struct v4l2_ctrl_handler hdl;
|
|
int rev1, rev2;
|
|
int ident;
|
|
u8 has_nicam;
|
|
u8 has_radio;
|
|
u8 has_headphones;
|
|
u8 has_ntsc_jp_d_k3;
|
|
u8 has_scart2;
|
|
u8 has_scart3;
|
|
u8 has_scart4;
|
|
u8 has_scart2_out;
|
|
u8 has_scart2_out_volume;
|
|
u8 has_i2s_conf;
|
|
u8 has_subwoofer;
|
|
u8 has_sound_processing;
|
|
u8 has_virtual_dolby_surround;
|
|
u8 has_dolby_pro_logic;
|
|
u8 force_btsc;
|
|
|
|
int radio;
|
|
int opmode;
|
|
int std;
|
|
int mode;
|
|
v4l2_std_id v4l2_std, detected_std;
|
|
int nicam_on;
|
|
int acb;
|
|
int in_scart;
|
|
int i2s_mode;
|
|
int main, second; /* sound carrier */
|
|
int input;
|
|
u32 route_in;
|
|
u32 route_out;
|
|
|
|
/* v4l2 */
|
|
int audmode;
|
|
int rxsubchans;
|
|
|
|
struct {
|
|
/* volume cluster */
|
|
struct v4l2_ctrl *volume;
|
|
struct v4l2_ctrl *muted;
|
|
};
|
|
|
|
int scan_in_progress;
|
|
|
|
/* thread */
|
|
struct task_struct *kthread;
|
|
wait_queue_head_t wq;
|
|
unsigned int restart:1;
|
|
unsigned int watch_stereo:1;
|
|
|
|
#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
|
|
struct media_pad pads[IF_AUD_DEC_PAD_NUM_PADS];
|
|
#endif
|
|
};
|
|
|
|
static inline struct msp_state *to_state(struct v4l2_subdev *sd)
|
|
{
|
|
return container_of(sd, struct msp_state, sd);
|
|
}
|
|
|
|
static inline struct msp_state *ctrl_to_state(struct v4l2_ctrl *ctrl)
|
|
{
|
|
return container_of(ctrl->handler, struct msp_state, hdl);
|
|
}
|
|
|
|
/* msp3400-driver.c */
|
|
int msp_write_dem(struct i2c_client *client, int addr, int val);
|
|
int msp_write_dsp(struct i2c_client *client, int addr, int val);
|
|
int msp_read_dem(struct i2c_client *client, int addr);
|
|
int msp_read_dsp(struct i2c_client *client, int addr);
|
|
int msp_reset(struct i2c_client *client);
|
|
void msp_set_scart(struct i2c_client *client, int in, int out);
|
|
void msp_update_volume(struct msp_state *state);
|
|
int msp_sleep(struct msp_state *state, int timeout);
|
|
|
|
/* msp3400-kthreads.c */
|
|
const char *msp_standard_std_name(int std);
|
|
void msp_set_audmode(struct i2c_client *client);
|
|
int msp_detect_stereo(struct i2c_client *client);
|
|
int msp3400c_thread(void *data);
|
|
int msp3410d_thread(void *data);
|
|
int msp34xxg_thread(void *data);
|
|
void msp3400c_set_mode(struct i2c_client *client, int mode);
|
|
void msp3400c_set_carrier(struct i2c_client *client, int cdo1, int cdo2);
|
|
|
|
#endif /* MSP3400_DRIVER_H */
|