Fixed deblobbing of:

drivers/net/r8169.c
drivers/net/tokenring/3c359.c
drivers/net/wireless/mwl8k.c
sound/pci/rme9652/hdsp.c

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

diff --git a/deblob-2.6.38 b/deblob-2.6.38
index c6f1412894582f1d9616f38f910a485d20dc489c..807076ee835c165dbed301451bbaa41964464dd1 100755 (executable)
--- a/deblob-2.6.38
+++ b/deblob-2.6.38
@@ -1155,12 +1155,7 @@ clean_kconfig drivers/net/Kconfig 'QLCNIC'
 clean_mk CONFIG_QLCNIC drivers/net/qlcnic/Makefile
 
 announce R8169 - "Realtek 8169 gigabit ethernet support"
-clean_sed '
-/^static void rtl_hw_phy_config(.*)$/,/^}$/{
-  /rtl8168d_[12]_hw_phy_config([^,)]*);$/i\
-               printk(KERN_ERR PFX "%s: Missing Free firmware\\n", dev->name);
-}
-' drivers/net/r8169.c 'report missing Free firmware'
+reject_firmware drivers/net/r8169.c
 clean_blob drivers/net/r8169.c
 clean_kconfig drivers/net/Kconfig R8169
 clean_mk CONFIG_R8169 drivers/net/Makefile
@@ -1290,6 +1285,7 @@ drop_fw_file firmware/cis/PE520.cis.ihex firmware/cis/PE520.cis
 
 announce 3C359 - "3Com 3C359 Token Link Velocity XL adapter"
 drop_fw_file firmware/3com/3C359.bin.ihex firmware/3com/3C359.bin
+reject_firmware drivers/net/tokenring/3c359.c
 clean_blob drivers/net/tokenring/3c359.c
 clean_kconfig drivers/net/tokenring/Kconfig '3C359'
 clean_mk CONFIG_3C359 drivers/net/tokenring/Makefile

diff --git a/deblob-check b/deblob-check
index b5400e02fd3214697f95ffee3a913cde44ddc322..ec4fdf5a8f4d36cd4d761c77982962b19b720d57 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2011-02-24.
+# deblob-check version 2011-02-24.2
 # 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]*=[^=]'
@@ -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