Skip to content

L
linux
Commit a709e779 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds
Browse files
Options

[PATCH] c99 struct initialization for the saa7134 driver 

From:  Gerd Knorr <kraxel@bytesex.org>
parent 461671fd
Show whitespace changes
Inline Side-by-side
Showing with 552 additions and 552 deletions
drivers/media/video/saa7134/saa7134-cards.c
View file @ a709e779
......@@ -39,253 +39,253 @@ static char name_svideo[] = "S-Video";
struct saa7134_board saa7134_boards[] = {
[SAA7134_BOARD_UNKNOWN] = {
name: "UNKNOWN/GENERIC",
audio_clock: 0x00187de7,
tuner_type: TUNER_ABSENT,
inputs: {{
name: "default",
vmux: 0,
amux: LINE1,
.name = "UNKNOWN/GENERIC",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_ABSENT,
.inputs = {{
.name = "default",
.vmux = 0,
.amux = LINE1,
}},
},
[SAA7134_BOARD_PROTEUS_PRO] = {
/* /me */
name: "Proteus Pro [philips reference design]",
audio_clock: 0x00187de7,
tuner_type: TUNER_PHILIPS_PAL,
inputs: {{
name: name_comp1,
vmux: 0,
amux: LINE1,
.name = "Proteus Pro [philips reference design]",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_PAL,
.inputs = {{
.name = name_comp1,
.vmux = 0,
.amux = LINE1,
},{
name: name_tv,
vmux: 1,
amux: TV,
tv: 1,
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
}},
},
[SAA7134_BOARD_FLYVIDEO3000] = {
/* "Marco d'Itri" <md@Linux.IT> */
name: "LifeView FlyVIDEO3000",
audio_clock: 0x00200000,
tuner_type: TUNER_PHILIPS_PAL,
inputs: {{
name: name_tv,
vmux: 1,
amux: TV,
tv: 1,
.name = "LifeView FlyVIDEO3000",
.audio_clock = 0x00200000,
.tuner_type = TUNER_PHILIPS_PAL,
.inputs = {{
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
},{
name: name_comp1,
vmux: 0,
amux: LINE1,
.name = name_comp1,
.vmux = 0,
.amux = LINE1,
},{
name: name_comp2,
vmux: 3,
amux: LINE1,
.name = name_comp2,
.vmux = 3,
.amux = LINE1,
},{
name: name_svideo,
vmux: 8,
amux: LINE1,
.name = name_svideo,
.vmux = 8,
.amux = LINE1,
}},
radio: {
name: name_radio,
amux: LINE2,
.radio = {
.name = name_radio,
.amux = LINE2,
},
},
[SAA7134_BOARD_FLYVIDEO2000] = {
/* "TC Wan" <tcwan@cs.usm.my> */
name: "LifeView FlyVIDEO2000",
audio_clock: 0x00200000,
tuner_type: TUNER_LG_PAL_NEW_TAPC,
gpiomask: 0x6000,
inputs: {{
name: name_tv,
vmux: 1,
amux: LINE2,
gpio: 0x0000,
tv: 1,
.name = "LifeView FlyVIDEO2000",
.audio_clock = 0x00200000,
.tuner_type = TUNER_LG_PAL_NEW_TAPC,
.gpiomask = 0x6000,
.inputs = {{
.name = name_tv,
.vmux = 1,
.amux = LINE2,
.gpio = 0x0000,
.tv = 1,
},{
name: name_comp1,
vmux: 0,
amux: LINE2,
gpio: 0x4000,
.name = name_comp1,
.vmux = 0,
.amux = LINE2,
.gpio = 0x4000,
},{
name: name_comp2,
vmux: 3,
amux: LINE2,
gpio: 0x4000,
.name = name_comp2,
.vmux = 3,
.amux = LINE2,
.gpio = 0x4000,
},{
name: name_svideo,
vmux: 8,
amux: LINE2,
gpio: 0x4000,
.name = name_svideo,
.vmux = 8,
.amux = LINE2,
.gpio = 0x4000,
}},
radio: {
name: name_radio,
amux: LINE2,
.radio = {
.name = name_radio,
.amux = LINE2,
},
mute: {
name: name_mute,
amux: LINE1,
.mute = {
.name = name_mute,
.amux = LINE1,
},
},
[SAA7134_BOARD_EMPRESS] = {
/* "Gert Vervoort" <gert.vervoort@philips.com> */
name: "EMPRESS",
audio_clock: 0x00187de7,
tuner_type: TUNER_PHILIPS_PAL,
inputs: {{
name: name_comp1,
vmux: 0,
amux: LINE1,
.name = "EMPRESS",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_PAL,
.inputs = {{
.name = name_comp1,
.vmux = 0,
.amux = LINE1,
},{
name: name_svideo,
vmux: 8,
amux: LINE1,
.name = name_svideo,
.vmux = 8,
.amux = LINE1,
},{
name: name_tv,
vmux: 1,
amux: LINE2,
tv: 1,
.name = name_tv,
.vmux = 1,
.amux = LINE2,
.tv = 1,
}},
radio: {
name: name_radio,
amux: LINE2,
.radio = {
.name = name_radio,
.amux = LINE2,
},
i2s_rate: 48000,
has_ts: 1,
video_out: CCIR656,
.i2s_rate = 48000,
.has_ts = 1,
.video_out = CCIR656,
},
[SAA7134_BOARD_MONSTERTV] = {
/* "K.Ohta" <alpha292@bremen.or.jp> */
name: "SKNet Monster TV",
audio_clock: 0x00187de7,
tuner_type: TUNER_PHILIPS_NTSC_M,
inputs: {{
name: name_tv,
vmux: 1,
amux: TV,
tv: 1,
.name = "SKNet Monster TV",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_NTSC_M,
.inputs = {{
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
},{
name: name_comp1,
vmux: 0,
amux: LINE1,
.name = name_comp1,
.vmux = 0,
.amux = LINE1,
},{
name: name_svideo,
vmux: 8,
amux: LINE1,
.name = name_svideo,
.vmux = 8,
.amux = LINE1,
}},
radio: {
name: name_radio,
amux: LINE2,
.radio = {
.name = name_radio,
.amux = LINE2,
},
},
[SAA7134_BOARD_MD9717] = {
name: "Tevion MD 9717",
audio_clock: 0x00200000,
tuner_type: TUNER_PHILIPS_PAL,
inputs: {{
name: name_tv,
vmux: 1,
amux: TV,
tv: 1,
.name = "Tevion MD 9717",
.audio_clock = 0x00200000,
.tuner_type = TUNER_PHILIPS_PAL,
.inputs = {{
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
},{
/* workaround for problems with normal TV sound */
name: "TV (mono only)",
vmux: 1,
amux: LINE2,
tv: 1,
.name = "TV (mono only)",
.vmux = 1,
.amux = LINE2,
.tv = 1,
},{
name: name_comp1,
vmux: 2,
amux: LINE1,
.name = name_comp1,
.vmux = 2,
.amux = LINE1,
},{
name: name_comp2,
vmux: 3,
amux: LINE1,
.name = name_comp2,
.vmux = 3,
.amux = LINE1,
},{
name: name_svideo,
vmux: 8,
amux: LINE1,
.name = name_svideo,
.vmux = 8,
.amux = LINE1,
}},
radio: {
name: name_radio,
amux: LINE2,
.radio = {
.name = name_radio,
.amux = LINE2,
},
},
[SAA7134_BOARD_TVSTATION_RDS] = {
name: "KNC One TV-Station RDS",
audio_clock: 0x00200000,
tuner_type: TUNER_PHILIPS_FM1216ME_MK3,
need_tda9887: 1,
inputs: {{
name: name_tv,
vmux: 1,
amux: TV,
tv: 1,
.name = "KNC One TV-Station RDS",
.audio_clock = 0x00200000,
.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
.need_tda9887 = 1,
.inputs = {{
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
},{
name: name_comp1,
vmux: 2,
amux: LINE1,
.name = name_comp1,
.vmux = 2,
.amux = LINE1,
},{
name: name_comp2,
vmux: 3,
amux: LINE1,
.name = name_comp2,
.vmux = 3,
.amux = LINE1,
}},
radio: {
name: name_radio,
amux: LINE2,
.radio = {
.name = name_radio,
.amux = LINE2,
},
},
[SAA7134_BOARD_CINERGY400] = {
name: "Terratec Cinergy 400 TV",
audio_clock: 0x00200000,
tuner_type: TUNER_PHILIPS_PAL,
inputs: {{
name: name_tv,
vmux: 1,
amux: TV,
tv: 1,
.name = "Terratec Cinergy 400 TV",
.audio_clock = 0x00200000,
.tuner_type = TUNER_PHILIPS_PAL,
.inputs = {{
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
},{
name: name_comp1,
vmux: 4,
amux: LINE1,
.name = name_comp1,
.vmux = 4,
.amux = LINE1,
},{
name: name_svideo,
vmux: 8,
amux: LINE1,
.name = name_svideo,
.vmux = 8,
.amux = LINE1,
},{
name: name_comp2, // CVideo over SVideo Connector
vmux: 0,
amux: LINE1,
.name = name_comp2, // CVideo over SVideo Connector
.vmux = 0,
.amux = LINE1,
}}
},
[SAA7134_BOARD_MD5044] = {
name: "Medion 5044",
audio_clock: 0x00200000,
tuner_type: TUNER_PHILIPS_FM1216ME_MK3,
need_tda9887: 1,
inputs: {{
name: name_tv,
vmux: 1,
amux: TV,
tv: 1,
.name = "Medion 5044",
.audio_clock = 0x00200000,
.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
.need_tda9887 = 1,
.inputs = {{
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
},{
name: name_comp1,
vmux: 0,
amux: LINE2,
.name = name_comp1,
.vmux = 0,
.amux = LINE2,
},{
name: name_comp2,
vmux: 3,
amux: LINE2,
.name = name_comp2,
.vmux = 3,
.amux = LINE2,
},{
name: name_svideo,
vmux: 8,
amux: LINE2,
.name = name_svideo,
.vmux = 8,
.amux = LINE2,
}},
radio: {
name: name_radio,
amux: LINE2,
.radio = {
.name = name_radio,
.amux = LINE2,
},
},
};
......@@ -296,57 +296,57 @@ const int saa7134_bcount = (sizeof(saa7134_boards)/sizeof(struct saa7134_board))
struct pci_device_id __devinitdata saa7134_pci_tbl[] = {
{
vendor: PCI_VENDOR_ID_PHILIPS,
device: PCI_DEVICE_ID_PHILIPS_SAA7134,
subvendor: PCI_VENDOR_ID_PHILIPS,
subdevice: 0x2001,
driver_data: SAA7134_BOARD_PROTEUS_PRO,
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = PCI_VENDOR_ID_PHILIPS,
.subdevice = 0x2001,
.driver_data = SAA7134_BOARD_PROTEUS_PRO,
},{
vendor: PCI_VENDOR_ID_PHILIPS,
device: PCI_DEVICE_ID_PHILIPS_SAA7134,
subvendor: PCI_VENDOR_ID_PHILIPS,
subdevice: 0x6752,
driver_data: SAA7134_BOARD_EMPRESS,
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = PCI_VENDOR_ID_PHILIPS,
.subdevice = 0x6752,
.driver_data = SAA7134_BOARD_EMPRESS,
},{
vendor: PCI_VENDOR_ID_PHILIPS,
device: PCI_DEVICE_ID_PHILIPS_SAA7134,
subvendor: 0x1131,
subdevice: 0x4e85,
driver_data: SAA7134_BOARD_MONSTERTV,
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = 0x1131,
.subdevice = 0x4e85,
.driver_data = SAA7134_BOARD_MONSTERTV,
},{
vendor: PCI_VENDOR_ID_PHILIPS,
device: PCI_DEVICE_ID_PHILIPS_SAA7134,
subvendor: 0x153B,
subdevice: 0x1142,
driver_data: SAA7134_BOARD_CINERGY400,
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = 0x153B,
.subdevice = 0x1142,
.driver_data = SAA7134_BOARD_CINERGY400,
},{
/* --- boards without eeprom + subsystem ID --- */
vendor: PCI_VENDOR_ID_PHILIPS,
device: PCI_DEVICE_ID_PHILIPS_SAA7134,
subvendor: PCI_VENDOR_ID_PHILIPS,
subdevice: 0,
driver_data: SAA7134_BOARD_NOAUTO,
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = PCI_VENDOR_ID_PHILIPS,
.subdevice = 0,
.driver_data = SAA7134_BOARD_NOAUTO,
},{
vendor: PCI_VENDOR_ID_PHILIPS,
device: PCI_DEVICE_ID_PHILIPS_SAA7130,
subvendor: PCI_VENDOR_ID_PHILIPS,
subdevice: 0,
driver_data: SAA7134_BOARD_NOAUTO,
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
.subvendor = PCI_VENDOR_ID_PHILIPS,
.subdevice = 0,
.driver_data = SAA7134_BOARD_NOAUTO,
},{
/* --- default catch --- */
vendor: PCI_VENDOR_ID_PHILIPS,
device: PCI_DEVICE_ID_PHILIPS_SAA7130,
subvendor: PCI_ANY_ID,
subdevice: PCI_ANY_ID,
driver_data: SAA7134_BOARD_UNKNOWN,
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.driver_data = SAA7134_BOARD_UNKNOWN,
},{
vendor: PCI_VENDOR_ID_PHILIPS,
device: PCI_DEVICE_ID_PHILIPS_SAA7134,
subvendor: PCI_ANY_ID,
subdevice: PCI_ANY_ID,
driver_data: SAA7134_BOARD_UNKNOWN,
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.driver_data = SAA7134_BOARD_UNKNOWN,
},{
/* --- end of list --- */
}
......
drivers/media/video/saa7134/saa7134-core.c
View file @ a709e779
......@@ -896,10 +896,10 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
}
static struct pci_driver saa7134_pci_driver = {
name: "saa7134",
id_table: saa7134_pci_tbl,
probe: saa7134_initdev,
remove: saa7134_finidev,
.name = "saa7134",
.id_table = saa7134_pci_tbl,
.probe = saa7134_initdev,
.remove = saa7134_finidev,
};
static int saa7134_init(void)
......
drivers/media/video/saa7134/saa7134-i2c.c
View file @ a709e779
......@@ -338,25 +338,25 @@ static int attach_inform(struct i2c_client *client)
}
static struct i2c_algorithm saa7134_algo = {
name: "saa7134",
id: I2C_ALGO_SAA7134,
master_xfer: saa7134_i2c_xfer,
algo_control: algo_control,
functionality: functionality,
.name = "saa7134",
.id = I2C_ALGO_SAA7134,
.master_xfer = saa7134_i2c_xfer,
.algo_control = algo_control,
.functionality = functionality,
};
static struct i2c_adapter saa7134_adap_template = {
name: "saa7134",
id: I2C_ALGO_SAA7134,
algo: &saa7134_algo,
inc_use: inc_use,
dec_use: dec_use,
client_register: attach_inform,
.name = "saa7134",
.id = I2C_ALGO_SAA7134,
.algo = &saa7134_algo,
.inc_use = inc_use,
.dec_use = dec_use,
.client_register = attach_inform,
};
static struct i2c_client saa7134_client_template = {
name: "saa7134 internal",
id: -1,
.name = "saa7134 internal",
.id = -1,
};
/* ----------------------------------------------------------- */
......
drivers/media/video/saa7134/saa7134-oss.c
View file @ a709e779
......@@ -486,14 +486,14 @@ static unsigned int dsp_poll(struct file *file, struct poll_table_struct *wait)
}
struct file_operations saa7134_dsp_fops = {
owner: THIS_MODULE,
open: dsp_open,
release: dsp_release,
read: dsp_read,
write: dsp_write,
ioctl: dsp_ioctl,
poll: dsp_poll,
llseek: no_llseek,
.owner = THIS_MODULE,
.open = dsp_open,
.release = dsp_release,
.read = dsp_read,
.write = dsp_write,
.ioctl = dsp_ioctl,
.poll = dsp_poll,
.llseek = no_llseek,
};
/* ------------------------------------------------------------------ */
......@@ -670,11 +670,11 @@ static int mixer_ioctl(struct inode *inode, struct file *file,
}
struct file_operations saa7134_mixer_fops = {
owner: THIS_MODULE,
open: mixer_open,
release: mixer_release,
ioctl: mixer_ioctl,
llseek: no_llseek,
.owner = THIS_MODULE,
.open = mixer_open,
.release = mixer_release,
.ioctl = mixer_ioctl,
.llseek = no_llseek,
};
/* ------------------------------------------------------------------ */
......
drivers/media/video/saa7134/saa7134-ts.c
View file @ a709e779
......@@ -151,10 +151,10 @@ static void buffer_release(struct file *file, struct videobuf_buffer *vb)
}
static struct videobuf_queue_ops ts_qops = {
buf_setup: buffer_setup,
buf_prepare: buffer_prepare,
buf_queue: buffer_queue,
buf_release: buffer_release,
.buf_setup = buffer_setup,
.buf_prepare = buffer_prepare,
.buf_queue = buffer_queue,
.buf_release = buffer_release,
};
/* ------------------------------------------------------------------ */
......@@ -375,14 +375,14 @@ static int ts_ioctl(struct inode *inode, struct file *file,
static struct file_operations ts_fops =
{
owner: THIS_MODULE,
open: ts_open,
release: ts_release,
read: ts_read,
poll: ts_poll,
mmap: ts_mmap,
ioctl: ts_ioctl,
llseek: no_llseek,
.owner = THIS_MODULE,
.open = ts_open,
.release = ts_release,
.read = ts_read,
.poll = ts_poll,
.mmap = ts_mmap,
.ioctl = ts_ioctl,
.llseek = no_llseek,
};
......@@ -391,12 +391,12 @@ static struct file_operations ts_fops =
struct video_device saa7134_ts_template =
{
name: "saa7134-ts",
type: 0 /* FIXME */,
type2: 0 /* FIXME */,
hardware: 0,
fops: &ts_fops,
minor: -1,
.name = "saa7134-ts",
.type = 0 /* FIXME */,
.type2 = 0 /* FIXME */,
.hardware = 0,
.fops = &ts_fops,
.minor = -1,
};
int saa7134_ts_init(struct saa7134_dev *dev)
......
drivers/media/video/saa7134/saa7134-tvaudio.c
View file @ a709e779
......@@ -48,65 +48,65 @@ MODULE_PARM_DESC(audio_debug,"enable debug messages [tv audio]");
static struct saa7134_tvaudio tvaudio[] = {
{
name: "PAL-B/G FM-stereo",
std: V4L2_STD_PAL,
mode: TVAUDIO_FM_BG_STEREO,
carr1: 5500,
carr2: 5742,
.name = "PAL-B/G FM-stereo",
.std = V4L2_STD_PAL,
.mode = TVAUDIO_FM_BG_STEREO,
.carr1 = 5500,
.carr2 = 5742,
},{
name: "PAL-D/K1 FM-stereo",
std: V4L2_STD_PAL,
carr1: 6500,
carr2: 6258,
mode: TVAUDIO_FM_BG_STEREO,
.name = "PAL-D/K1 FM-stereo",
.std = V4L2_STD_PAL,
.carr1 = 6500,
.carr2 = 6258,
.mode = TVAUDIO_FM_BG_STEREO,
},{
name: "PAL-D/K2 FM-stereo",
std: V4L2_STD_PAL,
carr1: 6500,
carr2: 6742,
mode: TVAUDIO_FM_BG_STEREO,
.name = "PAL-D/K2 FM-stereo",
.std = V4L2_STD_PAL,
.carr1 = 6500,
.carr2 = 6742,
.mode = TVAUDIO_FM_BG_STEREO,
},{
name: "PAL-D/K3 FM-stereo",
std: V4L2_STD_PAL,
carr1: 6500,
carr2: 5742,
mode: TVAUDIO_FM_BG_STEREO,
.name = "PAL-D/K3 FM-stereo",
.std = V4L2_STD_PAL,
.carr1 = 6500,
.carr2 = 5742,
.mode = TVAUDIO_FM_BG_STEREO,
},{
name: "PAL-B/G NICAM",
std: V4L2_STD_PAL,
carr1: 5500,
carr2: 5850,
mode: TVAUDIO_NICAM_FM,
.name = "PAL-B/G NICAM",
.std = V4L2_STD_PAL,
.carr1 = 5500,
.carr2 = 5850,
.mode = TVAUDIO_NICAM_FM,
},{
name: "PAL-I NICAM",
std: V4L2_STD_PAL,
carr1: 6000,
carr2: 6552,
mode: TVAUDIO_NICAM_FM,
.name = "PAL-I NICAM",
.std = V4L2_STD_PAL,
.carr1 = 6000,
.carr2 = 6552,
.mode = TVAUDIO_NICAM_FM,
},{
name: "PAL-D/K NICAM",
std: V4L2_STD_PAL,
carr1: 6500,
carr2: 5850,
mode: TVAUDIO_NICAM_FM,
.name = "PAL-D/K NICAM",
.std = V4L2_STD_PAL,
.carr1 = 6500,
.carr2 = 5850,
.mode = TVAUDIO_NICAM_FM,
},{
name: "SECAM-L NICAM",
std: V4L2_STD_SECAM,
carr1: 6500,
carr2: 5850,
mode: TVAUDIO_NICAM_AM,
.name = "SECAM-L NICAM",
.std = V4L2_STD_SECAM,
.carr1 = 6500,
.carr2 = 5850,
.mode = TVAUDIO_NICAM_AM,
},{
name: "NTSC-M",
std: V4L2_STD_NTSC,
carr1: 4500,
carr2: -1,
mode: TVAUDIO_FM_MONO,
.name = "NTSC-M",
.std = V4L2_STD_NTSC,
.carr1 = 4500,
.carr2 = -1,
.mode = TVAUDIO_FM_MONO,
},{
name: "NTSC-A2 FM-stereo",
std: V4L2_STD_NTSC,
carr1: 4500,
carr2: 4724,
mode: TVAUDIO_FM_K_STEREO,
.name = "NTSC-A2 FM-stereo",
.std = V4L2_STD_NTSC,
.carr1 = 4500,
.carr2 = 4724,
.mode = TVAUDIO_FM_K_STEREO,
}
};
#define TVAUDIO (sizeof(tvaudio)/sizeof(struct saa7134_tvaudio))
......
drivers/media/video/saa7134/saa7134-vbi.c
View file @ a709e779
......@@ -207,10 +207,10 @@ static void buffer_release(struct file *file, struct videobuf_buffer *vb)
}
struct videobuf_queue_ops saa7134_vbi_qops = {
buf_setup: buffer_setup,
buf_prepare: buffer_prepare,
buf_queue: buffer_queue,
buf_release: buffer_release,
.buf_setup = buffer_setup,
.buf_prepare = buffer_prepare,
.buf_queue = buffer_queue,
.buf_release = buffer_release,
};
/* ------------------------------------------------------------------ */
......
drivers/media/video/saa7134/saa7134-video.c
View file @ a709e779
......@@ -55,80 +55,80 @@ static int video_out[][9] = {
static struct saa7134_format formats[] = {
{
name: "8 bpp gray",
fourcc: V4L2_PIX_FMT_GREY,
depth: 8,
pm: 0x06,
.name = "8 bpp gray",
.fourcc = V4L2_PIX_FMT_GREY,
.depth = 8,
.pm = 0x06,
},{
name: "15 bpp RGB, le",
fourcc: V4L2_PIX_FMT_RGB555,
depth: 16,
pm: 0x13 | 0x80,
.name = "15 bpp RGB, le",
.fourcc = V4L2_PIX_FMT_RGB555,
.depth = 16,
.pm = 0x13 | 0x80,
},{
name: "15 bpp RGB, be",
fourcc: V4L2_PIX_FMT_RGB555X,
depth: 16,
pm: 0x13 | 0x80,
bswap: 1,
.name = "15 bpp RGB, be",
.fourcc = V4L2_PIX_FMT_RGB555X,
.depth = 16,
.pm = 0x13 | 0x80,
.bswap = 1,
},{
name: "16 bpp RGB, le",
fourcc: V4L2_PIX_FMT_RGB565,
depth: 16,
pm: 0x10 | 0x80,
.name = "16 bpp RGB, le",
.fourcc = V4L2_PIX_FMT_RGB565,
.depth = 16,
.pm = 0x10 | 0x80,
},{
name: "16 bpp RGB, be",
fourcc: V4L2_PIX_FMT_RGB565X,
depth: 16,
pm: 0x10 | 0x80,
bswap: 1,
.name = "16 bpp RGB, be",
.fourcc = V4L2_PIX_FMT_RGB565X,
.depth = 16,
.pm = 0x10 | 0x80,
.bswap = 1,
},{
name: "24 bpp RGB, le",
fourcc: V4L2_PIX_FMT_BGR24,
depth: 24,
pm: 0x11,
.name = "24 bpp RGB, le",
.fourcc = V4L2_PIX_FMT_BGR24,
.depth = 24,
.pm = 0x11,
},{
name: "32 bpp RGB, le",
fourcc: V4L2_PIX_FMT_BGR32,
depth: 32,
pm: 0x12,
.name = "32 bpp RGB, le",
.fourcc = V4L2_PIX_FMT_BGR32,
.depth = 32,
.pm = 0x12,
},{
name: "32 bpp RGB, be",
fourcc: V4L2_PIX_FMT_RGB32,
depth: 32,
pm: 0x12,
bswap: 1,
wswap: 1,
.name = "32 bpp RGB, be",
.fourcc = V4L2_PIX_FMT_RGB32,
.depth = 32,
.pm = 0x12,
.bswap = 1,
.wswap = 1,
},{
name: "4:2:2 packed, YUYV",
fourcc: V4L2_PIX_FMT_YUYV,
depth: 16,
pm: 0x00,
bswap: 1,
yuv: 1,
.name = "4:2:2 packed, YUYV",
.fourcc = V4L2_PIX_FMT_YUYV,
.depth = 16,
.pm = 0x00,
.bswap = 1,
.yuv = 1,
},{
name: "4:2:2 packed, UYVY",
fourcc: V4L2_PIX_FMT_UYVY,
depth: 16,
pm: 0x00,
yuv: 1,
.name = "4:2:2 packed, UYVY",
.fourcc = V4L2_PIX_FMT_UYVY,
.depth = 16,
.pm = 0x00,
.yuv = 1,
},{
name: "4:2:2 planar, Y-Cb-Cr",
fourcc: V4L2_PIX_FMT_YUV422P,
depth: 16,
pm: 0x09,
yuv: 1,
planar: 1,
hshift: 1,
vshift: 0,
.name = "4:2:2 planar, Y-Cb-Cr",
.fourcc = V4L2_PIX_FMT_YUV422P,
.depth = 16,
.pm = 0x09,
.yuv = 1,
.planar = 1,
.hshift = 1,
.vshift = 0,
},{
name: "4:2:0 planar, Y-Cb-Cr",
fourcc: V4L2_PIX_FMT_YUV420,
depth: 12,
pm: 0x0a,
yuv: 1,
planar: 1,
hshift: 1,
vshift: 1,
.name = "4:2:0 planar, Y-Cb-Cr",
.fourcc = V4L2_PIX_FMT_YUV420,
.depth = 12,
.pm = 0x0a,
.yuv = 1,
.planar = 1,
.hshift = 1,
.vshift = 1,
}
};
#define FORMATS (sizeof(formats)/sizeof(struct saa7134_format))
......@@ -136,77 +136,77 @@ static struct saa7134_format formats[] = {
static struct saa7134_tvnorm tvnorms[] = {
{
name: "PAL-BGHI",
id: V4L2_STD_PAL,
width: 720,
height: 576,
sync_control: 0x18,
luma_control: 0x40,
chroma_ctrl1: 0x81,
chroma_gain: 0x2a,
chroma_ctrl2: 0x06,
h_start: 0,
h_stop: 719,
video_v_start: 24,
video_v_stop: 311,
vbi_v_start: 7-3, /* FIXME */
vbi_v_stop: 22-3,
.name = "PAL-BGHI",
.id = V4L2_STD_PAL,
.width = 720,
.height = 576,
.sync_control = 0x18,
.luma_control = 0x40,
.chroma_ctrl1 = 0x81,
.chroma_gain = 0x2a,
.chroma_ctrl2 = 0x06,
.h_start = 0,
.h_stop = 719,
.video_v_start = 24,
.video_v_stop = 311,
.vbi_v_start = 7-3, /* FIXME */
.vbi_v_stop = 22-3,
},{
name: "NTSC-M",
id: V4L2_STD_NTSC,
width: 720,
height: 480,
sync_control: 0x59,
luma_control: 0x40,
chroma_ctrl1: 0x89,
chroma_gain: 0x2a,
chroma_ctrl2: 0x0e,
h_start: 0,
h_stop: 719,
video_v_start: 22,
video_v_stop: 22+240,
vbi_v_start: 10, /* FIXME */
vbi_v_stop: 21, /* FIXME */
.name = "NTSC-M",
.id = V4L2_STD_NTSC,
.width = 720,
.height = 480,
.sync_control = 0x59,
.luma_control = 0x40,
.chroma_ctrl1 = 0x89,
.chroma_gain = 0x2a,
.chroma_ctrl2 = 0x0e,
.h_start = 0,
.h_stop = 719,
.video_v_start = 22,
.video_v_stop = 22+240,
.vbi_v_start = 10, /* FIXME */
.vbi_v_stop = 21, /* FIXME */
},{
name: "SECAM",
id: V4L2_STD_SECAM,
width: 720,
height: 576,
sync_control: 0x58,
luma_control: 0x1b,
chroma_ctrl1: 0xd1,
chroma_gain: 0x80,
chroma_ctrl2: 0x00,
h_start: 0,
h_stop: 719,
video_v_start: 24,
video_v_stop: 311,
vbi_v_start: 7,
vbi_v_stop: 22,
.name = "SECAM",
.id = V4L2_STD_SECAM,
.width = 720,
.height = 576,
.sync_control = 0x58,
.luma_control = 0x1b,
.chroma_ctrl1 = 0xd1,
.chroma_gain = 0x80,
.chroma_ctrl2 = 0x00,
.h_start = 0,
.h_stop = 719,
.video_v_start = 24,
.video_v_stop = 311,
.vbi_v_start = 7,
.vbi_v_stop = 22,
},{
name: "AUTO",
id: -1,
width: 768,
height: 576,
sync_control: 0x98,
luma_control: 0x40,
chroma_ctrl1: 0x8b,
chroma_gain: 0x00,
chroma_ctrl2: 0x00,
h_start: 0,
h_stop: 719,
video_v_start: 24,
video_v_stop: 311,
vbi_v_start: 7,
vbi_v_stop: 22,
.name = "AUTO",
.id = -1,
.width = 768,
.height = 576,
.sync_control = 0x98,
.luma_control = 0x40,
.chroma_ctrl1 = 0x8b,
.chroma_gain = 0x00,
.chroma_ctrl2 = 0x00,
.h_start = 0,
.h_stop = 719,
.video_v_start = 24,
.video_v_stop = 311,
.vbi_v_start = 7,
.vbi_v_stop = 22,
}
};
#define TVNORMS (sizeof(tvnorms)/sizeof(struct saa7134_tvnorm))
......@@ -218,87 +218,87 @@ static struct saa7134_tvnorm tvnorms[] = {
#define V4L2_CID_PRIVATE_LASTP1 (V4L2_CID_PRIVATE_BASE + 3)
static const struct v4l2_queryctrl no_ctrl = {
name: "42",
flags: V4L2_CTRL_FLAG_DISABLED,
.name = "42",
.flags = V4L2_CTRL_FLAG_DISABLED,
};
static const struct v4l2_queryctrl video_ctrls[] = {
/* --- video --- */
{
id: V4L2_CID_BRIGHTNESS,
name: "Brightness",
minimum: 0,
maximum: 255,
step: 1,
default_value: 128,
type: V4L2_CTRL_TYPE_INTEGER,
.id = V4L2_CID_BRIGHTNESS,
.name = "Brightness",
.minimum = 0,
.maximum = 255,
.step = 1,
.default_value = 128,
.type = V4L2_CTRL_TYPE_INTEGER,
},{
id: V4L2_CID_CONTRAST,
name: "Contrast",
minimum: 0,
maximum: 127,
step: 1,
default_value: 68,
type: V4L2_CTRL_TYPE_INTEGER,
.id = V4L2_CID_CONTRAST,
.name = "Contrast",
.minimum = 0,
.maximum = 127,
.step = 1,
.default_value = 68,
.type = V4L2_CTRL_TYPE_INTEGER,
},{
id: V4L2_CID_SATURATION,
name: "Saturation",
minimum: 0,
maximum: 127,
step: 1,
default_value: 64,
type: V4L2_CTRL_TYPE_INTEGER,
.id = V4L2_CID_SATURATION,
.name = "Saturation",
.minimum = 0,
.maximum = 127,
.step = 1,
.default_value = 64,
.type = V4L2_CTRL_TYPE_INTEGER,
},{
id: V4L2_CID_HUE,
name: "Hue",
minimum: -128,
maximum: 127,
step: 1,
default_value: 0,
type: V4L2_CTRL_TYPE_INTEGER,
.id = V4L2_CID_HUE,
.name = "Hue",
.minimum = -128,
.maximum = 127,
.step = 1,
.default_value = 0,
.type = V4L2_CTRL_TYPE_INTEGER,
},{
id: V4L2_CID_VFLIP,
name: "vertical flip",
minimum: 0,
maximum: 1,
type: V4L2_CTRL_TYPE_BOOLEAN,
.id = V4L2_CID_VFLIP,
.name = "vertical flip",
.minimum = 0,
.maximum = 1,
.type = V4L2_CTRL_TYPE_BOOLEAN,
},
/* --- audio --- */
{
id: V4L2_CID_AUDIO_MUTE,
name: "Mute",
minimum: 0,
maximum: 1,
type: V4L2_CTRL_TYPE_BOOLEAN,
.id = V4L2_CID_AUDIO_MUTE,
.name = "Mute",
.minimum = 0,
.maximum = 1,
.type = V4L2_CTRL_TYPE_BOOLEAN,
},{
id: V4L2_CID_AUDIO_VOLUME,
name: "Volume",
minimum: -15,
maximum: 15,
step: 1,
default_value: 0,
type: V4L2_CTRL_TYPE_INTEGER,
.id = V4L2_CID_AUDIO_VOLUME,
.name = "Volume",
.minimum = -15,
.maximum = 15,
.step = 1,
.default_value = 0,
.type = V4L2_CTRL_TYPE_INTEGER,
},
/* --- private --- */
{
id: V4L2_CID_PRIVATE_INVERT,
name: "Invert",
minimum: 0,
maximum: 1,
type: V4L2_CTRL_TYPE_BOOLEAN,
.id = V4L2_CID_PRIVATE_INVERT,
.name = "Invert",
.minimum = 0,
.maximum = 1,
.type = V4L2_CTRL_TYPE_BOOLEAN,
},{
id: V4L2_CID_PRIVATE_Y_ODD,
name: "y offset odd field",
minimum: 0,
maximum: 128,
default_value: 0,
type: V4L2_CTRL_TYPE_INTEGER,
.id = V4L2_CID_PRIVATE_Y_ODD,
.name = "y offset odd field",
.minimum = 0,
.maximum = 128,
.default_value = 0,
.type = V4L2_CTRL_TYPE_INTEGER,
},{
id: V4L2_CID_PRIVATE_Y_EVEN,
name: "y offset even field",
minimum: 0,
maximum: 128,
default_value: 0,
type: V4L2_CTRL_TYPE_INTEGER,
.id = V4L2_CID_PRIVATE_Y_EVEN,
.name = "y offset even field",
.minimum = 0,
.maximum = 128,
.default_value = 0,
.type = V4L2_CTRL_TYPE_INTEGER,
}
};
const int CTRLS = (sizeof(video_ctrls)/sizeof(struct v4l2_queryctrl));
......@@ -912,10 +912,10 @@ static void buffer_release(struct file *file, struct videobuf_buffer *vb)
}
static struct videobuf_queue_ops video_qops = {
buf_setup: buffer_setup,
buf_prepare: buffer_prepare,
buf_queue: buffer_queue,
buf_release: buffer_release,
.buf_setup = buffer_setup,
.buf_prepare = buffer_prepare,
.buf_queue = buffer_queue,
.buf_release = buffer_release,
};
/* ------------------------------------------------------------------ */
......@@ -1873,23 +1873,23 @@ static int radio_ioctl(struct inode *inode, struct file *file,
static struct file_operations video_fops =
{
owner: THIS_MODULE,
open: video_open,
release: video_release,
read: video_read,
poll: video_poll,
mmap: video_mmap,
ioctl: video_ioctl,
llseek: no_llseek,
.owner = THIS_MODULE,
.open = video_open,
.release = video_release,
.read = video_read,
.poll = video_poll,
.mmap = video_mmap,
.ioctl = video_ioctl,
.llseek = no_llseek,
};
static struct file_operations radio_fops =
{
owner: THIS_MODULE,
open: video_open,
release: video_release,
ioctl: radio_ioctl,
llseek: no_llseek,
.owner = THIS_MODULE,
.open = video_open,
.release = video_release,
.ioctl = radio_ioctl,
.llseek = no_llseek,
};
/* ----------------------------------------------------------- */
......@@ -1897,30 +1897,30 @@ static struct file_operations radio_fops =
struct video_device saa7134_video_template =
{
name: "saa7134-video",
.name = "saa7134-video",
type: VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_OVERLAY|
VID_TYPE_CLIPPING|VID_TYPE_SCALES,
hardware: 0,
fops: &video_fops,
minor: -1,
.hardware = 0,
.fops = &video_fops,
.minor = -1,
};
struct video_device saa7134_vbi_template =
{
name: "saa7134-vbi",
type: VID_TYPE_TUNER|VID_TYPE_TELETEXT,
hardware: 0,
fops: &video_fops,
minor: -1,
.name = "saa7134-vbi",
.type = VID_TYPE_TUNER|VID_TYPE_TELETEXT,
.hardware = 0,
.fops = &video_fops,
.minor = -1,
};
struct video_device saa7134_radio_template =
{
name: "saa7134-radio",
type: VID_TYPE_TUNER,
hardware: 0,
fops: &radio_fops,
minor: -1,
.name = "saa7134-radio",
.type = VID_TYPE_TUNER,
.hardware = 0,
.fops = &radio_fops,
.minor = -1,
};
int saa7134_video_init(struct saa7134_dev *dev)
......
drivers/media/video/saa7134/saa7134.h
View file @ a709e779
......@@ -24,7 +24,7 @@
#include <linux/kdev_t.h>
#include "video-buf.h"
#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,1)
#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,2)
#ifndef TRUE
# define TRUE (1==1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7