Fixed deblob-2.6.37 for current Linus' tree.

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

diff --git a/deblob-2.6.37 b/deblob-2.6.37
index da7eefa8f00f1a3772f847dd0e2d8ae65d3d92e8..d7533a24c685173a1078b29bff5f45f758377f7a 100755 (executable)
--- a/deblob-2.6.37
+++ b/deblob-2.6.37
@@ -862,11 +862,11 @@ clean_blob drivers/media/video/cx18/cx18-firmware.c
 clean_kconfig drivers/media/video/cx18/Kconfig 'VIDEO_CX18'
 clean_mk CONFIG_VIDEO_CX18 drivers/media/video/cx18/Makefile
 
-announce VIDEO_CX231xx - "Conexant cx231xx USB video capture support"
-reject_firmware drivers/media/video/cx231xx/cx23885-417.c
-clean_blob drivers/media/video/cx231xx/cx23885-417.c
-clean_kconfig drivers/media/video/cx231xx/Kconfig 'VIDEO_CX231xx'
-clean_mk CONFIG_VIDEO_CX231xx drivers/media/video/cx231xx/Makefile
+announce VIDEO_CX231XX - "Conexant cx231xx USB video capture support"
+reject_firmware drivers/media/video/cx231xx/cx231xx-417.c
+clean_blob drivers/media/video/cx231xx/cx231xx-417.c
+clean_kconfig drivers/media/video/cx231xx/Kconfig 'VIDEO_CX231XX'
+clean_mk CONFIG_VIDEO_CX231XX drivers/media/video/cx231xx/Makefile
 
 announce VIDEO_CX23885 - "Conexant cx23885 (2388x successor) support"
 reject_firmware drivers/media/video/cx23885/cx23885-417.c
@@ -1066,8 +1066,8 @@ clean_mk CONFIG_FT1000_PCMCIA drivers/staging/ft1000/Makefile
 
 announce FT1000_USB - "Driver for ft1000 USB devices."
 clean_file drivers/staging/ft1000/ft1000-usb/ft3000.img
-reject_firmware drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
-clean_blob drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+reject_firmware drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+clean_blob drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
 clean_kconfig drivers/staging/ft1000/Kconfig 'FT1000_USB'
 clean_mk CONFIG_FT1000_USB drivers/staging/ft1000/Makefile
 
@@ -1390,10 +1390,12 @@ announce LIBERTAS - "Marvell 8xxx Libertas WLAN driver support"
 reject_firmware drivers/net/wireless/libertas/main.c '
 /Try user-specified firmware first/{
   :end1
-  /request_firmware/! {N; b end1;};
+  /request_firmware(helper, user_helper/! {N; b end1;};
   :end2
-  /request_firmware.*request_firmware/! {N; b end2;};
-  /request_firmware(helper, user_helper.*request_firmware(nfw, user_mainfw/{p; d;};
+  /request_firmware(helper, user_helper.*request_firmware(mainfw, user_mainfw/! {N; b end2;};
+  /request_firmware(helper, user_helper.*request_firmware(mainfw, user_mainfw/{
+    /request_firmware.*request_firmware.*request_firmware/!{p; d;};
+  }
 }
 '
 clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS'
@@ -1555,7 +1557,7 @@ clean_sed '
   'disabling non-Free firmware loading machinery'
 clean_blob drivers/staging/rtl8712/hal_init.c
 clean_kconfig drivers/staging/rtl8712/Kconfig 'R8712U'
-clean_mk CONFIG_R8712U drivers/staging/rtl8712/Maekfile
+clean_mk CONFIG_R8712U drivers/staging/rtl8712/Makefile
 
 announce VT6656 - "VIA Technologies VT6656 support"
 clean_sed '

diff --git a/deblob-check b/deblob-check
index eb3859c31acf25f3d14a899c2b95d2801a52d0c7..6ba219eef2279b351cdaf800b346e76765987366 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2010-12-28
+# deblob-check version 2010-12-29
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -2589,7 +2589,7 @@ set_except () {
     accept '[  ]return[ ]request_firmware_nowait[(][^\n]*,[ ]CARL9170FW_NAME,' drivers/net/wireless/carl9170/usb.c
     blobname 'iwlwifi-100-' drivers/net/iwlwifi/iwl-1000.c
     blobname 'iwlwifi-130-' drivers/net/iwlwifi/iwl-6000.c
-    blobname 'libertas[/]cf83\(05\|8[13]\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_cs.c
+    blobname 'libertas[/]cf83\(05\|8[15]\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_cs.c
     blobname 'libertas[/]sd\(8385\|8686\(_v[89]\)\|8688\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_sdio.c
     blobname 'libertas[/]gspi\(8385\|8686\(_v9\)\?\|8688\)\(_helper\|_hlp\)\?\.bin' drivers/net/wireless/libertas/if_spi.c
     blobname 'libertas[/]usb\(8388\(_v[59]\)\?\|8682\)\.bin' drivers/net/wireless/libertas/if_usb.c
@@ -2661,7 +2661,7 @@ set_except () {
     defsnc 'static[ ]const[ ]pmu1_xtaltab0_t[ ]pmu1_xtaltab0\(_880\(_4329\)\?\|_1760\|_1440\|_960\)\[\][ ]=' drivers/staging/brcm80211/util/hndpmu.c
     defsnc 'static[ ]const[ ]s16[ ]log_table\[\][ ]=' drivers/staging/brcm80211/util/qmath.c
     blobname 'ft[12]000\.img' drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
-    blobname 'ft3000\.img' drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+    blobname 'ft3000\.img' drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
     defsnc '[ ][ ][ ][ ]u8[ ]ConnectionMsg\[\][ ]='  drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
     blobname 'fw_sst_0\(80a\|82f\)\.bin' drivers/staging/intel_sst/intel_sst_common.h
     # This appends a .bin extension, but without loading the firmware
@@ -2674,7 +2674,7 @@ set_except () {
     defsnc 'static[ ]u8[ ][ ]*ZEBRA_AGC\[\][   ]=' drivers/staging/rtl8187se/r8185b_init.c
     defsnc 'static[ ]u32[ ]ZEBRA_RF_RX_GAIN_TABLE\[\][         ]=' drivers/staging/rtl8187se/r8185b_init.c
     blob 'static[ ]const[ ]unsigned[ ]char[ ]f_array\[122328\][ ]=[ ][{]'"$sepx$blobpat*"',[\n][}][;]' drivers/staging/rtl8712/farray.h
-    blob 'static[ ]u32[ ]rtl871x_open_fw[(][^)]*[)][\n][{]\([\n]\+[^\n}][^\n]*\)*[^\n]*f_array\([\n]\+[^\n}][^\n]*\)*[^\n]*[\n]\+[}]' drivers/staging/rtl8712/hal_init.c
+    blob 'static[ ]u32[ ]rtl871x_open_fw[(][^)]*[)][\n][{]\([\n]\+[^\n}][^\n]*\)*[^\n]*f_array[^\n]*\([\n]\+[^\n}][^\n]*\)*[^\n]*[\n]\+[}]' drivers/staging/rtl8712/hal_init.c
     defsnc 'static[ ]const[ ]long[ ]frequency_list\[\][ ]=' drivers/staging/rtl8712/rtl871x_ioctl_linux.c
     defsnc 'static[ ]const[ ]unsigned[ ]short[ ]Sbox1\[2\]\[256\][ ]=' drivers/staging/rtl8712/rtl871x_security.c
     defsnc 'static[ ]const[ ]u8[ ]sbox_table\[256\][ ]=' drivers/staging/rtl8712/rtl871x_security.c
@@ -2715,7 +2715,7 @@ set_except () {
     accept '[  ]return[ ]request_firmware_nowait[(][^\n]*,[ ]CARL9170FW_NAME,' drivers/net/wireless/carl9170/usb.c
     blobname 'iwlwifi-100-' drivers/net/iwlwifi/iwl-1000.c
     blobname 'iwlwifi-130-' drivers/net/iwlwifi/iwl-6000.c
-    blobname 'libertas[/]cf83\(05\|8[13]\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_cs.c
+    blobname 'libertas[/]cf83\(05\|8[15]\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_cs.c
     blobname 'libertas[/]sd\(8385\|8686\(_v[89]\)\|8688\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_sdio.c
     blobname 'libertas[/]gspi\(8385\|8686\(_v9\)\?\|8688\)\(_helper\|_hlp\)\?\.bin' drivers/net/wireless/libertas/if_spi.c
     blobname 'libertas[/]usb\(8388\(_v[59]\)\?\|8682\)\.bin' drivers/net/wireless/libertas/if_usb.c