Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
3e1ec1f4
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3e1ec1f4
编写于
12月 19, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
上级
bcb97940
ecfa4fdc
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
43 addition
and
33 deletion
+43
-33
MAINTAINERS
MAINTAINERS
+3
-3
drivers/media/dvb/ttpci/av7110.c
drivers/media/dvb/ttpci/av7110.c
+3
-0
drivers/media/dvb/ttpci/av7110_hw.h
drivers/media/dvb/ttpci/av7110_hw.h
+2
-1
drivers/media/video/cx25840/cx25840-core.c
drivers/media/video/cx25840/cx25840-core.c
+24
-18
drivers/media/video/em28xx/em28xx-core.c
drivers/media/video/em28xx/em28xx-core.c
+3
-3
drivers/media/video/em28xx/em28xx-i2c.c
drivers/media/video/em28xx/em28xx-i2c.c
+1
-1
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/em28xx/em28xx-video.c
+1
-1
drivers/media/video/em28xx/em28xx.h
drivers/media/video/em28xx/em28xx.h
+4
-4
drivers/media/video/saa7134/saa7134-alsa.c
drivers/media/video/saa7134/saa7134-alsa.c
+1
-1
drivers/media/video/tveeprom.c
drivers/media/video/tveeprom.c
+1
-1
未找到文件。
MAINTAINERS
浏览文件 @
3e1ec1f4
...
...
@@ -536,7 +536,7 @@ P: Mauro Carvalho Chehab
M: mchehab@brturbo.com.br
L: video4linux-list@redhat.com
W: http://linuxtv.org
T:
quilt http://www.linuxtv.org/download/quilt/
T:
git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
S: Maintained
BUSLOGIC SCSI DRIVER
...
...
@@ -834,7 +834,7 @@ P: LinuxTV.org Project
M: linux-dvb-maintainer@linuxtv.org
L: linux-dvb@linuxtv.org (subscription required)
W: http://linuxtv.org/
T:
quilt http://www.linuxtv.org/download/quilt/
T:
git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
S: Supported
EATA-DMA SCSI DRIVER
...
...
@@ -2896,7 +2896,7 @@ P: Mauro Carvalho Chehab
M: mchehab@brturbo.com.br
L: video4linux-list@redhat.com
W: http://linuxtv.org
T:
quilt http://www.linuxtv.org/download/quilt/
T:
git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
S: Maintained
W1 DALLAS'S 1-WIRE BUS
...
...
drivers/media/dvb/ttpci/av7110.c
浏览文件 @
3e1ec1f4
...
...
@@ -176,6 +176,9 @@ static void init_av7110_av(struct av7110 *av7110)
}
}
if
(
dev
->
pci
->
subsystem_vendor
==
0x13c2
&&
dev
->
pci
->
subsystem_device
==
0x000e
)
av7110_fw_cmd
(
av7110
,
COMTYPE_AUDIODAC
,
SpdifSwitch
,
1
,
0
);
// SPDIF on
ret
=
av7110_set_volume
(
av7110
,
av7110
->
mixer
.
volume_left
,
av7110
->
mixer
.
volume_right
);
if
(
ret
<
0
)
printk
(
"dvb-ttpci:cannot set volume :%d
\n
"
,
ret
);
...
...
drivers/media/dvb/ttpci/av7110_hw.h
浏览文件 @
3e1ec1f4
...
...
@@ -143,7 +143,8 @@ enum av7110_audio_command {
MainSwitch
,
ADSwitch
,
SendDiSEqC
,
SetRegister
SetRegister
,
SpdifSwitch
};
enum
av7110_request_command
{
...
...
drivers/media/video/cx25840/cx25840-core.c
浏览文件 @
3e1ec1f4
...
...
@@ -333,24 +333,30 @@ static int set_input(struct i2c_client *client, enum cx25840_input input)
static
int
set_v4lstd
(
struct
i2c_client
*
client
,
v4l2_std_id
std
)
{
u8
fmt
;
switch
(
std
)
{
/* zero is autodetect */
case
0
:
fmt
=
0x0
;
break
;
/* default ntsc to ntsc-m */
case
V4L2_STD_NTSC
:
case
V4L2_STD_NTSC_M
:
fmt
=
0x1
;
break
;
case
V4L2_STD_NTSC_M_JP
:
fmt
=
0x2
;
break
;
case
V4L2_STD_NTSC_443
:
fmt
=
0x3
;
break
;
case
V4L2_STD_PAL
:
fmt
=
0x4
;
break
;
case
V4L2_STD_PAL_M
:
fmt
=
0x5
;
break
;
case
V4L2_STD_PAL_N
:
fmt
=
0x6
;
break
;
case
V4L2_STD_PAL_Nc
:
fmt
=
0x7
;
break
;
case
V4L2_STD_PAL_60
:
fmt
=
0x8
;
break
;
case
V4L2_STD_SECAM
:
fmt
=
0xc
;
break
;
default:
return
-
ERANGE
;
u8
fmt
=
0
;
/* zero is autodetect */
/* First tests should be against specific std */
if
(
std
&
V4L2_STD_NTSC_M_JP
)
{
fmt
=
0x2
;
}
else
if
(
std
&
V4L2_STD_NTSC_443
)
{
fmt
=
0x3
;
}
else
if
(
std
&
V4L2_STD_PAL_M
)
{
fmt
=
0x5
;
}
else
if
(
std
&
V4L2_STD_PAL_N
)
{
fmt
=
0x6
;
}
else
if
(
std
&
V4L2_STD_PAL_Nc
)
{
fmt
=
0x7
;
}
else
if
(
std
&
V4L2_STD_PAL_60
)
{
fmt
=
0x8
;
}
else
{
/* Then, test against generic ones */
if
(
std
&
V4L2_STD_NTSC
)
{
fmt
=
0x1
;
}
else
if
(
std
&
V4L2_STD_PAL
)
{
fmt
=
0x4
;
}
else
if
(
std
&
V4L2_STD_SECAM
)
{
fmt
=
0xc
;
}
}
cx25840_and_or
(
client
,
0x400
,
~
0xf
,
fmt
);
...
...
drivers/media/video/em28xx/em28xx-core.c
浏览文件 @
3e1ec1f4
...
...
@@ -39,7 +39,7 @@ MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
#define em28xx_coredbg(fmt, arg...) do {\
if (core_debug) \
printk(KERN_INFO "%s %s :"fmt, \
dev->name, __FUNCTION__, ##arg); } while (0)
dev->name, __FUNCTION__
, ##arg); } while (0)
static
unsigned
int
reg_debug
;
module_param
(
reg_debug
,
int
,
0644
);
...
...
@@ -48,7 +48,7 @@ MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
#define em28xx_regdbg(fmt, arg...) do {\
if (reg_debug) \
printk(KERN_INFO "%s %s :"fmt, \
dev->name, __FUNCTION__, ##arg); } while (0)
dev->name, __FUNCTION__
, ##arg); } while (0)
static
unsigned
int
isoc_debug
;
module_param
(
isoc_debug
,
int
,
0644
);
...
...
@@ -57,7 +57,7 @@ MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");
#define em28xx_isocdbg(fmt, arg...) do {\
if (isoc_debug) \
printk(KERN_INFO "%s %s :"fmt, \
dev->name, __FUNCTION__, ##arg); } while (0)
dev->name, __FUNCTION__
, ##arg); } while (0)
static
int
alt
=
EM28XX_PINOUT
;
module_param
(
alt
,
int
,
0644
);
...
...
drivers/media/video/em28xx/em28xx-i2c.c
浏览文件 @
3e1ec1f4
...
...
@@ -44,7 +44,7 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
printk(fmt, ##args); } while (0)
#define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \
printk(KERN_DEBUG "%s at %s: " fmt, \
dev->name, __FUNCTION__, ##args); } while (0)
dev->name, __FUNCTION__
, ##args); } while (0)
/*
* em2800_i2c_send_max4()
...
...
drivers/media/video/em28xx/em28xx-video.c
浏览文件 @
3e1ec1f4
...
...
@@ -45,7 +45,7 @@
#define em28xx_videodbg(fmt, arg...) do {\
if (video_debug) \
printk(KERN_INFO "%s %s :"fmt, \
dev->name, __FUNCTION__, ##arg); } while (0)
dev->name, __FUNCTION__
, ##arg); } while (0)
MODULE_AUTHOR
(
DRIVER_AUTHOR
);
MODULE_DESCRIPTION
(
DRIVER_DESC
);
...
...
drivers/media/video/em28xx/em28xx.h
浏览文件 @
3e1ec1f4
...
...
@@ -392,18 +392,18 @@ extern const unsigned int em28xx_bcount;
/* printk macros */
#define em28xx_err(fmt, arg...) do {\
printk(KERN_ERR fmt, ##arg); } while (0)
printk(KERN_ERR fmt
, ##arg); } while (0)
#define em28xx_errdev(fmt, arg...) do {\
printk(KERN_ERR "%s: "fmt,\
dev->name, ##arg); } while (0)
dev->name
, ##arg); } while (0)
#define em28xx_info(fmt, arg...) do {\
printk(KERN_INFO "%s: "fmt,\
dev->name, ##arg); } while (0)
dev->name
, ##arg); } while (0)
#define em28xx_warn(fmt, arg...) do {\
printk(KERN_WARNING "%s: "fmt,\
dev->name, ##arg); } while (0)
dev->name
, ##arg); } while (0)
inline
static
int
em28xx_audio_source
(
struct
em28xx
*
dev
,
int
input
)
{
...
...
drivers/media/video/saa7134/saa7134-alsa.c
浏览文件 @
3e1ec1f4
...
...
@@ -60,7 +60,7 @@ module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC
(
index
,
"Index value for SAA7134 capture interface(s)."
);
#define dprintk(fmt, arg...) if (debug) \
printk(KERN_DEBUG "%s/alsa: " fmt, dev->name
, ##
arg)
printk(KERN_DEBUG "%s/alsa: " fmt, dev->name
, ##
arg)
...
...
drivers/media/video/tveeprom.c
浏览文件 @
3e1ec1f4
...
...
@@ -206,7 +206,7 @@ hauppauge_tuner[] =
{
TUNER_ABSENT
,
"TCL 2002MI_3H"
},
{
TUNER_TCL_2002N
,
"TCL 2002N 5H"
},
/* 100-109 */
{
TUNER_
ABSENT
,
"Philips FMD1216ME"
},
{
TUNER_
PHILIPS_FMD1216ME_MK3
,
"Philips FMD1216ME"
},
{
TUNER_TEA5767
,
"Philips TEA5768HL FM Radio"
},
{
TUNER_ABSENT
,
"Panasonic ENV57H12D5"
},
{
TUNER_PHILIPS_FM1236_MK3
,
"TCL MFNM05-4"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录