X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=deblob-check;h=657e84d164e2d2e814c4c269df54751c6f5c86b8;hb=2302f78f00e5c60d0afcc06c667afd10ddcd220b;hp=0621c9afdddfeefa2827e7d2743c43f147a7500c;hpb=3ca938a07c50287f2c616e6dd6002b7aaf4e4a7f;p=releases.git diff --git a/deblob-check b/deblob-check index 0621c9afdddf..657e84d164e2 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2009-03-19 +# deblob-check version 2009-03-24 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -226,6 +226,25 @@ case ${LANG+set} in set) LANG=C; export LANG;; esac rm="rm -f" + +for echo in 'echo' 'printf %s\n'; do + case `$echo '\nx'` in + '\nx') break;; + esac +done +case `$echo '\nx'` in +'\nx') ;; *) echo Cannot find out what echo to use >&2; exit 1;; +esac + +for echo_n in "echo -n" "printf %s"; do + case `$echo_n '\na'; $echo_n '\nb'` in + '\na\nb') break;; + esac +done +case `$echo_n a; $echo_n b` in +'ab') ;; *) echo Cannot find out an echo -n equivalent to use >&2; exit 1;; +esac + case $1 in --save-scripts | -S) shift @@ -847,6 +866,7 @@ set_except () { accept 'There is an USB interface for downloading[/]uploading.*request_firmware interface\.' Documentation/video4linux/si470x.txt accept '[\t]- move firmware loading to request_firmware()' drivers/staging/slicoss/README accept 'config FIRMWARE_IN_KERNEL.*let firmware be loaded from userspace\.' drivers/base/Kconfig + accept '[ ]*and request_firmware() in the source' drivers/base/Kconfig accept 'static int[\n]_request_firmware(const struct firmware \*\*firmware_p, const char \*name,[^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c accept 'static int[\n]request_firmware_work_func(void \*arg)[\n]{[\n]\([^}]\|[^\n}]}*\)*ret = _request_firmware(\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c accept '[/][*][*][\n] [*] request_firmware: - send firmware [^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c @@ -1001,7 +1021,7 @@ set_except () { blob 'static const u8 microcode\[\] = {[^}]*} *;' drivers/net/tokenring/3c359_microcode.h blob '#include "3c359_microcode\.h"' drivers/net/tokenring/3c359.c - blobna '[/][*][ \n*]* Now to write the microcode\([^/]\|[^*/][/]*\)*[*][/][\n ]*start = (0xFFFF - (mc_size)[^;]*;[\n ]*[/][*]\([^/]\|[^*/][/]*\)*[*][/][\n ]*printk(KERN_INFO "3C359: Uploading Microcode: ");[\n ]*for ([^{]*\(mc_size[^{]*) {[^}]*writeb(microcode\[\|) {[^}]*writeb(microcode\[mc_size\)[^}]*}\([\n][ ]*printk[^\n]*;[\n ]*for ([^{]*\(mc_size[^{]*) {[^}]*writeb(microcode\[\|) {[^}]*writeb(microcode\[mc_size\)[^}]*}\)*' drivers/net/tokenring/3c359.c + blobna 'start = (0xFFFF - (mc_size)[^;]*;[\n ]*[/][*]\([^/]\|[^*/][/]*\)*[*][/][\n ]*printk(KERN_INFO "3C359: Uploading Microcode: ");[\n ]*for ([^{]*\(mc_size[^{]*) {[^}]*writeb(microcode\[\|) {[^}]*writeb(microcode\[mc_size\)[^}]*}\([\n][ ]*printk[^\n]*;[\n ]*for ([^{]*\(mc_size[^{]*) {[^}]*writeb(microcode\[\|) {[^}]*writeb(microcode\[mc_size\)[^}]*}\)*' drivers/net/tokenring/3c359.c blobname 'tr_smctr\.bin' drivers/net/tokenring/smctr.c @@ -1127,8 +1147,9 @@ set_except () { blobname 'ipw2100-\("\([^"\n]\|[\\][\n]\)*"\([^"]\|[\\]["]\)*\)\+' drivers/net/wireless/ipw2100.c blobname '__stringify(IPW2100_FW_MINOR_VERSION)' drivers/net/wireless/ipw2100.c accept ' *Portions of ipw2100_\(do_\)\?mod_firmware_load[, ]*\(ipw2100_\(do_\)\?mod_firmware_load[, and\n]*\)*' drivers/net/wireless/ipw2100.c - blob 'static int ipw2100_mod_firmware_load([^{]*)[\n]{\([^}]\|[^\n]}*\)*[\n]}' drivers/net/wireless/ipw2100.c - blob 'ipw2100_mod_firmware_load([^;]*);' drivers/net/wireless/ipw2100.c + accept ' ipw2100_mod_firmware_load(fw);' drivers/net/wireless/ipw2100.c + accept 'static int ipw2100_mod_firmware_load(' drivers/net/wireless/ipw2100.c + blobna 'if (IPW2100_FW_MAJOR[^{]*{[^}]* }' drivers/net/wireless/ipw2100.c accept '[/][*] Call this function from process context\([^/]\|[^*/][/]*\)*request_firmware' drivers/net/wireless/ipw2200.c blobname 'ipw2200-\(i\?bss\|sniffer\)\.fw' drivers/net/wireless/ipw2200.c @@ -1138,10 +1159,11 @@ set_except () { accept ' [*] request_firmware() is synchronous' 'drivers/net/iwlwifi/iwl\(3945-base\|-agn\)\.c' blobname 'libertas_cs\(_helper\)\?\.fw' drivers/net/wireless/libertas/if_cs.c + blob 'sd\(8385\|8686\)_helper\.bin",[\n] \.firmware = "sd\(8385\|8686\)\.bin' drivers/net/wireless/libertas/if_sdio.c blobname 'sd\(8385\|8686\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_sdio.c accept ' *card->firmware = \(if_sdio\|lbs_fw\)' drivers/net/wireless/libertas/if_sdio.c blobname 'usb8388\(-5\.126\.0\.p5\)\?\.bin' drivers/net/wireless/libertas/if_usb.c - blobname '[/][*]\([^/]\|[^*/][/]*\)*usb8388\(-5\.126\.0\.p5\)\?\.bin[/][*]\([^/]\|[^*/][/]*\)*' drivers/net/wireless/libertas/if_usb.c + blob '[/][*]\([^/]\|[^*/][/]*\)*usb8388\(-5\.126\.0\.p5\)\?\.bin\([^/]\|[^*/][/]*\)*[*][/]' drivers/net/wireless/libertas/if_usb.c accept ' lbs_pr_err("request_firmware() failed' drivers/net/wireless/if_usb.c blobna 'o\. Copy the firmware image[^\n]*usb8388\([^\n]\|[\n][ ]*[^ \n]\)*' drivers/net/wireless/libertas/README blobna '\[fw_name=usb8388[^]]*\]' drivers/net/wireless/libertas/README @@ -1195,6 +1217,8 @@ set_except () { blobname 'atmel_at76c50\(3-\(i386[13]\|rfmd\(-acc\)\?\)\|5\(a\(mx\)\?\)\?-rfmd\(2958\)\?\)\.bin' 'drivers/\(staging\|net/wireless\)/at76_usb/at76_usb\.c' + accept 'static struct go7007_usb_board board_\(matrix_\(ii\|reload\|revolution\)\|star_trek\|px_tv402u\|xmen\|lifeview_lr192\|endura\|adlink_mpg24\) = {[\n]\( \.flags[ ]*= [^",]*,[\n]*\)* \.main_info[ ]*= {[\n] \.firmware[ ]*= ' drivers/media/dvb/dvb-usb/go7007-usb.c + accept 'static struct go7007_board_info board_voyager = {[\n] \.firmware[ ]*= ' drivers/staging/go7007/saa7134-go7007.c blobname 'go7007\(fw\|tv\)\.bin' 'drivers/staging/go7007/\(go7007-\(driver\|usb\)\|saa7134-go7007\)\.c' blobname 'cxacru-\(%s\|fw\|bp\|cf\)\.bin' drivers/usb/atm/cxacru.c @@ -1256,18 +1280,23 @@ set_except () { blobname '\([/]etc[/]sound[/]\)\?msnd\(init\|perm\)\.bin' sound/oss/msnd_classic.h blobna '\(Important Notes - Read Before Using\|Obtaining and Creating Firmware Files\)[\n]# ~*\([^\n]\|[\n]# *\([\n]# *\([\n]# *For the[^\n]*[\n]# *~*[\n]\)\?\)\?[^\n ]\)*\.' Documentation/sound/oss/MultiSound - accept ' len = mod_firmware_load(fn, [&]data);[\n] if [^{]* {[\n] printk(KERN_ERR "sscape:' sound/oss/sscape.c + accept ' len = mod_firmware_load(fn, [&]data);[\n] if [^{]* {[\n] [ ]*printk(KERN_ERR "sscape:' sound/oss/sscape.c blobname '[/]sndscape[/]scope\.co[dx]' sound/oss/sscape.c accept ' trix_boot_len = mod_firmware_load(' sound/oss/trix.c blobname '\([/]etc[/]sound[/]\)\?trxpro\.bin' sound/oss/trix.c - accept ' smw_ucodeLen = mod_firwmare_load(' sound/oss/sb_common.c - blobname '\([/]etc[/]sound[/]\)\?msnd\(init\|perm\)\.bin' sound/oss/sb_common.c + accept ' smw_ucodeLen = mod_firmware_load(' sound/oss/sb_common.c + blobname '\([/]etc[/]sound[/]\)\?midi0001\.bin' sound/oss/sb_common.c + blobname '\([/]etc[/]sound[/]\)\?msnd\(init\|perm\)\.bin' sound/oss/Kconfig blob 'When the module is loaded\([^\n]\|[\n][^\n]\)*[/]pss_synth\([^\n]\|[\n][^\n]\)*' Documentation/sound/oss/PSS blob 'pss_firmware[ \n ]*This parameter\([^\n]\|[\n][^\n]\)*[/]pss_synth\([^\n]\|[\n][^\n]\)*' Documentation/sound/oss/PSS-updates - accept ' pss_synthLen = mod_firmware_load(pss_firmware' sound/oss/pss.c + accept ' pss_synthLen = mod_firmware_load(pss_firmware, (void [*]) [&]pss_synth);' sound/oss/pss.c + accept ' *if \?(\(!\|fw_load [&][&] \)\?pss_synth' sound/oss/pss.c + accept ' *if (!pss_download_boot(devc, pss_synth, pss_synthLen,' sound/oss/pss.c + accept ' *vfree(pss_synth);' sound/oss/pss.c + blob 'to allow the user \([^/"]\|[^*"][/]*\)*fir[em]ware file\([^/"]\|[^*"][/]*\)*"[^"]*"' sound/oss/pss.c blobname '\([/]etc[/]sound[/]\)\?pss_synth' sound/oss/pss.c accept ' \$(obj)[/]bin2hex pss_synth' sound/oss/Makefile accept ' *echo '"'"'static \(unsigned char [*] *\|int \)pss_synth\(Len\)\? = \(NULL\|0\);' sound/oss/Makefile @@ -1277,10 +1306,13 @@ set_except () { accept '[ ]*"request_firmware \(fatal error\|unable to locate\|: Failed to find\)' drivers/media/video/pvrusb2/pvrusb2-hdw.c accept ' [*] NOTE : the pointer to the firmware data given by request_firmware()' drivers/media/video/pvrusb2-hdw.c + accept 'static struct dvb_usb_device_properties dw210[24]_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/dw2102.c blobname 'dvb-usb-dw210[24]\.fw' drivers/media/dvb/dvb-usb/dw2102.c - blobname 'dvb-usb-gp8psk-02\.fw' drivers/media/dvb/dvb-usb/gp8psk.c + accept 'static struct dvb_usb_device_properties gp8psk_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/gp8psk.c + blobname 'dvb-usb-gp8psk-0[12]\.fw' drivers/media/dvb/dvb-usb/gp8psk.c + accept 'static struct dvb_usb_device_properties opera1_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/nova-t-usb2.c blobname 'dvb-usb-opera-\(fpga-\)\?-01\.fw' drivers/media/dvb/dvb-usb/opera1.c blobname 'dvb-fe-af9013\.fw' drivers/media/dvb/frontends/af9013_priv.h @@ -1325,34 +1357,49 @@ set_except () { blobname 'drx397xD\.\(A2\|B1\)\.fw' drivers/media/dvb/frontends/drx397xD_fw.h + accept '#define DIB0700_DEFAULT_DEVICE_PROPERTIES \\[\n]\( \.\(caps\|usb_ctrl\) *= [^\n",]*, \\[\n]\)* \.firmware *= ' drivers/media/dvb/dvb-usb/dib0700_devices.c blobname 'dvb-usb-dib0700-1\.20\.fw' drivers/media/dvb/dvb-usb/dib0700_devices.c + accept 'static struct dvb_usb_device_properties nova_t_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/nova-t-usb2.c blobname 'dvb-usb-nova-t-usb2-02\.fw' drivers/media/dvb/dvb-usb/nova-t-usb2.c + accept 'static struct dvb_usb_device_properties umt_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/umt-010.c blobname 'dvb-usb-umt-010-02\.fw' drivers/media/dvb/dvb-usb/umt-010.c + accept 'static struct dvb_usb_device_properties ttusb2_properties\(_s2400\)\? = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/ttusb2.c blobname 'dvb-usb-\(pctv-400e\|tt-s2400\)-01\.fw' drivers/media/dvb/dvb-usb/ttusb2.c + accept 'static struct dvb_usb_device_properties cxusb_bluebird_\(lgh064f\|dee1601\|lgz201\|dtt7579\|nano2_needsfirmware\)_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/cxusb.c blobname 'dvb-usb-bluebird-0[12]\.fw' drivers/media/dvb/dvb-usb/cxusb.c + accept 'static struct dvb_usb_device_properties \(dtt200u\|wt220u\(_\(fc\|zl0353\|miglia\)\)\?\)_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/dtt200u.c blobname 'dvb-usb-\(dtt200u-01\|wt220u-\(02\|fc03\|\(zl0353\|miglia\)-01\)\)\.fw' drivers/media/dvb/dvb-usb/dtt200u.c + accept 'static struct dvb_usb_device_properties vp7045_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/vp7045.c blobname 'dvb-usb-vp7045-01\.fw' drivers/media/dvb/dvb-usb/vp7045.c + accept 'static struct dvb_usb_device_properties \(dibusb\(1_1\(_an2235\)\?\|2_0b\)\|artec_t1_usb2\)_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/dibusb-mb.c blobname 'dvb-usb-\(dibusb-\(5\.0\.0\.11\|an2235-01\|6\.0\.0\.8\)\|adstech-usb2-02\)\.fw' drivers/media/dvb/dvb-usb/dibusb-mb.c + accept 'static struct dvb_usb_device_properties a800_properties = {[\n]\( \.\(caps\|usb_ctrl\) = [^",]*,[\n]*\)* \.firmware = ' drivers/media/dvb/dvb-usb/a800.c blobname 'dvb-usb-avertv-a800-02\.fw' drivers/media/dvb/dvb-usb/a800.c + accept 'static struct dvb_usb_device_properties af9005_properties = {[\n]\( \.\(caps\|usb_ctrl\) = [^",]*,[\n]*\)* \.firmware = ' drivers/media/dvb/dvb-usb/af9005.c blobname 'af9005\.fw' drivers/media/dvb/dvb-usb/af9005.c + accept ' .download_firmware = af9015_download_firmware,[\n] \.firmware = ' drivers/media/dvb/dvb-usb/af9015.c blobname 'dvb-usb-af9015\.fw' drivers/media/dvb/dvb-usb/af9015.c + accept 'static struct dvb_usb_device_properties dibusb_mc_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/dibusb-mc.c blobname 'dvb-usb-dibusb-6\.0\.0\.8\.fw' drivers/media/dvb/dvb-usb/dibusb-mc.c + accept 'static struct dvb_usb_device_properties \(megasky\|digivox_mini_ii\|tvwalkertwin\|dposh\)_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/m920x.c blobname 'dvb-usb-\(\(megasky\|digivox\)-02\|tvwalkert\|dposh-01\)\.fw' drivers/media/dvb/dvb-usb/m920x.c + accept 'static struct dvb_usb_device_properties vp702x_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/vp702x.c blobname 'dvb-usb-vp702x-02\.fw' drivers/media/dvb/dvb-usb/vp702x.c + accept 'static struct dvb_usb_device_properties digitv_properties = {[\n]\( \.\(caps\|usb_ctrl\) *= [^",]*,[\n]*\)* \.firmware *= ' drivers/media/dvb/dvb-usb/digitv.c blobname 'dvb-usb-digitv-02\.fw' drivers/media/dvb/dvb-usb/digitv.c blob 'Driver: \(korg1212\|maestro3\|ymfpci\|smctr\|kaweth\|ttusb-budget\|keyspan\|emi26\|emi62\|tu_usb_3410_5052\|whiteheat\|ip2\|CPiA2\|DABUSB\|USB_VICAM\|USB_SERIAL_EDGEPORT\(_TI\)\?\|SND_SB16_CSP\|CASSINI\) --* \([^\n]\|[\n]*[^\n\-]\)*\([\n][\n]--*[\n][\n]Driver: \(korg1212\|maestro3\|ymfpci\|smctr\|kaweth\|ttusb-budget\|keyspan\|emi26\|emi62\|tu_usb_3410_5052\|whiteheat\|ip2\|CPiA2\|DABUSB\|USB_VICAM\|USB_SERIAL_EDGEPORT\(_TI\)\?\|SND_SB16_CSP\|CASSINI\) --* \([^\n]\|[\n]*[^\n\-]\)*\)*' firmware/WHENCE @@ -2182,7 +2229,7 @@ g; sedmain=" /^$/N; -/^[\n]\?;[/][*]\\(end .*\\)\\?[*][/];$/{ +/^[\\n]\\?;[/][*]\\(end .*\\)\\?[*][/];$/{ $4; d; } @@ -2210,7 +2257,7 @@ H; g; $4 $v:read all -s/^\\(;[/][*]begin [^\n]*[\\n]\\)*//; +s/^\\(;[/][*]begin [^\\n]*[\\n]\\)*//; s/\\($bol[\n]\?;[/][*]\\(end [^\\n]*\\)\\?[*][/];\\)*$//; $v:???!blobfast /$blobfast/!b clean; @@ -2741,7 +2788,7 @@ check () { # falsepos matches to files that match it. addx () { if test -n "$1"; then - echo -n "\\|$1" >> $falsepos_name + $echo_n "\\|$1" >> $falsepos_name fi } @@ -2750,7 +2797,7 @@ check () { # the falseneg matches to files that match it. badx () { if test -n "$1"; then - echo -n "\\|$1" >> $falseneg_name + $echo_n "\\|$1" >> $falseneg_name fi } @@ -2818,10 +2865,10 @@ check () { esac # Then run through the selected action. - if test "$rm" != "rm -f" || test ! `echo "$sedmain" | wc -c` -lt 1024; then + if test "$rm" != "rm -f" || test ! `$echo "$sedmain" | wc -c` -lt 1024; then scriptname=`mktemp -t deblob-check-sedmain-XXXXXX` tempfiles="$tempfiles $scriptname" - echo "$sedmain" > $scriptname + $echo "$sedmain" > $scriptname cmd="sed -n -f \"$scriptname\"" else cmd='sed -n "$sedmain"'