Fix deblobbing of pss.c

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

diff --git a/deblob-2.6.28 b/deblob-2.6.28
index 4add46e609c66796eb8f73dacbec57aa63c3b690..6a59c7fd8ba0b8ced286a4f81a9fa13c3d121047 100755 (executable)
--- a/deblob-2.6.28
+++ b/deblob-2.6.28
@@ -1788,6 +1788,7 @@ clean_mk CONFIG_SOUND_PAS sound/oss/Makefile
 clean_mk CONFIG_SOUND_SB sound/oss/Makefile
 
 announce SOUND_PSS - "PSS (AD1848, ADSP-2115, ESC614) support"
+clean_sed 's,^\( [*] .*synth"\)\.$,\1/*.,' sound/oss/pss.c 'avoid nested comments'
 clean_blob sound/oss/pss.c
 clean_kconfig sound/oss/Kconfig 'SOUND_PSS'
 clean_sed '

diff --git a/deblob-check b/deblob-check
index 21c188dc7c2db3545a48368397af707e9d427113..ddfbeda9055d740fa11755fd2af56c8f6519f67b 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -1289,7 +1289,11 @@ set_except () {
 
     blob 'When the module is loaded\([^\n]\|[\n][^\n]\)*[/]pss_synth\([^\n]\|[\n][^\n]\)*' Documentation/sound/oss/PSS
     blob 'pss_firmware[ \n     ]*This parameter\([^\n]\|[\n][^\n]\)*[/]pss_synth\([^\n]\|[\n][^\n]\)*' Documentation/sound/oss/PSS-updates
-    accept '           pss_synthLen = mod_firmware_load(pss_firmware' sound/oss/pss.c
+    accept '           pss_synthLen = mod_firmware_load(pss_firmware, (void [*]) [&]pss_synth);' sound/oss/pss.c
+    accept '   *if \?(\(!\|fw_load [&][&] \)\?pss_synth' sound/oss/pss.c
+    accept '   *if (!pss_download_boot(devc, pss_synth, pss_synthLen,' sound/oss/pss.c
+    accept '   *vfree(pss_synth);' sound/oss/pss.c
+    blob 'to allow the user \([^/"]\|[^*"][/]*\)*fir[em]ware file\([^/"]\|[^*"][/]*\)*"[^"]*"' sound/oss/pss.c
     blobname '\([/]etc[/]sound[/]\)\?pss_synth' sound/oss/pss.c
     accept '   \$(obj)[/]bin2hex pss_synth' sound/oss/Makefile
     accept '    *echo '"'"'static \(unsigned char [*] *\|int \)pss_synth\(Len\)\? = \(NULL\|0\);' sound/oss/Makefile