Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
linux
Commits
ff8ff505
Commit
ff8ff505
authored
21 years ago
by
David S. Miller
Browse files
Options
Download
Plain Diff
Merge davem@nuts.ninka.net:/home/davem/src/BK/sparc-2.5
into kernel.bkbits.net:/home/davem/sparc-2.5
parents
8128c97e
5899bb53
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
174 additions
and
81 deletions
+174
-81
arch/sparc64/Kconfig
arch/sparc64/Kconfig
+3
-38
arch/sparc64/defconfig
arch/sparc64/defconfig
+125
-7
arch/sparc64/kernel/process.c
arch/sparc64/kernel/process.c
+3
-0
arch/sparc64/kernel/sys_sparc32.c
arch/sparc64/kernel/sys_sparc32.c
+1
-0
arch/sparc64/lib/Makefile
arch/sparc64/lib/Makefile
+3
-1
arch/sparc64/lib/dec_and_lock.S
arch/sparc64/lib/dec_and_lock.S
+0
-3
drivers/i2c/Kconfig
drivers/i2c/Kconfig
+2
-2
drivers/media/dvb/b2c2/skystar2.c
drivers/media/dvb/b2c2/skystar2.c
+10
-7
drivers/media/dvb/dvb-core/dvb_net.c
drivers/media/dvb/dvb-core/dvb_net.c
+1
-1
drivers/media/dvb/ttpci/budget-patch.c
drivers/media/dvb/ttpci/budget-patch.c
+1
-1
drivers/media/video/Kconfig
drivers/media/video/Kconfig
+1
-1
drivers/media/video/bttv-cards.c
drivers/media/video/bttv-cards.c
+1
-0
drivers/media/video/bttv-driver.c
drivers/media/video/bttv-driver.c
+7
-7
drivers/media/video/bttv-risc.c
drivers/media/video/bttv-risc.c
+6
-6
drivers/media/video/bttvp.h
drivers/media/video/bttvp.h
+1
-0
drivers/media/video/bw-qcam.c
drivers/media/video/bw-qcam.c
+2
-2
drivers/media/video/c-qcam.c
drivers/media/video/c-qcam.c
+2
-2
drivers/media/video/cpia.c
drivers/media/video/cpia.c
+2
-2
drivers/media/video/saa5249.c
drivers/media/video/saa5249.c
+1
-1
drivers/media/video/saa7134/saa7134.h
drivers/media/video/saa7134/saa7134.h
+2
-0
No files found.
arch/sparc64/Kconfig
View file @
ff8ff505
...
...
@@ -741,44 +741,6 @@ config UNIX98_PTY_COUNT
endmenu
menu "Video For Linux"
config VIDEO_DEV
tristate "Video For Linux"
---help---
Support for audio/video capture and overlay devices and FM radio
cards. The exact capabilities of each device vary. User tools for
this are available from
<ftp://ftp.uk.linux.org/pub/linux/video4linux/>.
If you are interested in writing a driver for such an audio/video
device or user software interacting with such a driver, please read
the file <file:Documentation/video4linux/API.html>.
This driver is also available as a module called videodev ( = code
which can be inserted in and removed from the running kernel
whenever you want). If you want to compile it as a module, say M
here and read <file:Documentation/modules.txt>.
config VIDEO_BT848
tristate "BT848 Video For Linux"
depends on PCI && VIDEO_DEV
---help---
Support for BT848 based frame grabber/overlay boards. This includes
the Miro, Hauppauge and STB boards. Please read the material in
<file:Documentation/video4linux/bttv> for more information.
If you say Y or M here, you need to say Y or M to "I2C support" and
"I2C bit-banging interfaces" in the character device section.
This driver is available as a module called bttv ( = code
which can be inserted in and removed from the running kernel
whenever you want). If you want to compile it as a module, say M
here and read <file:Documentation/modules.txt>.
endmenu
menu "XFree86 DRI support"
config DRM
...
...
@@ -819,8 +781,11 @@ endmenu
source "drivers/input/Kconfig"
source "drivers/i2c/Kconfig"
source "fs/Kconfig"
source "drivers/media/Kconfig"
menu "Sound"
...
...
This diff is collapsed.
Click to expand it.
arch/sparc64/defconfig
View file @
ff8ff505
...
...
@@ -20,6 +20,8 @@ CONFIG_LOG_BUF_SHIFT=15
CONFIG_KALLSYMS=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
#
# Loadable module support
...
...
@@ -51,7 +53,6 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=m
# CONFIG_CPU_FREQ_24_API is not set
CONFIG_SPARC64=y
CONFIG_HOTPLUG=y
CONFIG_HAVE_DEC_LOCK=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_SBUS=y
...
...
@@ -383,6 +384,7 @@ CONFIG_IEEE1394_OUI_DB=y
#
# Device Drivers
#
CONFIG_IEEE1394_PCILYNX=m
CONFIG_IEEE1394_OHCI1394=m
#
...
...
@@ -594,6 +596,7 @@ CONFIG_BRIDGE_EBT_ARP=m
CONFIG_BRIDGE_EBT_VLAN=m
CONFIG_BRIDGE_EBT_MARK=m
CONFIG_BRIDGE_EBT_PKTTYPE=m
CONFIG_BRIDGE_EBT_STP=m
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_DNAT=m
CONFIG_BRIDGE_EBT_REDIRECT=m
...
...
@@ -923,12 +926,6 @@ CONFIG_PHONE_IXJ=m
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
#
# Video For Linux
#
CONFIG_VIDEO_DEV=y
# CONFIG_VIDEO_BT848 is not set
#
# XFree86 DRI support
#
...
...
@@ -984,6 +981,42 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_SPARCSPKR=y
# CONFIG_INPUT_UINPUT is not set
#
# I2C support
#
CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_PROSAVAGE=m
CONFIG_I2C_PHILIPSPAR=m
CONFIG_SCx200_ACB=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ELEKTOR is not set
CONFIG_I2C_CHARDEV=m
#
# I2C Hardware Sensors Mainboard support
#
CONFIG_I2C_ALI1535=m
CONFIG_I2C_ALI15X3=m
CONFIG_I2C_AMD756=m
CONFIG_I2C_AMD8111=m
CONFIG_I2C_I801=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_SIS96X=m
CONFIG_I2C_VIAPRO=m
#
# I2C Hardware Sensors Chip support
#
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM85=m
CONFIG_SENSORS_LM78=m
CONFIG_SENSORS_VIA686A=m
CONFIG_SENSORS_W83781D=m
CONFIG_I2C_SENSOR=m
#
# File systems
#
...
...
@@ -1146,6 +1179,90 @@ CONFIG_NLS_DEFAULT="iso8859-1"
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
#
# Multimedia devices
#
CONFIG_VIDEO_DEV=y
#
# Video For Linux
#
CONFIG_VIDEO_PROC_FS=y
#
# Video Adapters
#
CONFIG_VIDEO_BT848=m
CONFIG_VIDEO_BWQCAM=m
CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_W9966=m
CONFIG_VIDEO_CPIA=m
CONFIG_VIDEO_CPIA_PP=m
CONFIG_VIDEO_CPIA_USB=m
CONFIG_VIDEO_SAA5249=m
CONFIG_TUNER_3036=m
# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_ZR36120 is not set
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
#
# Radio Adapters
#
CONFIG_RADIO_GEMTEK_PCI=m
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_MAESTRO=m
#
# Digital Video Broadcasting Devices
#
CONFIG_DVB=y
CONFIG_DVB_CORE=m
#
# Supported Frontend Modules
#
CONFIG_DVB_STV0299=m
CONFIG_DVB_ALPS_BSRV2=m
CONFIG_DVB_ALPS_TDLB7=m
CONFIG_DVB_ALPS_TDMB7=m
CONFIG_DVB_ATMEL_AT76C651=m
CONFIG_DVB_CX24110=m
CONFIG_DVB_GRUNDIG_29504_491=m
CONFIG_DVB_GRUNDIG_29504_401=m
CONFIG_DVB_MT312=m
CONFIG_DVB_VES1820=m
# CONFIG_DVB_TDA1004X is not set
#
# Supported SAA7146 based PCI Adapters
#
# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_PATCH=m
#
# Supported USB Adapters
#
# CONFIG_DVB_TTUSB_BUDGET is not set
# CONFIG_DVB_TTUSB_DEC is not set
#
# Supported FlexCopII (B2C2) Adapters
#
CONFIG_DVB_B2C2_SKYSTAR=m
CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_VIDEOBUF=m
CONFIG_VIDEO_TUNER=m
CONFIG_VIDEO_BUF=m
CONFIG_VIDEO_BTCX=m
#
# Sound
#
...
...
@@ -1424,6 +1541,7 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SLAB is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_DEBUG_SPINLOCK is not set
CONFIG_HAVE_DEC_LOCK=y
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_DCFLUSH is not set
...
...
This diff is collapsed.
Click to expand it.
arch/sparc64/kernel/process.c
View file @
ff8ff505
...
...
@@ -209,6 +209,8 @@ static void show_regwindow(struct pt_regs *regs)
rw
->
ins
[
0
],
rw
->
ins
[
1
],
rw
->
ins
[
2
],
rw
->
ins
[
3
]);
printk
(
"i4: %016lx i5: %016lx i6: %016lx i7: %016lx
\n
"
,
rw
->
ins
[
4
],
rw
->
ins
[
5
],
rw
->
ins
[
6
],
rw
->
ins
[
7
]);
if
(
regs
->
tstate
&
TSTATE_PRIV
)
print_symbol
(
"I7: <%s>
\n
"
,
rw
->
ins
[
7
]);
}
void
show_stackframe
(
struct
sparc_stackf
*
sf
)
...
...
@@ -298,6 +300,7 @@ void __show_regs(struct pt_regs * regs)
printk
(
"o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx
\n
"
,
regs
->
u_regs
[
12
],
regs
->
u_regs
[
13
],
regs
->
u_regs
[
14
],
regs
->
u_regs
[
15
]);
print_symbol
(
"RPC: <%s>
\n
"
,
regs
->
u_regs
[
15
]);
show_regwindow
(
regs
);
#ifdef CONFIG_SMP
spin_unlock
(
&
regdump_lock
);
...
...
This diff is collapsed.
Click to expand it.
arch/sparc64/kernel/sys_sparc32.c
View file @
ff8ff505
...
...
@@ -1987,6 +1987,7 @@ do_execve32(char * filename, u32 * argv, u32 * envp, struct pt_regs * regs)
bprm
.
file
=
file
;
bprm
.
filename
=
filename
;
bprm
.
interp
=
filename
;
bprm
.
sh_bang
=
0
;
bprm
.
loader
=
0
;
bprm
.
exec
=
0
;
...
...
This diff is collapsed.
Click to expand it.
arch/sparc64/lib/Makefile
View file @
ff8ff505
...
...
@@ -9,5 +9,7 @@ lib-y := PeeCeeI.o blockops.o debuglocks.o strlen.o strncmp.o \
memscan.o strncpy_from_user.o strlen_user.o memcmp.o checksum.o
\
VIScopy.o VISbzero.o VISmemset.o VIScsum.o VIScsumcopy.o
\
VIScsumcopyusr.o VISsave.o atomic.o rwlock.o bitops.o
\
dec_and_lock.o
U3memcpy.o U3copy_from_user.o U3copy_to_user.o
\
U3memcpy.o U3copy_from_user.o U3copy_to_user.o
\
U3copy_in_user.o mcount.o ipcsum.o rwsem.o xor.o
lib-$(CONFIG_HAVE_DEC_LOCK)
+=
dec_and_lock.o
This diff is collapsed.
Click to expand it.
arch/sparc64/lib/dec_and_lock.S
View file @
ff8ff505
...
...
@@ -7,7 +7,6 @@
#include <linux/config.h>
#include <asm/thread_info.h>
#ifndef CONFIG_DEBUG_SPINLOCK
.
text
.
align
64
...
...
@@ -76,5 +75,3 @@ spin_on_lock:
ba
,
pt
%
xcc
,
to_zero
nop
nop
#endif /* !(CONFIG_DEBUG_SPINLOCK) */
This diff is collapsed.
Click to expand it.
drivers/i2c/Kconfig
View file @
ff8ff505
...
...
@@ -79,7 +79,7 @@ config I2C_PHILIPSPAR
config I2C_ELV
tristate "ELV adapter"
depends on I2C_ALGOBIT
depends on I2C_ALGOBIT
&& ISA
help
This supports parallel-port I2C adapters called ELV. Say Y if you
own such an adapter.
...
...
@@ -91,7 +91,7 @@ config I2C_ELV
config I2C_VELLEMAN
tristate "Velleman K9000 adapter"
depends on I2C_ALGOBIT
depends on I2C_ALGOBIT
&& ISA
help
This supports the Velleman K9000 parallel-port I2C adapter. Say Y
if you own such an adapter.
...
...
This diff is collapsed.
Click to expand it.
drivers/media/dvb/b2c2/skystar2.c
View file @
ff8ff505
...
...
@@ -21,6 +21,9 @@
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <asm/io.h>
#include "dvb_i2c.h"
#include "dvb_frontend.h"
...
...
@@ -71,8 +74,8 @@ struct adapter {
u32
PidFilterMax
;
u32
MacFilterMax
;
u32
irq
;
u
32
io_mem
;
u
32
io_port
;
u
nsigned
long
io_mem
;
u
nsigned
long
io_port
;
u8
mac_addr
[
8
];
u32
dwSramType
;
...
...
@@ -285,7 +288,7 @@ static int master_xfer(struct dvb_i2c_bus *i2c, const struct i2c_msg *msgs, int
dprintk
(
"%s:
\n
"
,
__FUNCTION__
);
for
(
i
=
0
;
i
<
num
;
i
++
)
{
printk
(
"message %d: flags=%x, addr=0x%04x, buf=%
x
, len=%d
\n
"
,
i
,
msgs
[
i
].
flags
,
msgs
[
i
].
addr
,
(
u32
)
msgs
[
i
].
buf
,
msgs
[
i
].
len
);
printk
(
"message %d: flags=%x, addr=0x%04x, buf=%
p
, len=%d
\n
"
,
i
,
msgs
[
i
].
flags
,
msgs
[
i
].
addr
,
msgs
[
i
].
buf
,
msgs
[
i
].
len
);
}
}
...
...
@@ -1942,7 +1945,7 @@ static void Initdmaqueue(struct adapter *adapter)
adapter
->
dma_status
=
adapter
->
dma_status
|
0x10000000
;
dprintk
(
"%s: allocated dma buffer at 0x%
x
, length=%d
\n
"
,
__FUNCTION__
,
(
int
)
adapter
->
dmaq1
.
buffer
,
SizeOfBufDMA1
);
dprintk
(
"%s: allocated dma buffer at 0x%
p
, length=%d
\n
"
,
__FUNCTION__
,
adapter
->
dmaq1
.
buffer
,
SizeOfBufDMA1
);
}
else
{
...
...
@@ -1968,7 +1971,7 @@ static void Initdmaqueue(struct adapter *adapter)
adapter
->
dma_status
=
adapter
->
dma_status
|
0x20000000
;
dprintk
(
"%s: allocated dma buffer at 0x%
x
, length=%d
\n
"
,
__FUNCTION__
,
(
int
)
adapter
->
dmaq2
.
buffer
,
(
int
)
SizeOfBufDMA2
);
dprintk
(
"%s: allocated dma buffer at 0x%
p
, length=%d
\n
"
,
__FUNCTION__
,
adapter
->
dmaq2
.
buffer
,
(
int
)
SizeOfBufDMA2
);
}
else
{
...
...
@@ -2045,7 +2048,7 @@ static int ClaimAdapter(struct adapter *adapter)
adapter
->
io_port
=
pdev
->
resource
[
1
].
start
;
adapter
->
io_mem
=
(
u
32
)
ioremap
(
pdev
->
resource
[
0
].
start
,
0x800
);
adapter
->
io_mem
=
(
u
nsigned
long
)
ioremap
(
pdev
->
resource
[
0
].
start
,
0x800
);
if
(
adapter
->
io_mem
==
0
)
{
dprintk
(
"%s: can not map io memory
\n
"
,
__FUNCTION__
);
...
...
@@ -2053,7 +2056,7 @@ static int ClaimAdapter(struct adapter *adapter)
return
2
;
}
dprintk
(
"%s: io memory maped at %x
\n
"
,
__FUNCTION__
,
adapter
->
io_mem
);
dprintk
(
"%s: io memory maped at %
l
x
\n
"
,
__FUNCTION__
,
adapter
->
io_mem
);
return
1
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/media/dvb/dvb-core/dvb_net.c
View file @
ff8ff505
...
...
@@ -597,7 +597,7 @@ static int dvb_net_do_ioctl(struct inode *inode, struct file *file,
case
NET_REMOVE_IF
:
if
(
!
capable
(
CAP_SYS_ADMIN
))
return
-
EPERM
;
return
dvb_net_remove_if
(
dvbnet
,
(
int
)
parg
);
return
dvb_net_remove_if
(
dvbnet
,
(
int
)
(
long
)
parg
);
default:
return
-
EINVAL
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/media/dvb/ttpci/budget-patch.c
View file @
ff8ff505
...
...
@@ -150,7 +150,7 @@ int budget_patch_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *
}
case
FE_DISEQC_SEND_BURST
:
av7110_send_diseqc_msg
(
budget
,
0
,
NULL
,
(
int
)
arg
);
av7110_send_diseqc_msg
(
budget
,
0
,
NULL
,
(
int
)
(
long
)
arg
);
break
;
default:
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/Kconfig
View file @
ff8ff505
...
...
@@ -35,7 +35,7 @@ config VIDEO_BT848
config VIDEO_PMS
tristate "Mediavision Pro Movie Studio Video For Linux"
depends on VIDEO_DEV
depends on VIDEO_DEV
&& ISA
help
Say Y if you have such a thing. This driver is also available as a
module called pms ( = code which can be inserted in and removed
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/bttv-cards.c
View file @
ff8ff505
...
...
@@ -30,6 +30,7 @@
#include <linux/kmod.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/vmalloc.h>
#include <asm/io.h>
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/bttv-driver.c
View file @
ff8ff505
...
...
@@ -2948,16 +2948,16 @@ static void bttv_print_irqbits(u32 print, u32 mark)
static
void
bttv_print_riscaddr
(
struct
bttv
*
btv
)
{
printk
(
" main: %08Lx
\n
"
,
(
u
64
)
btv
->
main
.
dma
);
(
u
nsigned
long
long
)
btv
->
main
.
dma
);
printk
(
" vbi : o=%08Lx e=%08Lx
\n
"
,
btv
->
vcurr
?
(
u
64
)
btv
->
vcurr
->
top
.
dma
:
0
,
btv
->
vcurr
?
(
u
64
)
btv
->
vcurr
->
bottom
.
dma
:
0
);
btv
->
vcurr
?
(
u
nsigned
long
long
)
btv
->
vcurr
->
top
.
dma
:
0
,
btv
->
vcurr
?
(
u
nsigned
long
long
)
btv
->
vcurr
->
bottom
.
dma
:
0
);
printk
(
" cap : o=%08Lx e=%08Lx
\n
"
,
btv
->
top
?
(
u
64
)
btv
->
top
->
top
.
dma
:
0
,
btv
->
bottom
?
(
u
64
)
btv
->
bottom
->
bottom
.
dma
:
0
);
btv
->
top
?
(
u
nsigned
long
long
)
btv
->
top
->
top
.
dma
:
0
,
btv
->
bottom
?
(
u
nsigned
long
long
)
btv
->
bottom
->
bottom
.
dma
:
0
);
printk
(
" scr : o=%08Lx e=%08Lx
\n
"
,
btv
->
screen
?
(
u
64
)
btv
->
screen
->
top
.
dma
:
0
,
btv
->
screen
?
(
u
64
)
btv
->
screen
->
bottom
.
dma
:
0
);
btv
->
screen
?
(
u
nsigned
long
long
)
btv
->
screen
->
top
.
dma
:
0
,
btv
->
screen
?
(
u
nsigned
long
long
)
btv
->
screen
->
bottom
.
dma
:
0
);
}
static
void
bttv_irq_timeout
(
unsigned
long
data
)
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/bttv-risc.c
View file @
ff8ff505
...
...
@@ -530,10 +530,10 @@ bttv_set_dma(struct bttv *btv, int override, int irqflags)
d2printk
(
KERN_DEBUG
"bttv%d: capctl=%x irq=%d top=%08Lx/%08Lx even=%08Lx/%08Lx
\n
"
,
btv
->
nr
,
capctl
,
irqflags
,
btv
->
vcurr
?
(
u
64
)
btv
->
vcurr
->
top
.
dma
:
0
,
btv
->
top
?
(
u
64
)
btv
->
top
->
top
.
dma
:
0
,
btv
->
vcurr
?
(
u
64
)
btv
->
vcurr
->
bottom
.
dma
:
0
,
btv
->
bottom
?
(
u
64
)
btv
->
bottom
->
bottom
.
dma
:
0
);
btv
->
vcurr
?
(
u
nsigned
long
long
)
btv
->
vcurr
->
top
.
dma
:
0
,
btv
->
top
?
(
u
nsigned
long
long
)
btv
->
top
->
top
.
dma
:
0
,
btv
->
vcurr
?
(
u
nsigned
long
long
)
btv
->
vcurr
->
bottom
.
dma
:
0
,
btv
->
bottom
?
(
u
nsigned
long
long
)
btv
->
bottom
->
bottom
.
dma
:
0
);
cmd
=
BT848_RISC_JUMP
;
if
(
irqflags
)
{
...
...
@@ -568,7 +568,7 @@ bttv_risc_init_main(struct bttv *btv)
if
((
rc
=
bttv_riscmem_alloc
(
btv
->
dev
,
&
btv
->
main
,
PAGE_SIZE
))
<
0
)
return
rc
;
dprintk
(
KERN_DEBUG
"bttv%d: risc main @ %08Lx
\n
"
,
btv
->
nr
,(
u
64
)
btv
->
main
.
dma
);
btv
->
nr
,(
u
nsigned
long
long
)
btv
->
main
.
dma
);
btv
->
main
.
cpu
[
0
]
=
cpu_to_le32
(
BT848_RISC_SYNC
|
BT848_RISC_RESYNC
|
BT848_FIFO_STATUS_VRE
);
...
...
@@ -612,7 +612,7 @@ bttv_risc_hook(struct bttv *btv, int slot, struct bttv_riscmem *risc,
btv
->
main
.
cpu
[
slot
+
1
]
=
cpu_to_le32
(
next
);
}
else
{
d2printk
(
KERN_DEBUG
"bttv%d: risc=%p slot[%d]=%08Lx irq=%d
\n
"
,
btv
->
nr
,
risc
,
slot
,(
u
64
)
risc
->
dma
,
irqflags
);
btv
->
nr
,
risc
,
slot
,(
u
nsigned
long
long
)
risc
->
dma
,
irqflags
);
cmd
=
BT848_RISC_JUMP
;
if
(
irqflags
)
cmd
|=
BT848_RISC_IRQ
|
(
irqflags
<<
16
);
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/bttvp.h
View file @
ff8ff505
...
...
@@ -33,6 +33,7 @@
#include <linux/videodev.h>
#include <linux/pci.h>
#include <asm/scatterlist.h>
#include <asm/io.h>
#include <media/video-buf.h>
#include <media/audiochip.h>
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/bw-qcam.c
View file @
ff8ff505
...
...
@@ -856,8 +856,8 @@ static int qcam_ioctl(struct inode *inode, struct file *file,
return
video_usercopy
(
inode
,
file
,
cmd
,
arg
,
qcam_do_ioctl
);
}
static
in
t
qcam_read
(
struct
file
*
file
,
char
*
buf
,
size_t
count
,
loff_t
*
ppos
)
static
ssize_
t
qcam_read
(
struct
file
*
file
,
char
*
buf
,
size_t
count
,
loff_t
*
ppos
)
{
struct
video_device
*
v
=
video_devdata
(
file
);
struct
qcam_device
*
qcam
=
(
struct
qcam_device
*
)
v
;
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/c-qcam.c
View file @
ff8ff505
...
...
@@ -668,8 +668,8 @@ static int qcam_ioctl(struct inode *inode, struct file *file,
return
video_usercopy
(
inode
,
file
,
cmd
,
arg
,
qcam_do_ioctl
);
}
static
in
t
qcam_read
(
struct
file
*
file
,
char
*
buf
,
size_t
count
,
loff_t
*
ppos
)
static
ssize_
t
qcam_read
(
struct
file
*
file
,
char
*
buf
,
size_t
count
,
loff_t
*
ppos
)
{
struct
video_device
*
v
=
video_devdata
(
file
);
struct
qcam_device
*
qcam
=
(
struct
qcam_device
*
)
v
;
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/cpia.c
View file @
ff8ff505
...
...
@@ -3300,8 +3300,8 @@ static int cpia_close(struct inode *inode, struct file *file)
return
0
;
}
static
in
t
cpia_read
(
struct
file
*
file
,
char
*
buf
,
size_t
count
,
loff_t
*
ppos
)
static
ssize_
t
cpia_read
(
struct
file
*
file
,
char
*
buf
,
size_t
count
,
loff_t
*
ppos
)
{
struct
video_device
*
dev
=
file
->
private_data
;
struct
cam_data
*
cam
=
dev
->
priv
;
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/saa5249.c
View file @
ff8ff505
...
...
@@ -579,7 +579,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
case
VTXIOCSETVIRT
:
{
/* The SAA5249 has virtual-row reception turned on always */
t
->
virtual_mode
=
(
int
)
arg
;
t
->
virtual_mode
=
(
int
)
(
long
)
arg
;
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
drivers/media/video/saa7134/saa7134.h
View file @
ff8ff505
...
...
@@ -23,6 +23,8 @@
#include <linux/videodev.h>
#include <linux/kdev_t.h>
#include <asm/io.h>
#include <media/video-buf.h>
#include <media/tuner.h>
#include <media/audiochip.h>
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment