From f8f2b5cd979b544e7e266be2e75a204dd0c8109e Mon Sep 17 00:00:00 2001 From: lxoliva Date: Sat, 7 Mar 2009 22:00:38 +0000 Subject: [PATCH] Revamped COPS LocalTalk. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4749 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-2.6.28 | 13 ++++++++----- deblob-check | 7 ++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/deblob-2.6.28 b/deblob-2.6.28 index 1e180583359..0ffa4224a73 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -588,11 +588,14 @@ clean_mk CONFIG_TYPHOON drivers/net/Makefile # appletalk -# COPS - COPS LocalTalk PC -# clean_blob drivers/net/appletalk/cops.c -# clean_blob drivers/net/appletalk/cops.h -clean_blob drivers/net/appletalk/cops_ffdrv.h -clean_blob drivers/net/appletalk/cops_ltdrv.h +announce COPS - COPS LocalTalk PC +clean_sed '/sizeof(\(ff\|lt\)drv_code)/i\ + printk(KERN_INFO "%s: Missing Free firmware.\\n", dev->name);\ + return; +/\(ff\|lt\)drv_code/d;' drivers/net/appletalk/cops.c +clean_blob drivers/net/appletalk/cops.c +clean_file drivers/net/appletalk/cops_ffdrv.h +clean_file drivers/net/appletalk/cops_ltdrv.h clean_kconfig drivers/net/appletalk/Kconfig 'COPS' clean_mk CONFIG_COPS drivers/net/appletalk/Makefile diff --git a/deblob-check b/deblob-check index fa1ba222525..643b5d75555 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2009-03-06 +# deblob-check version 2009-03-07 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -967,6 +967,11 @@ set_except () { blob 'static const u8 typhoon_firmware_image\[\] = {[^}]*};' drivers/net/typhoon-firmware.h + blobna 'licensed[^\n]*strictly for use[^\n]*[\n]*[^\n]*COPS LocalTalk' 'drivers/net/appletalk/cops_\(ff\|lt\)drv\.h' + blob 'static const unsigned char ffdrv_code\[\] = {[^}]*};' drivers/net/appletalk/cops_ffdrv.h + blob 'static const unsgined char ltdrv_code\[\] = {[^}]*};' drivers/net/appletalk/cops_ltdrv.h + blob '#include "cops_\(lt\|ff\)drv\.h"[ ]*\([/][*]\([^/]\|[^*][/]*\)*Firmware\([^/]\|[^*][/]*\)*[*][/]\)\?\([\n][\n]*#include "cops_\(lt\|ff\)drv\.h"[ ]*\([/][*]\([^/]\|[^*][/]*\)*Firmware\([^/]\|[^*][/]*\)*[*][/]\)\?\)*' drivers/net/appletalk/cops.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