diff options
-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/34_cx88 | 10 | ||||
-rw-r--r-- | v4l/.bp/2.4/35_documentation | 12 | ||||
-rw-r--r-- | v4l/.bp/2.6/bttv-input | 2 | ||||
-rw-r--r-- | v4l/.bp/2.6/bttv-update | 13 | ||||
-rw-r--r-- | v4l/.bp/2.6/cx88-update | 14 | ||||
-rw-r--r-- | v4l/.bp/2.6/dvb-pll | 3 | ||||
-rw-r--r-- | v4l/.bp/2.6/i2c-bt832 | 2 | ||||
-rw-r--r-- | v4l/.bp/2.6/i2c-ir | 2 | ||||
-rw-r--r-- | v4l/.bp/2.6/i2c-misc | 9 | ||||
-rw-r--r-- | v4l/.bp/2.6/i2c-tuner | 8 | ||||
-rw-r--r-- | v4l/.bp/2.6/saa7134-update | 19 | ||||
-rw-r--r-- | v4l/.bp/2.6/tveeprom | 2 | ||||
-rw-r--r-- | v4l/.bp/2.6/v4l-driver-doc | 30 | ||||
-rw-r--r-- | v4l/.bp/2.6/v4l2-api | 5 | ||||
-rw-r--r-- | v4l/.bp/2.6/video-buf | 4 | ||||
-rw-r--r-- | v4l/.buildpatch | 117 | ||||
-rwxr-xr-x | v4l/scripts/buildpatch | 266 | ||||
-rwxr-xr-x | v4l/scripts/make_kern_diff.sh | 34 |
26 files changed, 0 insertions, 604 deletions
diff --git a/v4l/.bp/2.4/20_v4l2 b/v4l/.bp/2.4/20_v4l2 deleted file mode 100644 index e723cd8ed..000000000 --- a/v4l/.bp/2.4/20_v4l2 +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 2093f8b68..000000000 --- a/v4l/.bp/2.4/30_video-buf +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index c79f408f2..000000000 --- a/v4l/.bp/2.4/31_bt832 +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index f16dc543d..000000000 --- a/v4l/.bp/2.4/31_i2c +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 1bfdb8f01..000000000 --- a/v4l/.bp/2.4/31_ir-input +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index c16cc99c2..000000000 --- a/v4l/.bp/2.4/31_tuner +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 08e87761d..000000000 --- a/v4l/.bp/2.4/32_bttv +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index f3c14babb..000000000 --- a/v4l/.bp/2.4/33_saa7134 +++ /dev/null @@ -1,16 +0,0 @@ -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/34_cx88 b/v4l/.bp/2.4/34_cx88 deleted file mode 100644 index 20745d6e0..000000000 --- a/v4l/.bp/2.4/34_cx88 +++ /dev/null @@ -1,10 +0,0 @@ -srcdiff cx88.h drivers/media/video/cx88.h -srcdiff cx88-reg.h drivers/media/video/cx88-reg.h - -srcdiff cx88-cards.c drivers/media/video/cx88-cards.c -srcdiff cx88-core.c drivers/media/video/cx88-core.c -srcdiff cx88-i2c.c drivers/media/video/cx88-i2c.c -srcdiff cx88-tvaudio.c drivers/media/video/cx88-tvaudio.c -srcdiff cx88-video.c drivers/media/video/cx88-video.c -srcdiff cx88-vbi.c drivers/media/video/cx88-vbi.c - diff --git a/v4l/.bp/2.4/35_documentation b/v4l/.bp/2.4/35_documentation deleted file mode 100644 index 234e772ba..000000000 --- a/v4l/.bp/2.4/35_documentation +++ /dev/null @@ -1,12 +0,0 @@ -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/.bp/2.6/bttv-input b/v4l/.bp/2.6/bttv-input deleted file mode 100644 index 537796211..000000000 --- a/v4l/.bp/2.6/bttv-input +++ /dev/null @@ -1,2 +0,0 @@ -srcdiff ir-kbd-i2c.c drivers/media/video/ir-kbd-i2c.c -srcdiff ir-kbd-gpio.c drivers/media/video/ir-kbd-gpio.c diff --git a/v4l/.bp/2.6/bttv-update b/v4l/.bp/2.6/bttv-update deleted file mode 100644 index 08e87761d..000000000 --- a/v4l/.bp/2.6/bttv-update +++ /dev/null @@ -1,13 +0,0 @@ -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.6/cx88-update b/v4l/.bp/2.6/cx88-update deleted file mode 100644 index 0325bc724..000000000 --- a/v4l/.bp/2.6/cx88-update +++ /dev/null @@ -1,14 +0,0 @@ -srcdiff cx88.h drivers/media/video/cx88/cx88.h -srcdiff cx88-reg.h drivers/media/video/cx88/cx88-reg.h - -srcdiff cx88-cards.c drivers/media/video/cx88/cx88-cards.c -srcdiff cx88-core.c drivers/media/video/cx88/cx88-core.c -srcdiff cx88-i2c.c drivers/media/video/cx88/cx88-i2c.c -srcdiff cx88-tvaudio.c drivers/media/video/cx88/cx88-tvaudio.c -srcdiff cx88-video.c drivers/media/video/cx88/cx88-video.c -srcdiff cx88-vbi.c drivers/media/video/cx88/cx88-vbi.c -srcdiff cx88-input.c drivers/media/video/cx88/cx88-input.c - -srcdiff cx88-mpeg.c drivers/media/video/cx88/cx88-mpeg.c -srcdiff cx88-dvb.c drivers/media/video/cx88/cx88-dvb.c -srcdiff cx88-blackbird.c drivers/media/video/cx88/cx88-blackbird.c diff --git a/v4l/.bp/2.6/dvb-pll b/v4l/.bp/2.6/dvb-pll deleted file mode 100644 index 8df297dd8..000000000 --- a/v4l/.bp/2.6/dvb-pll +++ /dev/null @@ -1,3 +0,0 @@ -# It looks it is part of DVB stuff -#srcdiff dvb-pll.h drivers/media/dvb/frontends/dvb-pll.h -#srcdiff dvb-pll.c drivers/media/dvb/frontends/dvb-pll.c diff --git a/v4l/.bp/2.6/i2c-bt832 b/v4l/.bp/2.6/i2c-bt832 deleted file mode 100644 index c79f408f2..000000000 --- a/v4l/.bp/2.6/i2c-bt832 +++ /dev/null @@ -1,2 +0,0 @@ -srcdiff bt832.c drivers/media/video/bt832.c -srcdiff bt832.h drivers/media/video/bt832.h diff --git a/v4l/.bp/2.6/i2c-ir b/v4l/.bp/2.6/i2c-ir deleted file mode 100644 index d579505a0..000000000 --- a/v4l/.bp/2.6/i2c-ir +++ /dev/null @@ -1,2 +0,0 @@ -srcdiff ir-common.h include/media/ir-common.h -srcdiff ir-common.c drivers/media/common/ir-common.c diff --git a/v4l/.bp/2.6/i2c-misc b/v4l/.bp/2.6/i2c-misc deleted file mode 100644 index 13254146b..000000000 --- a/v4l/.bp/2.6/i2c-misc +++ /dev/null @@ -1,9 +0,0 @@ -srcdiff audiochip.h include/media/audiochip.h -srcdiff id.h include/media/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 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.6/i2c-tuner b/v4l/.bp/2.6/i2c-tuner deleted file mode 100644 index 5a006911e..000000000 --- a/v4l/.bp/2.6/i2c-tuner +++ /dev/null @@ -1,8 +0,0 @@ -srcdiff tuner.h include/media/tuner.h -srcdiff tuner-core.c drivers/media/video/tuner-core.c -srcdiff tuner-simple.c drivers/media/video/tuner-simple.c -srcdiff mt20xx.c drivers/media/video/mt20xx.c -srcdiff tda8290.c drivers/media/video/tda8290.c -srcdiff tda9887.c drivers/media/video/tda9887.c -srcdiff tea5767.c drivers/media/video/tea5767.c - diff --git a/v4l/.bp/2.6/saa7134-update b/v4l/.bp/2.6/saa7134-update deleted file mode 100644 index feb6d032a..000000000 --- a/v4l/.bp/2.6/saa7134-update +++ /dev/null @@ -1,19 +0,0 @@ -srcdiff saa7134.h drivers/media/video/saa7134/saa7134.h -srcdiff saa7134-reg.h drivers/media/video/saa7134/saa7134-reg.h - -srcdiff saa7134-core.c drivers/media/video/saa7134/saa7134-core.c -srcdiff saa7134-cards.c drivers/media/video/saa7134/saa7134-cards.c -srcdiff saa7134-i2c.c drivers/media/video/saa7134/saa7134-i2c.c -srcdiff saa7134-tvaudio.c drivers/media/video/saa7134/saa7134-tvaudio.c -srcdiff saa7134-video.c drivers/media/video/saa7134/saa7134-video.c -srcdiff saa7134-vbi.c drivers/media/video/saa7134/saa7134-vbi.c -srcdiff saa7134-oss.c drivers/media/video/saa7134/saa7134-oss.c -srcdiff saa7134-ts.c drivers/media/video/saa7134/saa7134-ts.c -srcdiff saa7134-input.c drivers/media/video/saa7134/saa7134-input.c - -srcdiff saa7134-empress.c drivers/media/video/saa7134/saa7134-empress.c - -# Already at dvb-saa7134 -# srcdiff saa7134-dvb.c drivers/media/video/saa7134/saa7134-dvb.c -# srcdiff saa6752hs.h include/media/saa6752hs.h -# srcdiff saa6752hs.c drivers/media/video/saa7134/saa6752hs.c diff --git a/v4l/.bp/2.6/tveeprom b/v4l/.bp/2.6/tveeprom deleted file mode 100644 index f148b1ae8..000000000 --- a/v4l/.bp/2.6/tveeprom +++ /dev/null @@ -1,2 +0,0 @@ -srcdiff tveeprom.h include/media/tveeprom.h -srcdiff tveeprom.c drivers/media/video/tveeprom.c diff --git a/v4l/.bp/2.6/v4l-driver-doc b/v4l/.bp/2.6/v4l-driver-doc deleted file mode 100644 index b981b1f4a..000000000 --- a/v4l/.bp/2.6/v4l-driver-doc +++ /dev/null @@ -1,30 +0,0 @@ -# bttv -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/Sound-FAQ Documentation/video4linux/bttv/Sound-FAQ -srcdiff doc/Tuners Documentation/video4linux/bttv/Tuners -srcdiff doc/Cards Documentation/video4linux/bttv/Cards - -# other -srcdiff /dev/null Documentation/video4linux/MAKEDEV -srcdiff /dev/null Documentation/video4linux/bttv/CARDLIST -srcdiff doc/README.cx88 Documentation/video4linux/README.cx88 -srcdiff doc/README.saa7134 Documentation/video4linux/README.saa7134 -srcdiff doc/README.ir Documentation/video4linux/README.ir -srcdiff doc/not-in-cx2388x-datasheet.txt Documentation/video4linux/not-in-cx2388x-datasheet.txt - -# cardlists -srcdiff doc/CARDLIST.bttv Documentation/video4linux/CARDLIST.bttv -srcdiff doc/CARDLIST.saa7134 Documentation/video4linux/CARDLIST.saa7134 -srcdiff doc/CARDLIST.tuner Documentation/video4linux/CARDLIST.tuner -srcdiff doc/CARDLIST.cx88 Documentation/video4linux/CARDLIST.cx88 - -# API -srcdiff doc/API.html Documentation/video4linux/API.html - -# obsolete / fixme -#srcdiff doc/Specs Documentation/video4linux/bttv/Specs -#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/.bp/2.6/v4l2-api b/v4l/.bp/2.6/v4l2-api deleted file mode 100644 index e723cd8ed..000000000 --- a/v4l/.bp/2.6/v4l2-api +++ /dev/null @@ -1,5 +0,0 @@ -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.6/video-buf b/v4l/.bp/2.6/video-buf deleted file mode 100644 index bc7bde19e..000000000 --- a/v4l/.bp/2.6/video-buf +++ /dev/null @@ -1,4 +0,0 @@ -srcdiff video-buf.h include/media/video-buf.h -srcdiff video-buf-dvb.h include/media/video-buf-dvb.h -srcdiff video-buf.c drivers/media/video/video-buf.c -srcdiff video-buf-dvb.c drivers/media/video/video-buf-dvb.c diff --git a/v4l/.buildpatch b/v4l/.buildpatch deleted file mode 100644 index e8001bc62..000000000 --- a/v4l/.buildpatch +++ /dev/null @@ -1,117 +0,0 @@ -srcdiff ir-kbd-i2c.c drivers/media/video/ir-kbd-i2c.c -srcdiff ir-kbd-gpio.c drivers/media/video/ir-kbd-gpio.c -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 -srcdiff cx88.h drivers/media/video/cx88/cx88.h -srcdiff cx88-reg.h drivers/media/video/cx88/cx88-reg.h - -srcdiff cx88-cards.c drivers/media/video/cx88/cx88-cards.c -srcdiff cx88-core.c drivers/media/video/cx88/cx88-core.c -srcdiff cx88-i2c.c drivers/media/video/cx88/cx88-i2c.c -srcdiff cx88-tvaudio.c drivers/media/video/cx88/cx88-tvaudio.c -srcdiff cx88-video.c drivers/media/video/cx88/cx88-video.c -srcdiff cx88-vbi.c drivers/media/video/cx88/cx88-vbi.c -srcdiff cx88-input.c drivers/media/video/cx88/cx88-input.c - -srcdiff cx88-mpeg.c drivers/media/video/cx88/cx88-mpeg.c -srcdiff cx88-dvb.c drivers/media/video/cx88/cx88-dvb.c -srcdiff cx88-blackbird.c drivers/media/video/cx88/cx88-blackbird.c -# It looks it is part of DVB stuff -#srcdiff dvb-pll.h drivers/media/dvb/frontends/dvb-pll.h -#srcdiff dvb-pll.c drivers/media/dvb/frontends/dvb-pll.c -srcdiff saa7134-dvb.c drivers/media/video/saa7134/saa7134-dvb.c - -srcdiff saa6752hs.h include/media/saa6752hs.h -srcdiff saa6752hs.c drivers/media/video/saa7134/saa6752hs.c -srcdiff bt832.c drivers/media/video/bt832.c -srcdiff bt832.h drivers/media/video/bt832.h -srcdiff ir-common.h include/media/ir-common.h -srcdiff ir-common.c drivers/media/common/ir-common.c -srcdiff audiochip.h include/media/audiochip.h -srcdiff id.h include/media/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 tvaudio.h drivers/media/video/tvaudio.h -srcdiff tvaudio.c drivers/media/video/tvaudio.c -srcdiff tvmixer.c drivers/media/video/tvmixer.c -srcdiff tuner.h include/media/tuner.h -srcdiff tuner-core.c drivers/media/video/tuner-core.c -srcdiff tuner-simple.c drivers/media/video/tuner-simple.c -srcdiff mt20xx.c drivers/media/video/mt20xx.c -srcdiff tda8290.c drivers/media/video/tda8290.c -srcdiff tda9887.c drivers/media/video/tda9887.c -srcdiff tea5767.c drivers/media/video/tea5767.c - -srcdiff saa7134.h drivers/media/video/saa7134/saa7134.h -srcdiff saa7134-reg.h drivers/media/video/saa7134/saa7134-reg.h - -srcdiff saa7134-core.c drivers/media/video/saa7134/saa7134-core.c -srcdiff saa7134-cards.c drivers/media/video/saa7134/saa7134-cards.c -srcdiff saa7134-i2c.c drivers/media/video/saa7134/saa7134-i2c.c -srcdiff saa7134-tvaudio.c drivers/media/video/saa7134/saa7134-tvaudio.c -srcdiff saa7134-video.c drivers/media/video/saa7134/saa7134-video.c -srcdiff saa7134-vbi.c drivers/media/video/saa7134/saa7134-vbi.c -srcdiff saa7134-oss.c drivers/media/video/saa7134/saa7134-oss.c -srcdiff saa7134-ts.c drivers/media/video/saa7134/saa7134-ts.c -srcdiff saa7134-input.c drivers/media/video/saa7134/saa7134-input.c - -srcdiff saa7134-empress.c drivers/media/video/saa7134/saa7134-empress.c - -# Already at dvb-saa7134 -# srcdiff saa7134-dvb.c drivers/media/video/saa7134/saa7134-dvb.c -# srcdiff saa6752hs.h include/media/saa6752hs.h -# srcdiff saa6752hs.c drivers/media/video/saa7134/saa6752hs.c -srcdiff tveeprom.h include/media/tveeprom.h -srcdiff tveeprom.c drivers/media/video/tveeprom.c -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 -# bttv -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/Sound-FAQ Documentation/video4linux/bttv/Sound-FAQ -srcdiff doc/Tuners Documentation/video4linux/bttv/Tuners -srcdiff doc/Cards Documentation/video4linux/bttv/Cards - -# other -srcdiff /dev/null Documentation/video4linux/MAKEDEV -srcdiff /dev/null Documentation/video4linux/bttv/CARDLIST -srcdiff doc/README.cx88 Documentation/video4linux/README.cx88 -srcdiff doc/README.saa7134 Documentation/video4linux/README.saa7134 -srcdiff doc/README.ir Documentation/video4linux/README.ir -srcdiff doc/not-in-cx2388x-datasheet.txt Documentation/video4linux/not-in-cx2388x-datasheet.txt - -# cardlists -srcdiff doc/CARDLIST.bttv Documentation/video4linux/CARDLIST.bttv -srcdiff doc/CARDLIST.saa7134 Documentation/video4linux/CARDLIST.saa7134 -srcdiff doc/CARDLIST.tuner Documentation/video4linux/CARDLIST.tuner -srcdiff doc/CARDLIST.cx88 Documentation/video4linux/CARDLIST.cx88 - -# API -srcdiff doc/API.html Documentation/video4linux/API.html - -# obsolete / fixme -#srcdiff doc/Specs Documentation/video4linux/bttv/Specs -#srcdiff README.freeze Documentation/video4linux/bttv/README.freeze -#srcdiff README.quirks Documentation/video4linux/bttv/README.quirks -#srcdiff Modules.conf Documentation/video4linux/bttv/Modules.conf -srcdiff video-buf.h include/media/video-buf.h -srcdiff video-buf-dvb.h include/media/video-buf-dvb.h -srcdiff video-buf.c drivers/media/video/video-buf.c -srcdiff video-buf-dvb.c drivers/media/video/video-buf-dvb.c diff --git a/v4l/scripts/buildpatch b/v4l/scripts/buildpatch deleted file mode 100755 index 39caee1bf..000000000 --- a/v4l/scripts/buildpatch +++ /dev/null @@ -1,266 +0,0 @@ -#!/usr/bin/perl -use strict; - -my $SRC = shift; -my $LINUX = shift; -my $CONF = shift; - -$SRC = "." if !defined($SRC); -$LINUX = "/usr/src/linux" if !defined($LINUX); -$CONF = "$SRC/.buildpatch" if !defined($CONF); - -my ($VERSION,$CODE) = &kernel_version; -my $DEBUG = 0; - - -################################################################# -# helpers - -sub readfile ($) { - my ($filename) = @_; - my $file; - - open FILE, "<$filename" or - die "can't open file $filename: $!"; - { local $/; undef $/; $file = <FILE> } - close FILE; - return $file; -} - -sub kernel_version() { - my $makefile = readfile("$LINUX/Makefile"); - my (@ver,$ver,$code); - - @ver = (); $code = 0; - foreach my $name ("VERSION", "PATCHLEVEL", "SUBLEVEL") { - $makefile =~ /$name = (\d+)/ or die; - $code = $code * 256 + $1; - push @ver,$1; - } - $ver = join(".",@ver); - $makefile =~ /EXTRAVERSION = (\S+)/ and $ver .= "$1"; - return ($ver,$code); -} - - -################################################################# -# filter out version-specific code - -sub filter_source ($$) { - my ($in,$out) = @_; - my ($line,$if,$state,$mmkernel); - - if (-e $LINUX . "/.mm") { - $mmkernel = 1; - } else { - $mmkernel = 0; - } - - open IN, "<$in"; - open OUT, ">$out"; - - while ($line = <IN>) { - die "nested" if defined($state) && $line =~ /^#if/; - if ($line =~ m/^#include <linux\/version.h>/ && - $in =~ m/.*\.c/) { - next; - } - if ($line =~ m/^#include \"compat.h\"/) { - next; - } - if ($line =~ m/[\$]Id:.*/) { - next; - } - if ($line =~ /^#ifdef MM_KERNEL/) { - chomp($line); - $state = "if"; - $if = $mmkernel; - print OUT "/* BP #if $if ($line) */\n" if $DEBUG; - next; - } - if ($line =~ /^#if 0/) { - chomp($line); - $state = "if"; - $if = 0; - print OUT "/* BP #if $if ($line) */\n" if $DEBUG; - next; - } - if ($line =~ /^#if 1 .*KEEP.*/) { - print OUT "#if 1\n"; - next; - } - if ($line =~ /^#if 1/) { - chomp($line); - $state = "if"; - $if = 1; - print OUT "/* BP #if $if ($line) */\n" if $DEBUG; - next; - } - if ($line =~ /^#if.*BTTV_VERSION_CODE/) { - chomp($line); - $state = "if"; - $line =~ s@^#if\s*@@; - $line =~ s@BTTV_VERSION_CODE@\$CODE@; - $line =~ s@KERNEL_VERSION\((\d+),\s*(\d+),\s*(\d+)\)@ - sprintf("%d",$1*65536 + $2*256 + $3) @e; - $if = eval $line; - print OUT "/* BP #if $if ($line) */\n" if $DEBUG; - next; - } - if ($line =~ /^#if.*LINUX_VERSION_CODE/) { - chomp($line); - $line =~ s@^#if\s*@@; - $line =~ s@LINUX_VERSION_CODE@\$CODE@; - $line =~ s@KERNEL_VERSION\((\d+),\s*(\d+),\s*(\d+)\)@ - sprintf("%d",$1*65536 + $2*256 + $3) @e; - $if = eval $line; - $state = "if"; - print OUT "/* BP #if $if ($line) */\n" if $DEBUG; - next; - } - if (defined($state) && $line =~ /^#else/) { - $state = "else"; - print OUT "/* BP #else */\n" if $DEBUG; - next; - } - if (defined($state) && $line =~ /^#endif/) { - undef $state; - print OUT "/* BP #endif */\n" if $DEBUG; - next; - } - if (!defined($state) || - $state eq "if" && $if || - $state eq "else" && !$if) { - print OUT $line; - } else { - chomp($line); - print OUT "/* BP DEL $line */\n" if $DEBUG; - } - } - close IN; - close OUT; -} - -sub filter_dest ($$) { - my ($in,$out) = @_; - my ($line,$if,$state,$mmkernel); - - if (-e $LINUX . "/.mm") { - $mmkernel = 1; - } else { - $mmkernel = 0; - } - - open IN, "<$in"; - open OUT, ">$out"; - - while ($line = <IN>) { - if ($line =~ m/[\$]Id:.*/) { - next; - } - print OUT $line; - } - close IN; - close OUT; -} - - -################################################################# -# build diffs - -sub makediff ($$) { - my ($here,$kernel) = @_; - my ($line1,$line2,$file1,$file2); - my $tmp = "/tmp/src.$$"; - my $tmp2 = "/tmp/dst.$$"; - - filter_source("../linux/$here","$tmp"); - - if (-f "$LINUX/$kernel") { - filter_dest("$LINUX/$kernel","$tmp2"); - open DIFF, "diff -up $tmp2 $tmp|"; - } else { - # new file - open DIFF, "diff -up /dev/null $tmp|"; - } - - # header - $line1 = <DIFF>; - $line1 =~ s@$LINUX@linux-$VERSION@; - $line1 =~ s@/dev/null@linux-$VERSION/$kernel@; - $file1 = $1 if $line1 =~ m/^\-\-\- (\S+)/; - $line2 = <DIFF>; - $line2 =~ s@$tmp@linux/$kernel@; - $file2 = $1 if $line2 =~ m/^\+\+\+ (\S+)/; - print "diff -u $file1 $file2\n" - if defined($file1) && defined($file2); - print $line1; - print $line2; - - # body - { local $/; undef $/; my $diff = <DIFF>; print $diff; } - close DIFF; - - unlink $tmp; -} - -sub delfile ($) { - my ($kernel) = @_; - my ($line); - - return unless -f "$LINUX/$kernel"; - open DIFF, "diff -u $LINUX/$kernel /dev/null|"; - - # header - $line = <DIFF>; - $line =~ s@$LINUX@linux-$VERSION@; - print $line; - $line = <DIFF>; - $line =~ s@/dev/null@linux/$kernel@; - print $line; - - # body - { local $/; undef $/; $line = <DIFF>; print $line; } - close DIFF; -} - - -################################################################# -# main - -my $patchtmploc = "/tmp/temp.patch"; -open(PATCHTMP, ">", $patchtmploc) || die("can't open tempfile: $!"); -select(PATCHTMP); - -printf STDERR <<EOF,$CODE; -kernel in $LINUX is $VERSION (0x%x) -EOF - -open CONFIG,"$CONF" or - die "can't open file $CONF: $!"; -while (my $line = <CONFIG>) { - $line =~ s/#.*//; # kill comments - next if $line =~ /^\s*$/; # empty line - - if ($line =~ /srcdiff\s+(\S+)\s+(\S+)/) { - print STDERR "srcdiff $2\n"; - makediff($2,$2); - - } elsif ($line =~ /delete\s+(\S+)/) { - print STDERR "delete $1\n"; - delfile($1); - - } else { - die "Huh?: $line"; - - } -} - -close(PATCHTMP); -select(STDOUT); - -if (-s "$patchtmploc") { - system "diffstat -p0 -w72 $patchtmploc"; - print "\n",readfile($patchtmploc); - unlink $patchtmploc; -} diff --git a/v4l/scripts/make_kern_diff.sh b/v4l/scripts/make_kern_diff.sh deleted file mode 100755 index a00837e45..000000000 --- a/v4l/scripts/make_kern_diff.sh +++ /dev/null @@ -1,34 +0,0 @@ -KERNEL=/usr/src/linux-2.6.12-rc5-mm - -KDIR="`find $KERNEL/drivers/media/ $KERNEL/include/media -type d|sed s,$KERNEL/,,g`" - -echo $KDIR - -CUR="`pwd`" -mkdir kernel -cd kernel -for d in $KDIR; do - mkdir -p $d - FILES="`ls $KERNEL/$d|grep -v Makefile`" - - for f in $FILES; do - if [ -e $CUR/$f ]; then - echo ln -sf $CUR/$f $d/$f - ln -sf $CUR/$f $d/$f - fi - done -done - -mkdir -p Documentation/video4linux -FILES="`find $CUR/doc/* -type f`" -for f in $FILES; do - echo ln -sf $f Documentation/video4linux/ - ln -sf $f Documentation/video4linux/ - -done - -cd $CUR -# Excludes DVB code from diff -rm -r kernel/drivers/media/dvb - -(export LC_ALL=C;diff -ur /usr/src/linux-2.6.12-rc5-mm kernel/|grep -v Only) |