summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-12-21 05:29:27 +0000
committerMichael Krufky <devnull@localhost>2005-12-21 05:29:27 +0000
commit58efbafea3d6bf03f4976ab7df1c853a4a0ef638 (patch)
treef7a0934664958f3babbedcc7f2a5a052b73685fb /v4l
parentdeaf073a136a4f44e8114f6475ae2d3a1981406d (diff)
downloadmediapointer-dvb-s2-58efbafea3d6bf03f4976ab7df1c853a4a0ef638.tar.gz
mediapointer-dvb-s2-58efbafea3d6bf03f4976ab7df1c853a4a0ef638.tar.bz2
use v4l cvs modules instead of kernel modules
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog7
-rw-r--r--v4l/insmod.sh41
-rw-r--r--v4l/scripts/insmod.sh41
3 files changed, 43 insertions, 46 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 71a66ef38..75088d6eb 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-21 05:28 mkrufky
+
+ * v4l/insmod.sh:
+ - use v4l cvs modules instead of kernel modules
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-12-21 05:25 mkrufky
* v4l/insmod.sh:
diff --git a/v4l/insmod.sh b/v4l/insmod.sh
index b981e9d77..540f18e88 100644
--- a/v4l/insmod.sh
+++ b/v4l/insmod.sh
@@ -7,21 +7,19 @@ case "$1" in
load)
echo "Inserting DVB modules into kernel"
modprobe i2c-core
- modprobe crc32
+# modprobe crc32
modprobe firmware_class
# make sure input stuff is there for IR remote controls
modprobe evdev
- # vide4linux for av7110 based "full featured" cards
- modprobe videodev
- modprobe v4l1-compat
- modprobe v4l2-common
- if [ -r ./video-buf.ko ]; then
- insmod ./video-buf.ko
- else
- modprobe video-buf
- fi
+ # video4linux for av7110 based "full featured" cards
+ insmod ./videodev.ko
+ insmod ./v4l1-compat.ko
+ insmod ./v4l2-common.ko
+ insmod ./video-buf.ko
# DVB core
insmod ./dvb-core.ko # dvb_net_debug=1
+ # for hybrid cx88 and saa7134 cards
+ insmod ./video-buf-dvb.ko
# frontend drivers
insmod ./dvb-pll.ko
insmod ./ves1x93.ko
@@ -90,15 +88,12 @@ case "$1" in
modprobe crc32
modprobe firmware_class
modprobe evdev
- modprobe videodev
- modprobe v4l1-compat
- modprobe v4l2-common
- if [ -r ./video-buf.ko ]; then
- insmod ./video-buf.ko
- else
- modprobe video-buf
- fi
+ insmod ./videodev.ko
+ insmod ./v4l1-compat.ko
+ insmod ./v4l2-common.ko
+ insmod ./video-buf.ko
insmod ./dvb-core.ko cam_debug=1
+ insmod ./video-buf-dvb.ko
insmod ./dvb-pll.ko
insmod ./ves1x93.ko
insmod ./sp8870.ko
@@ -157,7 +152,7 @@ case "$1" in
echo
;;
unload)
- echo "Deleting DVB modules from kernel"
+ echo "Removing DVB modules from kernel"
rmmod b2c2-flexcop-usb b2c2-flexcop-pci b2c2-flexcop dvb-ttpci budget \
budget-av budget-ci budget-core ttusb_dec dvb-ttusb-budget \
ttpci-eeprom dvb-usb-nova-t-usb2.ko dvb-usb-a800.ko dvb-usb-umt-010.ko \
@@ -166,14 +161,14 @@ case "$1" in
dvb-usb.ko
# frontends
- rmmod dib3000mb dib3000mc dib3000_common nxt2002 ves1x93 sp8870 cx22700 \
+ rmmod dib3000mb dib3000mc dib3000_common nxt2002 nxt200x ves1x93 sp8870 cx22700 \
stv0299 ves1820 cinergyT2 ttusbdecfe tda1004x l64781 tda8083 \
cx24110 cx22702 stv0297 tda10021 mt352 mt312 bcm3510 dvb-pll \
- s5h1420 nxt6000 stv0297_cs2 lgdt330x nxt200x cx24123
+ s5h1420 nxt6000 stv0297_cs2 lgdt330x cx24123
# chips and helpers
- rmmod saa7146_vv saa7146 video-buf v4l2-common v4l1-compat dvb-core \
- videodev
+ rmmod saa7146_vv saa7146 video-buf-dvb video-buf v4l2-common v4l1-compat \
+ dvb-core videodev
echo
;;
diff --git a/v4l/scripts/insmod.sh b/v4l/scripts/insmod.sh
index b981e9d77..540f18e88 100644
--- a/v4l/scripts/insmod.sh
+++ b/v4l/scripts/insmod.sh
@@ -7,21 +7,19 @@ case "$1" in
load)
echo "Inserting DVB modules into kernel"
modprobe i2c-core
- modprobe crc32
+# modprobe crc32
modprobe firmware_class
# make sure input stuff is there for IR remote controls
modprobe evdev
- # vide4linux for av7110 based "full featured" cards
- modprobe videodev
- modprobe v4l1-compat
- modprobe v4l2-common
- if [ -r ./video-buf.ko ]; then
- insmod ./video-buf.ko
- else
- modprobe video-buf
- fi
+ # video4linux for av7110 based "full featured" cards
+ insmod ./videodev.ko
+ insmod ./v4l1-compat.ko
+ insmod ./v4l2-common.ko
+ insmod ./video-buf.ko
# DVB core
insmod ./dvb-core.ko # dvb_net_debug=1
+ # for hybrid cx88 and saa7134 cards
+ insmod ./video-buf-dvb.ko
# frontend drivers
insmod ./dvb-pll.ko
insmod ./ves1x93.ko
@@ -90,15 +88,12 @@ case "$1" in
modprobe crc32
modprobe firmware_class
modprobe evdev
- modprobe videodev
- modprobe v4l1-compat
- modprobe v4l2-common
- if [ -r ./video-buf.ko ]; then
- insmod ./video-buf.ko
- else
- modprobe video-buf
- fi
+ insmod ./videodev.ko
+ insmod ./v4l1-compat.ko
+ insmod ./v4l2-common.ko
+ insmod ./video-buf.ko
insmod ./dvb-core.ko cam_debug=1
+ insmod ./video-buf-dvb.ko
insmod ./dvb-pll.ko
insmod ./ves1x93.ko
insmod ./sp8870.ko
@@ -157,7 +152,7 @@ case "$1" in
echo
;;
unload)
- echo "Deleting DVB modules from kernel"
+ echo "Removing DVB modules from kernel"
rmmod b2c2-flexcop-usb b2c2-flexcop-pci b2c2-flexcop dvb-ttpci budget \
budget-av budget-ci budget-core ttusb_dec dvb-ttusb-budget \
ttpci-eeprom dvb-usb-nova-t-usb2.ko dvb-usb-a800.ko dvb-usb-umt-010.ko \
@@ -166,14 +161,14 @@ case "$1" in
dvb-usb.ko
# frontends
- rmmod dib3000mb dib3000mc dib3000_common nxt2002 ves1x93 sp8870 cx22700 \
+ rmmod dib3000mb dib3000mc dib3000_common nxt2002 nxt200x ves1x93 sp8870 cx22700 \
stv0299 ves1820 cinergyT2 ttusbdecfe tda1004x l64781 tda8083 \
cx24110 cx22702 stv0297 tda10021 mt352 mt312 bcm3510 dvb-pll \
- s5h1420 nxt6000 stv0297_cs2 lgdt330x nxt200x cx24123
+ s5h1420 nxt6000 stv0297_cs2 lgdt330x cx24123
# chips and helpers
- rmmod saa7146_vv saa7146 video-buf v4l2-common v4l1-compat dvb-core \
- videodev
+ rmmod saa7146_vv saa7146 video-buf-dvb video-buf v4l2-common v4l1-compat \
+ dvb-core videodev
echo
;;