From 83b77d14b5b689dba84f322fcdaf163f4cc25ff6 Mon Sep 17 00:00:00 2001 From: lxoliva Date: Tue, 10 Mar 2009 04:39:00 +0000 Subject: [PATCH] Revamped drivers/net and drivers/pcmcia. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4769 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-2.6.28 | 177 +++++++++++++++++++++++++++++++++++++++++++++ deblob-2.6.28-todo | 27 ------- deblob-check | 62 +++++++++++++++- 3 files changed, 237 insertions(+), 29 deletions(-) diff --git a/deblob-2.6.28 b/deblob-2.6.28 index dbdf8eef1c6..e9c0c7456d6 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -695,6 +695,18 @@ clean_blob drivers/net/myri_sbus.c clean_kconfig drivers/net/Kconfig 'MYRI_SBUS' clean_mk CONFIG_MYRI_SBUS drivers/net/Makefile +announce MYRI10GE - "Myricom Myri-10G Ethernet support" +reject_firmware drivers/net/myri10ge/myri10ge.c +clean_blob drivers/net/myri10ge/myri10ge.c +clean_kconfig drivers/net/Kconfig 'MYRI10GE' +clean_mk CONFIG_MYRI10GE drivers/net/myri10ge/Makefile + +announce SPIDER_NET - "Spider Gigabit Ethernet driver" +reject_firmware drivers/net/spider_net.c +clean_blob drivers/net/spider_net.h +clean_kconfig drivers/net/Kconfig 'SPIDER_NET' +clean_mk CONFIG_SPIDER_NET drivers/net/Makefile + announce TEHUTI - "Tehuti Networks 10G Ethernet" clean_blob drivers/net/tehuti_fw.h clean_sed ' @@ -768,6 +780,14 @@ clean_blob drivers/net/hamradio/yam.c clean_kconfig drivers/net/hamradio/Kconfig 'YAM' clean_mk CONFIG_YAM drivers/net/hamradio/Makefile +# irda + +announce USB_IRDA - "IrDA USB dongles" +reject_firmware drivers/net/irda/irda-usb.c +clean_blob drivers/net/irda/irda-usb.c +clean_kconfig drivers/net/irda/Kconfig 'USB_IRDA' +clean_mk CONFIG_USB_IRDA drivers/net/irda/Makefile + # pcmcia announce PCMCIA_SMC91C92 - "SMC 91Cxx PCMCIA" @@ -783,6 +803,31 @@ clean_sed ' clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_SMC91C92' clean_mk CONFIG_PCMCIA_SMC91C92 drivers/net/pcmcia/Makefile +announce PCCARD - "PCCard (PCMCIA/CardBus) support" +reject_firmware drivers/pcmcia/ds.c +clean_blob drivers/pcmcia/ds.c +clean_kconfig drivers/pcmcia/Kconfig 'PCCARD' +clean_mk CONFIG_PCCARD drivers/pcmcia/Makefile + +announce PCMCIA_3C574 - "3Com 3c574 PCMCIA support" +clean_blob drivers/net/pcmcia/3c574_cs.c +clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_3C574' +clean_mk CONFIG_PCMCIA_3C574 drivers/net/pcmcia/Makefile + +announce PCMCIA_3C589 - "3Com 3c589 PCMCIA support" +clean_blob drivers/net/pcmcia/3c589_cs.c +clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_3C589' +clean_mk CONFIG_PCMCIA_3C589 drivers/net/pcmcia/Makefile + +announce PCMCIA_PCNET - "NE2000 compatible PCMCIA support" +clean_blob drivers/net/pcmcia/pcnet_cs.c +clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_PCNET' +clean_mk CONFIG_PCMCIA_PCNET drivers/net/pcmcia/Makefile + +announce SERIAL_8250_CS - "8250/16550 PCMCIA device support" +clean_blob drivers/serial/serial_cs.c +clean_kconfig drivers/serial/Kconfig 'SERIAL_8250_CS' +clean_mk CONFIG_SERIAL_8250_CS drivers/serial/Makefile # tokenring @@ -805,6 +850,12 @@ clean_blob drivers/net/tokenring/smctr.c clean_kconfig drivers/net/tokenring/Kconfig 'SMCTR' clean_mk CONFIG_SMCTR drivers/net/tokenring/Makefile +announce TMS380TR - "Generic TMS380 Token Ring ISA/PCI adapter support" +reject_firmware drivers/net/tokenring/tms380tr.c +clean_blob drivers/net/tokenring/tms380tr.c +clean_kconfig drivers/net/tokenring/Kconfig 'TMS380TR' +clean_mk CONFIG_TMS380TR drivers/net/tokenring/Makefile + # usb announce USB_KAWETH - "USB KLSI KL5USB101-based ethernet device support" @@ -819,12 +870,138 @@ clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile # wireless +announce ATMEL "Atmel at76c50x chipset 802.11b support" +reject_firmware drivers/net/wireless/atmel.c +clean_blob drivers/net/wireless/atmel.c +clean_kconfig drivers/net/wireless/Kconfig 'ATMEL' +clean_mk CONFIG_ATMEL drivers/net/wireless/Makefile + +announce B43 - "Broadcom 43xx wireless support (mac80211 stack)" +reject_firmware drivers/net/wireless/b43/main.c +# Major portions of firwmare filenames not deblobbed. +clean_blob drivers/net/wireless/b43/main.c +clean_kconfig drivers/net/wireless/b43/Kconfig 'B43' +clean_mk CONFIG_B43 drivers/net/wireless/b43/Makefile + +announce B43LEGACY - "Broadcom 43xx-legacy wireless support (mac80211 stack)" +reject_firmware drivers/net/wireless/b43legacy/main.c +# Major portions of firwmare filenames not deblobbed. +clean_blob drivers/net/wireless/b43legacy/main.c +clean_kconfig drivers/net/wireless/b43legacy/Kconfig 'B43LEGACY' +clean_mk CONFIG_B43LEGACY drivers/net/wireless/b43legacy/Makefile + announce HERMES - "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)" reject_firmware drivers/net/wireless/orinoco.c clean_blob drivers/net/wireless/orinoco.c clean_kconfig drivers/net/wireless/Kconfig 'HERMES' clean_mk CONFIG_HERMES drivers/net/wireless/Makefile +announce IPW2100 - "Intel PRO/Wireless 2100 Network Connection" +reject_firmware drivers/net/wireless/ipw2100.c +clean_blob drivers/net/wireless/ipw2100.c +clean_kconfig drivers/net/wireless/Kconfig 'IPW2100' +clean_mk CONFIG_IPW2100 drivers/net/wireless/Makefile + +announce IPW2200 - "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" +reject_firmware drivers/net/wireless/ipw2200.c +clean_blob drivers/net/wireless/ipw2200.c +clean_kconfig drivers/net/wireless/Kconfig 'IPW2200' +clean_mk CONFIG_IPW2200 drivers/net/wireless/Makefile + +announce IWL3945 - "Intel PRO/Wireless 3945ABG/BG Network Connection" +reject_firmware drivers/net/wireless/iwlwifi/iwl3945-base.c +clean_blob drivers/net/wireless/iwlwifi/iwl3945-base.c +clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWL3945' +clean_mk CONFIG_IWL3945 drivers/net/wireless/iwlwifi/Makefile + +announce IWLAGN - "Intel Wireless WiFi Next Gen AGN" +reject_firmware drivers/net/wireless/iwlwifi/iwl-agn.c +clean_blob drivers/net/wireless/iwlwifi/iwl-agn.c +clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWLAGN' +clean_mk CONFIG_IWLAGN drivers/net/wireless/iwlwifi/Makefile + +announce IWL4965 - "Intel Wireless WiFi 4965AGN" +clean_blob drivers/net/wireless/iwlwifi/iwl-4965.c +clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWL4965' +clean_mk CONFIG_IWL4965 drivers/net/wireless/iwlwifi/Makefile + +announce IWL5000 - "Intel Wireless WiFi 5000AGN" +clean_blob drivers/net/wireless/iwlwifi/iwl-5000.c +clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWL5000' +clean_mk CONFIG_IWL5000 drivers/net/wireless/iwlwifi/Makefile + +announce LIBERTAS_CS - "Marvell Libertas 8385 CompactFlash 802.11b/g cards" +reject_firmware drivers/net/wireless/libertas/if_cs.c +clean_blob drivers/net/wireless/libertas/if_cs.c +clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_CS' +clean_mk CONFIG_LIBERTAS_CS drivers/net/wireless/libertas/Makefile + +announce LIBERTAS_SDIO - "Marvell Libertas 8385 and 8686 SDIO 802.11b/g cards" +reject_firmware drivers/net/wireless/libertas/if_sdio.c +clean_blob drivers/net/wireless/libertas/if_sdio.c +clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_SDIO' +clean_mk CONFIG_LIBERTAS_SDIO drivers/net/wireless/libertas/Makefile + +announce LIBERTAS_USB - "Marvell Libertas 8388 USB 802.11b/g cards" +reject_firmware drivers/net/wireless/libertas/if_usb.c +clean_blob drivers/net/wireless/libertas/if_usb.c +clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_USB' +clean_mk CONFIG_LIBERTAS_USB drivers/net/wireless/libertas/Makefile + +announce LIBERTAS_THINFIRM_USB - "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware" +reject_firmware drivers/net/wireless/libertas_tf/if_usb.c +clean_blob drivers/net/wireless/libertas_tf/if_usb.c +clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_THINFIRM_USB' +clean_mk CONFIG_LIBERTAS_THINFIRM_USB drivers/net/wireless/libertas_tf/Makefile + +announce P54_PCI - "Prism54 PCI support" +reject_firmware drivers/net/wireless/p54/p54pci.c +clean_blob drivers/net/wireless/p54/p54pci.c +clean_kconfig drivers/net/wireless/p54/Kconfig 'P54_PCI' +clean_mk CONFIG_P54_PCI drivers/net/wireless/p54/Makefile + +announce P54_USB - "Prism54 USB support" +reject_firmware drivers/net/wireless/p54/p54usb.c +clean_blob drivers/net/wireless/p54/p54usb.c +clean_kconfig drivers/net/wireless/p54/Kconfig 'P54_USB' +clean_mk CONFIG_P54_USB drivers/net/wireless/p54/Makefile + +announce PRISM54 - 'Intersil Prism GT/Duette/Indigo PCI/Cardbus' +reject_firmware drivers/net/wireless/prism54/islpci_dev.c +clean_blob drivers/net/wireless/prism54/islpci_dev.c +clean_kconfig drivers/net/wireless/Kconfig 'PRISM54' +clean_mk CONFIG_PRISM54 drivers/net/wireless/prism54/Makefile + +announce RT2X00_LIB_FIRMWARE - "Ralink driver firmware support" +reject_firmware drivers/net/wireless/rt2x00/rt2x00firmware.c +clean_blob drivers/net/wireless/rt2x00/rt2x00firmware.c +clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT2X00_LIB_FIRMWARE' +clean_mk CONFIG_RT2X00_LIB_FIRMWARE drivers/net/wireless/rt2x00/Makefile + +announce RT61PCI - "Ralink rt2501/rt61 (PCI/PCMCIA) support" +clean_blob drivers/net/wireless/rt2x00/rt61pci.h +clean_blob drivers/net/wireless/rt2x00/rt61pci.c +clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT61PCI' +clean_mk CONFIG_RT61PCI drivers/net/wireless/rt2x00/Makefile + +announce RT73USB - "Ralink rt2501/rt73 (USB) support" +clean_blob drivers/net/wireless/rt2x00/rt73usb.h +clean_blob drivers/net/wireless/rt2x00/rt73usb.c +clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT73USB' +clean_mk CONFIG_RT73USB drivers/net/wireless/rt2x00/Makefile + +announce USB_ZD1201 - "USB ZD1201 based Wireless device support" +reject_firmware drivers/net/wireless/zd1201.c +clean_blob drivers/net/wireless/zd1201.c +clean_kconfig drivers/net/wireless/Kconfig 'USB_ZD1201' +clean_mk CONFIG_USB_ZD1201 drivers/net/wireless/Makefile + +announce ZD1211RW - "ZyDAS ZD1211/ZD1211B USB-wireless support" +reject_firmware drivers/net/wireless/zd1211rw/zd_usb.c +clean_blob drivers/net/wireless/zd1211rw/zd_usb.c +clean_kconfig drivers/net/wireless/zd1211rw/Kconfig 'ZD1211RW' +clean_mk CONFIG_ZD1211RW drivers/net/wireless/zd1211rw/Makefile + # bluetooth announce BT_HCIBCM203X - "HCI BCM203x USB driver" diff --git a/deblob-2.6.28-todo b/deblob-2.6.28-todo index ca4d7771fe4..3728898cf59 100644 --- a/deblob-2.6.28-todo +++ b/deblob-2.6.28-todo @@ -41,33 +41,6 @@ drivers/media/video/ivtv/ivtv-firmware.c drivers/media/video/pvrusb2/pvrusb2-hdw.c drivers/media/video/s2255drv.c drivers/media/video/saa7134/saa7134-dvb.c -drivers/net/irda/irda-usb.c -drivers/net/myri10ge/myri10ge.c -drivers/net/spider_net.c -drivers/net/tokenring/smctr.c -drivers/net/tokenring/tms380tr.c -drivers/net/wireless/atmel.c -drivers/net/wireless/b43/main.c -drivers/net/wireless/b43legacy/main.c -drivers/net/wireless/ipw2100.c -drivers/net/wireless/ipw2200.c -drivers/net/wireless/iwlwifi/iwl-agn.c -drivers/net/wireless/iwlwifi/iwl3945-base.c -drivers/net/wireless/iwlwifi/iwl-4965.c -drivers/net/wireless/iwlwifi/iwl-5000.c -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/p54/p54pci.c -drivers/net/wireless/p54/p54usb.c -drivers/net/wireless/prism54/islpci_dev.c -drivers/net/wireless/rt2x00/rt2x00firmware.c -drivers/net/wireless/rt2x00/rt61pci.c -drivers/net/wireless/rt2x00/rt73usb.c -drivers/net/wireless/zd1201.c -drivers/net/wireless/zd1211rw/zd_usb.c -drivers/pcmcia/ds.c drivers/scsi/aic94xx/aic94xx_init.c drivers/scsi/aic94xx/aic94xx_seq.c drivers/scsi/ipr.c diff --git a/deblob-check b/deblob-check index 98717d878cf..8949f7564ba 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2009-03-08 +# deblob-check version 2009-03-09 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -1099,7 +1099,65 @@ set_except () { blobname 'xc3028L-v36\.fw' drivers/media/common/tuners/tuner-xc2028.h blobname 'dvb-fe-xc5000-1\.1\.fw' drivers/media/common/tuners/xc5000.c accept '#define XC5000_DEFAULT_FIRMWARE NONFREE_FIRMWARE' drivers/media/common/tuners/xc5000.c - accept '\([ ]*\(\(ctl\)\?\(->\|[.]\)fname[ ]*=[ ]*\|if (fw->size != \|ret = reject_firmware([&]fw, \)XC\(2028\|3028L\|5000\)_DEFAULT_FIRMWARE' 'drivers/media/video/\(common/tuners/\(xc5000\.c\|tuner-xc2028\.h\)\|saa7134/saa7134-cards\.c\|em28xx/em28xx-cards\.c\|cx23885/cx23885-dvb\.c\|cx88/cx88-\(cards\|dvb\)\.c\|cx18/cx18-driver\.c\|ivtv/ivtv-driver\.c\|dvb/dvb-usb/\(dib0700_devices\|cxusb\)\.c\)' + accept '[ ]*\(\(ctl\)\?\(->\|[.]\)fname[ ]*=[ ]*\|if (fw->size != \|ret = reject_firmware([&]fw, \)XC\(2028\|3028L\|5000\)_DEFAULT_FIRMWARE' 'drivers/media/video/\(common/tuners/\(xc5000\.c\|tuner-xc2028\.h\)\|saa7134/saa7134-cards\.c\|em28xx/em28xx-cards\.c\|cx23885/cx23885-dvb\.c\|cx88/cx88-\(cards\|dvb\)\.c\|cx18/cx18-driver\.c\|ivtv/ivtv-driver\.c\|dvb/dvb-usb/\(dib0700_devices\|cxusb\)\.c\)' + + blobname '4210\(100[12]\|%4X\)\.sb' drivers/net/irda/irda-usb.c + + blobname 'myri10ge_\(rss_\)\?ethp\?_z8e\.dat' drivers/net/myri10ge.c + + blobname 'spider_fw\.bin' drivers/net/spider_net.h + + blobname 'tms380tr\.bin' drivers/net/tokenring/tms380tr.c + + blobname 'atmel_at76c50\(2\([de]\|_3com\)\?\|4a\?\(_2958\)\?\|6\)\(\.bin\)\?' drivers/net/wireless/atmel.c + + blobname 'b43[^/]*[/]\(%s\|ucode\(5\|1[13]\)\|pcm5\|[abn]0g[01]initvals\(5\|1[13]\)\)\.fw' 'drivers/net/wireless/b43\(legacy\)\?/main.c' + + blob '#define IPW2100_FW_\(\(MAJOR\|MINOR\)\(_VERSION\|(x)\)\|VERSION\) \([^\n]\|[\\][\n]\)*' drivers/net/wireless/ipw2100.c + blobname 'ipw2100-\("\([^"\n]\|[\\][\n]\)*"\([^"]\|[\\]["]\)*\)*' drivers/net/wireless/ipw2100.c + blobname '__stringify(IPW2100_FW_MINOR_VERSION)' drivers/net/wireless/ipw2100.c + + accept '[/][*] Call this function from process context\([^/]\|[^*][/]*\)*request_firmware' drivers/net/wireless/ipw2200.c + blobname 'ipw2200-\(i\?bss\|sniffer\)\.fw' drivers/net/wireless/ipw2200.c + accept ' IPW_ERROR("%s request_firmware failed' drivers/net/wireless/ipw2200.c + + blobname 'iwlwifi-\(3945\|4965\|5000\)" IWL\(3945\|4965\|5000\)_UCODE_API "\.ucode' 'drivers/net/iwlwifi/iwl\(3945-base\|-4965\|-5000\)\.c' + accept ' [*] request_firmware() is synchronous' 'drivers/net/iwlwifi/iwl\(3945-base\|-agn\)\.c' + + blobname 'libertas_cs\(_helper\)\?\.fw' drivers/net/wireless/libertas/if_cs.c + + blobname 'sd\(8385\|8686\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_sdio.c + + blobname 'usb8388\(-5\.126\.0\.p5\)\?\.bin' drivers/net/wireless/libertas/if_usb.c + accept ' lbs_pr_err("request_firmware() failed' drivers/net/wireless/ipw2200.c + + blobname 'lbtf_usb\.bin' drivers/net/wireless/libertas_tf/if_usb.c + + blobname 'isl38\(86\|87usb_bare\|90usb\)' 'drivers/net/wireless/p54/p54\(pci\.c\|usb\.[ch]\)' + + blobname 'isl38\(77\|86\|90\)' drivers/net/wireless/prism54/islpci_dev.c + + blobname 'rt2[56]61s\?\.bin' drivers/net/wireless/rt2x00/rt61pci.h + blobname 'rt73\.bin' drivers/net/wireless/rt2x00/rt73usb.h + + blobname 'zd1201\(-ap\)\?\.fw' drivers/net/wireless/zd1201.c + + blobname 'zd1211[/]zd1211b\?\(_u\([rb]\|phr\)\?\)\?' drivers/net/wireless/zd1211/zd_usb.c + + # ??? gotta introduce some means to match false-positives + # including post context containing blobs, so that the macro name + # is not flagged or deblobbed, but the blob name is. + # blobna 'PCMCIA_\([PM]FC_\)\?DEVICE_CIS_\(MANF_CARD\|PROD_ID[1-4]*\)' + # accept ' PCMCIA_\([PM]FC_\)\?DEVICE_CIS_\(MANF_CARD\|PROD_ID[1-4]*\)([^)]*, "[/][*](DEBLOBBED)[*][/]")' + # accept '#define PCMCIA_\([PM]FC_\)\?DEVICE_CIS_\(MANF_CARD\|PROD_ID[1-4]*\)(' include/pcmcia/device_id.h + + blobname '3CCFEM556\.cis' drivers/net/pcmcia/3c574_cs.c + + blobname '3CXEM556\.cis' drivers/net/pcmcia/3c589_cs.c + + blobname '\(PCMLM28\|DP83903\|LA-PCM\|PE520\|NE2K\|PE-200\|tamarack\)\.cis' drivers/net/pcmcia/pcnet_cs.c + + blobname '\(PCMLM28\|DP83903\|3C\(CF\|X\)EM556\|SW_\([78]xx\|555\)_SER\|MT5634ZLX\|COMpad[24]\|RS-COM-2P\|GLOBETROTTER\)\.cis' drivers/serial/serial_cs.c # This looks suspicious, but it pretty much just sets stuff to zero. initnc 'static __u8 mode8420\(pro\|con\)\[\] =' drivers/media/video/cs8420.h -- 2.31.1