Update for 2.6.26-git14.

Move a few comments into filename arguments.

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4012 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-check b/deblob-check
index 1a38247fdd7e038373681a94db1a75405e1612a7..9f577873f656dcd3a3e869b87af1572932278bbb 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2008-07-24
+# deblob-check version 2008-07-26
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -558,67 +558,37 @@ set_except () {
     accept 'PITBL:[\n]  \.long  0xC0040000,0xC90FDAA2,'"$blobpat*"
     # arch/m68k/mac/mac_penguin.S
     accept '\(0x[0F][0F],\)\+\\[\n]\(\(0x[0F][0F],\)\+\\[\n]\)*\(0x[0F][0F],\)\+0x00'
-    # arch/s390/kernel/head.S
-    accept '\.lowcase:[\n]     \.byte 0x00\(,0x0[1-7]\)\+'"$sepx$blobpat*$eol"
-    # arch/s390/kernel/bitmap.S
-    accept '_zb_findmap:[\n]         \.byte  0\(,[123],0\)\+,4'"$sepx$blobpat*$eol"
-    accept '_sb_findmap:[\n]         \.byte  8\(,0,[123]\)\+,0'"$sepx$blobpat*$eol"
-    # arch/powerpc/lib/copyuser_64.S
-    accept '   \.section __ex_table,"a"'"$sepx$blobpat*"
-    # arch/powerpc/platforms/iseries/mf.c
-    accept '   memcpy(src, "\\x01\\x00\\x00\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00".*PROGxxxx'
-    # arch/ppc/platforms/ev64260.c
-    initnc 'static const unsigned int cpu_745x\[2\]\[16\] ='
-    # arch/alpha/lib/fls.c
-    initnc 'const unsigned char __flsm1_tab\[256\] ='
-    # drivers/input/misc/map_to_7segment.h
-    accept '#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE \\[\n]  \(0,\)\+'"$eol"
-    # sound/oss/ad1848.c
-    initc '    static int      init_values_b\[\] ='
-    # drivers/input/keyboard/atkbd.c
-    initnc 'static unsigned char atkbd_set2_keycode\[512\] ='
-    # drivers/usb/serial/keyspan_pda.S and
-    # drivers/usb/serial/xircom_pgs.S
-    accept 'desc_config1:[\n]  \.byte 0x09, 0x02'"$sepx$blobpat*"
-    accept 'string_mfg:[\n]\?\(;\?     \.byte[^\n]*[\n]\)\+string_mfg_end:'
-    accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:'
-    # drivers/media/video/pwc/pwc-nala.h
-    accept '   [/][*] \(SQCIF\|QSIF\|QCIF\|SIF\|CIF\|VGA\) [*][/][\n]   {[\n]      {'"$blobpat*"
-    # drivers/video/logo/*.ppm
-    accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+'
-    # Documentation/specialix.txt
-    accept 'for i in [         0-9\\\n]*[\n]do'
-    # Documentation/cpu-freq/cpufreq-stats.txt
-    accept '         :   3600000   3400000   3200000   3000000   2800000 '
-    # Documentation/scsi/sym53c8xx_2.txt and
-    # Documentation/scsi/ncr53c8xx_2.txt
-    accept '00 00[\n]64 01[\n]8e 0b[\n][\n][0-9a-f \n]*fe fe'
-    accept '0f 00 08 08 64 00 0a 00 - id 0[\n]'"$blobpat*"
-    accept 'default nvram data:'"$sepx$blobpat*"
-    # Documentation/video4linux/sn9c102.txt
-    accept '0x0458     0x7025[\n]'"$blobpat*"
-    # Documentation/video4linux/et61x251.txt
-    accept '0x102c     0x6151[\n]'"$blobpat*"
-    # Documentation/video4linux/zc0301.txt
-    accept '0x041e     0x4017[\n]'"$blobpat*"
-    # Documentation/uml/UserModeLinux-HOWTO.txt
-    accept '  (gdb) x\/100x \$25[\n]  0x507d2434:     0x507d2434      0x00000000      0x08048000      0x080a4f8c'"$sepx$blobpat*"
-    # Documentation/isdn/README.inc
-    accept '      1  0  0  0  0x308'"$sepx$blobpat*"
-    # Documentation/sched-stats.txt
-    accept 'domain<N> <cpumask> 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36'"$eol"
-    # net/ipv4/ipvs/ip_vs_sync.c and
-    # net/sctp/sm_make_chunk.c and
-    # include/linux/sctp.h
-    accept '[ *        ]*0                   1                   2                   3[\n][ *  ]*0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1'
-    # arch/x86/lguest/boot.c
-    accept ' \*  1 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0'
-    # drivers/net/fealnx.c
-    ocomment ' [/][*] Configure the PCI bus bursts and FIFO thresholds.'
-    # drivers/hwmon/via686a.c
-    ocomment '[/][*] the original LUT values from Alex van Kaam <darkside@chello\.nl>'
-    # drivers/media/video/saa7114.c
-    initc 'static const unsigned char init\[\] = {[^;]*MODE=0 ;.*SAA_7114_NTSC_HSYNC_START'
+    accept '\.lowcase:[\n]     \.byte 0x00\(,0x0[1-7]\)\+'"$sepx$blobpat*$eol" arch/s390/kernel/head.S
+    accept '_zb_findmap:[\n]         \.byte  0\(,[123],0\)\+,4'"$sepx$blobpat*$eol" arch/s390/kernel/bitmap.S
+    accept '_sb_findmap:[\n]         \.byte  8\(,0,[123]\)\+,0'"$sepx$blobpat*$eol" arch/s390/kernel/bitmap.S
+    accept '   \.section __ex_table,"a"'"$sepx$blobpat*" arch/powerpc/lib/copyuser_64.S
+    accept '   memcpy(src, "\\x01\\x00\\x00\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00".*PROGxxxx' arch/powerpc/platforms/iseries/mf.c
+    initnc 'static const unsigned int cpu_745x\[2\]\[16\] =' arch/ppc/platforms/ev64260.c
+    initnc 'const unsigned char __flsm1_tab\[256\] =' arch/alpha/lib/fls.c
+    accept '#define _MAP_0_32_ASCII_SEG7_NON_PRINTABLE \\[\n]  \(0,\)\+'"$eol" drivers/input/misc/map_to_7segment.h
+    initc '    static int      init_values_b\[\] =' sound/oss/ad1848.c
+    initnc 'static unsigned char atkbd_set2_keycode\[512\] =' drivers/input/keyboard/atkbd.c
+    accept 'desc_config1:[\n]  \.byte 0x09, 0x02'"$sepx$blobpat*" 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S'
+    accept 'string_mfg:[\n]\?\(;\?     \.byte[^\n]*[\n]\)\+string_mfg_end:' 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S'
+    accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:' 'drivers/usb/serial/\(keyspan_pda\|xircom_pgs\).S'
+    accept '   [/][*] \(SQCIF\|QSIF\|QCIF\|SIF\|CIF\|VGA\) [*][/][\n]   {[\n]      {'"$blobpat*" drivers/media/video/pwc/pwc-nala.h
+    accept 'P[13]\([\n]#[^\n]*\)*[\n]*\([\n][0-9 ]*\)\+' drivers/video/logo/*.ppm
+    accept 'for i in [         0-9\\\n]*[\n]do' Documentation/specialix.txt
+    accept '         :   3600000   3400000   3200000   3000000   2800000 ' Documentation/cpu-freq/cpufreq-stats.txt
+    accept '00 00[\n]64 01[\n]8e 0b[\n][\n][0-9a-f \n]*fe fe' 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt'
+    accept '0f 00 08 08 64 00 0a 00 - id 0[\n]'"$blobpat*" 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt'
+    accept 'default nvram data:'"$sepx$blobpat*" 'Documentation/scsi/\(sym\|ncr\)53c8xx_2.txt'
+    accept '0x0458     0x7025[\n]'"$blobpat*" Documentation/video4linux/sn9c102.txt
+    accept '0x102c     0x6151[\n]'"$blobpat*" Documentation/video4linux/et61x251.txt
+    accept '0x041e     0x4017[\n]'"$blobpat*" Documentation/video4linux/zc0301.txt
+    accept '  (gdb) x\/100x \$25[\n]  0x507d2434:     0x507d2434      0x00000000      0x08048000      0x080a4f8c'"$sepx$blobpat*" Documentation/uml/UserModeLinux-HOWTO.txt
+    accept '      1  0  0  0  0x308'"$sepx$blobpat*" Documentation/isdn/README.inc
+    accept 'domain<N> <cpumask> 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36'"$eol" Documentation/sched-stats.txt
+    accept '[ *        ]*0                   1                   2                   3[\n][ *  ]*0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1' 'net/ipv4/ipvs/ip_vs_sync.c|net/sctp/sm_make_chunk.c|include/linux/scpt.h'
+    accept ' \*  1 1 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0' arch/x86/lguest/boot.c
+    ocomment ' [/][*] Configure the PCI bus bursts and FIFO thresholds.' drivers/net/fealnx.c
+    ocomment '[/][*] the original LUT values from Alex van Kaam <darkside@chello\.nl>' drivers/hwmon/via686a.c
+    initc 'static const unsigned char init\[\] = {[^;]*MODE=0 ;.*SAA_7114_NTSC_HSYNC_START' drivers/media/video/saa7114.c
 
     # in 2.6.23 only
     accept " Psize    Ipps       Tput     Rxint     Txint    Done     Ndone[\\n] ---------------------------------------------------------------\\([\\n][ 0-9]\\+\\)\\+$eol"
@@ -1153,6 +1123,7 @@ set_except () {
     initnc 'static const __u16 t10_dif_crc_table\[256\] =' lib/crc-t10dif.c
     initnc 'static crb_128M_2M_block_map_t crb_128M_2M_map\[64\] =' drivers/net/netxen/netxen_hw.c
     initnc 'static const __u16 crc10_table\[256\] =' drivers/usb/serial/safe_serial.c
+    accept '[  ]*\( *0\)*\( *1\)*[\n][         ]*0 1 2 3 4 5 6 7 8 9 0 1 *2 3 4 5 6 7' 'Documentation/bt8xxgpio.txt'
     ;;
     
   */patch*2.6.26-rc*)