Deal with firmware_sample_driver. Prepare to deblob orinoco.

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

diff --git a/deblob-2.6.28-todo b/deblob-2.6.28-todo
index 004c6a4ad91e5d5b66217032b8a4a4f1690a11d9..6bfaaff4529112b172936aa4db83ba85844c1ca6 100644 (file)
--- a/deblob-2.6.28-todo
+++ b/deblob-2.6.28-todo
@@ -95,7 +95,6 @@ drivers/net/wireless/libertas/if_cs.c
 drivers/net/wireless/libertas/if_sdio.c
 drivers/net/wireless/libertas/if_usb.c
 drivers/net/wireless/libertas_tf/if_usb.c
-drivers/net/wireless/orinoco.c
 drivers/net/wireless/p54/p54pci.c
 drivers/net/wireless/p54/p54usb.c
 drivers/net/wireless/prism54/islpci_dev.c
@@ -133,7 +132,6 @@ drivers/uwb/i1480/dfu/i1480-dfu.h
 drivers/uwb/i1480/dfu/mac.c
 drivers/uwb/i1480/dfu/phy.c
 drivers/video/metronomefb.c
-samples/firmware_class/firmware_sample_driver.c
 sound/drivers/vx/vx_hwdep.c
 sound/isa/sb/sb16_csp.c
 sound/isa/wavefront/wavefront_fx.c
@@ -161,3 +159,9 @@ sound/pci/rme9652/hdsp.c
 sound/pci/ymfpci/ymfpci_main.c
 sound/sh/aica.c
 sound/sound_firmware.c
+
+For these, the blob names are already matched and "deblobbed", but
+tweaking deblob-kver to adjust the request_firmware calls remains to
+be done:
+
+drivers/net/wireless/orinoco.c

diff --git a/deblob-check b/deblob-check
index 69a05bd5f0fac979742e788296e5422a1a5ef537..f6b5c21dc91d52d4d897ce198100b491e3ebc883 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -841,6 +841,12 @@ set_except () {
     accept 'static inline int request_ihex_firmware\?([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' include/linux/ihex.h
     ocomment '[/][*] Optional firmware\([^\n]*[\n] [*]\)*[^\n]* MODULE_FIRMWARE()'
     oprepline '#define MODULE_FIRMWARE(_firmware)' include/linux/module.h
+    accept ' [*] Sample code on how to use request_firmware() from drivers\.' samples/firmware_class/firmware_sample_driver.c
+    accept '[\t]\(retval\|error\) = request_firmware\(_nowait\)\?([^;]*"sample_driver_fw",[^;]*);' samples/firmware_class/firmware_sample_driver.c
+    ocomment ' [/][*] request_firmware blocks until userspace finished' samples/firmware_class/firmware_sample_driver.c
+    accept '           [ \t]*" request_firmware_nowait failed' samples/firmware_class/firmware_sample_driver.c
+    blobna '\(agere\|prism\)_\(sta\|ap\)_fw\.bin' drivers/net/wireless/orinoco.c
+    blobna 'symbol_sp24t_\(prim\|sec\)_fw' drivers/net/wireless/orinoco.c
 
     # This looks suspicious, but it pretty much just sets stuff to zero.
     initnc 'static __u8 mode8420\(pro\|con\)\[\] =' drivers/media/video/cs8420.h