From aa99e64fac9862e76123604b5d58c6dab7057bfb Mon Sep 17 00:00:00 2001 From: lxoliva Date: Sat, 7 Feb 2009 23:05:06 +0000 Subject: [PATCH] Clean up DVB_USB_AF9005 git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4718 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-2.6.28 | 16 +++++++++------- deblob-check | 8 ++++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/deblob-2.6.28 b/deblob-2.6.28 index bb80e54839e..0a90cec5d10 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright (C) 2008 Jeff Moe # Copyright (C) 2008, 2009 Alexandre Oliva +# Copyright (C) 2008 Jeff Moe # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -307,7 +307,7 @@ clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile # Removed char Drivers # ######################## -# COMPUTONE - Computone IntelliPort Plus serial +announce COMPUTONE - Computone IntelliPort Plus serial drop_fw_file firmware/intelliport2.bin.ihex firmware/intelliport2.bin reject_firmware drivers/char/ip2/ip2main.c clean_blob drivers/char/ip2/ip2main.c @@ -316,13 +316,13 @@ clean_mk CONFIG_COMPUTONE drivers/char/Makefile # gpu drm -# DRM_MGA - Matrox g200/g400 +announce DRM_MGA - Matrox g200/g400 clean_blob drivers/gpu/drm/mga/mga_ucode.h clean_blob drivers/gpu/drm/mga/mga_warp.c clean_kconfig drivers/gpu/drm/Kconfig 'DRM_MGA' clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile -# DRM_R128 - ATI Rage 128 +announce DRM_R128 - ATI Rage 128 clean_sed '/^static int r128_do_init_cce(/,/^}$/{ /^ r128_cce_load_microcode(dev_priv);$/{ i\ @@ -336,7 +336,7 @@ clean_blob drivers/gpu/drm/r128/r128_cce.c clean_kconfig drivers/gpu/drm/Kconfig 'DRM_R128' clean_mk CONFIG_DRM_R128 drivers/gpu/drm/Makefile -# DRM_RADEON - ATI Radeon +announce DRM_RADEON - ATI Radeon clean_sed '/^static int radeon_do_init_cce(/,/^}$/{ /^ radeon_cp_load_microcode(dev_priv);$/{ i\ @@ -362,8 +362,10 @@ clean_mk CONFIG_DRM_RADEON drivers/gpu/drm/Makefile ######################### -# dvb/dvb-usb -clean_blob drivers/media/dvb/dvb-usb/af9005-script.h +announce DVB_USB_AF9005 - Afatech AF9005 DVB-T USB1.1 +clean_file drivers/media/dvb/dvb-usb/af9005-script.h +clean_sed 's,^ deb_info("load init script\\n");$, {\n err("Missing Free init script\\n");\n return scriptlen = ret = -EINVAL;\n ,' drivers/media/dvb/dvb-usb/af9005-fe.c +clean_blob drivers/media/dvb/dvb-usb/af9005-fe.c clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' clean_mk CONFIG_DVB_USB_AF9005 drivers/media/dvb/dvb-usb/Makefile diff --git a/deblob-check b/deblob-check index 8d87aa79026..3b131c6fcb5 100755 --- a/deblob-check +++ b/deblob-check @@ -1,13 +1,13 @@ #! /bin/sh -# deblob-check version 2009-01-24 +# deblob-check version 2009-02-07 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva # Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer # versions. -# Copyright (C) 2008, 2009 Alexandre Oliva +# Copyright 2008, 2009 Alexandre Oliva # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -873,6 +873,10 @@ set_except () { blob 'static void radeon_cp_load_microcode([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/gpu/drm/radeon/radeon_cp.c blob ' radeon_cp_load_microcode([^;]*);' drivers/gpu/drm/radeon/radeon_cp.c + blob '\/\*[\n ]*File automatically generated by createinit\.py using data[\n ]*extracted from AF05BDA\.sys.*};' drivers/media/dvb/dvb-use/af9005-script.h + blob '#include "af9005-script\.h"' drivers/media/dvb/dvb-usb/af9005-fe.c + blob '[\n] scriptlen = sizeof(script)[^;]*;[\n] for[^{]*scriptlen[^{]*{[^}]*[^\n }]' drivers/media/dvb/dvb-usb/af9005-fe.c + blobna '\(agere\|prism\)_\(sta\|ap\)_fw\.bin' drivers/net/wireless/orinoco.c blobna 'symbol_sp24t_\(prim\|sec\)_fw' drivers/net/wireless/orinoco.c -- 2.31.1