diff options
author | Gerd Knorr <devnull@localhost> | 2004-02-22 01:59:35 +0000 |
---|---|---|
committer | Gerd Knorr <devnull@localhost> | 2004-02-22 01:59:35 +0000 |
commit | bf27ea1722664c76261b5f3c11f6310fe6c8bef4 (patch) | |
tree | 42324df12864253409fb4935a67431e45436186e /v4l | |
parent | 229b130306c830b9f1c410ccd6060b65aa68dcec (diff) | |
download | mediapointer-dvb-s2-bf27ea1722664c76261b5f3c11f6310fe6c8bef4.tar.gz mediapointer-dvb-s2-bf27ea1722664c76261b5f3c11f6310fe6c8bef4.tar.bz2 |
- import video4linux drivers.
Diffstat (limited to 'v4l')
-rw-r--r-- | v4l/.bp/2.4/20_v4l2 | 5 | ||||
-rw-r--r-- | v4l/.bp/2.4/30_video-buf | 2 | ||||
-rw-r--r-- | v4l/.bp/2.4/31_bt832 | 2 | ||||
-rw-r--r-- | v4l/.bp/2.4/31_i2c | 10 | ||||
-rw-r--r-- | v4l/.bp/2.4/31_ir-input | 2 | ||||
-rw-r--r-- | v4l/.bp/2.4/31_tuner | 2 | ||||
-rw-r--r-- | v4l/.bp/2.4/32_bttv | 13 | ||||
-rw-r--r-- | v4l/.bp/2.4/33_saa7134 | 16 | ||||
-rw-r--r-- | v4l/.bp/2.4/35_documentation | 12 | ||||
-rw-r--r-- | v4l/scripts/config.bttv | 9 | ||||
-rw-r--r-- | v4l/scripts/config.cx88 | 9 | ||||
-rw-r--r-- | v4l/scripts/config.saa7134 | 9 | ||||
-rw-r--r-- | v4l/scripts/modules.sh | 51 |
13 files changed, 142 insertions, 0 deletions
diff --git a/v4l/.bp/2.4/20_v4l2 b/v4l/.bp/2.4/20_v4l2 new file mode 100644 index 000000000..e723cd8ed --- /dev/null +++ b/v4l/.bp/2.4/20_v4l2 @@ -0,0 +1,5 @@ +srcdiff videodev.h include/linux/videodev.h +srcdiff videodev2.h include/linux/videodev2.h +#srcdiff videodev.c drivers/media/video/videodev.c +srcdiff v4l1-compat.c drivers/media/video/v4l1-compat.c +srcdiff v4l2-common.c drivers/media/video/v4l2-common.c diff --git a/v4l/.bp/2.4/30_video-buf b/v4l/.bp/2.4/30_video-buf new file mode 100644 index 000000000..2093f8b68 --- /dev/null +++ b/v4l/.bp/2.4/30_video-buf @@ -0,0 +1,2 @@ +srcdiff video-buf.h drivers/media/video/video-buf.h +srcdiff video-buf.c drivers/media/video/video-buf.c diff --git a/v4l/.bp/2.4/31_bt832 b/v4l/.bp/2.4/31_bt832 new file mode 100644 index 000000000..c79f408f2 --- /dev/null +++ b/v4l/.bp/2.4/31_bt832 @@ -0,0 +1,2 @@ +srcdiff bt832.c drivers/media/video/bt832.c +srcdiff bt832.h drivers/media/video/bt832.h diff --git a/v4l/.bp/2.4/31_i2c b/v4l/.bp/2.4/31_i2c new file mode 100644 index 000000000..f16dc543d --- /dev/null +++ b/v4l/.bp/2.4/31_i2c @@ -0,0 +1,10 @@ +srcdiff audiochip.h drivers/media/video/audiochip.h +srcdiff id.h drivers/media/video/id.h +srcdiff msp3400.c drivers/media/video/msp3400.c +srcdiff msp3400.h drivers/media/video/msp3400.h +srcdiff tda7432.c drivers/media/video/tda7432.c +srcdiff tda9875.c drivers/media/video/tda9875.c +srcdiff tda9887.c drivers/media/video/tda9887.c +srcdiff tvaudio.h drivers/media/video/tvaudio.h +srcdiff tvaudio.c drivers/media/video/tvaudio.c +srcdiff tvmixer.c drivers/media/video/tvmixer.c diff --git a/v4l/.bp/2.4/31_ir-input b/v4l/.bp/2.4/31_ir-input new file mode 100644 index 000000000..1bfdb8f01 --- /dev/null +++ b/v4l/.bp/2.4/31_ir-input @@ -0,0 +1,2 @@ +srcdiff ir-common.h drivers/media/video/ir-common.h +srcdiff ir-common.c drivers/media/video/ir-common.c diff --git a/v4l/.bp/2.4/31_tuner b/v4l/.bp/2.4/31_tuner new file mode 100644 index 000000000..c16cc99c2 --- /dev/null +++ b/v4l/.bp/2.4/31_tuner @@ -0,0 +1,2 @@ +srcdiff tuner.h drivers/media/video/tuner.h +srcdiff tuner.c drivers/media/video/tuner.c diff --git a/v4l/.bp/2.4/32_bttv b/v4l/.bp/2.4/32_bttv new file mode 100644 index 000000000..08e87761d --- /dev/null +++ b/v4l/.bp/2.4/32_bttv @@ -0,0 +1,13 @@ +srcdiff bt848.h drivers/media/video/bt848.h +srcdiff bttv.h drivers/media/video/bttv.h +srcdiff bttvp.h drivers/media/video/bttvp.h +srcdiff bttv-driver.c drivers/media/video/bttv-driver.c +srcdiff bttv-cards.c drivers/media/video/bttv-cards.c +srcdiff bttv-if.c drivers/media/video/bttv-if.c +srcdiff bttv-risc.c drivers/media/video/bttv-risc.c +srcdiff bttv-vbi.c drivers/media/video/bttv-vbi.c +srcdiff bttv-gpio.c drivers/media/video/bttv-gpio.c +srcdiff bttv-i2c.c drivers/media/video/bttv-i2c.c + +srcdiff btcx-risc.h drivers/media/video/btcx-risc.h +srcdiff btcx-risc.c drivers/media/video/btcx-risc.c diff --git a/v4l/.bp/2.4/33_saa7134 b/v4l/.bp/2.4/33_saa7134 new file mode 100644 index 000000000..f3c14babb --- /dev/null +++ b/v4l/.bp/2.4/33_saa7134 @@ -0,0 +1,16 @@ +srcdiff saa7134.h drivers/media/video/saa7134.h +srcdiff saa7134-reg.h drivers/media/video/saa7134-reg.h + +srcdiff saa7134-core.c drivers/media/video/saa7134-core.c +srcdiff saa7134-cards.c drivers/media/video/saa7134-cards.c +srcdiff saa7134-i2c.c drivers/media/video/saa7134-i2c.c +srcdiff saa7134-tvaudio.c drivers/media/video/saa7134-tvaudio.c +srcdiff saa7134-video.c drivers/media/video/saa7134-video.c +srcdiff saa7134-vbi.c drivers/media/video/saa7134-vbi.c +srcdiff saa7134-oss.c drivers/media/video/saa7134-oss.c +srcdiff saa7134-ts.c drivers/media/video/saa7134-ts.c +srcdiff saa7134-input.c drivers/media/video/saa7134-input.c + +srcdiff saa6752hs.h drivers/media/video/saa6752hs.h +srcdiff saa6752hs.c drivers/media/video/saa6752hs.c + diff --git a/v4l/.bp/2.4/35_documentation b/v4l/.bp/2.4/35_documentation new file mode 100644 index 000000000..234e772ba --- /dev/null +++ b/v4l/.bp/2.4/35_documentation @@ -0,0 +1,12 @@ +srcdiff doc/README.bttv Documentation/video4linux/bttv/README +srcdiff doc/insmod-options Documentation/video4linux/bttv/Insmod-options +srcdiff doc/MAKEDEV Documentation/video4linux/bttv/MAKEDEV +srcdiff doc/CARDLIST.bttv Documentation/video4linux/bttv/CARDLIST +srcdiff doc/Sound-FAQ Documentation/video4linux/bttv/Sound-FAQ +srcdiff doc/Specs Documentation/video4linux/bttv/Specs +srcdiff doc/Tuners Documentation/video4linux/bttv/Tuners +srcdiff doc/Cards Documentation/video4linux/bttv/Cards + +#srcdiff README.freeze Documentation/video4linux/bttv/README.freeze +#srcdiff README.quirks Documentation/video4linux/bttv/README.quirks +#srcdiff Modules.conf Documentation/video4linux/bttv/Modules.conf diff --git a/v4l/scripts/config.bttv b/v4l/scripts/config.bttv new file mode 100644 index 000000000..29eba6e69 --- /dev/null +++ b/v4l/scripts/config.bttv @@ -0,0 +1,9 @@ +MDIR := v4l2 +snap := video4linux + +CONFIG_VIDEO_BTTV := m +CONFIG_VIDEO_CX88 := n +CONFIG_VIDEO_SAA7134 := n +CONFIG_VIDEO_IR := m +CONFIG_VIDEO_TUNER := m +CONFIG_VIDEO_TVAUDIO := m diff --git a/v4l/scripts/config.cx88 b/v4l/scripts/config.cx88 new file mode 100644 index 000000000..9e26a4183 --- /dev/null +++ b/v4l/scripts/config.cx88 @@ -0,0 +1,9 @@ +MDIR := v4l2 +snap := video4linux + +CONFIG_VIDEO_BTTV := n +CONFIG_VIDEO_CX88 := m +CONFIG_VIDEO_SAA7134 := n +CONFIG_VIDEO_IR := n +CONFIG_VIDEO_TUNER := m +CONFIG_VIDEO_TVAUDIO := n diff --git a/v4l/scripts/config.saa7134 b/v4l/scripts/config.saa7134 new file mode 100644 index 000000000..286b63aba --- /dev/null +++ b/v4l/scripts/config.saa7134 @@ -0,0 +1,9 @@ +MDIR := v4l2 +snap := video4linux + +CONFIG_VIDEO_BTTV := n +CONFIG_VIDEO_CX88 := n +CONFIG_VIDEO_SAA7134 := m +CONFIG_VIDEO_IR := m +CONFIG_VIDEO_TUNER := m +CONFIG_VIDEO_TVAUDIO := m diff --git a/v4l/scripts/modules.sh b/v4l/scripts/modules.sh new file mode 100644 index 000000000..8bbc62253 --- /dev/null +++ b/v4l/scripts/modules.sh @@ -0,0 +1,51 @@ +#!/bin/sh + +function xrmmod() { + local module regex + module="$1" + regex=`echo $module | sed -e 's/[-_]/[-_]/g'` + grep -qe "$regex" /proc/modules || return 0 + echo "unload $module" + if test "$UID" = "0"; then + /sbin/rmmod $module + else + sudo /sbin/rmmod $module + fi +} + +function xinsmod() { + local module regex file args + module="$1" + shift + args="$*" + regex=`echo $module | sed -e 's/[-_]/[-_]/g'` + grep -qe "$regex" /proc/modules && return + file="" + test -f "$module.o" && file="$module.o" + test -f "$module.ko" && file="$module.ko" + if test "$file" != ""; then + echo "load $file $args" + if test "$UID" = "0"; then + /sbin/insmod $file $args + else + sudo /sbin/insmod $file $args + fi + else + echo "load $module $args" + if test "$UID" = "0"; then + /sbin/modprobe $module $args + else + sudo /sbin/modprobe $module $args + fi + fi +} + +function v4l2basic() { + for module in i2c-core i2c-algo-bit \ + videodev v4l2-common v4l1-compat \ + video-buf \ + soundcore + do + xinsmod $module + done +} |