Adjust for reg_boundaries in drivers/net/bnx2.c.

[releases.git] / deblob-check

diff --git a/deblob-check b/deblob-check
index b5400e02fd3214697f95ffee3a913cde44ddc322..0d44ffa2eff61c271f52913dc06b9f0a38e914ab 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2011-02-24.
+# deblob-check version 2011-03-15
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -878,9 +878,10 @@ fi
 
 set_except () {
   blob "$blobseq"
-  blobna 'request_firmware_nowait'
-  blobna 'request_firmware'
-  blobna 'request_ihex_firmware'
+  # We leave out the initial and final letters of request_firmware so
+  # that deblobbing turns them into r/*DEBLOBBED*/e, a syntax error.
+  blobna 'equest_firmwar'
+  blobna 'equest_ihex_firmwar'
   blobna 'MODULE_FIRMWARE[     ]*[(][^\n;]*[)][        ]*[;]\([        \n]*MODULE_FIRMWARE[    ]*[(][^\n;]*[)][        ]*[;]\)*'
   blobna 'DEFAULT_FIRMWARE'
   blobna '\([.]\|->\)firmware[         \n]*=[^=]'
@@ -1906,7 +1907,7 @@ set_except () {
     initnc '[  ]static[ ]unsigned[ ]char[ ]static_pad\[\][ ]='
     initnc '[  ]static[ ]unsigned[ ]char[ ]table_alaw2ulaw\[\][ ]='
     initnc '[  ]static[ ]unsigned[ ]char[ ]table_ulaw2alaw\[\][ ]='
-    defsnc '[  ]u32[ ]reg_boundaries\[\][ ]=' drivers/net/bnx2.c
+    defsnc '[  ]\(static[ ]const[ ]\)\?u32[ ]reg_boundaries\[\][ ]=' drivers/net/bnx2.c
     initnc '[  ]u8[ ]b\[\][ ]='
     initnc '[  ]uint8_t[ ]tx\[\][ ]='
     initnc '[  ]unsigned[ ]char[ ]saa7111_regs\[\][ ]='
@@ -2738,6 +2739,9 @@ set_except () {
     defsnc '[  ]static[ ]const[ ]uint8_t[ ]branch_table\[32\][ ]=' lib/xz/xz_dec_bcj.c
     defsnc 'static[ ]const[ ]struct[ ]_pll_div[ ]codec_master_pll_div\[\][ ]=' sound/soc/codecs/alc5623.c
     defsnc '[}][ ]coeff_div\[\][ ]=' sound/soc/codecs/wm8737.c
+    blobname 'rpm_firmware\(_rev11\)\?\.bin' sound/pci/rme9652/hdsp.c
+    blobname 'mwl8k[/]fmimage_8366_ap-["][ ][#]api[ ]["]\.fw' drivers/net/wireless/mwl8k.c
+    blobname 'rtl_nic[/]rtl8168d-[12]\.fw' drivers/net/r8169.c
     ;;
 
   */*freedo*.patch | */*logo*.patch)
@@ -2794,6 +2798,9 @@ set_except () {
     defsnc '[  ]static[ ]const[ ]uint8_t[ ]branch_table\[32\][ ]=' lib/xz/xz_dec_bcj.c
     defsnc 'static[ ]const[ ]struct[ ]_pll_div[ ]codec_master_pll_div\[\][ ]=' sound/soc/codecs/alc5623.c
     defsnc '[}][ ]coeff_div\[\][ ]=' sound/soc/codecs/wm8737.c
+    blobname 'rpm_firmware\(_rev11\)\?\.bin' sound/pci/rme9652/hdsp.c
+    blobname 'mwl8k[/]fmimage_8366_ap-["][ ][#]api[ ]["]\.fw' drivers/net/wireless/mwl8k.c
+    blobname 'rtl_nic[/]rtl8168d-[12]\.fw' drivers/net/r8169.c
     # Above is for patterns new in 2.6.38, below is for older patterns.
     initnc '\([;][/][*]@@[ ]-[0-9]*,[0-9]*[ ][+][0-9]*,[0-9]*[ ]@@[ ]\)\?static[ ]const[ ]__u8[ ]pac207_sensor_init\[\]\[8\(\][ ]=[ ][{]\)\?\([*][/][;]\)\?' drivers/media/video/gspca/pac207.c
     initnc '\([;][/][*]@@[ ]-[0-9]*,[0-9]*[ ][+][0-9]*,[0-9]*[ ]@@[ ]\)\?static[ ]const[ ]__u8[ ]pas202_sensor_init\[\]\[8\(\][ ]=[ ][{]\)\?\([*][/][;]\)\?' drivers/media/video/gspca/sonixb.c
@@ -2826,7 +2833,7 @@ set_except () {
     defsnc 'static[ ]u8[ ]\(init\|c\)_table\[\]=' drivers/media/dvb/frontends/s921_core.c
     defsnc 'static[ ]\(u16\|struct[ ]i2c_reg_u16\)[ ]\(bridge\|mt9\(v\(11[12]\|011\)\|m001\)\)_init\[\]\(\[2\]\)\?[ ]=' drivers/media/video/gspca/sn9c20x.c
     defsnc '[  ]static[ ]const[ ]struct[ ]struct_initData[ ]initData\[\][ ]=' drivers/media/video/usbvideo/ibmcam.c
-    defsnc '[  ]u32[ ]reg_boundaries\[\][ ]=' drivers/net/bnx2.c
+    defsnc '[  ]\(static[ ]const[ ]\)\?u32[ ]reg_boundaries\[\][ ]=' drivers/net/bnx2.c
     initnc 'static[ ]const[ ]struct[ ]ath5k_ini_mode[ ]rf\(5413\|24\(13\|25\)\)_ini_mode_end\[\][ ]=' drivers/net/wireless/ath5k/initvals.c
     defsnc 'static[ ]u32[ ]\(h_prescale\|v_gain\)\[64\][ ]=' drivers/staging/stradis/stradis.c
     ;;