diff options
290 files changed, 29511 insertions, 150 deletions
@@ -1,16 +1,25 @@ +drivers +include +net +udev *~ +git-describe +compat-release Module.symvers module.order .pc -ckmake.log +code-metrics.txt +.compat_base +.compat_base_tree +.compat_base_tree_version +.compat_version +.compat_autoconf_compat-* .config -include/linux/compat_autoconf.h +.config.mk_md5sum.txt .tmp_versions/ -compat/*.cmd -compat/*.o -compat/*.mod.c -compat/*.ko -modules.order +MAINTAINERS modules -*.patch -debs/ +modules.order +*.o.d +*.o +scripts/kconfig/mconf diff --git a/Kconfig b/Kconfig new file mode 100644 index 00000000..8dd684a9 --- /dev/null +++ b/Kconfig @@ -0,0 +1,25 @@ +# +# For a description of the syntax of this configuration file, +# see Documentation/kbuild/kconfig-language.txt. +# + +mainmenu "$VERSION $BASE $BASE_TREE $BASE_TREE_VERSION" + +comment "Linux kernel backport configuration" + +source Kconfig.env + +config COMPAT_VIDEO_MODULES + bool "Video drivers" + help + This enables compilation of Video DRM drivers. + +config COMPAT_WIRELESS + bool "Wireless drivers" + help + This enables compilation of Wireless drivers. + +config COMPAT_BLUETOOTH + bool "Bluetooth drivers" + help + This enables compilation of Bluetooth drivers. diff --git a/Kconfig.env b/Kconfig.env new file mode 100644 index 00000000..89d4935e --- /dev/null +++ b/Kconfig.env @@ -0,0 +1,19 @@ +config BASE + string + option env="COMPAT_BASE" + +config BASE_TREE + string + option env="COMPAT_BASE_TREE" + +config BASE_TREE_VERSION + string + option env="COMPAT_BASE_TREE_VERSION" + +config PROJECT + string + option env="COMPAT_PROJECT" + +config VERSION + string + option env="COMPAT_VERSION" @@ -1,84 +1,272 @@ -export KMODDIR?= updates/ +# + +# Copyright (c) 2007-2012 Luis R. Rodriguez <mcgrof@frijolero.org> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +export KMODDIR?= updates KMODDIR_ARG:= "INSTALL_MOD_DIR=$(KMODDIR)" -ifneq ($(origin $(KLIB)), undefined) +ifneq ($(origin KLIB), undefined) KMODPATH_ARG:= "INSTALL_MOD_PATH=$(KLIB)" else export KLIB:= /lib/modules/$(shell uname -r) endif -export KLIB_BUILD ?= $(KLIB)/build +export KLIB_BUILD ?= $(KLIB)/build +export MAKE DESTDIR?= -ifeq ($(KERNELRELEASE),) -export PWD := $(shell pwd) -export COMPAT_BASE_TREE := "linux-next.git" -# For this specific tree this is only relevant in -# terms of the last time we synched code up with upstream -# for internal stuff. For other compatability projects this -# would be the git describe of the base tree you are -# working with. -export COMPAT_BASE_TREE_VERSION := "next-20100517" -export COMPAT_VERSION := $(shell git describe) - -# This is used to annotate what version of -# compat.git was used. -export COMPAT_BASE := $(shell git describe) +ifneq ($(KERNELRELEASE),) -# to check config and compat autoconf -export COMPAT_CONFIG=$(PWD)/.config -export COMPAT_AUTOCONF=$(PWD)/include/linux/compat_autoconf.h -export MAKE +-include $(COMPAT_CONFIG) +include $(COMPAT_CONFIG_CW) -else -# By stuffing this hear we avoid using -# this hackery on modpost, the 2nd section of module building. -# -# This hack lets us put our include path first than the kernel's -# when building our compat modules. Your own makefile would look -# the same. -NOSTDINC_FLAGS := -I$(M)/include/ \ +NOSTDINC_FLAGS := \ + -I$(M)/include/ \ + -I$(M)/include/uapi \ + -I$(M)/include/drm \ -include $(M)/include/linux/compat-2.6.h \ - $(CFLAGS) \ - -DCOMPAT_BASE="\"$(COMPAT_BASE)\"" \ - -DCOMPAT_BASE_TREE="\"$(COMPAT_BASE_TREE)\"" \ - -DCOMPAT_BASE_TREE_VERSION="\"$(COMPAT_BASE_TREE_VERSION)\"" \ - -DCOMPAT_PROJECT="\"Generic kernel\"" \ - -DCOMPAT_VERSION="\"$(COMPAT_VERSION)\"" - -# Technicallay we can require the inclusion of COMPAT_CONFIG for -# all targets except clean, so avoid the warnings at clean time. --include $(COMPAT_CONFIG) + $(CFLAGS) + +obj-y := compat/ + +obj-$(CONFIG_COMPAT_RFKILL) += net/rfkill/ +obj-$(CONFIG_COMPAT_VIDEO_MODULES) += drivers/gpu/drm/ +obj-$(CONFIG_COMPAT_VIDEO_MODULES) += drivers/video/ + +ifeq ($(BT),) +obj-$(CONFIG_COMPAT_WIRELESS) += net/wireless/ net/mac80211/ +obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += drivers/net/wireless/ + +obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/ + +obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/ethernet/atheros/ +obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/ethernet/broadcom/ + +obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/ +obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/ +obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/ + +ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),) +endif + +endif + +obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/ +obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/ + +else + +export PWD := $(shell pwd) + +# The build will fail if there is any space in PWD. +ifneq (,$(findstring $() ,$(PWD))) +$(error "The path to this compat-drivers directory has spaces in it." \ + "Please put it somewhere where there is no space") endif -obj-y += compat/ +# For C code +export CFLAGS += \ + -DCOMPAT_BASE="\"$(shell cat $(PWD)/.compat_base)\"" \ + -DCOMPAT_BASE_TREE="\"$(shell cat $(PWD)/.compat_base_tree)\"" \ + -DCOMPAT_BASE_TREE_VERSION="\"$(shell cat $(PWD)/.compat_base_tree_version)\"" \ + -DCOMPAT_PROJECT="\"compat-drivers\"" \ + -DCOMPAT_VERSION="\"$(shell cat $(PWD)/.compat_version)\"" + +# These exported as they are used by the scripts +# to check config and compat autoconf +export COMPAT_CONFIG_CW=$(PWD)/config.mk +export COMPAT_CONFIG=$(PWD)/.config +export CONFIG_CHECK=$(PWD)/.config.mk_md5sum.txt +export COMPAT_AUTOCONF=include/linux/compat_autoconf.h +export CREL=$(shell cat $(PWD)/.compat_version) +export CREL_PRE:=.compat_autoconf_ +export CREL_CHECK:=$(PWD)/$(CREL_PRE)$(CREL) all: modules -modules: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF) +$(COMPAT_CONFIG): ; + +menuconfig: + @echo "Not yet supported, still under development" + @echo "If you want to hack on this start testing with:" + @echo " make -f scripts/kconfig/Makefile menuconfig " + @exit 1 + make -f scripts/kconfig/Makefile menuconfig + +modules: $(CREL_CHECK) + +@./scripts/check_config.sh $(MAKE) -C $(KLIB_BUILD) M=$(PWD) modules - @touch modules + @touch $@ -install: modules - $(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \ +bt: $(CREL_CHECK) + +@./scripts/check_config.sh + $(MAKE) -C $(KLIB_BUILD) M=$(PWD) BT=TRUE modules + @touch $@ + +# We use a CREL_CHECK variable which will depend on the environment used to +# build. If the environment requirements change it forces a reconfiguration +# check. This means we force a new reconfiguration check if a the user gets a +# new updates of compat-drivers or when the user updates the $(COMPAT_CONFIG) +# file. +# XXX: add kernel target to the CREL_CHECK mix, this would ensure we also +# reconfigure and build again fresh if we detect a new target kernel is +# being used. +$(CREL_CHECK): + @# Force to regenerate compat autoconf + +@./compat/scripts/gen-compat-config.sh > $(COMPAT_CONFIG) + @rm -f $(CONFIG_CHECK) + +@./scripts/check_config.sh + @md5sum $(COMPAT_CONFIG_CW) > $(CONFIG_CHECK) + @touch $@ + +btinstall: btuninstall bt-install-modules + +bt-install-modules: bt + $(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) BT=TRUE \ modules_install - depmod -a + @/sbin/depmod -ae + @echo + @echo Now run: + @echo + @echo sudo make btunload: + @echo + @echo And then load the needed bluetooth modules. If unsure reboot. + @echo + +btuninstall: + @# New location, matches upstream + @rm -rf $(KLIB)/$(KMODDIR)/net/bluetooth/ + @rm -rf $(KLIB)/$(KMODDIR)/drivers/bluetooth/ + @# Lets only remove the stuff we are sure we are providing + @# on the misc directory. + @/sbin/depmod -ae + @echo -$(COMPAT_AUTOCONF): $(COMPAT_CONFIG) - +@$(PWD)/scripts/gen-compat-autoconf.sh $(COMPAT_CONFIG) > $(COMPAT_AUTOCONF) +btclean: + $(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(PWD) BT=TRUE clean + @rm -f $(CREL_PRE)* -$(COMPAT_CONFIG): - +@$(PWD)/scripts/gen-compat-config.sh > $(COMPAT_CONFIG) +install: uninstall install-modules install-scripts + +install-modules: modules + $(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \ + modules_install + @./scripts/update-initramfs -install: modules +install-scripts: + @# All the scripts we can use + @mkdir -p $(DESTDIR)/usr/lib/compat-drivers/ + @install scripts/modlib.sh $(DESTDIR)/usr/lib/compat-drivers/ + @install scripts/git-paranoia $(DESTDIR)/usr/sbin/ + @install scripts/madwifi-unload $(DESTDIR)/usr/sbin/ + @# This is to allow switching between drivers without blacklisting + @install scripts/athenable $(DESTDIR)/usr/sbin/ + @install scripts/b43enable $(DESTDIR)/usr/sbin/ + @install scripts/iwl-enable $(DESTDIR)/usr/sbin/ + @install scripts/athload $(DESTDIR)/usr/sbin/ + @install scripts/b43load $(DESTDIR)/usr/sbin/ + @install scripts/iwl-load $(DESTDIR)/usr/sbin/ + @if [ $(shell modinfo ath_pci > /dev/null 2>&1 && echo 1) ]; then \ + echo -n "Note: madwifi detected, we're going to disable it. " ;\ + echo "If you would like to enable it later you can run:" ;\ + echo " sudo athenable madwifi" ;\ + echo ;\ + echo Running athenable ath5k...;\ + $(DESTDIR)/usr/sbin/athenable ath5k ;\ + fi + @if [ $(shell modinfo iwl4965 > /dev/null 2>&1 && echo 1) ]; then \ + echo ;\ + echo -n "Note: iwl4965 detected, we're going to disable it. " ;\ + echo "If you would like to enable it later you can run:" ;\ + echo " sudo iwl-load iwl4965" ;\ + echo ;\ + echo Running iwl-enable iwlagn...;\ + $(DESTDIR)/usr/sbin/iwl-enable iwlagn ;\ + fi + @if [ $(shell modinfo iwlagn > /dev/null 2>&1 && echo 1) ] \ + && [ $(shell modinfo iwlwifi > /dev/null 2>&1 && echo 1) ]; then \ + echo ;\ + echo -n "Note: iwlagn detected, we're going to disable it. " ;\ + echo "If you would like to enable it later you can run:" ;\ + echo " sudo iwl-load iwlagn" ;\ + echo ;\ + echo Running iwl-enable iwlwifi...;\ + $(DESTDIR)/usr/sbin/iwl-enable iwlwifi ;\ + fi + @# If on distributions like Mandriva which like to + @# compress their modules this will find out and do + @# it for you. Reason is some old version of modutils + @# won't know mac80211.ko should be used instead of + @# mac80211.ko.gz + @./scripts/compress_modules + @# Mandrake doesn't have a depmod.d/ conf file to prefer + @# the updates/ dir which is what we use so we add one for it + @# (or any other distribution that doens't have this). + @./scripts/check_depmod + @# Udev stuff needed for the new compat_firmware_class. + @./compat/scripts/compat_firmware_install + @/sbin/depmod -a + @echo + @echo Now run: + @echo + @echo sudo make unload to unload all: wireless, bluetooth and ethernet modules + @echo sudo make wlunload to unload wireless modules + @echo sudo make btunload to unload bluetooth modules + @echo + @echo Run sudo modprobe 'driver-name' to load your desired driver. + @echo If unsure reboot. + @echo -install-ckmake: - @mkdir -p $(DESTDIR)/usr/bin/ - @install bin/ckmake $(DESTDIR)/usr/bin/ +uninstall: + @# New location, matches upstream + @rm -rf $(KLIB)/$(KMODDIR)/compat/ + @rm -rf $(KLIB)/$(KMODDIR)/net/mac80211/ + @rm -rf $(KLIB)/$(KMODDIR)/net/rfkill/ + @rm -rf $(KLIB)/$(KMODDIR)/net/wireless/ + @rm -rf $(KLIB)/$(KMODDIR)/drivers/ssb/ + @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/usb/ + @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/wireless/ + @rm -rf $(KLIB)/$(KMODDIR)/drivers/staging/ + @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/atl* + @find $(KLIB)/$(KMODDIR)/drivers/net/ -name "alx*.ko" -o -name "atl*.ko" 2>/dev/null |xargs rm -f + @# Lets only remove the stuff we are sure we are providing + @# on the misc directory. + @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom/eeprom_93cx6.ko* + @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom_93cx6.ko* + @rm -f $(KLIB)/$(KMODDIR)/drivers/net/b44.ko* + @/sbin/depmod -a + @./scripts/update-initramfs + @echo clean: - $(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean + @if [ -d net -a -d $(KLIB_BUILD) ]; then \ + $(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean ;\ + fi + @rm -f $(CREL_PRE)* +unload: + @./scripts/unload.sh -clean-files := Module.symvers modules.order Module.markers compat/modules.order -clean-files += modules $(COMPAT_CONFIG) $(COMPAT_AUTOCONF) +btunload: + @./scripts/btunload.sh + +wlunload: + @./scripts/wlunload.sh + + +.PHONY: all clean install uninstall unload btunload wlunload modules bt Makefile + +endif -.PHONY: all install clean modules Makefile +clean-files += Module.symvers Module.markers modules modules.order +clean-files += $(CREL_CHECK) $(CONFIG_CHECK) $(COMPAT_CONFIG) diff --git a/README.md b/README.md new file mode 100644 index 00000000..b647eb29 --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +# Linux compat drivers compatibility package + +This package provides backport support for drivers from newer kernels +down to older kernels. It currently backports 3 subsystems: + + * Ethernet + * Wireless + * Bluetooth + * GPU + +This package provides the latest Linux kernel subsystem enhancements +for kernels 2.6.24 and above. It is technically possible to support +kernels < 2.6.24 but more work is required for that. + +# Documentation + +This package is documented online and has more-up-to date information +online than on this README file. You should read the wiki page +and not rely on this README! + +https://backports.wiki.kernel.org + +# License + +This work is a subset of the Linux kernel as such we keep the kernel's +Copyright practice. Some files have their own copyright and in those +cases the license is mentioned in the file. All additional work made +to building this package is licensed under the GPLv2. diff --git a/compat/.gitignore b/compat/.gitignore new file mode 100644 index 00000000..13317962 --- /dev/null +++ b/compat/.gitignore @@ -0,0 +1,16 @@ +*~ +Module.symvers +module.order +.pc +ckmake.log +.config +include/linux/compat_autoconf.h +.tmp_versions/ +compat/*.cmd +compat/*.o +compat/*.mod.c +compat/*.ko +modules.order +modules +*.patch +debs/ diff --git a/compat/COPYRIGHT b/compat/COPYRIGHT new file mode 100644 index 00000000..ca442d31 --- /dev/null +++ b/compat/COPYRIGHT @@ -0,0 +1,356 @@ + + NOTE! This copyright does *not* cover user programs that use kernel + services by normal system calls - this is merely considered normal use + of the kernel, and does *not* fall under the heading of "derived work". + Also note that the GPL below is copyrighted by the Free Software + Foundation, but the instance of code that it refers to (the Linux + kernel) is copyrighted by me and others who actually wrote it. + + Also note that the only valid version of the GPL as far as the kernel + is concerned is _this_ particular version of the license (ie v2, not + v2.2 or v3.x or whatever), unless explicitly otherwise stated. + + Linus Torvalds + +---------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/compat/Makefile b/compat/Makefile index 469025e5..cd4fc213 100644 --- a/compat/Makefile +++ b/compat/Makefile @@ -1,64 +1,84 @@ -ccflags-y += -I$(src) -obj-m += compat.o -#compat-objs := - -obj-$(CONFIG_COMPAT_FIRMWARE_CLASS) += compat_firmware_class.o -obj-$(CONFIG_COMPAT_NET_SCH_CODEL) += sch_codel.o - -sch_fq_codel-y = sch_fq_codel_core.o flow_dissector.o - -obj-$(CONFIG_COMPAT_NET_SCH_FQ_CODEL) += sch_fq_codel.o - -compat-y += main.o - -# Compat kernel compatibility code -compat-$(CONFIG_COMPAT_KERNEL_2_6_14) += compat-2.6.14.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_18) += compat-2.6.18.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_19) += compat-2.6.19.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_21) += compat-2.6.21.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_22) += compat-2.6.22.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_23) += compat-2.6.23.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_24) += compat-2.6.24.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_25) += \ - compat-2.6.25.o \ - pm_qos_params.o - -compat-$(CONFIG_COMPAT_KERNEL_2_6_26) += compat-2.6.26.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_27) += compat-2.6.27.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_28) += compat-2.6.28.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_29) += compat-2.6.29.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_32) += compat-2.6.32.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_33) += compat-2.6.33.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_34) += compat-2.6.34.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_35) += compat-2.6.35.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_36) += compat-2.6.36.o - -compat-$(CONFIG_COMPAT_KFIFO) += kfifo.o - -compat-$(CONFIG_COMPAT_KERNEL_2_6_37) += compat-2.6.37.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_38) += compat-2.6.38.o -compat-$(CONFIG_COMPAT_KERNEL_2_6_39) += \ - compat-2.6.39.o \ - kstrtox.o -compat-$(CONFIG_COMPAT_KERNEL_3_0) += compat-3.0.o -compat-$(CONFIG_COMPAT_KERNEL_3_1) += compat-3.1.o -compat-$(CONFIG_COMPAT_KERNEL_3_2) += compat-3.2.o -compat-$(CONFIG_COMPAT_KERNEL_3_3) += \ - compat-3.3.o -compat-$(CONFIG_COMPAT_KERNEL_3_4) += compat-3.4.o -compat-$(CONFIG_COMPAT_KERNEL_3_5) += \ - compat-3.5.o \ - user_namespace.o -compat-$(CONFIG_COMPAT_KERNEL_3_6) += compat-3.6.o -compat-$(CONFIG_COMPAT_KERNEL_3_7) += compat-3.7.o -compat-$(CONFIG_COMPAT_KERNEL_3_8) += compat-3.8.o -compat-$(CONFIG_COMPAT_KERNEL_3_9) += compat-3.9.o - -compat-$(CONFIG_COMPAT_CORDIC) += cordic.o -compat-$(CONFIG_COMPAT_CRC8) += crc8.o - -ifndef CONFIG_64BIT -ifndef CONFIG_GENERIC_ATOMIC64 - compat-y += compat_atomic.o +export KMODDIR?= updates/ +KMODDIR_ARG:= "INSTALL_MOD_DIR=$(KMODDIR)" +ifneq ($(origin $(KLIB)), undefined) +KMODPATH_ARG:= "INSTALL_MOD_PATH=$(KLIB)" +else +export KLIB:= /lib/modules/$(shell uname -r) endif +export KLIB_BUILD ?= $(KLIB)/build + +DESTDIR?= + +ifeq ($(KERNELRELEASE),) +export PWD := $(shell pwd) +export COMPAT_BASE_TREE := "linux-next.git" +# For this specific tree this is only relevant in +# terms of the last time we synched code up with upstream +# for internal stuff. For other compatability projects this +# would be the git describe of the base tree you are +# working with. +export COMPAT_BASE_TREE_VERSION := "next-20100517" +export COMPAT_VERSION := $(shell git describe) + +# This is used to annotate what version of +# compat.git was used. +export COMPAT_BASE := $(shell git describe) + +# to check config and compat autoconf +export COMPAT_CONFIG=$(PWD)/.config +export COMPAT_AUTOCONF=$(PWD)/include/linux/compat_autoconf.h +export MAKE + +else +# By stuffing this hear we avoid using +# this hackery on modpost, the 2nd section of module building. +# +# This hack lets us put our include path first than the kernel's +# when building our compat modules. Your own makefile would look +# the same. +NOSTDINC_FLAGS := -I$(M)/include/ \ + -include $(M)/include/linux/compat-2.6.h \ + $(CFLAGS) \ + -DCOMPAT_BASE="\"$(COMPAT_BASE)\"" \ + -DCOMPAT_BASE_TREE="\"$(COMPAT_BASE_TREE)\"" \ + -DCOMPAT_BASE_TREE_VERSION="\"$(COMPAT_BASE_TREE_VERSION)\"" \ + -DCOMPAT_PROJECT="\"Generic kernel\"" \ + -DCOMPAT_VERSION="\"$(COMPAT_VERSION)\"" + +# Technicallay we can require the inclusion of COMPAT_CONFIG for +# all targets except clean, so avoid the warnings at clean time. +-include $(COMPAT_CONFIG) endif + +obj-y += compat/ + +all: modules + +modules: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF) + $(MAKE) -C $(KLIB_BUILD) M=$(PWD) modules + @touch modules + +install: modules + $(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \ + modules_install + depmod -a + +$(COMPAT_AUTOCONF): $(COMPAT_CONFIG) + +@$(PWD)/scripts/gen-compat-autoconf.sh $(COMPAT_CONFIG) > $(COMPAT_AUTOCONF) + +$(COMPAT_CONFIG): + +@$(PWD)/scripts/gen-compat-config.sh > $(COMPAT_CONFIG) + +install: modules + +install-ckmake: + @mkdir -p $(DESTDIR)/usr/bin/ + @install bin/ckmake $(DESTDIR)/usr/bin/ + +clean: + $(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean + +clean-files := Module.symvers modules.order Module.markers compat/modules.order +clean-files += modules $(COMPAT_CONFIG) $(COMPAT_AUTOCONF) + +.PHONY: all install clean modules Makefile diff --git a/bin/ckmake b/compat/bin/ckmake index cd9741ae..cd9741ae 100755 --- a/bin/ckmake +++ b/compat/bin/ckmake diff --git a/bin/get-compat-kernels b/compat/bin/get-compat-kernels index 269dfd26..269dfd26 100755 --- a/bin/get-compat-kernels +++ b/compat/bin/get-compat-kernels diff --git a/bin/get-compat-trees b/compat/bin/get-compat-trees index d7812457..d7812457 100755 --- a/bin/get-compat-trees +++ b/compat/bin/get-compat-trees diff --git a/compat/compat/Makefile b/compat/compat/Makefile new file mode 100644 index 00000000..469025e5 --- /dev/null +++ b/compat/compat/Makefile @@ -0,0 +1,64 @@ +ccflags-y += -I$(src) +obj-m += compat.o +#compat-objs := + +obj-$(CONFIG_COMPAT_FIRMWARE_CLASS) += compat_firmware_class.o +obj-$(CONFIG_COMPAT_NET_SCH_CODEL) += sch_codel.o + +sch_fq_codel-y = sch_fq_codel_core.o flow_dissector.o + +obj-$(CONFIG_COMPAT_NET_SCH_FQ_CODEL) += sch_fq_codel.o + +compat-y += main.o + +# Compat kernel compatibility code +compat-$(CONFIG_COMPAT_KERNEL_2_6_14) += compat-2.6.14.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_18) += compat-2.6.18.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_19) += compat-2.6.19.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_21) += compat-2.6.21.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_22) += compat-2.6.22.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_23) += compat-2.6.23.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_24) += compat-2.6.24.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_25) += \ + compat-2.6.25.o \ + pm_qos_params.o + +compat-$(CONFIG_COMPAT_KERNEL_2_6_26) += compat-2.6.26.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_27) += compat-2.6.27.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_28) += compat-2.6.28.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_29) += compat-2.6.29.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_32) += compat-2.6.32.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_33) += compat-2.6.33.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_34) += compat-2.6.34.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_35) += compat-2.6.35.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_36) += compat-2.6.36.o + +compat-$(CONFIG_COMPAT_KFIFO) += kfifo.o + +compat-$(CONFIG_COMPAT_KERNEL_2_6_37) += compat-2.6.37.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_38) += compat-2.6.38.o +compat-$(CONFIG_COMPAT_KERNEL_2_6_39) += \ + compat-2.6.39.o \ + kstrtox.o +compat-$(CONFIG_COMPAT_KERNEL_3_0) += compat-3.0.o +compat-$(CONFIG_COMPAT_KERNEL_3_1) += compat-3.1.o +compat-$(CONFIG_COMPAT_KERNEL_3_2) += compat-3.2.o +compat-$(CONFIG_COMPAT_KERNEL_3_3) += \ + compat-3.3.o +compat-$(CONFIG_COMPAT_KERNEL_3_4) += compat-3.4.o +compat-$(CONFIG_COMPAT_KERNEL_3_5) += \ + compat-3.5.o \ + user_namespace.o +compat-$(CONFIG_COMPAT_KERNEL_3_6) += compat-3.6.o +compat-$(CONFIG_COMPAT_KERNEL_3_7) += compat-3.7.o +compat-$(CONFIG_COMPAT_KERNEL_3_8) += compat-3.8.o +compat-$(CONFIG_COMPAT_KERNEL_3_9) += compat-3.9.o + +compat-$(CONFIG_COMPAT_CORDIC) += cordic.o +compat-$(CONFIG_COMPAT_CRC8) += crc8.o + +ifndef CONFIG_64BIT +ifndef CONFIG_GENERIC_ATOMIC64 + compat-y += compat_atomic.o +endif +endif diff --git a/compat/compat-2.6.14.c b/compat/compat/compat-2.6.14.c index 3de847d9..3de847d9 100644 --- a/compat/compat-2.6.14.c +++ b/compat/compat/compat-2.6.14.c diff --git a/compat/compat-2.6.18.c b/compat/compat/compat-2.6.18.c index c7961eeb..c7961eeb 100644 --- a/compat/compat-2.6.18.c +++ b/compat/compat/compat-2.6.18.c diff --git a/compat/compat-2.6.19.c b/compat/compat/compat-2.6.19.c index 60c34045..60c34045 100644 --- a/compat/compat-2.6.19.c +++ b/compat/compat/compat-2.6.19.c diff --git a/compat/compat-2.6.21.c b/compat/compat/compat-2.6.21.c index 7cf88619..7cf88619 100644 --- a/compat/compat-2.6.21.c +++ b/compat/compat/compat-2.6.21.c diff --git a/compat/compat-2.6.22.c b/compat/compat/compat-2.6.22.c index d4df7b7d..d4df7b7d 100644 --- a/compat/compat-2.6.22.c +++ b/compat/compat/compat-2.6.22.c diff --git a/compat/compat-2.6.23.c b/compat/compat/compat-2.6.23.c index 1a76957d..1a76957d 100644 --- a/compat/compat-2.6.23.c +++ b/compat/compat/compat-2.6.23.c diff --git a/compat/compat-2.6.24.c b/compat/compat/compat-2.6.24.c index 977db0ca..977db0ca 100644 --- a/compat/compat-2.6.24.c +++ b/compat/compat/compat-2.6.24.c diff --git a/compat/compat-2.6.25.c b/compat/compat/compat-2.6.25.c index 20cc3dbd..20cc3dbd 100644 --- a/compat/compat-2.6.25.c +++ b/compat/compat/compat-2.6.25.c diff --git a/compat/compat-2.6.26.c b/compat/compat/compat-2.6.26.c index f4715067..f4715067 100644 --- a/compat/compat-2.6.26.c +++ b/compat/compat/compat-2.6.26.c diff --git a/compat/compat-2.6.27.c b/compat/compat/compat-2.6.27.c index 084bdf6d..084bdf6d 100644 --- a/compat/compat-2.6.27.c +++ b/compat/compat/compat-2.6.27.c diff --git a/compat/compat-2.6.28.c b/compat/compat/compat-2.6.28.c index 0ae8f465..0ae8f465 100644 --- a/compat/compat-2.6.28.c +++ b/compat/compat/compat-2.6.28.c diff --git a/compat/compat-2.6.29.c b/compat/compat/compat-2.6.29.c index 1beb718d..1beb718d 100644 --- a/compat/compat-2.6.29.c +++ b/compat/compat/compat-2.6.29.c diff --git a/compat/compat-2.6.32.c b/compat/compat/compat-2.6.32.c index b5a66a86..b5a66a86 100644 --- a/compat/compat-2.6.32.c +++ b/compat/compat/compat-2.6.32.c diff --git a/compat/compat-2.6.33.c b/compat/compat/compat-2.6.33.c index f584b859..f584b859 100644 --- a/compat/compat-2.6.33.c +++ b/compat/compat/compat-2.6.33.c diff --git a/compat/compat-2.6.34.c b/compat/compat/compat-2.6.34.c index 4b23c817..4b23c817 100644 --- a/compat/compat-2.6.34.c +++ b/compat/compat/compat-2.6.34.c diff --git a/compat/compat-2.6.34.h b/compat/compat/compat-2.6.34.h index b36b441a..b36b441a 100644 --- a/compat/compat-2.6.34.h +++ b/compat/compat/compat-2.6.34.h diff --git a/compat/compat-2.6.35.c b/compat/compat/compat-2.6.35.c index 20fee853..20fee853 100644 --- a/compat/compat-2.6.35.c +++ b/compat/compat/compat-2.6.35.c diff --git a/compat/compat-2.6.36.c b/compat/compat/compat-2.6.36.c index 9295895b..9295895b 100644 --- a/compat/compat-2.6.36.c +++ b/compat/compat/compat-2.6.36.c diff --git a/compat/compat-2.6.37.c b/compat/compat/compat-2.6.37.c index 9f722a62..9f722a62 100644 --- a/compat/compat-2.6.37.c +++ b/compat/compat/compat-2.6.37.c diff --git a/compat/compat-2.6.38.c b/compat/compat/compat-2.6.38.c index 0074ac62..0074ac62 100644 --- a/compat/compat-2.6.38.c +++ b/compat/compat/compat-2.6.38.c diff --git a/compat/compat-2.6.39.c b/compat/compat/compat-2.6.39.c index 5bb93221..5bb93221 100644 --- a/compat/compat-2.6.39.c +++ b/compat/compat/compat-2.6.39.c diff --git a/compat/compat-3.0.c b/compat/compat/compat-3.0.c index e8413730..e8413730 100644 --- a/compat/compat-3.0.c +++ b/compat/compat/compat-3.0.c diff --git a/compat/compat-3.1.c b/compat/compat/compat-3.1.c index cb5d596a..cb5d596a 100644 --- a/compat/compat-3.1.c +++ b/compat/compat/compat-3.1.c diff --git a/compat/compat-3.2.c b/compat/compat/compat-3.2.c index 55ae6af0..55ae6af0 100644 --- a/compat/compat-3.2.c +++ b/compat/compat/compat-3.2.c diff --git a/compat/compat-3.3.c b/compat/compat/compat-3.3.c index 84893446..84893446 100644 --- a/compat/compat-3.3.c +++ b/compat/compat/compat-3.3.c diff --git a/compat/compat-3.4.c b/compat/compat/compat-3.4.c index f8512e45..f8512e45 100644 --- a/compat/compat-3.4.c +++ b/compat/compat/compat-3.4.c diff --git a/compat/compat-3.5.c b/compat/compat/compat-3.5.c index d7f1c275..d7f1c275 100644 --- a/compat/compat-3.5.c +++ b/compat/compat/compat-3.5.c diff --git a/compat/compat-3.6.c b/compat/compat/compat-3.6.c index 113e3a86..113e3a86 100644 --- a/compat/compat-3.6.c +++ b/compat/compat/compat-3.6.c diff --git a/compat/compat-3.7.c b/compat/compat/compat-3.7.c index 226d136a..226d136a 100644 --- a/compat/compat-3.7.c +++ b/compat/compat/compat-3.7.c diff --git a/compat/compat-3.8.c b/compat/compat/compat-3.8.c index 81343234..81343234 100644 --- a/compat/compat-3.8.c +++ b/compat/compat/compat-3.8.c diff --git a/compat/compat-3.9.c b/compat/compat/compat-3.9.c index 1f248421..1f248421 100644 --- a/compat/compat-3.9.c +++ b/compat/compat/compat-3.9.c diff --git a/compat/compat_atomic.c b/compat/compat/compat_atomic.c index b8565aa5..b8565aa5 100644 --- a/compat/compat_atomic.c +++ b/compat/compat/compat_atomic.c diff --git a/compat/compat_firmware_class.c b/compat/compat/compat_firmware_class.c index 9ea5080e..9ea5080e 100644 --- a/compat/compat_firmware_class.c +++ b/compat/compat/compat_firmware_class.c diff --git a/compat/cordic.c b/compat/compat/cordic.c index a6340b6a..a6340b6a 100644 --- a/compat/cordic.c +++ b/compat/compat/cordic.c diff --git a/compat/crc8.c b/compat/compat/crc8.c index 5878171c..5878171c 100644 --- a/compat/crc8.c +++ b/compat/compat/crc8.c diff --git a/compat/flow_dissector.c b/compat/compat/flow_dissector.c index 7dd7ec19..7dd7ec19 100644 --- a/compat/flow_dissector.c +++ b/compat/compat/flow_dissector.c diff --git a/compat/hid-ids.h b/compat/compat/hid-ids.h index c147dc06..c147dc06 100644 --- a/compat/hid-ids.h +++ b/compat/compat/hid-ids.h diff --git a/compat/kfifo.c b/compat/compat/kfifo.c index 96e1bdfd..96e1bdfd 100644 --- a/compat/kfifo.c +++ b/compat/compat/kfifo.c diff --git a/compat/kstrtox.c b/compat/compat/kstrtox.c index fdbc56eb..fdbc56eb 100644 --- a/compat/kstrtox.c +++ b/compat/compat/kstrtox.c diff --git a/compat/main.c b/compat/compat/main.c index 4e72ca55..4e72ca55 100644 --- a/compat/main.c +++ b/compat/compat/main.c diff --git a/compat/pm_qos_params.c b/compat/compat/pm_qos_params.c index 42785ce1..42785ce1 100644 --- a/compat/pm_qos_params.c +++ b/compat/compat/pm_qos_params.c diff --git a/compat/sch_codel.c b/compat/compat/sch_codel.c index 5ad66fbc..5ad66fbc 100644 --- a/compat/sch_codel.c +++ b/compat/compat/sch_codel.c diff --git a/compat/sch_fq_codel_core.c b/compat/compat/sch_fq_codel_core.c index f03df2ab..f03df2ab 100644 --- a/compat/sch_fq_codel_core.c +++ b/compat/compat/sch_fq_codel_core.c diff --git a/compat/user_namespace.c b/compat/compat/user_namespace.c index 0dcc4bcf..0dcc4bcf 100644 --- a/compat/user_namespace.c +++ b/compat/compat/user_namespace.c diff --git a/include/crypto/aes.h b/compat/include/crypto/aes.h index 8031a54d..8031a54d 100644 --- a/include/crypto/aes.h +++ b/compat/include/crypto/aes.h diff --git a/include/linux/atomic.h b/compat/include/linux/atomic.h index 378b748f..378b748f 100644 --- a/include/linux/atomic.h +++ b/compat/include/linux/atomic.h diff --git a/include/linux/average.h b/compat/include/linux/average.h index ece86ca3..ece86ca3 100644 --- a/include/linux/average.h +++ b/compat/include/linux/average.h diff --git a/include/linux/bitops.h b/compat/include/linux/bitops.h index aa76af18..aa76af18 100644 --- a/include/linux/bitops.h +++ b/compat/include/linux/bitops.h diff --git a/include/linux/compat-2.6.14.h b/compat/include/linux/compat-2.6.14.h index 1f19f7fe..1f19f7fe 100644 --- a/include/linux/compat-2.6.14.h +++ b/compat/include/linux/compat-2.6.14.h diff --git a/include/linux/compat-2.6.18.h b/compat/include/linux/compat-2.6.18.h index 5e0182b1..5e0182b1 100644 --- a/include/linux/compat-2.6.18.h +++ b/compat/include/linux/compat-2.6.18.h diff --git a/include/linux/compat-2.6.19.h b/compat/include/linux/compat-2.6.19.h index 1e648c0a..1e648c0a 100644 --- a/include/linux/compat-2.6.19.h +++ b/compat/include/linux/compat-2.6.19.h diff --git a/include/linux/compat-2.6.20.h b/compat/include/linux/compat-2.6.20.h index 14579e29..14579e29 100644 --- a/include/linux/compat-2.6.20.h +++ b/compat/include/linux/compat-2.6.20.h diff --git a/include/linux/compat-2.6.21.h b/compat/include/linux/compat-2.6.21.h index 89ed6d9a..89ed6d9a 100644 --- a/include/linux/compat-2.6.21.h +++ b/compat/include/linux/compat-2.6.21.h diff --git a/include/linux/compat-2.6.22.h b/compat/include/linux/compat-2.6.22.h index 7ca1b18e..7ca1b18e 100644 --- a/include/linux/compat-2.6.22.h +++ b/compat/include/linux/compat-2.6.22.h diff --git a/include/linux/compat-2.6.23.h b/compat/include/linux/compat-2.6.23.h index 37cbc22a..37cbc22a 100644 --- a/include/linux/compat-2.6.23.h +++ b/compat/include/linux/compat-2.6.23.h diff --git a/include/linux/compat-2.6.24.h b/compat/include/linux/compat-2.6.24.h index 5448604c..5448604c 100644 --- a/include/linux/compat-2.6.24.h +++ b/compat/include/linux/compat-2.6.24.h diff --git a/include/linux/compat-2.6.25.h b/compat/include/linux/compat-2.6.25.h index dd986f5c..dd986f5c 100644 --- a/include/linux/compat-2.6.25.h +++ b/compat/include/linux/compat-2.6.25.h diff --git a/include/linux/compat-2.6.26.h b/compat/include/linux/compat-2.6.26.h index b8d9dc64..b8d9dc64 100644 --- a/include/linux/compat-2.6.26.h +++ b/compat/include/linux/compat-2.6.26.h diff --git a/include/linux/compat-2.6.27.h b/compat/include/linux/compat-2.6.27.h index b71a3b57..b71a3b57 100644 --- a/include/linux/compat-2.6.27.h +++ b/compat/include/linux/compat-2.6.27.h diff --git a/include/linux/compat-2.6.28.h b/compat/include/linux/compat-2.6.28.h index 3b5f3ea7..3b5f3ea7 100644 --- a/include/linux/compat-2.6.28.h +++ b/compat/include/linux/compat-2.6.28.h diff --git a/include/linux/compat-2.6.29.h b/compat/include/linux/compat-2.6.29.h index c8cf8987..c8cf8987 100644 --- a/include/linux/compat-2.6.29.h +++ b/compat/include/linux/compat-2.6.29.h diff --git a/include/linux/compat-2.6.30.h b/compat/include/linux/compat-2.6.30.h index 5841b6c8..5841b6c8 100644 --- a/include/linux/compat-2.6.30.h +++ b/compat/include/linux/compat-2.6.30.h diff --git a/include/linux/compat-2.6.31.h b/compat/include/linux/compat-2.6.31.h index 096c1318..096c1318 100644 --- a/include/linux/compat-2.6.31.h +++ b/compat/include/linux/compat-2.6.31.h diff --git a/include/linux/compat-2.6.32.h b/compat/include/linux/compat-2.6.32.h index d5b5df87..d5b5df87 100644 --- a/include/linux/compat-2.6.32.h +++ b/compat/include/linux/compat-2.6.32.h diff --git a/include/linux/compat-2.6.33.h b/compat/include/linux/compat-2.6.33.h index c0be190e..c0be190e 100644 --- a/include/linux/compat-2.6.33.h +++ b/compat/include/linux/compat-2.6.33.h diff --git a/include/linux/compat-2.6.34.h b/compat/include/linux/compat-2.6.34.h index 09d59229..09d59229 100644 --- a/include/linux/compat-2.6.34.h +++ b/compat/include/linux/compat-2.6.34.h diff --git a/include/linux/compat-2.6.35.h b/compat/include/linux/compat-2.6.35.h index 99968bf2..99968bf2 100644 --- a/include/linux/compat-2.6.35.h +++ b/compat/include/linux/compat-2.6.35.h diff --git a/include/linux/compat-2.6.36.h b/compat/include/linux/compat-2.6.36.h index d90b84f6..d90b84f6 100644 --- a/include/linux/compat-2.6.36.h +++ b/compat/include/linux/compat-2.6.36.h diff --git a/include/linux/compat-2.6.37.h b/compat/include/linux/compat-2.6.37.h index 317ae6fe..317ae6fe 100644 --- a/include/linux/compat-2.6.37.h +++ b/compat/include/linux/compat-2.6.37.h diff --git a/include/linux/compat-2.6.38.h b/compat/include/linux/compat-2.6.38.h index 58ec64e5..58ec64e5 100644 --- a/include/linux/compat-2.6.38.h +++ b/compat/include/linux/compat-2.6.38.h diff --git a/include/linux/compat-2.6.39.h b/compat/include/linux/compat-2.6.39.h index e9a2eba8..e9a2eba8 100644 --- a/include/linux/compat-2.6.39.h +++ b/compat/include/linux/compat-2.6.39.h diff --git a/include/linux/compat-2.6.h b/compat/include/linux/compat-2.6.h index 1e9effb7..1e9effb7 100644 --- a/include/linux/compat-2.6.h +++ b/compat/include/linux/compat-2.6.h diff --git a/include/linux/compat-3.0.h b/compat/include/linux/compat-3.0.h index 7fcd763a..7fcd763a 100644 --- a/include/linux/compat-3.0.h +++ b/compat/include/linux/compat-3.0.h diff --git a/include/linux/compat-3.1.h b/compat/include/linux/compat-3.1.h index 3e8be336..3e8be336 100644 --- a/include/linux/compat-3.1.h +++ b/compat/include/linux/compat-3.1.h diff --git a/include/linux/compat-3.10.h b/compat/include/linux/compat-3.10.h index f972203b..f972203b 100644 --- a/include/linux/compat-3.10.h +++ b/compat/include/linux/compat-3.10.h diff --git a/include/linux/compat-3.2.h b/compat/include/linux/compat-3.2.h index 982b9898..982b9898 100644 --- a/include/linux/compat-3.2.h +++ b/compat/include/linux/compat-3.2.h diff --git a/include/linux/compat-3.3.h b/compat/include/linux/compat-3.3.h index ee4b7ce2..ee4b7ce2 100644 --- a/include/linux/compat-3.3.h +++ b/compat/include/linux/compat-3.3.h diff --git a/include/linux/compat-3.4.h b/compat/include/linux/compat-3.4.h index 3866330b..3866330b 100644 --- a/include/linux/compat-3.4.h +++ b/compat/include/linux/compat-3.4.h diff --git a/include/linux/compat-3.5.h b/compat/include/linux/compat-3.5.h index 57b06b04..57b06b04 100644 --- a/include/linux/compat-3.5.h +++ b/compat/include/linux/compat-3.5.h diff --git a/include/linux/compat-3.6.h b/compat/include/linux/compat-3.6.h index d9c964ed..d9c964ed 100644 --- a/include/linux/compat-3.6.h +++ b/compat/include/linux/compat-3.6.h diff --git a/include/linux/compat-3.7.h b/compat/include/linux/compat-3.7.h index 96662e37..96662e37 100644 --- a/include/linux/compat-3.7.h +++ b/compat/include/linux/compat-3.7.h diff --git a/include/linux/compat-3.8.h b/compat/include/linux/compat-3.8.h index 55fdc165..55fdc165 100644 --- a/include/linux/compat-3.8.h +++ b/compat/include/linux/compat-3.8.h diff --git a/include/linux/compat-3.9.h b/compat/include/linux/compat-3.9.h index 240a328d..240a328d 100644 --- a/include/linux/compat-3.9.h +++ b/compat/include/linux/compat-3.9.h diff --git a/include/linux/cordic.h b/compat/include/linux/cordic.h index 7f27b007..7f27b007 100644 --- a/include/linux/cordic.h +++ b/compat/include/linux/cordic.h diff --git a/include/linux/crc8.h b/compat/include/linux/crc8.h index f0a92ef1..f0a92ef1 100644 --- a/include/linux/crc8.h +++ b/compat/include/linux/crc8.h diff --git a/include/linux/export.h b/compat/include/linux/export.h index f7842b7a..f7842b7a 100644 --- a/include/linux/export.h +++ b/compat/include/linux/export.h diff --git a/include/linux/gpio.h b/compat/include/linux/gpio.h index d31e14ee..d31e14ee 100644 --- a/include/linux/gpio.h +++ b/compat/include/linux/gpio.h diff --git a/include/linux/kfifo.h b/compat/include/linux/kfifo.h index 398b00d0..398b00d0 100644 --- a/include/linux/kfifo.h +++ b/compat/include/linux/kfifo.h diff --git a/include/linux/kmemleak.h b/compat/include/linux/kmemleak.h index 83bd199c..83bd199c 100644 --- a/include/linux/kmemleak.h +++ b/compat/include/linux/kmemleak.h diff --git a/include/linux/math64.h b/compat/include/linux/math64.h index eb9e8e15..eb9e8e15 100644 --- a/include/linux/math64.h +++ b/compat/include/linux/math64.h diff --git a/include/linux/of.h b/compat/include/linux/of.h index c5dc87c2..c5dc87c2 100644 --- a/include/linux/of.h +++ b/compat/include/linux/of.h diff --git a/include/linux/olpc-ec.h b/compat/include/linux/olpc-ec.h index a5b932a7..a5b932a7 100644 --- a/include/linux/olpc-ec.h +++ b/compat/include/linux/olpc-ec.h diff --git a/include/linux/pci-aspm.h b/compat/include/linux/pci-aspm.h index 2bc6efb3..2bc6efb3 100644 --- a/include/linux/pci-aspm.h +++ b/compat/include/linux/pci-aspm.h diff --git a/include/linux/pm_qos.h b/compat/include/linux/pm_qos.h index c58c1c1f..c58c1c1f 100644 --- a/include/linux/pm_qos.h +++ b/compat/include/linux/pm_qos.h diff --git a/include/linux/pm_qos_params.h b/compat/include/linux/pm_qos_params.h index 4c8c89ef..4c8c89ef 100644 --- a/include/linux/pm_qos_params.h +++ b/compat/include/linux/pm_qos_params.h diff --git a/include/linux/pm_runtime.h b/compat/include/linux/pm_runtime.h index eec965ba..eec965ba 100644 --- a/include/linux/pm_runtime.h +++ b/compat/include/linux/pm_runtime.h diff --git a/include/linux/printk.h b/compat/include/linux/printk.h index c0822ac4..c0822ac4 100644 --- a/include/linux/printk.h +++ b/compat/include/linux/printk.h diff --git a/include/linux/rfkill.h b/compat/include/linux/rfkill.h index d615ac9f..d615ac9f 100644 --- a/include/linux/rfkill.h +++ b/compat/include/linux/rfkill.h diff --git a/include/linux/semaphore.h b/compat/include/linux/semaphore.h index 78af4db3..78af4db3 100644 --- a/include/linux/semaphore.h +++ b/compat/include/linux/semaphore.h diff --git a/include/linux/tracepoint.h b/compat/include/linux/tracepoint.h index fc44692a..fc44692a 100644 --- a/include/linux/tracepoint.h +++ b/compat/include/linux/tracepoint.h diff --git a/include/linux/u64_stats_sync.h b/compat/include/linux/u64_stats_sync.h index f15116c2..f15116c2 100644 --- a/include/linux/u64_stats_sync.h +++ b/compat/include/linux/u64_stats_sync.h diff --git a/include/linux/uidgid.h b/compat/include/linux/uidgid.h index ae1ed808..ae1ed808 100644 --- a/include/linux/uidgid.h +++ b/compat/include/linux/uidgid.h diff --git a/include/linux/unaligned/access_ok.h b/compat/include/linux/unaligned/access_ok.h index 99c1b4d2..99c1b4d2 100644 --- a/include/linux/unaligned/access_ok.h +++ b/compat/include/linux/unaligned/access_ok.h diff --git a/include/linux/unaligned/be_byteshift.h b/compat/include/linux/unaligned/be_byteshift.h index 9356b242..9356b242 100644 --- a/include/linux/unaligned/be_byteshift.h +++ b/compat/include/linux/unaligned/be_byteshift.h diff --git a/include/linux/unaligned/be_memmove.h b/compat/include/linux/unaligned/be_memmove.h index c2a76c5c..c2a76c5c 100644 --- a/include/linux/unaligned/be_memmove.h +++ b/compat/include/linux/unaligned/be_memmove.h diff --git a/include/linux/unaligned/be_struct.h b/compat/include/linux/unaligned/be_struct.h index 13241583..13241583 100644 --- a/include/linux/unaligned/be_struct.h +++ b/compat/include/linux/unaligned/be_struct.h diff --git a/include/linux/unaligned/generic.h b/compat/include/linux/unaligned/generic.h index 02d97ff3..02d97ff3 100644 --- a/include/linux/unaligned/generic.h +++ b/compat/include/linux/unaligned/generic.h diff --git a/include/linux/unaligned/le_byteshift.h b/compat/include/linux/unaligned/le_byteshift.h index be376fb7..be376fb7 100644 --- a/include/linux/unaligned/le_byteshift.h +++ b/compat/include/linux/unaligned/le_byteshift.h diff --git a/include/linux/unaligned/le_memmove.h b/compat/include/linux/unaligned/le_memmove.h index 269849be..269849be 100644 --- a/include/linux/unaligned/le_memmove.h +++ b/compat/include/linux/unaligned/le_memmove.h diff --git a/include/linux/unaligned/le_struct.h b/compat/include/linux/unaligned/le_struct.h index 088c4572..088c4572 100644 --- a/include/linux/unaligned/le_struct.h +++ b/compat/include/linux/unaligned/le_struct.h diff --git a/include/linux/unaligned/memmove.h b/compat/include/linux/unaligned/memmove.h index eeb5a779..eeb5a779 100644 --- a/include/linux/unaligned/memmove.h +++ b/compat/include/linux/unaligned/memmove.h diff --git a/include/linux/unaligned/packed_struct.h b/compat/include/linux/unaligned/packed_struct.h index 2498bb9f..2498bb9f 100644 --- a/include/linux/unaligned/packed_struct.h +++ b/compat/include/linux/unaligned/packed_struct.h diff --git a/include/linux/vga_switcheroo.h b/compat/include/linux/vga_switcheroo.h index 4bda17bf..4bda17bf 100644 --- a/include/linux/vga_switcheroo.h +++ b/compat/include/linux/vga_switcheroo.h diff --git a/include/linux/wireless.h b/compat/include/linux/wireless.h index 4395b28b..4395b28b 100644 --- a/include/linux/wireless.h +++ b/compat/include/linux/wireless.h diff --git a/include/net/codel.h b/compat/include/net/codel.h index eee0359c..eee0359c 100644 --- a/include/net/codel.h +++ b/compat/include/net/codel.h diff --git a/include/net/flow_keys.h b/compat/include/net/flow_keys.h index a875ee6e..a875ee6e 100644 --- a/include/net/flow_keys.h +++ b/compat/include/net/flow_keys.h diff --git a/include/net/net_namespace.h b/compat/include/net/net_namespace.h index 0f74944b..0f74944b 100644 --- a/include/net/net_namespace.h +++ b/compat/include/net/net_namespace.h diff --git a/include/pcmcia/cistpl.h b/compat/include/pcmcia/cistpl.h index 789dc59d..789dc59d 100644 --- a/include/pcmcia/cistpl.h +++ b/compat/include/pcmcia/cistpl.h diff --git a/include/trace/define_trace.h b/compat/include/trace/define_trace.h index 7d03ccf7..7d03ccf7 100644 --- a/include/trace/define_trace.h +++ b/compat/include/trace/define_trace.h diff --git a/scripts/compat_firmware_install b/compat/scripts/compat_firmware_install index e4b9fb03..e4b9fb03 100755 --- a/scripts/compat_firmware_install +++ b/compat/scripts/compat_firmware_install diff --git a/compat/scripts/gen-compat-autoconf.sh b/compat/scripts/gen-compat-autoconf.sh new file mode 100755 index 00000000..e52cc5aa --- /dev/null +++ b/compat/scripts/gen-compat-autoconf.sh @@ -0,0 +1,105 @@ +#!/bin/bash +# +# Copyright 2012 Luis R. Rodriguez <mcgrof@frijolero.org> +# Copyright 2011 Hauke Mehrtens <hauke@hauke-m.de> +# Copyright 2011 John W. Linville <linville@tuxdriver.com> +# +# Use this to parse a small .config equivalent looking file to generate +# our own autoconf.h. This file has defines for each config option +# just like the kernels include/linux/autoconf.h +# +# XXX: consider using scripts/kconfig/confdata.c instead. +# On the downside this would require the user to have libc though. + +# This indicates which is the oldest kernel we support +# Update this if you are adding support for older kernels. +OLDEST_KERNEL_SUPPORTED="2.6.24" + +if [ $# -ne 1 ]; then + echo "Usage $0 config-file" + exit +fi + +COMPAT_CONFIG="$1" + +if [ ! -f $COMPAT_CONFIG ]; then + echo "File $1 is not a file" + exit +fi + +# Defines a CONFIG_ option if not defined yet, this helps respect +# linux/autoconf.h +function define_config { + VAR=$1 + VALUE=$2 + case $VALUE in + n) # Try to undefine it + echo "#undef $VAR" + ;; + y) + echo "#ifndef $VAR" + echo "#define $VAR 1" + echo "#endif /* $VAR */" + ;; + m) + echo "#ifndef $VAR" + echo "#define $VAR 1" + echo "#endif /* $VAR */" + ;; + *) # Assume string + # XXX: add better checks to make sure what was on + # the right was indeed a string + echo "#ifndef $VAR" + echo "#define $VAR \"$VALUE\"" + echo "#endif /* $VAR */" + ;; + esac +} + +function kernel_version_req { + VERSION=$(echo $1 | sed -e 's/\./,/g') + echo "#if (LINUX_VERSION_CODE < KERNEL_VERSION($VERSION))" + echo "#error compat requirement: Linux >= $VERSION" + echo "#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION($VERSION) */" +} + +cat <<EOF +#ifndef COMPAT_AUTOCONF_INCLUDED +#define COMPAT_AUTOCONF_INCLUDED +/* + * Automatically generated C config: don't edit + */ +EOF + +# Checks user is compiling against a kernel we support +kernel_version_req $OLDEST_KERNEL_SUPPORTED + +# For each CONFIG_FOO=x option +for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else #CONFIG_' $COMPAT_CONFIG | sed 's/ /+/'); do + case $i in + 'ifdef+CONFIG_'* ) + echo "#$i" | sed -e 's/+/ /' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_3_\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(3,\2,0))/' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_2_6_\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,\2))/' -e 's/\(ifdef CONFIG_COMPAT_RHEL_\)\([0-9]*\)_\([0-9]*\)/if (defined(RHEL_MAJOR) \&\& RHEL_MAJOR == \2 \&\& RHEL_MINOR >= \3)/' -e 's/\(#ifdef \)\(CONFIG_[^:space:]*\)/#if defined(\2) || defined(\2_MODULE)/' + continue + ;; + 'ifndef+CONFIG_'* ) + echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_3_\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,\2,0))/' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_2_6_\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,\2))/' -e 's/\(ifndef CONFIG_COMPAT_RHEL_\)\([0-9]*\)_\([0-9]*\)/if (!defined(RHEL_MAJOR) || RHEL_MAJOR != \2 || RHEL_MINOR < \3)/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) \&\& !defined(\2_MODULE)/' + continue + ;; + 'else+#CONFIG_'* | 'endif+#CONFIG_'* ) + echo "#$i */" |sed -e 's/+#/ \/* /g' + continue + ;; + CONFIG_* ) + # Get the element on the left of the "=" + VAR=$(echo $i | cut -d"=" -f 1) + # Get the element on the right of the "=" + VALUE=$(echo $i | cut -d"=" -f 2) + + # Any other module which can *definitely* be built as a module goes here + define_config $VAR $VALUE + continue + ;; + esac +done + +echo "#endif /* COMPAT_AUTOCONF_INCLUDED */" diff --git a/scripts/gen-compat-config.sh b/compat/scripts/gen-compat-config.sh index 8dd6f4c4..8dd6f4c4 100755 --- a/scripts/gen-compat-config.sh +++ b/compat/scripts/gen-compat-config.sh diff --git a/compat/scripts/skip-colors b/compat/scripts/skip-colors new file mode 100755 index 00000000..121626fb --- /dev/null +++ b/compat/scripts/skip-colors @@ -0,0 +1,2 @@ +#!/bin/bash +perl -pe 's|(\e)\[(\d+)(;*)(\d*)(\w)||g' diff --git a/udev/50-compat_firmware.rules b/compat/udev/50-compat_firmware.rules index 6473788e..6473788e 100644 --- a/udev/50-compat_firmware.rules +++ b/compat/udev/50-compat_firmware.rules diff --git a/udev/compat_firmware.sh b/compat/udev/compat_firmware.sh index ef609e71..ef609e71 100755 --- a/udev/compat_firmware.sh +++ b/compat/udev/compat_firmware.sh diff --git a/udev/ubuntu/compat_firmware.sh b/compat/udev/ubuntu/compat_firmware.sh index 9d4659a3..9d4659a3 100755 --- a/udev/ubuntu/compat_firmware.sh +++ b/compat/udev/ubuntu/compat_firmware.sh diff --git a/config.mk b/config.mk new file mode 100644 index 00000000..c21b9b15 --- /dev/null +++ b/config.mk @@ -0,0 +1,751 @@ +ifeq ($(wildcard $(KLIB_BUILD)/.config),) +# These will be ignored by compat autoconf + export CONFIG_PCI=y + export CONFIG_USB=y + export CONFIG_PCMCIA=y + export CONFIG_SSB=m +else +include $(KLIB_BUILD)/.config +endif + +ifneq ($(wildcard $(KLIB_BUILD)/Makefile),) + +KERNEL_VERSION := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p') + +ifneq ($(KERNEL_VERSION),2) +else +KERNEL_26SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p') +endif + +ifdef CONFIG_COMPAT_KERNEL_2_6_24 +$(error "ERROR: compat-drivers by default supports kernels >= 2.6.24, try enabling only one driver though") +endif #CONFIG_COMPAT_KERNEL_2_6_24 + +ifeq ($(CONFIG_CFG80211),y) +$(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.") +endif + + +# 2.6.27 has FTRACE_DYNAMIC borked, so we will complain if +# you have it enabled, otherwise you will very likely run into +# a kernel panic. +# XXX: move this to compat_autoconf.h script generation +ifeq ($(KERNEL_VERSION),2) +ifeq ($(shell test $(KERNEL_VERSION) -eq 2 -a $(KERNEL_26SUBLEVEL) -eq 27 && echo yes),yes) +ifeq ($(CONFIG_DYNAMIC_FTRACE),y) +$(error "ERROR: Your 2.6.27 kernel has CONFIG_DYNAMIC_FTRACE, please upgrade your distribution kernel as newer ones should not have this enabled (and if so report a bug) or remove this warning if you know what you are doing") +endif +endif +endif + +# This is because with CONFIG_MAC80211 include/linux/skbuff.h will +# enable on 2.6.27 a new attribute: +# +# skb->do_not_encrypt +# +# and on 2.6.28 another new attribute: +# +# skb->requeue +# +# In kernel 2.6.32 both attributes were removed. +# +# XXX: move this to compat_autoconf.h script generation +ifeq ($(KERNEL_VERSION),2) +ifeq ($(shell test $(KERNEL_VERSION) -eq 2 -a $(KERNEL_26SUBLEVEL) -ge 27 -a $(KERNEL_26SUBLEVEL) -le 31 && echo yes),yes) +ifeq ($(CONFIG_MAC80211),) +$(error "ERROR: Your >=2.6.27 and <= 2.6.31 kernel has CONFIG_MAC80211 disabled, you should have it CONFIG_MAC80211=m if you want to use this thing.") +endif +endif +endif + +ifneq ($(KERNELRELEASE),) # This prevents a warning + +# We will warn when you don't have MQ support or NET_SCHED enabled. +# +# We could consider just quiting if MQ and NET_SCHED is disabled +# as I suspect all users of this package want 802.11e (WME) and +# 802.11n (HT) support. +ifeq ($(CONFIG_NET_SCHED),) + QOS_REQS_MISSING+=CONFIG_NET_SCHED +endif + +ifneq ($(QOS_REQS_MISSING),) # Complain about our missing dependencies +$(warning "WARNING: You are running a kernel >= 2.6.23, you should enable in it $(QOS_REQS_MISSING) for 802.11[ne] support") +endif + +endif # build check +endif # kernel Makefile check + +# These both are needed by 802.11 and bluetooth so enable + export CONFIG_COMPAT_RFKILL=y + +ifeq ($(CONFIG_MAC80211),y) +$(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular") +else + export CONFIG_COMPAT_WIRELESS=y + export CONFIG_COMPAT_WIRELESS_MODULES=m + export CONFIG_COMPAT_VAR_MODULES=m +# We could technically separate these but not yet, we only have b44 +# Note that we don't intend on backporting network drivers that +# use Multiqueue as that was a pain to backport to kernels older than +# 2.6.27. But -- we could just disable those drivers from kernels +# older than 2.6.27 + export CONFIG_COMPAT_NETWORK_MODULES=m + export CONFIG_COMPAT_NET_USB_MODULES=m +endif + +# The Bluetooth compatibility only builds on kernels >= 2.6.27 for now +ifndef CONFIG_COMPAT_KERNEL_2_6_27 +ifeq ($(CONFIG_BT),y) +# we'll ignore compiling bluetooth +else + export CONFIG_COMPAT_BLUETOOTH=y + export CONFIG_COMPAT_BLUETOOTH_MODULES=m + export CONFIG_HID_GENERIC=m +endif +endif #CONFIG_COMPAT_KERNEL_2_6_27 + +# +# CONFIG_COMPAT_FIRMWARE_CLASS definition has no leading whitespace, +# because it gets passed-on through compat_autoconf.h. +# +ifdef CONFIG_COMPAT_KERNEL_2_6_33 +ifndef CONFIG_COMPAT_RHEL_6_1 +ifdef CONFIG_FW_LOADER +export CONFIG_COMPAT_FIRMWARE_CLASS=m +endif #CONFIG_FW_LOADER +endif #CONFIG_COMPAT_RHEL_6_1 +endif #CONFIG_COMPAT_KERNEL_2_6_33 + +ifdef CONFIG_COMPAT_KERNEL_2_6_36 +ifndef CONFIG_COMPAT_RHEL_6_1 + export CONFIG_COMPAT_KFIFO=y +endif #CONFIG_COMPAT_RHEL_6_1 +endif #CONFIG_COMPAT_KERNEL_2_6_36 + +# +# CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN definitions have no leading +# whitespace, because they get passed-on through compat_autoconf.h. +# +ifndef CONFIG_COMPAT_KERNEL_2_6_33 +export CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN=y +endif #CONFIG_COMPAT_KERNEL_2_6_33 +ifdef CONFIG_COMPAT_RHEL_6_0 +export CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN=y +endif #CONFIG_COMPAT_RHEL_6_0 + +# +# CONFIG_COMPAT_FIRMWARE_DATA_RW_NEEDS_FILP definition has no leading +# whitespace, because it gets passed-on through compat_autoconf.h. +# +ifdef CONFIG_COMPAT_RHEL_6_0 +export CONFIG_COMPAT_FIRMWARE_DATA_RW_NEEDS_FILP=y +endif #CONFIG_COMPAT_RHEL_6_0 + +# Wireless subsystem stuff +export CONFIG_MAC80211=m + +ifndef CONFIG_COMPAT_KERNEL_2_6_33 +export CONFIG_COMPAT_MAC80211_DRIVER_API_TRACER=y +endif #CONFIG_COMPAT_KERNEL_2_6_33 + +# export CONFIG_MAC80211_DEBUGFS=y +# export CONFIG_MAC80211_NOINLINE=y +# export CONFIG_MAC80211_VERBOSE_DEBUG=y +# export CONFIG_MAC80211_MESSAGE_TRACING=y +# export CONFIG_MAC80211_DEBUG_COUNTERS=y + +# export CONFIG_MAC80211_IBSS_DEBUG=y +# export CONFIG_MAC80211_PS_DEBUG=y +# export CONFIG_MAC80211_HT_DEBUG=y +# export CONFIG_MAC80211_MPL_DEBUG=y +# export CONFIG_MAC80211_MPATH_DEBUG=y +# export CONFIG_MAC80211_MHWMP_DEBUG=y +# export CONFIG_MAC80211_MESH_SYNC_DEBUG=y +# export CONFIG_MAC80211_TDLS_DEBUG=y +# export CONFIG_MAC80211_STA_DEBUG=y +# export CONFIG_MAC80211_MLME_DEBUG=y + +# choose between pid and minstrel as default rate control algorithm +export CONFIG_MAC80211_RC_DEFAULT=minstrel_ht +export CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +# export CONFIG_MAC80211_RC_DEFAULT_PID=y +# This is the one used by our compat-drivers net/mac80211/rate.c +# in case you have and old kernel which is overriding this to pid. +export CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht +export CONFIG_MAC80211_RC_PID=y +export CONFIG_MAC80211_RC_MINSTREL=y +export CONFIG_MAC80211_RC_MINSTREL_HT=y +ifdef CONFIG_LEDS_TRIGGERS +export CONFIG_MAC80211_LEDS=y +endif #CONFIG_LEDS_TRIGGERS + +# enable mesh networking too +export CONFIG_MAC80211_MESH=y + +export CONFIG_CFG80211=m +export CONFIG_CFG80211_DEFAULT_PS=y +# export CONFIG_CFG80211_DEBUGFS=y +# export CONFIG_NL80211_TESTMODE=y +# export CONFIG_CFG80211_DEVELOPER_WARNINGS=y +# export CONFIG_CFG80211_REG_DEBUG=y +# export CONFIG_CFG80211_INTERNAL_REGDB=y +# See below for wext stuff + +ifndef CONFIG_COMPAT_KERNEL_2_6_33 +export CONFIG_COMPAT_CFG80211_DRIVER_API_TRACER=y +endif #CONFIG_COMPAT_KERNEL_2_6_33 + +export CONFIG_LIB80211=m +export CONFIG_LIB80211_CRYPT_WEP=m +export CONFIG_LIB80211_CRYPT_CCMP=m +export CONFIG_LIB80211_CRYPT_TKIP=m +# export CONFIG_LIB80211_DEBUG=y + +export CONFIG_BT=m +export CONFIG_BT_RFCOMM=m +ifndef CONFIG_COMPAT_KERNEL_2_6_33 +export CONFIG_COMPAT_BT_RFCOMM_TTY=y +endif #CONFIG_COMPAT_KERNEL_2_6_33 +export CONFIG_BT_BNEP=m +export CONFIG_BT_BNEP_MC_FILTER=y +export CONFIG_BT_BNEP_PROTO_FILTER=y +# CONFIG_BT_CMTP depends on ISDN_CAPI +ifdef CONFIG_ISDN_CAPI +export CONFIG_BT_CMTP=m +endif #CONFIG_ISDN_CAPI +ifndef CONFIG_COMPAT_KERNEL_2_6_28 +export CONFIG_COMPAT_BT_HIDP=m +endif #CONFIG_COMPAT_KERNEL_2_6_28 + +export CONFIG_BT_HCIUART=m +export CONFIG_BT_HCIUART_H4=y +export CONFIG_BT_HCIUART_BCSP=y +export CONFIG_BT_HCIUART_ATH3K=y +export CONFIG_BT_HCIUART_LL=y +export CONFIG_BT_HCIUART_3WIRE=y + +export CONFIG_BT_HCIVHCI=m +export CONFIG_BT_MRVL=m +ifndef CONFIG_COMPAT_KERNEL_2_6_39 +ifdef CONFIG_TI_ST +export CONFIG_BT_WILINK=m +endif #CONFIG_TI_ST +endif #CONFIG_COMPAT_KERNEL_2_6_39 + +ifdef CONFIG_PCMCIA +export CONFIG_BT_HCIDTL1=m +export CONFIG_BT_HCIBT3C=m +export CONFIG_BT_HCIBLUECARD=m +export CONFIG_BT_HCIBTUART=m +endif #CONFIG_PCMCIA + + +# We need CONFIG_WIRELESS_EXT for CONFIG_CFG80211_WEXT for every kernel +# version. The new way CONFIG_CFG80211_WEXT is called from the kernel +# does not work with compat-drivers because it calls some callback +# function on struct wiphy. This struct is shipped with compat-drivers +# and changes from kernel version to version. We are using the +# wireless_handlers attribute which will be activated by +# export CONFIG_WIRELESS_EXT. +ifdef CONFIG_WIRELESS_EXT +export CONFIG_CFG80211_WEXT=y +else #CONFIG_CFG80211_WEXT +$(warning "WARNING: CONFIG_CFG80211_WEXT will be deactivated or not working because kernel was compiled with CONFIG_WIRELESS_EXT=n. Tools using wext interface like iwconfig will not work. To activate it build your kernel e.g. with CONFIG_LIBIPW=m.") +endif #CONFIG_WIRELESS_EXT + +ifdef CONFIG_STAGING +export CONFIG_COMPAT_STAGING=m +endif #CONFIG_STAGING + +ifndef CONFIG_COMPAT_KERNEL_2_6_31 +# mac80211 test driver +export CONFIG_COMPAT_MAC80211_HWSIM=m +endif #CONFIG_COMPAT_KERNEL_2_6_31 + +export CONFIG_ATH5K=m +# export CONFIG_ATH5K_DEBUG=y +# export CONFIG_ATH5K_TRACER=y +# export CONFIG_ATH5K_AHB=y + +export CONFIG_ATH9K=m +export CONFIG_ATH9K_HW=m +export CONFIG_ATH9K_COMMON=m +# export CONFIG_ATH9K_DEBUGFS=y +# export CONFIG_ATH9K_AHB=y + +# Disable this to get minstrel as default, we leave the ath9k +# rate control algorithm as the default for now as that is also +# default upstream on the kernel. We will move this to minstrel +# as default once we get minstrel properly tested and blessed by +# our systems engineering team. CCK rates also need to be used +# for long range considerations. +export CONFIG_COMPAT_ATH9K_RATE_CONTROL=y + +export CONFIG_ATH9K_BTCOEX_SUPPORT=y + +ifndef CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_ATH6KL=m +# export CONFIG_ATH6KL_DEBUG=y +# export CONFIG_ATH6KL_TRACING=y +endif #CONFIG_COMPAT_KERNEL_2_6_27 + +# PCI Drivers +ifdef CONFIG_PCI + +export CONFIG_ATH5K_PCI=y +export CONFIG_ATH9K_PCI=y + +ifndef CONFIG_COMPAT_KERNEL_2_6_31 +export CONFIG_WIL6210=m +export CONFIG_WIL6210_ISR_COR=y +endif #CONFIG_COMPAT_KERNEL_2_6_31 + +export CONFIG_IWLWIFI=m +export CONFIG_IWLDVM=m +export CONFIG_IWLMVM=m +export CONFIG_IWLWIFI_OPMODE_MODULAR=y +export CONFIG_IWLWIFI_P2P=y +# export CONFIG_IWLWIFI_DEBUG=y +# export CONFIG_IWLWIFI_DEBUGFS=y +# export CONFIG_IWLWIFI_DEVICE_TRACING=y +# export CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE=y + +export CONFIG_IWLEGACY=m +export CONFIG_COMPAT_IWL4965=m +export CONFIG_IWL3945=m +# export CONFIG_IWLEGACY_DEBUG=y +# export CONFIG_IWLEGACY_DEBUGFS=y + + +export CONFIG_B43=m +export CONFIG_B43_HWRNG=y +export CONFIG_B43_PCI_AUTOSELECT=y +ifdef CONFIG_PCMCIA +export CONFIG_B43_PCMCIA=y +endif #CONFIG_PCMCIA +ifdef CONFIG_MAC80211_LEDS +export CONFIG_B43_LEDS=y +endif #CONFIG_MAC80211_LEDS +export CONFIG_B43_PHY_LP=y +export CONFIG_B43_PHY_N=y +export CONFIG_B43_PHY_HT=y +# export CONFIG_B43_PHY_LCN=y +# export CONFIG_B43_DEBUG=y + +export CONFIG_B43LEGACY=m +export CONFIG_B43LEGACY_HWRNG=y +export CONFIG_B43LEGACY_PCI_AUTOSELECT=y +ifdef CONFIG_MAC80211_LEDS +export CONFIG_B43LEGACY_LEDS=y +endif #CONFIG_MAC80211_LEDS +# export CONFIG_B43LEGACY_DEBUG=y +export CONFIG_B43LEGACY_DMA=y +export CONFIG_B43LEGACY_PIO=y + +ifdef CONFIG_WIRELESS_EXT +# The Intel ipws +export CONFIG_LIBIPW=m +# export CONFIG_LIBIPW_DEBUG=y + +export CONFIG_IPW2100=m +export CONFIG_IPW2100_MONITOR=y +# export CONFIG_IPW2100_DEBUG=y +export CONFIG_IPW2200=m +export CONFIG_IPW2200_MONITOR=y +export CONFIG_IPW2200_RADIOTAP=y +export CONFIG_IPW2200_PROMISCUOUS=y +export CONFIG_IPW2200_QOS=y +# export CONFIG_IPW2200_DEBUG=y +# The above enables use a second interface prefixed 'rtap'. +# Example usage: +# +# % modprobe ipw2200 rtap_iface=1 +# % ifconfig rtap0 up +# % tethereal -i rtap0 +# +# If you do not specify 'rtap_iface=1' as a module parameter then +# the rtap interface will not be created and you will need to turn +# it on via sysfs: +# +# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface +endif #CONFIG_WIRELESS_EXT + +ifdef CONFIG_SSB +# Sonics Silicon Backplane +export CONFIG_SSB_SPROM=y + +export CONFIG_SSB_BLOCKIO=y +export CONFIG_SSB_PCIHOST=y +export CONFIG_SSB_B43_PCI_BRIDGE=y +ifdef CONFIG_PCMCIA +export CONFIG_SSB_PCMCIAHOST=y +endif #CONFIG_PCMCIA +# export CONFIG_SSB_DEBUG=y +export CONFIG_SSB_DRIVER_PCICORE=y +export CONFIG_B43_SSB=y +endif #CONFIG_SSB + +export CONFIG_BCMA=m +export CONFIG_BCMA_BLOCKIO=y +export CONFIG_BCMA_HOST_PCI=y +# export CONFIG_BCMA_DEBUG=y +export CONFIG_B43_BCMA=y +export CONFIG_B43_BCMA_EXTRA=y + +export CONFIG_P54_PCI=m + +export CONFIG_B44=m +export CONFIG_B44_PCI=y + +export CONFIG_RTL8180=m + +export CONFIG_ADM8211=m + +export CONFIG_RT2X00_LIB_PCI=m +export CONFIG_RT2400PCI=m +export CONFIG_RT2500PCI=m +ifdef CONFIG_CRC_CCITT +export CONFIG_RT2800PCI=m +export CONFIG_RT2800PCI_RT3290=y +export CONFIG_RT2800PCI_RT33XX=y +export CONFIG_RT2800PCI_RT35XX=y +export CONFIG_RT2800PCI_RT53XX=y +endif #CONFIG_CRC_CCITT +NEED_RT2X00=y + +# Two rt2x00 drivers require firmware: rt61pci and rt73usb. They depend on +# CRC to check the firmware. We check here first for the PCI +# driver as we're in the PCI section. +ifdef CONFIG_CRC_ITU_T +export CONFIG_RT61PCI=m +endif #CONFIG_CRC_ITU_T + +export CONFIG_MWL8K=m + +# Ethernet drivers go here +export CONFIG_ATL1=m +export CONFIG_ATL2=m +export CONFIG_ATL1E=m +ifndef CONFIG_COMPAT_KERNEL_2_6_28 +export CONFIG_ATL1C=m +export CONFIG_ALX=m +# If MDIO is needed for another driver feel free to +# make it not depend on 2.6.28 +export CONFIG_COMPAT_MDIO=m +endif #CONFIG_COMPAT_KERNEL_2_6_28 + +ifdef CONFIG_WIRELESS_EXT +export CONFIG_HERMES=m +export CONFIG_HERMES_CACHE_FW_ON_INIT=y +ifdef CONFIG_PPC_PMAC +export CONFIG_APPLE_AIRPORT=m +endif #CONFIG_PPC_PMAC +export CONFIG_PLX_HERMES=m +export CONFIG_TMD_HERMES=m +export CONFIG_NORTEL_HERMES=m +export CONFIG_PCI_HERMES=m +ifdef CONFIG_PCMCIA +export CONFIG_PCMCIA_HERMES=m +export CONFIG_PCMCIA_SPECTRUM=m +endif #CONFIG_PCMCIA +endif #CONFIG_WIRELESS_EXT + +export CONFIG_RTL8192CE=m +export CONFIG_RTL8192SE=m +export CONFIG_RTL8192DE=m +export CONFIG_RTL8723AE=m + +export CONFIG_BRCMSMAC=m + +export CONFIG_MWIFIEX_PCIE=m + +endif #CONFIG_PCI +## end of PCI + +ifdef CONFIG_PCMCIA + +ifdef CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_LIBERTAS=n +export CONFIG_LIBERTAS_CS=n +else #CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_LIBERTAS_CS=m +NEED_LIBERTAS=y +endif #CONFIG_COMPAT_KERNEL_2_6_27 + +endif #CONFIG_PCMCIA +## end of PCMCIA + +# This is required for some cards +export CONFIG_EEPROM_93CX6=m + +# USB Drivers +ifdef CONFIG_USB +ifndef CONFIG_COMPAT_KERNEL_2_6_29 +export CONFIG_COMPAT_ZD1211RW=m +# export CONFIG_ZD1211RW_DEBUG=y +endif #CONFIG_COMPAT_KERNEL_2_6_29 + +# Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat... + +# Wireless RNDIS USB support (RTL8185 802.11g) A-Link WL54PC +# All of these devices are based on Broadcom 4320 chip which +# is only wireless RNDIS chip known to date. +# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER +# it also requires new RNDIS_HOST and CDC_ETHER modules which we add +ifdef CONFIG_COMPAT_KERNEL_2_6_29 +export CONFIG_USB_COMPAT_USBNET=n +export CONFIG_USB_NET_COMPAT_RNDIS_HOST=n +export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n +export CONFIG_USB_NET_COMPAT_CDCETHER=n +else #CONFIG_COMPAT_KERNEL_2_6_29 +export CONFIG_USB_COMPAT_USBNET=m +ifdef CONFIG_USB_NET_CDCETHER +export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m +export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m +endif #CONFIG_USB_NET_CDCETHER +ifdef CONFIG_USB_NET_CDCETHER_MODULE +export CONFIG_USB_NET_COMPAT_RNDIS_HOST=m +export CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m +endif #CONFIG_USB_NET_CDCETHER +export CONFIG_USB_NET_COMPAT_CDCETHER=m +endif #CONFIG_COMPAT_KERNEL_2_6_29 + + +export CONFIG_P54_USB=m +export CONFIG_RTL8187=m +ifdef CONFIG_MAC80211_LEDS +export CONFIG_RTL8187_LEDS=y +endif #CONFIG_MAC80211_LEDS + +export CONFIG_AT76C50X_USB=m + +ifndef CONFIG_COMPAT_KERNEL_2_6_29 +export CONFIG_CARL9170=m +ifdef CONFIG_MAC80211_LEDS +export CONFIG_CARL9170_LEDS=y +endif #CONFIG_MAC80211_LEDS +# export CONFIG_CARL9170_DEBUGFS=y +export CONFIG_CARL9170_WPC=y +endif #CONFIG_COMPAT_KERNEL_2_6_29 + +# This activates a threading fix for usb urb. +# this is mainline commit: b3e670443b7fb8a2d29831b62b44a039c283e351 +# This fix will be included in some stable releases. +export CONFIG_COMPAT_USB_URB_THREAD_FIX=y + +export CONFIG_ATH9K_HTC=m +# export CONFIG_ATH9K_HTC_DEBUGFS=y + +export CONFIG_ATH6KL_USB=m + +export CONFIG_AR5523=m + +export CONFIG_BRCMFMAC_USB=y + +# RT2500USB does not require firmware +export CONFIG_RT2500USB=m +ifdef CONFIG_CRC_CCITT +export CONFIG_RT2800USB=m +export CONFIG_RT2800USB_RT33XX=y +export CONFIG_RT2800USB_RT35XX=y +export CONFIG_RT2800USB_RT53XX=y +export CONFIG_RT2800USB_RT55XX=y +export CONFIG_RT2800USB_UNKNOWN=y +endif #CONFIG_CRC_CCITT +export CONFIG_RT2X00_LIB_USB=m +NEED_RT2X00=y +# RT73USB requires firmware +ifdef CONFIG_CRC_ITU_T +export CONFIG_RT73USB=m +endif #CONFIG_CRC_ITU_T + +ifdef CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_LIBERTAS_THINFIRM_USB=n +export CONFIG_LIBERTAS_USB=n +NEED_LIBERTAS=n +else #CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_LIBERTAS_THINFIRM_USB=m +export CONFIG_LIBERTAS_USB=m +NEED_LIBERTAS=y +endif #CONFIG_COMPAT_KERNEL_2_6_27 + +export CONFIG_ORINOCO_USB=m + +export CONFIG_BT_HCIBTUSB=m +export CONFIG_BT_HCIBCM203X=m +export CONFIG_BT_HCIBPA10X=m +export CONFIG_BT_HCIBFUSB=m +export CONFIG_BT_ATH3K=m + +export CONFIG_RTL8192CU=m + +export CONFIG_MWIFIEX_USB=m + +endif #CONFIG_USB end of USB driver list + +ifdef CONFIG_SPI_MASTER +ifndef CONFIG_COMPAT_KERNEL_2_6_25 + +ifdef CONFIG_CRC7 +ifndef CONFIG_COMPAT_KERNEL_2_6_37 +export CONFIG_COMPAT_WL1251_SPI=m +endif #CONFIG_COMPAT_KERNEL_2_6_37 +export CONFIG_WLCORE_SPI=m +endif #CONFIG_CRC7 +export CONFIG_P54_SPI=m + +ifdef CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_LIBERTAS_SPI=n +NEED_LIBERTAS=n +else #CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_LIBERTAS_SPI=m +NEED_LIBERTAS=y +endif #CONFIG_COMPAT_KERNEL_2_6_27 + +endif #CONFIG_COMPAT_KERNEL_2_6_25 +endif #CONFIG_SPI_MASTER end of SPI driver list + +ifdef CONFIG_MMC + +export CONFIG_SSB_SDIOHOST=y +export CONFIG_B43_SDIO=y + +ifdef CONFIG_CRC7 +ifdef CONFIG_WL12XX_PLATFORM_DATA +ifndef CONFIG_COMPAT_KERNEL_2_6_37 +export CONFIG_COMPAT_WL1251_SDIO=m +endif #CONFIG_COMPAT_KERNEL_2_6_37 +ifndef CONFIG_COMPAT_KERNEL_2_6_38 +export CONFIG_WLCORE_SDIO=m +endif #CONFIG_COMPAT_KERNEL_2_6_38 +endif #CONFIG_WL12XX_PLATFORM_DATA +endif #CONFIG_CRC7 + +export CONFIG_MWIFIEX_SDIO=m + +ifndef CONFIG_COMPAT_KERNEL_2_6_32 +export CONFIG_COMPAT_LIBERTAS_SDIO=m +NEED_LIBERTAS=y +endif #CONFIG_COMPAT_KERNEL_2_6_32 + +export CONFIG_BT_HCIBTSDIO=m +export CONFIG_BT_MRVL_SDIO=m + +export CONFIG_ATH6KL_SDIO=m + +export CONFIG_BRCMFMAC_SDIO=y + +endif #CONFIG_MMC + +export CONFIG_RTLWIFI=m +# export CONFIG_RTLWIFI_DEBUG=y +export CONFIG_RTL8192C_COMMON=m + +# Common rt2x00 requirements +ifeq ($(NEED_RT2X00),y) +export CONFIG_RT2X00=y +export CONFIG_RT2X00_LIB=m +export CONFIG_RT2800_LIB=m +export CONFIG_RT2X00_LIB_FIRMWARE=y +export CONFIG_RT2X00_LIB_CRYPTO=y +# export CONFIG_RT2X00_LIB_SOC=y +ifdef CONFIG_COMPAT_KERNEL_2_6_25 +export CONFIG_RT2X00_LIB_LEDS=n +else #CONFIG_COMPAT_KERNEL_2_6_25 +ifdef CONFIG_LEDS_CLASS +export CONFIG_RT2X00_LIB_LEDS=y +endif #CONFIG_LEDS_CLASS +endif #CONFIG_COMPAT_KERNEL_2_6_25 +# export CONFIG_RT2X00_DEBUG=y +# export CONFIG_RT2X00_LIB_DEBUGFS=y +endif + +# p54 +export CONFIG_P54_COMMON=m +ifdef CONFIG_MAC80211_LEDS +export CONFIG_P54_LEDS=y +endif #CONFIG_MAC80211_LEDS + +# Atheros +export CONFIG_ATH_COMMON=m +export CONFIG_ATH_CARDS=m +# export CONFIG_ATH_DEBUG=y + +export CONFIG_BRCMUTIL=m +# export CONFIG_BRCMDBG=y + +ifndef CONFIG_COMPAT_KERNEL_2_6_29 +export CONFIG_BRCMFMAC=m +endif #CONFIG_COMPAT_KERNEL_2_6_29 + +ifndef CONFIG_COMPAT_KERNEL_2_6_30 + +export CONFIG_WL_TI=y +export CONFIG_WLCORE=m + +ifdef CONFIG_CRC7 +export CONFIG_WL1251=m +export CONFIG_WL12XX=m +export CONFIG_WL18XX=m +endif #CONFIG_CRC7 + +endif #CONFIG_COMPAT_KERNEL_2_6_30 + +ifndef CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_COMPAT_MWIFIEX=m +endif #CONFIG_COMPAT_KERNEL_2_6_27 + +ifndef CONFIG_CORDIC +export CONFIG_COMPAT_CORDIC=y +endif #CONFIG_CORDIC + +ifndef CONFIG_CRC8 +export CONFIG_COMPAT_CRC8=y +endif #CONFIG_CRC8 + +ifdef CONFIG_COMPAT_KERNEL_2_6_27 +export CONFIG_LIBERTAS=n +else #CONFIG_COMPAT_KERNEL_2_6_27 +ifeq ($(NEED_LIBERTAS),y) +export CONFIG_LIBERTAS_THINFIRM=m +export CONFIG_LIBERTAS=m +export CONFIG_LIBERTAS_MESH=y +# export CONFIG_LIBERTAS_DEBUG=y +endif +endif #CONFIG_COMPAT_KERNEL_2_6_27 + +# We need the backported rfkill module on kernel < 2.6.31. +# In more recent kernel versions use the in kernel rfkill module. +ifdef CONFIG_COMPAT_KERNEL_2_6_31 +export CONFIG_RFKILL_BACKPORT=m +ifdef CONFIG_LEDS_TRIGGERS +export CONFIG_RFKILL_BACKPORT_LEDS=y +endif #CONFIG_LEDS_TRIGGERS +export CONFIG_RFKILL_BACKPORT_INPUT=y +endif #CONFIG_COMPAT_KERNEL_2_6_31 + +# compilation has been tested down to 3.0 but run time +# tests have only started on 3.2. +ifndef CONFIG_COMPAT_KERNEL_3_2 +# Basic DRM support +export CONFIG_COMPAT_HDMI=m +export CONFIG_COMPAT_VIDEO_MODULES=y +export CONFIG_COMPAT_DRM=m +export CONFIG_COMPAT_DRM_TTM=m +export CONFIG_COMPAT_DRM_KMS_HELPER=m +export CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE=y +# Intel i915 +export CONFIG_COMPAT_DRM_I915=m +# ATI/AMD Radeon +export CONFIG_COMPAT_DRM_RADEON=m +export CONFIG_COMPAT_DRM_RADEON_KMS=y +endif #CONFIG_COMPAT_KERNEL_3_2 + +# Enable nouveau on >= 3.3 +ifndef CONFIG_COMPAT_KERNEL_3_3 +export CONFIG_COMPAT_DRM_NOUVEAU=m +export CONFIG_COMPAT_DRM_NOUVEAU_BACKLIGHT=y +export CONFIG_COMPAT_NOUVEAU_DEBUG=5 +export CONFIG_COMPAT_NOUVEAU_DEBUG_DEFAULT=3 +endif #CONFIG_COMPAT_KERNEL_3_3 diff --git a/enable-older-kernels/README b/enable-older-kernels/README new file mode 100644 index 00000000..c26e35a8 --- /dev/null +++ b/enable-older-kernels/README @@ -0,0 +1,12 @@ +compat-drivers as a whole aims to always be compiled and used with the +oldest stable kernel supported by kernel.org. This will be the oldest +stable kernel on the 2.6. series listed on the kernel.org front page. +Sometimes we'll go even beyond that. + +Backporting compat-drivers involves backporting some subsystems but +at times we may want to support compiling only certain drivers on older +kernels since its easier to backport some subsystems. Such is the case +with PCI drivers. This directly exists to allow developers enable +compilation of compat-drivers on older drivers using ./scripts/driver-select +Upon selection of a driver a patch from this directly will be applied to +allow further compilation of one driver onto even older kernels. diff --git a/enable-older-kernels/enable-2.6.21.patch b/enable-older-kernels/enable-2.6.21.patch new file mode 100644 index 00000000..83e1daf2 --- /dev/null +++ b/enable-older-kernels/enable-2.6.21.patch @@ -0,0 +1,26 @@ +--- a/config.mk ++++ b/config.mk +@@ -33,9 +33,9 @@ endif + COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done) + $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3_$(ver)=y)) + +-ifdef CONFIG_COMPAT_KERNEL_2_6_24 +-$(error "ERROR: compat-drivers by default supports kernels >= 2.6.24, try enabling only one driver though") +-endif #CONFIG_COMPAT_KERNEL_2_6_24 ++ifdef CONFIG_COMPAT_KERNEL_2_6_21 ++$(error "ERROR: compat-drivers by default supports kernels >= 2.6.21, try enabling only one driver though") ++endif #CONFIG_COMPAT_KERNEL_2_6_21 + + ifeq ($(CONFIG_CFG80211),y) + $(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.") +--- a/scripts/gen-compat-autoconf.sh ++++ b/scripts/gen-compat-autoconf.sh +@@ -11,7 +11,7 @@ + + # This indicates which is the oldest kernel we support + # Update this if you are adding support for older kernels. +-OLDEST_KERNEL_SUPPORTED="2.6.24" ++OLDEST_KERNEL_SUPPORTED="2.6.21" + COMPAT_RELEASE=".compat_version" + KERNEL_RELEASE=".compat_base_tree_version" + MULT_DEP_FILE=".compat_pivot_dep" diff --git a/enable-older-kernels/enable-2.6.22.patch b/enable-older-kernels/enable-2.6.22.patch new file mode 100644 index 00000000..9caebbac --- /dev/null +++ b/enable-older-kernels/enable-2.6.22.patch @@ -0,0 +1,26 @@ +--- a/config.mk ++++ b/config.mk +@@ -33,9 +33,9 @@ endif + COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done) + $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3_$(ver)=y)) + +-ifdef CONFIG_COMPAT_KERNEL_2_6_24 +-$(error "ERROR: compat-drivers by default supports kernels >= 2.6.24, try enabling only one driver though") +-endif #CONFIG_COMPAT_KERNEL_2_6_24 ++ifdef CONFIG_COMPAT_KERNEL_2_6_22 ++$(error "ERROR: compat-drivers by default supports kernels >= 2.6.22, try enabling only one driver though") ++endif #CONFIG_COMPAT_KERNEL_2_6_22 + + ifeq ($(CONFIG_CFG80211),y) + $(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.") +--- a/scripts/gen-compat-autoconf.sh ++++ b/scripts/gen-compat-autoconf.sh +@@ -11,7 +11,7 @@ + + # This indicates which is the oldest kernel we support + # Update this if you are adding support for older kernels. +-OLDEST_KERNEL_SUPPORTED="2.6.24" ++OLDEST_KERNEL_SUPPORTED="2.6.22" + COMPAT_RELEASE=".compat_version" + KERNEL_RELEASE=".compat_base_tree_version" + MULT_DEP_FILE=".compat_pivot_dep" diff --git a/enable-older-kernels/enable-2.6.23.patch b/enable-older-kernels/enable-2.6.23.patch new file mode 100644 index 00000000..f36bba7f --- /dev/null +++ b/enable-older-kernels/enable-2.6.23.patch @@ -0,0 +1,26 @@ +--- a/config.mk ++++ b/config.mk +@@ -33,9 +33,9 @@ endif + COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done) + $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3_$(ver)=y)) + +-ifdef CONFIG_COMPAT_KERNEL_2_6_24 +-$(error "ERROR: compat-drivers by default supports kernels >= 2.6.24, try enabling only one driver though") +-endif #CONFIG_COMPAT_KERNEL_2_6_24 ++ifdef CONFIG_COMPAT_KERNEL_2_6_23 ++$(error "ERROR: compat-drivers by default supports kernels >= 2.6.23, try enabling only one driver though") ++endif #CONFIG_COMPAT_KERNEL_2_6_23 + + ifeq ($(CONFIG_CFG80211),y) + $(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.") +--- a/scripts/gen-compat-autoconf.sh ++++ b/scripts/gen-compat-autoconf.sh +@@ -11,7 +11,7 @@ + + # This indicates which is the oldest kernel we support + # Update this if you are adding support for older kernels. +-OLDEST_KERNEL_SUPPORTED="2.6.24" ++OLDEST_KERNEL_SUPPORTED="2.6.23" + COMPAT_RELEASE=".compat_version" + KERNEL_RELEASE=".compat_base_tree_version" + MULT_DEP_FILE=".compat_pivot_dep" diff --git a/patches/collateral-evolutions/README b/patches/collateral-evolutions/README new file mode 100644 index 00000000..4580c0e5 --- /dev/null +++ b/patches/collateral-evolutions/README @@ -0,0 +1,16 @@ + +compat-drivers collateral evolutions patches +============================================ + +You must have a really good reason to be adding files +in this directory. Your reasoning should either match the +explanation already present on the top of each patch file +or you should add your own. + +We try to avoid having patch files because: + + * Its a pain in the ass to maintain them. + + * Most backport changes can be pulled off through + some macro magic or new files which implement + the new functionality on the old kernels. diff --git a/patches/collateral-evolutions/drm/0001-fb-info-vt_switch.patch b/patches/collateral-evolutions/drm/0001-fb-info-vt_switch.patch new file mode 100644 index 00000000..ae1b2cb3 --- /dev/null +++ b/patches/collateral-evolutions/drm/0001-fb-info-vt_switch.patch @@ -0,0 +1,55 @@ +Commit 3cf2667 as of next-20130301 extended the struct fb_info +with a skip_vt_switch to allow drivers to skip the VT switch +at suspend/resume time. For older kernels we can skip this +as all this switch does is call pm_vt_switch_required() with true +or false depending on this new flag and later +pm_vt_switch_unregister() would not have been made. + +This patch cannot be broken down further so I'm pegging +this as the first one with 4 digits under the DRM folder +for collateral evolutions. This reflects its as atomic as +is possible. + +Relevant commits below, starting with the first one that +added this new collateral evolution. + +commit 3cf2667b9f8b2c2fe298a427deb399e52321da6b +Author: Jesse Barnes <jbarnes@virtuousgeek.org> +Date: Mon Feb 4 13:37:21 2013 +0000 + + fb: add support for drivers not needing VT switch at suspend/resume time + + Use the new PM routines to indicate whether we need to VT switch at suspend + and resume time. When a new driver is bound, set its flag accordingly, + and when unbound, remove it from the PM's console tracking list. + + Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> + Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> + Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> + +commit 24576d23976746cb52e7700c4cadbf4bc1bc3472 +Author: Jesse Barnes <jbarnes@virtuousgeek.org> +Date: Tue Mar 26 09:25:45 2013 -0700 + + drm/i915: enable VT switchless resume v3 + + With the other bits in place, we can do this safely. + + v2: disable backlight on suspend to prevent premature enablement on resume + v3: disable CRTCs on suspend to allow RTD3 (Kristen) + + Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> + Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> + Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> + +--- a/drivers/gpu/drm/i915/intel_fb.c ++++ b/drivers/gpu/drm/i915/intel_fb.c +@@ -151,7 +151,7 @@ static int intelfb_create(struct drm_fb_ + info->screen_size = size; + + /* This driver doesn't need a VT switch to restore the mode on resume */ +- info->skip_vt_switch = true; ++ fb_enable_skip_vt_switch(info); + + drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth); + drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height); diff --git a/patches/collateral-evolutions/drm/01-dma_buf_ops-addition.patch b/patches/collateral-evolutions/drm/01-dma_buf_ops-addition.patch new file mode 100644 index 00000000..3493e12b --- /dev/null +++ b/patches/collateral-evolutions/drm/01-dma_buf_ops-addition.patch @@ -0,0 +1,41 @@ +Assign vmap, vunmap and mmap fields in dma_buf_ops structs only +if kernel version >= 3.5.0 as they are added in 3.5. The begin_cpu_access +was added as of the original dma-buf code via 3.4. + +mcgrof@frijol ~/linux-next (git::master)$ git describe --contains fc13020e086bfedf2afb95c91c026d5af1f80107 +v3.4-rc1~57^2~3 + +Note that the dma-buf itself was added with 3.4. It is not available +on kernels < 3.4. + +--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c ++++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c +@@ -216,10 +216,14 @@ static const struct dma_buf_ops i915_dma + .kmap_atomic = i915_gem_dmabuf_kmap_atomic, + .kunmap = i915_gem_dmabuf_kunmap, + .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .mmap = i915_gem_dmabuf_mmap, + .vmap = i915_gem_dmabuf_vmap, + .vunmap = i915_gem_dmabuf_vunmap, ++#endif ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + .begin_cpu_access = i915_gem_begin_cpu_access, ++#endif + }; + + struct dma_buf *i915_gem_prime_export(struct drm_device *dev, +--- a/drivers/gpu/drm/drm_prime.c ++++ b/drivers/gpu/drm/drm_prime.c +@@ -152,9 +152,11 @@ static const struct dma_buf_ops drm_gem_ + .kmap_atomic = drm_gem_dmabuf_kmap_atomic, + .kunmap = drm_gem_dmabuf_kunmap, + .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .mmap = drm_gem_dmabuf_mmap, + .vmap = drm_gem_dmabuf_vmap, + .vunmap = drm_gem_dmabuf_vunmap, ++#endif + }; + + /** diff --git a/patches/collateral-evolutions/drm/02-revert-vm_mmap.patch b/patches/collateral-evolutions/drm/02-revert-vm_mmap.patch new file mode 100644 index 00000000..81fc1cc9 --- /dev/null +++ b/patches/collateral-evolutions/drm/02-revert-vm_mmap.patch @@ -0,0 +1,94 @@ +vm_mmap() and vm_munmap() were introduced in kernels >= 3.4.0. Revert +those changes for versions older than that. + +These can't be backported as they rely on non-exported symbols. + +--- a/drivers/gpu/drm/drm_bufs.c ++++ b/drivers/gpu/drm/drm_bufs.c +@@ -1541,6 +1541,20 @@ int drm_mapbufs(struct drm_device *dev, + retcode = -EINVAL; + goto done; + } ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) ++ down_write(¤t->mm->mmap_sem); ++ virtual = do_mmap(file_priv->filp, 0, map->size, ++ PROT_READ | PROT_WRITE, ++ MAP_SHARED, ++ token); ++ up_write(¤t->mm->mmap_sem); ++ } else { ++ down_write(¤t->mm->mmap_sem); ++ virtual = do_mmap(file_priv->filp, 0, dma->byte_count, ++ PROT_READ | PROT_WRITE, ++ MAP_SHARED, 0); ++ up_write(¤t->mm->mmap_sem); ++#else + virtual = vm_mmap(file_priv->filp, 0, map->size, + PROT_READ | PROT_WRITE, + MAP_SHARED, +@@ -1549,6 +1563,7 @@ int drm_mapbufs(struct drm_device *dev, + virtual = vm_mmap(file_priv->filp, 0, dma->byte_count, + PROT_READ | PROT_WRITE, + MAP_SHARED, 0); ++#endif + } + if (virtual > -1024UL) { + /* Real error */ +--- a/drivers/gpu/drm/i810/i810_dma.c ++++ b/drivers/gpu/drm/i810/i810_dma.c +@@ -135,9 +135,17 @@ static int i810_map_buffer(struct drm_bu + old_fops = file_priv->filp->f_op; + file_priv->filp->f_op = &i810_buffer_fops; + dev_priv->mmap_buffer = buf; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) ++ down_write(¤t->mm->mmap_sem); ++ buf_priv->virtual = (void *)do_mmap(file_priv->filp, 0, buf->total, ++ PROT_READ | PROT_WRITE, ++ MAP_SHARED, buf->bus_address); ++ up_write(¤t->mm->mmap_sem); ++#else + buf_priv->virtual = (void *)vm_mmap(file_priv->filp, 0, buf->total, + PROT_READ | PROT_WRITE, + MAP_SHARED, buf->bus_address); ++#endif + dev_priv->mmap_buffer = NULL; + file_priv->filp->f_op = old_fops; + if (IS_ERR(buf_priv->virtual)) { +@@ -158,9 +166,15 @@ static int i810_unmap_buffer(struct drm_ + if (buf_priv->currently_mapped != I810_BUF_MAPPED) + return -EINVAL; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) ++ down_write(¤t->mm->mmap_sem); ++ retcode = do_munmap(current->mm, (unsigned long)buf_priv->virtual, ++ (size_t) buf->total); ++ up_write(¤t->mm->mmap_sem); ++#else + retcode = vm_munmap((unsigned long)buf_priv->virtual, + (size_t) buf->total); +- ++#endif + buf_priv->currently_mapped = I810_BUF_UNMAPPED; + buf_priv->virtual = NULL; + +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -1294,10 +1294,17 @@ i915_gem_mmap_ioctl(struct drm_device *d + drm_gem_object_unreference_unlocked(obj); + return -EINVAL; + } +- ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) ++ down_write(¤t->mm->mmap_sem); ++ addr = do_mmap(obj->filp, 0, args->size, ++ PROT_READ | PROT_WRITE, MAP_SHARED, ++ args->offset); ++ up_write(¤t->mm->mmap_sem); ++#else + addr = vm_mmap(obj->filp, 0, args->size, + PROT_READ | PROT_WRITE, MAP_SHARED, + args->offset); ++#endif + drm_gem_object_unreference_unlocked(obj); + if (IS_ERR((void *)addr)) + return addr; diff --git a/patches/collateral-evolutions/drm/03-swiotlb.patch b/patches/collateral-evolutions/drm/03-swiotlb.patch new file mode 100644 index 00000000..8554da54 --- /dev/null +++ b/patches/collateral-evolutions/drm/03-swiotlb.patch @@ -0,0 +1,83 @@ + +swiotlb_nr_tbl() was available since 3.2 but was exported since 3.3. +Since it uses an internal global state variable, it is impossible +to backport it to compat.git. So revert the changes. + +--- a/drivers/gpu/drm/nouveau/nouveau_bo.c ++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c +@@ -1374,11 +1374,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t + } + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) + #ifdef CONFIG_SWIOTLB + if (swiotlb_nr_tbl()) { + return ttm_dma_populate((void *)ttm, dev->dev); + } + #endif ++#endif + + r = ttm_pool_populate(ttm); + if (r) { +@@ -1424,12 +1426,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt + } + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) + #ifdef CONFIG_SWIOTLB + if (swiotlb_nr_tbl()) { + ttm_dma_unpopulate((void *)ttm, dev->dev); + return; + } + #endif ++#endif + + for (i = 0; i < ttm->num_pages; i++) { + if (ttm_dma->dma_address[i]) { +--- a/drivers/gpu/drm/radeon/radeon_ttm.c ++++ b/drivers/gpu/drm/radeon/radeon_ttm.c +@@ -603,11 +603,13 @@ static int radeon_ttm_tt_populate(struct + } + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) + #ifdef CONFIG_SWIOTLB + if (swiotlb_nr_tbl()) { + return ttm_dma_populate(>t->ttm, rdev->dev); + } + #endif ++#endif + + r = ttm_pool_populate(ttm); + if (r) { +@@ -649,12 +651,14 @@ static void radeon_ttm_tt_unpopulate(str + } + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) + #ifdef CONFIG_SWIOTLB + if (swiotlb_nr_tbl()) { + ttm_dma_unpopulate(>t->ttm, rdev->dev); + return; + } + #endif ++#endif + + for (i = 0; i < ttm->num_pages; i++) { + if (gtt->ttm.dma_address[i]) { +@@ -877,6 +881,7 @@ static int radeon_ttm_debugfs_init(struc + radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs; + radeon_mem_types_list[i].driver_features = 0; + radeon_mem_types_list[i++].data = NULL; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) + #ifdef CONFIG_SWIOTLB + if (swiotlb_nr_tbl()) { + sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool"); +@@ -886,6 +891,7 @@ static int radeon_ttm_debugfs_init(struc + radeon_mem_types_list[i++].data = NULL; + } + #endif ++#endif + return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i); + + #endif diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch new file mode 100644 index 00000000..5ceeb790 --- /dev/null +++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch @@ -0,0 +1,347 @@ +Disable PRIME support in core drm, radeon, nouveau and i915 for +kernels < 3.4.0. + +PRIME depends on dma-buf which is added to the kernel with 3.3 but +the one in 3.3 is mostly stub, e.g. it is a skeleton API which +is highly modified in 3.4. So disable PRIME for kernels < 3.4.0, +not < 3.3.0. + +--- a/drivers/gpu/drm/drm_drv.c ++++ b/drivers/gpu/drm/drm_drv.c +@@ -137,8 +137,10 @@ static struct drm_ioctl_desc drm_ioctls[ + + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_CONTROL_ALLOW|DRM_UNLOCKED), + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD, drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED), + DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED), ++#endif + + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_CONTROL_ALLOW|DRM_UNLOCKED), + DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED), +--- a/drivers/gpu/drm/drm_fops.c ++++ b/drivers/gpu/drm/drm_fops.c +@@ -284,8 +284,10 @@ static int drm_open_helper(struct inode + if (dev->driver->driver_features & DRIVER_GEM) + drm_gem_open(dev, priv); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + if (drm_core_check_feature(dev, DRIVER_PRIME)) + drm_prime_init_file_private(&priv->prime); ++#endif + + if (dev->driver->open) { + ret = dev->driver->open(dev, priv); +@@ -538,8 +540,10 @@ int drm_release(struct inode *inode, str + if (dev->driver->postclose) + dev->driver->postclose(dev, file_priv); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + if (drm_core_check_feature(dev, DRIVER_PRIME)) + drm_prime_destroy_file_private(&file_priv->prime); ++#endif + + put_pid(file_priv->pid); + kfree(file_priv); +--- a/drivers/gpu/drm/drm_gem.c ++++ b/drivers/gpu/drm/drm_gem.c +@@ -35,7 +35,9 @@ + #include <linux/mman.h> + #include <linux/pagemap.h> + #include <linux/shmem_fs.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + #include <linux/dma-buf.h> ++#endif + #include <drm/drmP.h> + + /** @file drm_gem.c +@@ -204,6 +206,7 @@ EXPORT_SYMBOL(drm_gem_object_alloc); + static void + drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp) + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + if (obj->import_attach) { + drm_prime_remove_imported_buf_handle(&filp->prime, + obj->import_attach->dmabuf); +@@ -212,6 +215,7 @@ drm_gem_remove_prime_handles(struct drm_ + drm_prime_remove_imported_buf_handle(&filp->prime, + obj->export_dma_buf); + } ++#endif + } + + /** +--- a/drivers/gpu/drm/drm_prime.c ++++ b/drivers/gpu/drm/drm_prime.c +@@ -26,6 +26,8 @@ + * + */ + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) ++ + #include <linux/export.h> + #include <linux/dma-buf.h> + #include <drm/drmP.h> +@@ -532,3 +534,4 @@ void drm_prime_remove_imported_buf_handl + mutex_unlock(&prime_fpriv->lock); + } + EXPORT_SYMBOL(drm_prime_remove_imported_buf_handle); ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ +--- a/drivers/gpu/drm/nouveau/nouveau_prime.c ++++ b/drivers/gpu/drm/nouveau/nouveau_prime.c +@@ -22,6 +22,8 @@ + * Authors: Dave Airlie + */ + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) ++ + #include <drm/drmP.h> + + #include "nouveau_drm.h" +@@ -93,3 +95,4 @@ int nouveau_gem_prime_pin(struct drm_gem + + return 0; + } ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ +--- a/drivers/gpu/drm/radeon/radeon_prime.c ++++ b/drivers/gpu/drm/radeon/radeon_prime.c +@@ -23,6 +23,7 @@ + * + * Authors: Alex Deucher + */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + #include <drm/drmP.h> + + #include "radeon.h" +@@ -96,3 +97,4 @@ int radeon_gem_prime_pin(struct drm_gem_ + + return 0; + } ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */ +--- a/drivers/gpu/drm/radeon/radeon_drv.c ++++ b/drivers/gpu/drm/radeon/radeon_drv.c +@@ -374,8 +374,10 @@ static const struct file_operations rade + static struct drm_driver kms_driver = { + .driver_features = + DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | +- DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_GEM | +- DRIVER_PRIME, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) ++ DRIVER_PRIME | ++#endif ++ DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_GEM, + .dev_priv_size = 0, + .load = radeon_driver_load_kms, + .firstopen = radeon_driver_firstopen_kms, +@@ -410,6 +412,7 @@ static struct drm_driver kms_driver = { + .dumb_destroy = radeon_mode_dumb_destroy, + .fops = &radeon_driver_kms_fops, + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_export = drm_gem_prime_export, +@@ -419,6 +422,7 @@ static struct drm_driver kms_driver = { + .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, + .gem_prime_vmap = radeon_gem_prime_vmap, + .gem_prime_vunmap = radeon_gem_prime_vunmap, ++#endif + + .name = DRIVER_NAME, + .desc = DRIVER_DESC, +--- a/drivers/gpu/drm/radeon/radeon_gem.c ++++ b/drivers/gpu/drm/radeon/radeon_gem.c +@@ -41,8 +41,10 @@ void radeon_gem_object_free(struct drm_g + struct radeon_bo *robj = gem_to_radeon_bo(gobj); + + if (robj) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + if (robj->gem_base.import_attach) + drm_prime_gem_destroy(&robj->gem_base, robj->tbo.sg); ++#endif + radeon_bo_unref(&robj); + } + } +--- a/drivers/gpu/drm/radeon/radeon_ttm.c ++++ b/drivers/gpu/drm/radeon/radeon_ttm.c +@@ -584,17 +584,21 @@ static int radeon_ttm_tt_populate(struct + struct radeon_ttm_tt *gtt = (void *)ttm; + unsigned i; + int r; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); ++#endif + + if (ttm->state != tt_unpopulated) + return 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + if (slave && ttm->sg) { + drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages, + gtt->ttm.dma_address, ttm->num_pages); + ttm->state = tt_unbound; + return 0; + } ++#endif + + rdev = radeon_get_rdev(ttm->bdev); + #if __OS_HAS_AGP +@@ -638,10 +642,12 @@ static void radeon_ttm_tt_unpopulate(str + struct radeon_device *rdev; + struct radeon_ttm_tt *gtt = (void *)ttm; + unsigned i; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); + + if (slave) + return; ++#endif + + rdev = radeon_get_rdev(ttm->bdev); + #if __OS_HAS_AGP +--- a/drivers/gpu/drm/nouveau/nouveau_bo.c ++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c +@@ -1352,11 +1352,14 @@ nouveau_ttm_tt_populate(struct ttm_tt *t + struct drm_device *dev; + unsigned i; + int r; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); ++#endif + + if (ttm->state != tt_unpopulated) + return 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + if (slave && ttm->sg) { + /* make userspace faulting work */ + drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages, +@@ -1364,6 +1367,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *t + ttm->state = tt_unbound; + return 0; + } ++#endif + + drm = nouveau_bdev(ttm->bdev); + dev = drm->dev; +@@ -1411,10 +1415,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt + struct nouveau_drm *drm; + struct drm_device *dev; + unsigned i; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG); + + if (slave) + return; ++#endif + + drm = nouveau_bdev(ttm->bdev); + dev = drm->dev; +--- a/drivers/gpu/drm/nouveau/nouveau_drm.c ++++ b/drivers/gpu/drm/nouveau/nouveau_drm.c +@@ -662,7 +662,10 @@ driver = { + .driver_features = + DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG | + DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | +- DRIVER_MODESET | DRIVER_PRIME, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) ++ DRIVER_PRIME | ++#endif ++ DRIVER_MODESET, + + .load = nouveau_drm_load, + .unload = nouveau_drm_unload, +@@ -688,6 +691,7 @@ driver = { + .ioctls = nouveau_ioctls, + .fops = &nouveau_driver_fops, + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_export = drm_gem_prime_export, +@@ -697,6 +701,7 @@ driver = { + .gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table, + .gem_prime_vmap = nouveau_gem_prime_vmap, + .gem_prime_vunmap = nouveau_gem_prime_vunmap, ++#endif + + .gem_init_object = nouveau_gem_object_new, + .gem_free_object = nouveau_gem_object_del, +--- a/drivers/gpu/drm/nouveau/nouveau_gem.c ++++ b/drivers/gpu/drm/nouveau/nouveau_gem.c +@@ -55,8 +55,10 @@ nouveau_gem_object_del(struct drm_gem_ob + nouveau_bo_unpin(nvbo); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + if (gem->import_attach) + drm_prime_gem_destroy(gem, nvbo->bo.sg); ++#endif + + ttm_bo_unref(&bo); + +--- a/drivers/gpu/drm/i915/i915_drv.c ++++ b/drivers/gpu/drm/i915/i915_drv.c +@@ -1058,7 +1058,11 @@ static struct drm_driver driver = { + */ + .driver_features = + DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME, ++#else ++ DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM, ++#endif + .load = i915_driver_load, + .unload = i915_driver_unload, + .open = i915_driver_open, +@@ -1081,10 +1085,12 @@ static struct drm_driver driver = { + .gem_free_object = i915_gem_free_object, + .gem_vm_ops = &i915_gem_vm_ops, + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_export = i915_gem_prime_export, + .gem_prime_import = i915_gem_prime_import, ++#endif + + .dumb_create = i915_gem_dumb_create, + .dumb_map_offset = i915_gem_mmap_gtt, +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -34,7 +34,9 @@ + #include <linux/slab.h> + #include <linux/swap.h> + #include <linux/pci.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + #include <linux/dma-buf.h> ++#endif + + static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj); + static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj); +@@ -3825,8 +3827,10 @@ void i915_gem_free_object(struct drm_gem + + BUG_ON(obj->pages); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + if (obj->base.import_attach) + drm_prime_gem_destroy(&obj->base, NULL); ++#endif + + drm_gem_object_release(&obj->base); + i915_gem_info_remove_obj(dev_priv, obj->base.size); +--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c ++++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c +@@ -23,6 +23,7 @@ + * Authors: + * Dave Airlie <airlied@redhat.com> + */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) + #include <drm/drmP.h> + #include "i915_drv.h" + #include <linux/dma-buf.h> +@@ -307,3 +308,4 @@ fail_detach: + dma_buf_detach(dma_buf, attach); + return ERR_PTR(ret); + } ++#endif diff --git a/patches/collateral-evolutions/drm/05-i915-define-acpi-video-class.patch b/patches/collateral-evolutions/drm/05-i915-define-acpi-video-class.patch new file mode 100644 index 00000000..cf7eb389 --- /dev/null +++ b/patches/collateral-evolutions/drm/05-i915-define-acpi-video-class.patch @@ -0,0 +1,16 @@ +The definition of ACPI_VIDEO_CLASS was moved from video.c +to video.h in 3.1. Define it here to fix build for kernels older +than 3.1. + +--- a/drivers/gpu/drm/i915/intel_opregion.c ++++ b/drivers/gpu/drm/i915/intel_opregion.c +@@ -307,6 +307,9 @@ static int intel_opregion_video_event(st + struct acpi_bus_event *event = data; + int ret = NOTIFY_OK; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) ++#define ACPI_VIDEO_CLASS "video" ++#endif + if (strcmp(event->device_class, ACPI_VIDEO_CLASS) != 0) + return NOTIFY_DONE; + diff --git a/patches/collateral-evolutions/drm/06-rename-config-options.patch b/patches/collateral-evolutions/drm/06-rename-config-options.patch new file mode 100644 index 00000000..93397d82 --- /dev/null +++ b/patches/collateral-evolutions/drm/06-rename-config-options.patch @@ -0,0 +1,207 @@ +--- a/drivers/gpu/drm/Makefile ++++ b/drivers/gpu/drm/Makefile +@@ -15,41 +15,41 @@ drm-y := drm_auth.o drm_buffer.o d + drm_trace_points.o drm_global.o drm_prime.o + + drm-$(CONFIG_COMPAT) += drm_ioc32.o +-drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o ++drm-$(CONFIG_COMPAT_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o + drm-$(CONFIG_PCI) += ati_pcigart.o + + drm-usb-y := drm_usb.o + + drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_helper.o +-drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o +-drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o ++drm_kms_helper-$(CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o ++drm_kms_helper-$(CONFIG_COMPAT_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o + +-obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o ++obj-$(CONFIG_COMPAT_DRM_KMS_HELPER) += drm_kms_helper.o + + CFLAGS_drm_trace_points.o := -I$(src) + +-obj-$(CONFIG_DRM) += drm.o +-obj-$(CONFIG_DRM_USB) += drm_usb.o +-obj-$(CONFIG_DRM_TTM) += ttm/ +-obj-$(CONFIG_DRM_TDFX) += tdfx/ +-obj-$(CONFIG_DRM_R128) += r128/ +-obj-$(CONFIG_DRM_RADEON)+= radeon/ +-obj-$(CONFIG_DRM_MGA) += mga/ +-obj-$(CONFIG_DRM_I810) += i810/ +-obj-$(CONFIG_DRM_I915) += i915/ +-obj-$(CONFIG_DRM_MGAG200) += mgag200/ +-obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus/ +-obj-$(CONFIG_DRM_SIS) += sis/ +-obj-$(CONFIG_DRM_SAVAGE)+= savage/ +-obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ +-obj-$(CONFIG_DRM_VIA) +=via/ +-obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ +-obj-$(CONFIG_DRM_EXYNOS) +=exynos/ +-obj-$(CONFIG_DRM_GMA500) += gma500/ +-obj-$(CONFIG_DRM_UDL) += udl/ +-obj-$(CONFIG_DRM_AST) += ast/ +-obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/ +-obj-$(CONFIG_DRM_TEGRA) += tegra/ +-obj-$(CONFIG_DRM_OMAP) += omapdrm/ +-obj-$(CONFIG_DRM_TILCDC) += tilcdc/ ++obj-$(CONFIG_COMPAT_DRM) += drm.o ++obj-$(CONFIG_COMPAT_DRM_USB) += drm_usb.o ++obj-$(CONFIG_COMPAT_DRM_TTM) += ttm/ ++obj-$(CONFIG_COMPAT_DRM_TDFX) += tdfx/ ++obj-$(CONFIG_COMPAT_DRM_R128) += r128/ ++obj-$(CONFIG_COMPAT_DRM_RADEON)+= radeon/ ++obj-$(CONFIG_COMPAT_DRM_MGA) += mga/ ++obj-$(CONFIG_COMPAT_DRM_I810) += i810/ ++obj-$(CONFIG_COMPAT_DRM_I915) += i915/ ++obj-$(CONFIG_COMPAT_DRM_MGAG200) += mgag200/ ++obj-$(CONFIG_COMPAT_DRM_CIRRUS_QEMU) += cirrus/ ++obj-$(CONFIG_COMPAT_DRM_SIS) += sis/ ++obj-$(CONFIG_COMPAT_DRM_SAVAGE)+= savage/ ++obj-$(CONFIG_COMPAT_DRM_VMWGFX)+= vmwgfx/ ++obj-$(CONFIG_COMPAT_DRM_VIA) +=via/ ++obj-$(CONFIG_COMPAT_DRM_NOUVEAU) +=nouveau/ ++obj-$(CONFIG_COMPAT_DRM_EXYNOS) +=exynos/ ++obj-$(CONFIG_COMPAT_DRM_GMA500) += gma500/ ++obj-$(CONFIG_COMPAT_DRM_UDL) += udl/ ++obj-$(CONFIG_COMPAT_DRM_AST) += ast/ ++obj-$(CONFIG_COMPAT_DRM_SHMOBILE) +=shmobile/ ++obj-$(CONFIG_COMPAT_DRM_TEGRA) += tegra/ ++obj-$(CONFIG_COMPAT_DRM_OMAP) += omapdrm/ ++obj-$(CONFIG_COMPAT_DRM_TILCDC) += tilcdc/ + obj-y += i2c/ +--- a/drivers/gpu/drm/ast/Makefile ++++ b/drivers/gpu/drm/ast/Makefile +@@ -6,4 +6,4 @@ ccflags-y := -Iinclude/drm + + ast-y := ast_drv.o ast_main.o ast_mode.o ast_fb.o ast_ttm.o ast_post.o + +-obj-$(CONFIG_DRM_AST) := ast.o +\ No newline at end of file ++obj-$(CONFIG_COMPAT_DRM_AST) := ast.o +--- a/drivers/gpu/drm/cirrus/Makefile ++++ b/drivers/gpu/drm/cirrus/Makefile +@@ -2,4 +2,4 @@ ccflags-y := -Iinclude/drm + cirrus-y := cirrus_main.o cirrus_mode.o \ + cirrus_drv.o cirrus_fbdev.o cirrus_ttm.o + +-obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o ++obj-$(CONFIG_COMPAT_DRM_CIRRUS_QEMU) += cirrus.o +--- a/drivers/gpu/drm/drm_crtc_helper.c ++++ b/drivers/gpu/drm/drm_crtc_helper.c +@@ -152,7 +152,7 @@ int drm_helper_probe_single_connector_mo + goto prune; + } + +-#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE ++#ifdef CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE + count = drm_load_edid_firmware(connector); + if (count == 0) + #endif +--- a/drivers/gpu/drm/gma500/Makefile ++++ b/drivers/gpu/drm/gma500/Makefile +@@ -49,4 +49,4 @@ gma500_gfx-$(CONFIG_DRM_MEDFIELD) += mdf + mdfld_tmd_vid.o \ + tc35876x-dsi-lvds.o + +-obj-$(CONFIG_DRM_GMA500) += gma500_gfx.o ++obj-$(CONFIG_COMPAT_DRM_GMA500) += gma500_gfx.o +--- a/drivers/gpu/drm/i2c/Makefile ++++ b/drivers/gpu/drm/i2c/Makefile +@@ -1,10 +1,10 @@ + ccflags-y := -Iinclude/drm + + ch7006-y := ch7006_drv.o ch7006_mode.o +-obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o ++obj-$(CONFIG_COMPAT_DRM_I2C_CH7006) += ch7006.o + + sil164-y := sil164_drv.o +-obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o ++obj-$(CONFIG_COMPAT_DRM_I2C_SIL164) += sil164.o + + tda998x-y := tda998x_drv.o +-obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o ++obj-$(CONFIG_COMPAT_DRM_I2C_NXP_TDA998X) += tda998x.o +--- a/drivers/gpu/drm/i810/Makefile ++++ b/drivers/gpu/drm/i810/Makefile +@@ -5,4 +5,4 @@ + ccflags-y := -Iinclude/drm + i810-y := i810_drv.o i810_dma.o + +-obj-$(CONFIG_DRM_I810) += i810.o ++obj-$(CONFIG_COMPAT_DRM_I810) += i810.o +--- a/drivers/gpu/drm/i915/Makefile ++++ b/drivers/gpu/drm/i915/Makefile +@@ -48,6 +48,6 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o + + i915-$(CONFIG_ACPI) += intel_acpi.o + +-obj-$(CONFIG_DRM_I915) += i915.o ++obj-$(CONFIG_COMPAT_DRM_I915) += i915.o + + CFLAGS_i915_trace_points.o := -I$(src) +--- a/drivers/gpu/drm/mgag200/Makefile ++++ b/drivers/gpu/drm/mgag200/Makefile +@@ -2,4 +2,4 @@ ccflags-y := -Iinclude/drm + mgag200-y := mgag200_main.o mgag200_mode.o \ + mgag200_drv.o mgag200_fb.o mgag200_i2c.o mgag200_ttm.o + +-obj-$(CONFIG_DRM_MGAG200) += mgag200.o ++obj-$(CONFIG_COMPAT_DRM_MGAG200) += mgag200.o +--- a/drivers/gpu/drm/nouveau/Makefile ++++ b/drivers/gpu/drm/nouveau/Makefile +@@ -241,7 +241,7 @@ nouveau-$(CONFIG_COMPAT) += nouveau_ioc3 + ifdef CONFIG_X86 + nouveau-$(CONFIG_ACPI) += nouveau_acpi.o + endif +-nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o ++nouveau-$(CONFIG_COMPAT_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o + nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o + +-obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o ++obj-$(CONFIG_COMPAT_DRM_NOUVEAU)+= nouveau.o +--- a/drivers/gpu/drm/nouveau/nouveau_display.h ++++ b/drivers/gpu/drm/nouveau/nouveau_display.h +@@ -73,7 +73,7 @@ int nouveau_display_dumb_destroy(struct + + void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *); + +-#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT ++#ifdef CONFIG_COMPAT_DRM_NOUVEAU_BACKLIGHT + extern int nouveau_backlight_init(struct drm_device *); + extern void nouveau_backlight_exit(struct drm_device *); + #else +--- a/drivers/gpu/drm/radeon/Makefile ++++ b/drivers/gpu/drm/radeon/Makefile +@@ -82,6 +82,6 @@ radeon-$(CONFIG_COMPAT) += radeon_ioc32. + radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o + radeon-$(CONFIG_ACPI) += radeon_acpi.o + +-obj-$(CONFIG_DRM_RADEON)+= radeon.o ++obj-$(CONFIG_COMPAT_DRM_RADEON)+= radeon.o + + CFLAGS_radeon_trace_points.o := -I$(src) +--- a/drivers/gpu/drm/ttm/Makefile ++++ b/drivers/gpu/drm/ttm/Makefile +@@ -11,4 +11,4 @@ ifeq ($(CONFIG_SWIOTLB),y) + ttm-y += ttm_page_alloc_dma.o + endif + +-obj-$(CONFIG_DRM_TTM) += ttm.o ++obj-$(CONFIG_COMPAT_DRM_TTM) += ttm.o +--- a/drivers/gpu/drm/via/Makefile ++++ b/drivers/gpu/drm/via/Makefile +@@ -5,4 +5,4 @@ + ccflags-y := -Iinclude/drm + via-y := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o + +-obj-$(CONFIG_DRM_VIA) +=via.o ++obj-$(CONFIG_COMPAT_DRM_VIA) +=via.o +--- a/drivers/gpu/drm/vmwgfx/Makefile ++++ b/drivers/gpu/drm/vmwgfx/Makefile +@@ -8,4 +8,4 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr. + vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.o \ + vmwgfx_surface.o + +-obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o ++obj-$(CONFIG_COMPAT_DRM_VMWGFX) := vmwgfx.o diff --git a/patches/collateral-evolutions/drm/07-intel-gtt.patch b/patches/collateral-evolutions/drm/07-intel-gtt.patch new file mode 100644 index 00000000..c9e461d8 --- /dev/null +++ b/patches/collateral-evolutions/drm/07-intel-gtt.patch @@ -0,0 +1,42 @@ +Kernels older than 3.6 don't have intel_enable_gtt() exported +and most Linux distributions have CONFIG_AGP_INTEL as built-in +(y) and as such we don't bother to make it available as +modular here. The change to export intel_enable_gtt() was +made through commit 8ecd1a66 but previous to this the driver +never called intel_enable_gtt() so we can safely assume we +can do the same for older kernels. + +There should be a way to export an intel_enable_gtt() for +kernels with CONFIG_AGP_INTEL as built-in but that itself +is a project. + +commit 8ecd1a6615f0d9de6759aafe229bc1cc4ee99c7b +Author: Daniel Vetter <daniel.vetter@ffwll.ch> +Date: Thu Jun 7 15:56:03 2012 +0200 + + drm/i915: call intel_enable_gtt + + When drm/i915 is in control of the gtt, we need to call + the enable function at all the relevant places ourselves. + + Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com> + Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> + +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -3997,9 +3997,14 @@ i915_gem_init_hw(struct drm_device *dev) + drm_i915_private_t *dev_priv = dev->dev_private; + int ret; + +- if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt()) ++ if (INTEL_INFO(dev)->gen < 6) + return -EIO; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) ++ if (!intel_enable_gtt()) ++ return -EIO; ++#endif ++ + if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1)) + I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000); + diff --git a/patches/collateral-evolutions/drm/08-shmem_truncate_range.patch b/patches/collateral-evolutions/drm/08-shmem_truncate_range.patch new file mode 100644 index 00000000..5112bf63 --- /dev/null +++ b/patches/collateral-evolutions/drm/08-shmem_truncate_range.patch @@ -0,0 +1,43 @@ +Backport e2377fe0b -- this could likely be implemented +on compat.git but I'd much prefer a better review of that. +For now this stays as a patch. + +commit e2377fe0b65e3c7577ff6df1701c56ef477d336f +Author: Hugh Dickins <hughd@google.com> +Date: Mon Jun 27 16:18:19 2011 -0700 + + drm/i915: use shmem_truncate_range + + The interface to ->truncate_range is changing very slightly: once "tmpfs: + take control of its truncate_range" has been applied, this can be applied. + For now there is only a slight inefficiency while this remains unapplied, + but it will soon become essential for managing shmem's use of swap. + + Change i915_gem_object_truncate() to use shmem_truncate_range() directly: + which should also spare i915 later change if we switch from + inode_operations->truncate_range to file_operations->fallocate. + + Signed-off-by: Hugh Dickins <hughd@google.com> + Cc: Christoph Hellwig <hch@infradead.org> + Cc: Chris Wilson <chris@chris-wilson.co.uk> + Cc: Keith Packard <keithp@keithp.com> + Cc: Dave Airlie <airlied@redhat.com> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> + +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -1620,7 +1620,13 @@ i915_gem_object_truncate(struct drm_i915 + * backing pages, *now*. + */ + inode = file_inode(obj->base.filp); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)) + shmem_truncate_range(inode, 0, (loff_t)-1); ++#else ++ truncate_inode_pages(inode->i_mapping, 0); ++ if (inode->i_op->truncate_range) ++ inode->i_op->truncate_range(inode, 0, (loff_t)-1); ++#endif + + obj->madv = __I915_MADV_PURGED; + } diff --git a/patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars.patch b/patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars.patch new file mode 100644 index 00000000..29c77194 --- /dev/null +++ b/patches/collateral-evolutions/drm/09-nouveau-compatify-kconfig-vars.patch @@ -0,0 +1,153 @@ +Rename CONFIG_NOUVEAU_DEBUG and CONFIG_NOUVEAU_DEBUG_DEFAULT to +CONFIG_COMPAT_*. + +--- a/drivers/gpu/drm/nouveau/core/core/option.c ++++ b/drivers/gpu/drm/nouveau/core/core/option.c +@@ -86,7 +86,7 @@ nouveau_boolopt(const char *optstr, cons + int + nouveau_dbgopt(const char *optstr, const char *sub) + { +- int mode = 1, level = CONFIG_NOUVEAU_DEBUG_DEFAULT; ++ int mode = 1, level = CONFIG_COMPAT_NOUVEAU_DEBUG_DEFAULT; + + while (optstr) { + int len = strcspn(optstr, ",="); +--- a/drivers/gpu/drm/nouveau/core/include/core/client.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/client.h +@@ -15,7 +15,7 @@ struct nouveau_client { + static inline struct nouveau_client * + nv_client(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!nv_iclass(obj, NV_CLIENT_CLASS))) + nv_assert("BAD CAST -> NvClient, %08x", nv_hclass(obj)); + #endif +--- a/drivers/gpu/drm/nouveau/core/include/core/device.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/device.h +@@ -97,7 +97,7 @@ nv_device(void *obj) + if (device->parent) + device = device->parent; + +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!nv_iclass(device, NV_SUBDEV_CLASS) || + (nv_hclass(device) & 0xff) != NVDEV_SUBDEV_DEVICE)) { + nv_assert("BAD CAST -> NvDevice, 0x%08x 0x%08x", +--- a/drivers/gpu/drm/nouveau/core/include/core/engctx.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/engctx.h +@@ -20,7 +20,7 @@ struct nouveau_engctx { + static inline struct nouveau_engctx * + nv_engctx(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!nv_iclass(obj, NV_ENGCTX_CLASS))) + nv_assert("BAD CAST -> NvEngCtx, %08x", nv_hclass(obj)); + #endif +--- a/drivers/gpu/drm/nouveau/core/include/core/engine.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/engine.h +@@ -22,7 +22,7 @@ struct nouveau_engine { + static inline struct nouveau_engine * + nv_engine(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!nv_iclass(obj, NV_ENGINE_CLASS))) + nv_assert("BAD CAST -> NvEngine, %08x", nv_hclass(obj)); + #endif +--- a/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/gpuobj.h +@@ -27,7 +27,7 @@ struct nouveau_gpuobj { + static inline struct nouveau_gpuobj * + nv_gpuobj(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!nv_iclass(obj, NV_GPUOBJ_CLASS))) + nv_assert("BAD CAST -> NvGpuObj, %08x", nv_hclass(obj)); + #endif +--- a/drivers/gpu/drm/nouveau/core/include/core/namedb.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/namedb.h +@@ -14,7 +14,7 @@ struct nouveau_namedb { + static inline struct nouveau_namedb * + nv_namedb(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!nv_iclass(obj, NV_NAMEDB_CLASS))) + nv_assert("BAD CAST -> NvNameDB, %08x", nv_hclass(obj)); + #endif +--- a/drivers/gpu/drm/nouveau/core/include/core/object.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/object.h +@@ -20,7 +20,7 @@ struct nouveau_object { + struct nouveau_object *engine; + atomic_t refcount; + atomic_t usecount; +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + #define NOUVEAU_OBJECT_MAGIC 0x75ef0bad + struct list_head list; + u32 _magic; +@@ -30,7 +30,7 @@ struct nouveau_object { + static inline struct nouveau_object * + nv_object(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (likely(obj)) { + struct nouveau_object *object = obj; + if (unlikely(object->_magic != NOUVEAU_OBJECT_MAGIC)) +--- a/drivers/gpu/drm/nouveau/core/include/core/parent.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/parent.h +@@ -29,7 +29,7 @@ struct nouveau_parent { + static inline struct nouveau_parent * + nv_parent(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!(nv_iclass(obj, NV_PARENT_CLASS)))) + nv_assert("BAD CAST -> NvParent, %08x", nv_hclass(obj)); + #endif +--- a/drivers/gpu/drm/nouveau/core/include/core/printk.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/printk.h +@@ -19,7 +19,7 @@ void __printf(4, 5) + nv_printk_(struct nouveau_object *, const char *, int, const char *, ...); + + #define nv_printk(o,l,f,a...) do { \ +- if (NV_DBG_##l <= CONFIG_NOUVEAU_DEBUG) \ ++ if (NV_DBG_##l <= CONFIG_COMPAT_NOUVEAU_DEBUG) \ + nv_printk_(nv_object(o), NV_PRINTK_##l, NV_DBG_##l, f, ##a); \ + } while(0) + +@@ -32,7 +32,7 @@ nv_printk_(struct nouveau_object *, cons + #define nv_spam(o,f,a...) nv_printk((o), SPAM, f, ##a) + + #define nv_assert(f,a...) do { \ +- if (NV_DBG_FATAL <= CONFIG_NOUVEAU_DEBUG) \ ++ if (NV_DBG_FATAL <= CONFIG_COMPAT_NOUVEAU_DEBUG) \ + nv_printk_(NULL, NV_PRINTK_FATAL, NV_DBG_FATAL, f "\n", ##a); \ + BUG_ON(1); \ + } while(0) +--- a/drivers/gpu/drm/nouveau/core/include/core/subdev.h ++++ b/drivers/gpu/drm/nouveau/core/include/core/subdev.h +@@ -20,7 +20,7 @@ struct nouveau_subdev { + static inline struct nouveau_subdev * + nv_subdev(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!nv_iclass(obj, NV_SUBDEV_CLASS))) + nv_assert("BAD CAST -> NvSubDev, %08x", nv_hclass(obj)); + #endif +--- a/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h ++++ b/drivers/gpu/drm/nouveau/core/include/subdev/instmem.h +@@ -16,7 +16,7 @@ struct nouveau_instobj { + static inline struct nouveau_instobj * + nv_memobj(void *obj) + { +-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA ++#if CONFIG_COMPAT_NOUVEAU_DEBUG >= NV_DBG_PARANOIA + if (unlikely(!nv_iclass(obj, NV_MEMOBJ_CLASS))) + nv_assert("BAD CAST -> NvMemObj, %08x", nv_hclass(obj)); + #endif diff --git a/patches/collateral-evolutions/drm/10-radeon-revert-acpi-table-size-check.patch b/patches/collateral-evolutions/drm/10-radeon-revert-acpi-table-size-check.patch new file mode 100644 index 00000000..8adaeb35 --- /dev/null +++ b/patches/collateral-evolutions/drm/10-radeon-revert-acpi-table-size-check.patch @@ -0,0 +1,27 @@ +acpi_get_table_with_size() was exported with kernels >= 3.6. Revert the +size checking for kernels < 3.6. + +--- a/drivers/gpu/drm/radeon/radeon_bios.c ++++ b/drivers/gpu/drm/radeon/radeon_bios.c +@@ -554,12 +554,21 @@ static bool radeon_acpi_vfct_bios(struct + { + bool ret = false; + struct acpi_table_header *hdr; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) + acpi_size tbl_size; ++#else ++ /* acpi_get_table_with_size() not exported on kernels < 3.6 */ ++ acpi_size tbl_size = 0x7fffffff; ++#endif + UEFI_ACPI_VFCT *vfct; + GOP_VBIOS_CONTENT *vbios; + VFCT_IMAGE_HEADER *vhdr; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) + if (!ACPI_SUCCESS(acpi_get_table_with_size("VFCT", 1, &hdr, &tbl_size))) ++#else ++ if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr))) ++#endif + return false; + if (tbl_size < sizeof(UEFI_ACPI_VFCT)) { + DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n"); diff --git a/patches/collateral-evolutions/drm/11-videomode-includes.patch b/patches/collateral-evolutions/drm/11-videomode-includes.patch new file mode 100644 index 00000000..1858cc31 --- /dev/null +++ b/patches/collateral-evolutions/drm/11-videomode-includes.patch @@ -0,0 +1,15 @@ +--- a/drivers/gpu/drm/drm_modes.c ++++ b/drivers/gpu/drm/drm_modes.c +@@ -35,8 +35,12 @@ + #include <linux/export.h> + #include <drm/drmP.h> + #include <drm/drm_crtc.h> ++#if IS_ENABLED(CONFIG_OF_VIDEOMODE) + #include <video/of_videomode.h> ++#endif ++#if IS_ENABLED(CONFIG_VIDEOMODE) + #include <video/videomode.h> ++#endif + + /** + * drm_mode_debug_printmodeline - debug print a mode diff --git a/patches/collateral-evolutions/drm/98-pr_fmt.patch b/patches/collateral-evolutions/drm/98-pr_fmt.patch new file mode 100644 index 00000000..3c922450 --- /dev/null +++ b/patches/collateral-evolutions/drm/98-pr_fmt.patch @@ -0,0 +1,189 @@ + +Undef/define/include printk.h for fixing redefinition warnings +during build. + +Patch adapted from compat-wireless tree. + +--- a/drivers/gpu/drm/drm_fb_helper.c ++++ b/drivers/gpu/drm/drm_fb_helper.c +@@ -27,9 +27,11 @@ + * Dave Airlie <airlied@linux.ie> + * Jesse Barnes <jesse.barnes@intel.com> + */ ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/sysrq.h> + #include <linux/slab.h> + #include <linux/fb.h> +--- a/drivers/gpu/drm/ttm/ttm_agp_backend.c ++++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c +@@ -29,8 +29,10 @@ + * Keith Packard. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) "[TTM] " fmt + ++#include <linux/printk.h> + #include <drm/ttm/ttm_module.h> + #include <drm/ttm/ttm_bo_driver.h> + #include <drm/ttm/ttm_page_alloc.h> +--- a/drivers/gpu/drm/ttm/ttm_bo.c ++++ b/drivers/gpu/drm/ttm/ttm_bo.c +@@ -28,11 +28,13 @@ + * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> + */ + ++#undef pr_fmt + #define pr_fmt(fmt) "[TTM] " fmt + + #include <drm/ttm/ttm_module.h> + #include <drm/ttm/ttm_bo_driver.h> + #include <drm/ttm/ttm_placement.h> ++#include <linux/printk.h> + #include <linux/jiffies.h> + #include <linux/slab.h> + #include <linux/sched.h> +--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c ++++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c +@@ -28,8 +28,10 @@ + * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> + */ + ++#undef pr_fmt + #define pr_fmt(fmt) "[TTM] " fmt + ++#include <linux/printk.h> + #include <ttm/ttm_module.h> + #include <ttm/ttm_bo_driver.h> + #include <ttm/ttm_placement.h> +--- a/drivers/gpu/drm/ttm/ttm_memory.c ++++ b/drivers/gpu/drm/ttm/ttm_memory.c +@@ -25,11 +25,13 @@ + * + **************************************************************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) "[TTM] " fmt + + #include <drm/ttm/ttm_memory.h> + #include <drm/ttm/ttm_module.h> + #include <drm/ttm/ttm_page_alloc.h> ++#include <linux/printk.h> + #include <linux/spinlock.h> + #include <linux/sched.h> + #include <linux/wait.h> +--- a/drivers/gpu/drm/ttm/ttm_object.c ++++ b/drivers/gpu/drm/ttm/ttm_object.c +@@ -49,10 +49,12 @@ + * for fast lookup of ref objects given a base object. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) "[TTM] " fmt + + #include <drm/ttm/ttm_object.h> + #include <drm/ttm/ttm_module.h> ++#include <linux/printk.h> + #include <linux/list.h> + #include <linux/spinlock.h> + #include <linux/slab.h> +--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c ++++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c +@@ -31,8 +31,10 @@ + * - doesn't track currently in use pages + */ + ++#undef pr_fmt + #define pr_fmt(fmt) "[TTM] " fmt + ++#include <linux/printk.h> + #include <linux/list.h> + #include <linux/spinlock.h> + #include <linux/highmem.h> +--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c ++++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +@@ -33,8 +33,10 @@ + * when freed). + */ + ++#undef pr_fmt + #define pr_fmt(fmt) "[TTM] " fmt + ++#include <linux/printk.h> + #include <linux/dma-mapping.h> + #include <linux/list.h> + #include <linux/seq_file.h> /* for seq_printf */ +--- a/drivers/gpu/drm/ttm/ttm_tt.c ++++ b/drivers/gpu/drm/ttm/ttm_tt.c +@@ -28,8 +28,10 @@ + * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> + */ + ++#undef pr_fmt + #define pr_fmt(fmt) "[TTM] " fmt + ++#include <linux/printk.h> + #include <linux/sched.h> + #include <linux/highmem.h> + #include <linux/pagemap.h> +--- a/drivers/gpu/drm/i915/i915_dma.c ++++ b/drivers/gpu/drm/i915/i915_dma.c +@@ -26,6 +26,7 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <drm/drmP.h> +@@ -35,6 +36,7 @@ + #include <drm/i915_drm.h> + #include "i915_drv.h" + #include "i915_trace.h" ++#include <linux/printk.h> + #include <linux/pci.h> + #include <linux/vgaarb.h> + #include <linux/acpi.h> +--- a/drivers/gpu/drm/i915/i915_irq.c ++++ b/drivers/gpu/drm/i915/i915_irq.c +@@ -26,8 +26,10 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/sysrq.h> + #include <linux/slab.h> + #include <drm/drmP.h> +--- a/drivers/gpu/drm/i915/intel_opregion.c ++++ b/drivers/gpu/drm/i915/intel_opregion.c +@@ -25,8 +25,10 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/acpi.h> + #include <linux/acpi_io.h> + #include <acpi/video.h> +--- a/drivers/gpu/drm/i915/intel_panel.c ++++ b/drivers/gpu/drm/i915/intel_panel.c +@@ -28,8 +28,10 @@ + * Chris Wilson <chris@chris-wilson.co.uk> + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/moduleparam.h> + #include "intel_drv.h" + diff --git a/patches/collateral-evolutions/drm/99-change-makefile.patch b/patches/collateral-evolutions/drm/99-change-makefile.patch new file mode 100644 index 00000000..00fa2be6 --- /dev/null +++ b/patches/collateral-evolutions/drm/99-change-makefile.patch @@ -0,0 +1,30 @@ +Remove drivers that we do not want to build from gpu/drm/Makefile + +--- a/drivers/gpu/drm/Makefile ++++ b/drivers/gpu/drm/Makefile +@@ -31,25 +31,14 @@ CFLAGS_drm_trace_points.o := -I$(src) + obj-$(CONFIG_COMPAT_DRM) += drm.o + obj-$(CONFIG_COMPAT_DRM_USB) += drm_usb.o + obj-$(CONFIG_COMPAT_DRM_TTM) += ttm/ +-obj-$(CONFIG_COMPAT_DRM_TDFX) += tdfx/ +-obj-$(CONFIG_COMPAT_DRM_R128) += r128/ + obj-$(CONFIG_COMPAT_DRM_RADEON)+= radeon/ +-obj-$(CONFIG_COMPAT_DRM_MGA) += mga/ + obj-$(CONFIG_COMPAT_DRM_I810) += i810/ + obj-$(CONFIG_COMPAT_DRM_I915) += i915/ + obj-$(CONFIG_COMPAT_DRM_MGAG200) += mgag200/ + obj-$(CONFIG_COMPAT_DRM_CIRRUS_QEMU) += cirrus/ +-obj-$(CONFIG_COMPAT_DRM_SIS) += sis/ +-obj-$(CONFIG_COMPAT_DRM_SAVAGE)+= savage/ + obj-$(CONFIG_COMPAT_DRM_VMWGFX)+= vmwgfx/ + obj-$(CONFIG_COMPAT_DRM_VIA) +=via/ + obj-$(CONFIG_COMPAT_DRM_NOUVEAU) +=nouveau/ +-obj-$(CONFIG_COMPAT_DRM_EXYNOS) +=exynos/ + obj-$(CONFIG_COMPAT_DRM_GMA500) += gma500/ +-obj-$(CONFIG_COMPAT_DRM_UDL) += udl/ + obj-$(CONFIG_COMPAT_DRM_AST) += ast/ +-obj-$(CONFIG_COMPAT_DRM_SHMOBILE) +=shmobile/ +-obj-$(CONFIG_COMPAT_DRM_TEGRA) += tegra/ +-obj-$(CONFIG_COMPAT_DRM_OMAP) += omapdrm/ +-obj-$(CONFIG_COMPAT_DRM_TILCDC) += tilcdc/ + obj-y += i2c/ diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch new file mode 100644 index 00000000..e13fea7c --- /dev/null +++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch @@ -0,0 +1,290 @@ + +This patch backports the struct net_device_ops changes added on 2.6.29. + +If we add the compat.git netdev_attach_ops() implementation +for newer kernels upstream it means we do not have to use this +patch at all for older kernels. + +mcgrof@tux ~/linux-stable (git::master)$ git describe --contains d314774cf2cd5dfeb39a00d37deee65d4c627927 +v2.6.29-rc1~581^2~677 + +commit d314774cf2cd5dfeb39a00d37deee65d4c627927 +Author: Stephen Hemminger <shemminger@vyatta.com> +Date: Wed Nov 19 21:32:24 2008 -0800 + + netdev: network device operations infrastructure + + This patch changes the network device internal API to move adminstrative + operations out of the network device structure and into a separate structure. + + This patch involves some hackery to maintain compatablity between the + new and old model, so all 300+ drivers don't have to be changed at once. + For drivers that aren't converted yet, the netdevice_ops virt function list + still resides in the net_device structure. For old protocols, the new + net_device_ops are copied out to the old net_device pointers. + + After the transistion is completed the nag message can be changed to + an WARN_ON, and the compatiablity code can be made configurable. + + Some function pointers aren't moved: + * destructor can't be in net_device_ops because + it may need to be referenced after the module is unloaded. + * neighbor setup is manipulated in a couple of places that need special + consideration + * hard_start_xmit is in the fast path for transmit. + + Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +--- a/drivers/net/usb/rndis_host.c ++++ b/drivers/net/usb/rndis_host.c +@@ -358,7 +358,7 @@ generic_rndis_bind(struct usbnet *dev, s + dev->rx_urb_size &= ~(dev->maxpacket - 1); + u.init->max_transfer_size = cpu_to_le32(dev->rx_urb_size); + +- net->netdev_ops = &rndis_netdev_ops; ++ netdev_attach_ops(net, &rndis_netdev_ops); + + retval = rndis_command(dev, u.header, CONTROL_BUFFER_SIZE); + if (unlikely(retval < 0)) { +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -1446,7 +1446,7 @@ usbnet_probe (struct usb_interface *udev + net->features |= NETIF_F_HIGHDMA; + #endif + +- net->netdev_ops = &usbnet_netdev_ops; ++ netdev_attach_ops(net, &usbnet_netdev_ops); + net->watchdog_timeo = TX_TIMEOUT_JIFFIES; + net->ethtool_ops = &usbnet_ethtool_ops; + +--- a/drivers/net/wireless/ath/ath6kl/main.c ++++ b/drivers/net/wireless/ath/ath6kl/main.c +@@ -1289,7 +1289,7 @@ static const struct net_device_ops ath6k + + void init_netdev(struct net_device *dev) + { +- dev->netdev_ops = &ath6kl_netdev_ops; ++ netdev_attach_ops(dev, &ath6kl_netdev_ops); + dev->destructor = free_netdev; + dev->watchdog_timeo = ATH6KL_TX_TIMEOUT; + +--- a/drivers/net/wireless/ath/wil6210/netdev.c ++++ b/drivers/net/wireless/ath/wil6210/netdev.c +@@ -76,7 +76,7 @@ void *wil_if_alloc(struct device *dev, v + goto out_priv; + } + +- ndev->netdev_ops = &wil_netdev_ops; ++ netdev_attach_ops(ndev, &wil_netdev_ops); + ndev->ieee80211_ptr = wdev; + SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy)); + wdev->netdev = ndev; +--- a/drivers/net/wireless/rndis_wlan.c ++++ b/drivers/net/wireless/rndis_wlan.c +@@ -3438,7 +3438,7 @@ static int rndis_wlan_bind(struct usbnet + * rndis_host wants to avoid all OID as much as possible + * so do promisc/multicast handling in rndis_wlan. + */ +- usbdev->net->netdev_ops = &rndis_wlan_netdev_ops; ++ netdev_attach_ops(usbdev->net, &rndis_wlan_netdev_ops); + + tmp = cpu_to_le32(RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST); + retval = rndis_set_oid(usbdev, +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -2170,7 +2170,7 @@ static int b44_init_one(struct ssb_devic + bp->rx_pending = B44_DEF_RX_RING_PENDING; + bp->tx_pending = B44_DEF_TX_RING_PENDING; + +- dev->netdev_ops = &b44_netdev_ops; ++ netdev_attach_ops(dev, &b44_netdev_ops); + netif_napi_add(dev, &bp->napi, b44_poll, 64); + dev->watchdog_timeo = B44_TX_TIMEOUT; + dev->irq = sdev->irq; +--- a/drivers/net/wireless/ipw2x00/ipw2100.c ++++ b/drivers/net/wireless/ipw2x00/ipw2100.c +@@ -6086,7 +6086,7 @@ static struct net_device *ipw2100_alloc_ + priv->ieee->perfect_rssi = -20; + priv->ieee->worst_rssi = -85; + +- dev->netdev_ops = &ipw2100_netdev_ops; ++ netdev_attach_ops(dev, &ipw2100_netdev_ops); + dev->ethtool_ops = &ipw2100_ethtool_ops; + dev->wireless_handlers = &ipw2100_wx_handler_def; + priv->wireless_data.libipw = priv->ieee; +--- a/drivers/net/wireless/ipw2x00/ipw2200.c ++++ b/drivers/net/wireless/ipw2x00/ipw2200.c +@@ -11680,7 +11680,7 @@ static int ipw_prom_alloc(struct ipw_pri + memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN); + + priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP; +- priv->prom_net_dev->netdev_ops = &ipw_prom_netdev_ops; ++ netdev_attach_ops(priv->prom_net_dev, &ipw_prom_netdev_ops); + + priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR; + SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev); +@@ -11818,7 +11818,7 @@ static int ipw_pci_probe(struct pci_dev + priv->ieee->perfect_rssi = -20; + priv->ieee->worst_rssi = -85; + +- net_dev->netdev_ops = &ipw_netdev_ops; ++ netdev_attach_ops(net_dev, &ipw_netdev_ops); + priv->wireless_data.spy_data = &priv->ieee->spy_data; + net_dev->wireless_data = &priv->wireless_data; + net_dev->wireless_handlers = &ipw_wx_handler_def; +--- a/drivers/net/wireless/libertas/main.c ++++ b/drivers/net/wireless/libertas/main.c +@@ -993,7 +993,7 @@ struct lbs_private *lbs_add_card(void *c + wdev->netdev = dev; + priv->dev = dev; + +- dev->netdev_ops = &lbs_netdev_ops; ++ netdev_attach_ops(dev, &lbs_netdev_ops); + dev->watchdog_timeo = 5 * HZ; + dev->ethtool_ops = &lbs_ethtool_ops; + dev->flags |= IFF_BROADCAST | IFF_MULTICAST; +--- a/drivers/net/wireless/libertas/mesh.c ++++ b/drivers/net/wireless/libertas/mesh.c +@@ -1015,7 +1015,7 @@ static int lbs_add_mesh(struct lbs_priva + mesh_dev->ieee80211_ptr = mesh_wdev; + priv->mesh_dev = mesh_dev; + +- mesh_dev->netdev_ops = &mesh_netdev_ops; ++ netdev_attach_ops(mesh_dev, &mesh_netdev_ops); + mesh_dev->ethtool_ops = &lbs_ethtool_ops; + memcpy(mesh_dev->dev_addr, priv->dev->dev_addr, ETH_ALEN); + +--- a/drivers/net/wireless/mac80211_hwsim.c ++++ b/drivers/net/wireless/mac80211_hwsim.c +@@ -1695,7 +1695,7 @@ static const struct net_device_ops hwsim + + static void hwsim_mon_setup(struct net_device *dev) + { +- dev->netdev_ops = &hwsim_netdev_ops; ++ netdev_attach_ops(dev, &hwsim_netdev_ops); + dev->destructor = free_netdev; + ether_setup(dev); + dev->tx_queue_len = 0; +--- a/drivers/net/wireless/mwifiex/main.c ++++ b/drivers/net/wireless/mwifiex/main.c +@@ -654,7 +654,7 @@ static const struct net_device_ops mwifi + void mwifiex_init_priv_params(struct mwifiex_private *priv, + struct net_device *dev) + { +- dev->netdev_ops = &mwifiex_netdev_ops; ++ netdev_attach_ops(dev, &mwifiex_netdev_ops); + /* Initialize private structure */ + priv->current_key_index = 0; + priv->media_connected = false; +--- a/net/bluetooth/bnep/netdev.c ++++ b/net/bluetooth/bnep/netdev.c +@@ -223,7 +223,7 @@ void bnep_net_setup(struct net_device *d + + ether_setup(dev); + dev->priv_flags &= ~IFF_TX_SKB_SHARING; +- dev->netdev_ops = &bnep_netdev_ops; ++ netdev_attach_ops(dev, &bnep_netdev_ops); + + dev->watchdog_timeo = HZ * 2; + } +--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c ++++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +@@ -2207,7 +2207,7 @@ static int atl1e_init_netdev(struct net_ + SET_NETDEV_DEV(netdev, &pdev->dev); + pci_set_drvdata(pdev, netdev); + +- netdev->netdev_ops = &atl1e_netdev_ops; ++ netdev_attach_ops(netdev, &atl1e_netdev_ops); + + netdev->watchdog_timeo = AT_TX_WATCHDOG; + atl1e_set_ethtool_ops(netdev); +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -2470,7 +2470,7 @@ static int atl1c_init_netdev(struct net_ + SET_NETDEV_DEV(netdev, &pdev->dev); + pci_set_drvdata(pdev, netdev); + +- netdev->netdev_ops = &atl1c_netdev_ops; ++ netdev_attach_ops(netdev, &atl1c_netdev_ops); + netdev->watchdog_timeo = AT_TX_WATCHDOG; + atl1c_set_ethtool_ops(netdev); + +--- a/drivers/net/ethernet/atheros/atlx/atl1.c ++++ b/drivers/net/ethernet/atheros/atlx/atl1.c +@@ -3009,7 +3009,7 @@ static int atl1_probe(struct pci_dev *pd + adapter->mii.phy_id_mask = 0x1f; + adapter->mii.reg_num_mask = 0x1f; + +- netdev->netdev_ops = &atl1_netdev_ops; ++ netdev_attach_ops(netdev, &atl1_netdev_ops); + netdev->watchdog_timeo = 5 * HZ; + netif_napi_add(netdev, &adapter->napi, atl1_rings_clean, 64); + +--- a/drivers/net/ethernet/atheros/atlx/atl2.c ++++ b/drivers/net/ethernet/atheros/atlx/atl2.c +@@ -1396,7 +1396,7 @@ static int atl2_probe(struct pci_dev *pd + + atl2_setup_pcicmd(pdev); + +- netdev->netdev_ops = &atl2_netdev_ops; ++ netdev_attach_ops(netdev, &atl2_netdev_ops); + atl2_set_ethtool_ops(netdev); + netdev->watchdog_timeo = 5 * HZ; + strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1017,7 +1017,7 @@ static void ieee80211_if_setup(struct ne + { + ether_setup(dev); + dev->priv_flags &= ~IFF_TX_SKB_SHARING; +- dev->netdev_ops = &ieee80211_dataif_ops; ++ netdev_attach_ops(dev, &ieee80211_dataif_ops); + dev->destructor = free_netdev; + } + +@@ -1180,7 +1180,7 @@ static void ieee80211_setup_sdata(struct + + /* only monitor/p2p-device differ */ + if (sdata->dev) { +- sdata->dev->netdev_ops = &ieee80211_dataif_ops; ++ netdev_attach_ops(sdata->dev, &ieee80211_dataif_ops); + sdata->dev->type = ARPHRD_ETHER; + } + +@@ -1218,7 +1218,7 @@ static void ieee80211_setup_sdata(struct + break; + case NL80211_IFTYPE_MONITOR: + sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; +- sdata->dev->netdev_ops = &ieee80211_monitorif_ops; ++ netdev_attach_ops(sdata->dev, &ieee80211_monitorif_ops); + sdata->u.mntr_flags = MONITOR_FLAG_CONTROL | + MONITOR_FLAG_OTHER_BSS; + break; +--- a/drivers/net/wireless/orinoco/main.c ++++ b/drivers/net/wireless/orinoco/main.c +@@ -2272,9 +2272,9 @@ int orinoco_if_add(struct orinoco_privat + #endif + /* Default to standard ops if not set */ + if (ops) +- dev->netdev_ops = ops; ++ netdev_attach_ops(dev, ops); + else +- dev->netdev_ops = &orinoco_netdev_ops; ++ netdev_attach_ops(dev, &orinoco_netdev_ops); + + /* we use the default eth_mac_addr for setting the MAC addr */ + +--- a/net/wireless/wext-core.c ++++ b/net/wireless/wext-core.c +@@ -925,9 +925,7 @@ static int wireless_process_ioctl(struct + return private(dev, iwr, cmd, info, handler); + } + /* Old driver API : call driver ioctl handler */ +- if (dev->netdev_ops->ndo_do_ioctl) +- return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd); +- return -EOPNOTSUPP; ++ return ndo_do_ioctl(dev, ifr, cmd); + } + + /* If command is `set a parameter', or `get the encoding parameters', diff --git a/patches/collateral-evolutions/network/0002-net-misc.patch b/patches/collateral-evolutions/network/0002-net-misc.patch new file mode 100644 index 00000000..bd50e0d2 --- /dev/null +++ b/patches/collateral-evolutions/network/0002-net-misc.patch @@ -0,0 +1,68 @@ +These are things that removed in later kernels but no good explanatin +was provided as to their removal. We should review if this is needed +and if not remove these hunks. + +Pretty sure we can remove the netdev_tx_t hunk change on +net/bluetooth/bnep/netdev.c, removing that hunk just needs to be +compile tested against older kernels. + +--- a/drivers/net/usb/rndis_host.c ++++ b/drivers/net/usb/rndis_host.c +@@ -332,6 +332,11 @@ generic_rndis_bind(struct usbnet *dev, s + u.init->major_version = cpu_to_le32(1); + u.init->minor_version = cpu_to_le32(0); + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++ /* can't we remove this? */ ++ net->change_mtu = NULL; ++#endif ++ + /* max transfer (in spec) is 0x4000 at full speed, but for + * TX we'll stick to one Ethernet packet plus RNDIS framing. + * For RX we handle drivers that zero-pad to end-of-packet. +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1018,6 +1018,11 @@ static void ieee80211_if_setup(struct ne + ether_setup(dev); + dev->priv_flags &= ~IFF_TX_SKB_SHARING; + netdev_attach_ops(dev, &ieee80211_dataif_ops); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++ /* Do we need this ? */ ++ /* we will validate the address ourselves in ->open */ ++ dev->validate_addr = NULL; ++#endif + dev->destructor = free_netdev; + } + +--- a/net/bluetooth/bnep/netdev.c ++++ b/net/bluetooth/bnep/netdev.c +@@ -161,8 +161,12 @@ static int bnep_net_proto_filter(struct + } + #endif + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + static netdev_tx_t bnep_net_xmit(struct sk_buff *skb, + struct net_device *dev) ++#else ++static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev) ++#endif + { + struct bnep_session *s = netdev_priv(dev); + struct sock *sk = s->sock->sk; +--- a/drivers/net/wireless/libertas/defs.h ++++ b/drivers/net/wireless/libertas/defs.h +@@ -16,6 +16,14 @@ + #define DRV_NAME "libertas" + #endif + ++/* ++ * Really nasty hack to avoid stuffing compat.diff with tons of ifdefs, ++ * we could add this to a compat header file but too lazy to check ml_priv ++ * is not used anywhere else ++ */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) ++#define ml_priv priv ++#endif + + #define LBS_DEB_ENTER 0x00000001 + #define LBS_DEB_LEAVE 0x00000002 diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch new file mode 100644 index 00000000..a38ceaf6 --- /dev/null +++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch @@ -0,0 +1,36 @@ +This is an optimization introduced on newer kernels, just ignore for +older kernels on mac80211. For others the netdev->hard_header_len +could be used. + +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1518,6 +1518,7 @@ int ieee80211_if_add(struct ieee80211_lo + return -ENOMEM; + dev_net_set(ndev, wiphy_net(local->hw.wiphy)); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) + ndev->needed_headroom = local->tx_headroom + + 4*6 /* four MAC addresses */ + + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ +@@ -1526,6 +1527,7 @@ int ieee80211_if_add(struct ieee80211_lo + - ETH_HLEN /* ethernet hard_header_len */ + + IEEE80211_ENCRYPT_HEADROOM; + ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; ++#endif + + ret = dev_alloc_name(ndev, ndev->name); + if (ret < 0) { +--- a/drivers/net/wireless/orinoco/main.c ++++ b/drivers/net/wireless/orinoco/main.c +@@ -2279,7 +2279,11 @@ int orinoco_if_add(struct orinoco_privat + /* we use the default eth_mac_addr for setting the MAC addr */ + + /* Reserve space in skb for the SNAP header */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) + dev->needed_headroom = ENCAPS_OVERHEAD; ++#else ++ dev->hard_header_len += ENCAPS_OVERHEAD; ++#endif + + netif_carrier_off(dev); + diff --git a/patches/collateral-evolutions/network/0004-wext-namespace.patch b/patches/collateral-evolutions/network/0004-wext-namespace.patch new file mode 100644 index 00000000..606001b6 --- /dev/null +++ b/patches/collateral-evolutions/network/0004-wext-namespace.patch @@ -0,0 +1,58 @@ + +This patch backports the namespace changes added +through net/wireless/wext.c. + +--- a/net/wireless/wext-core.c ++++ b/net/wireless/wext-core.c +@@ -342,6 +342,7 @@ static const int compat_event_type_size[ + + /* IW event code */ + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + static int __net_init wext_pernet_init(struct net *net) + { + skb_queue_head_init(&net->wext_nlevents); +@@ -384,6 +385,29 @@ static void wireless_nlevent_process(str + + static DECLARE_WORK(wireless_nlevent_work, wireless_nlevent_process); + ++#else ++/* Older kernels get the old way of doing stuff*/ ++static struct sk_buff_head wireless_nlevent_queue; ++ ++static int __init wireless_nlevent_init(void) ++{ ++ skb_queue_head_init(&wireless_nlevent_queue); ++ return 0; ++} ++ ++subsys_initcall(wireless_nlevent_init); ++ ++static void wireless_nlevent_process(unsigned long data) ++{ ++ struct sk_buff *skb; ++ while ((skb = skb_dequeue(&wireless_nlevent_queue))) ++ rtnl_notify(skb, &init_net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC); ++} ++ ++static DECLARE_TASKLET(wireless_nlevent_tasklet, wireless_nlevent_process, 0); ++ ++#endif ++ + static struct nlmsghdr *rtnetlink_ifinfo_prep(struct net_device *dev, + struct sk_buff *skb) + { +@@ -597,8 +621,13 @@ void wireless_send_event(struct net_devi + + skb_shinfo(skb)->frag_list = compskb; + #endif ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + skb_queue_tail(&dev_net(dev)->wext_nlevents, skb); + schedule_work(&wireless_nlevent_work); ++#else ++ skb_queue_tail(&wireless_nlevent_queue, skb); ++ tasklet_schedule(&wireless_nlevent_tasklet); ++#endif + } + EXPORT_SYMBOL(wireless_send_event); + diff --git a/patches/collateral-evolutions/network/0005-netlink-portid.patch b/patches/collateral-evolutions/network/0005-netlink-portid.patch new file mode 100644 index 00000000..56dd3efc --- /dev/null +++ b/patches/collateral-evolutions/network/0005-netlink-portid.patch @@ -0,0 +1,315 @@ +The patch: + +commit 15e473046cb6e5d18a4d0057e61d76315230382b +Author: Eric W. Biederman <ebiederm@xmission.com> +Date: Fri Sep 7 20:12:54 2012 +0000 + + netlink: Rename pid to portid to avoid confusion + + It is a frequent mistake to confuse the netlink port identifier with a + process identifier. Try to reduce this confusion by renaming fields + that hold port identifiers portid instead of pid. + + I have carefully avoided changing the structures exported to + userspace to avoid changing the userspace API. + + I have successfully built an allyesconfig kernel with this change. + + Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> + Acked-by: Stephen Hemminger <shemminger@vyatta.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +Changed the struct members: + +struct netlink_notify->pid to +struct netlink_notify->portid + +struct genl_info->snd_pid to +struct genl_info->snd_portid + +To help backport this and not have to #ifdef around it against +kernel versions compat has introduced two helpers for us to +simply do the backport with two macro helpers: + +genl_info_snd_portid() +netlink_notify_portid() + +This takes care of the work for us requiring only one +single line change. If we get another patch thrown into +this file then I suspect we can extract SMPL out of it +and use it to backport further collateral evolutions like +this one should other drivers / subsystem need this change. + +--- a/drivers/net/wireless/mac80211_hwsim.c ++++ b/drivers/net/wireless/mac80211_hwsim.c +@@ -2019,10 +2019,10 @@ static int hwsim_register_received_nl(st + if (info == NULL) + goto out; + +- wmediumd_portid = info->snd_portid; ++ wmediumd_portid = genl_info_snd_portid(info); + + printk(KERN_DEBUG "mac80211_hwsim: received a REGISTER, " +- "switching to wmediumd mode with pid %d\n", info->snd_portid); ++ "switching to wmediumd mode with pid %d\n", genl_info_snd_portid(info)); + + return 0; + out: +@@ -2059,7 +2059,7 @@ static int mac80211_hwsim_netlink_notify + if (state != NETLINK_URELEASE) + return NOTIFY_DONE; + +- if (notify->portid == wmediumd_portid) { ++ if (netlink_notify_portid(notify) == wmediumd_portid) { + printk(KERN_INFO "mac80211_hwsim: wmediumd released netlink" + " socket, switching to perfect channel medium\n"); + wmediumd_portid = 0; +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_ + /* attempt to fit multiple wiphy data chunks into the skb */ + do { + ret = nl80211_send_wiphy(dev, skb, +- NETLINK_CB(cb->skb).portid, ++ NETLINK_CB_PORTID(cb->skb), + cb->nlh->nlmsg_seq, + NLM_F_MULTI, + split, &cb->args[1], +@@ -1642,7 +1642,7 @@ static int nl80211_get_wiphy(struct sk_b + if (!msg) + return -ENOMEM; + +- if (nl80211_send_wiphy(dev, msg, info->snd_portid, info->snd_seq, 0, ++ if (nl80211_send_wiphy(dev, msg, genl_info_snd_portid(info), info->snd_seq, 0, + false, NULL, NULL, NULL) < 0) { + nlmsg_free(msg); + return -ENOBUFS; +@@ -2222,7 +2222,7 @@ static int nl80211_dump_interface(struct + if_idx++; + continue; + } +- if (nl80211_send_iface(skb, NETLINK_CB(cb->skb).portid, ++ if (nl80211_send_iface(skb, NETLINK_CB_PORTID(cb->skb), + cb->nlh->nlmsg_seq, NLM_F_MULTI, + rdev, wdev) < 0) { + mutex_unlock(&rdev->devlist_mtx); +@@ -2253,7 +2253,7 @@ static int nl80211_get_interface(struct + if (!msg) + return -ENOMEM; + +- if (nl80211_send_iface(msg, info->snd_portid, info->snd_seq, 0, ++ if (nl80211_send_iface(msg, genl_info_snd_portid(info), info->snd_seq, 0, + dev, wdev) < 0) { + nlmsg_free(msg); + return -ENOBUFS; +@@ -2478,7 +2478,7 @@ static int nl80211_new_interface(struct + break; + } + +- if (nl80211_send_iface(msg, info->snd_portid, info->snd_seq, 0, ++ if (nl80211_send_iface(msg, genl_info_snd_portid(info), info->snd_seq, 0, + rdev, wdev) < 0) { + nlmsg_free(msg); + return -ENOBUFS; +@@ -2613,7 +2613,7 @@ static int nl80211_get_key(struct sk_buf + if (!msg) + return -ENOMEM; + +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_NEW_KEY); + if (IS_ERR(hdr)) + return PTR_ERR(hdr); +@@ -3549,7 +3549,7 @@ static int nl80211_dump_station(struct s + goto out_err; + + if (nl80211_send_station(skb, +- NETLINK_CB(cb->skb).portid, ++ NETLINK_CB_PORTID(cb->skb), + cb->nlh->nlmsg_seq, NLM_F_MULTI, + dev, netdev, mac_addr, + &sinfo) < 0) +@@ -3595,7 +3595,7 @@ static int nl80211_get_station(struct sk + if (!msg) + return -ENOMEM; + +- if (nl80211_send_station(msg, info->snd_portid, info->snd_seq, 0, ++ if (nl80211_send_station(msg, genl_info_snd_portid(info), info->snd_seq, 0, + rdev, dev, mac_addr, &sinfo) < 0) { + nlmsg_free(msg); + return -ENOBUFS; +@@ -4195,7 +4195,7 @@ static int nl80211_dump_mpath(struct sk_ + if (err) + goto out_err; + +- if (nl80211_send_mpath(skb, NETLINK_CB(cb->skb).portid, ++ if (nl80211_send_mpath(skb, NETLINK_CB_PORTID(cb->skb), + cb->nlh->nlmsg_seq, NLM_F_MULTI, + netdev, dst, next_hop, + &pinfo) < 0) +@@ -4244,7 +4244,7 @@ static int nl80211_get_mpath(struct sk_b + if (!msg) + return -ENOMEM; + +- if (nl80211_send_mpath(msg, info->snd_portid, info->snd_seq, 0, ++ if (nl80211_send_mpath(msg, genl_info_snd_portid(info), info->snd_seq, 0, + dev, dst, next_hop, &pinfo) < 0) { + nlmsg_free(msg); + return -ENOBUFS; +@@ -4508,7 +4508,7 @@ static int nl80211_get_mesh_config(struc + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!msg) + return -ENOMEM; +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_GET_MESH_CONFIG); + if (!hdr) + goto out; +@@ -4858,7 +4858,7 @@ static int nl80211_get_reg(struct sk_buf + goto out; + } + +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_GET_REG); + if (!hdr) + goto put_failure; +@@ -5558,7 +5558,7 @@ static int nl80211_send_bss(struct sk_bu + + ASSERT_WDEV_LOCK(wdev); + +- hdr = nl80211hdr_put(msg, NETLINK_CB(cb->skb).portid, seq, flags, ++ hdr = nl80211hdr_put(msg, NETLINK_CB_PORTID(cb->skb), seq, flags, + NL80211_CMD_NEW_SCAN_RESULTS); + if (!hdr) + return -1; +@@ -5789,7 +5789,7 @@ static int nl80211_dump_survey(struct sk + } + + if (nl80211_send_survey(skb, +- NETLINK_CB(cb->skb).portid, ++ NETLINK_CB_PORTID(cb->skb), + cb->nlh->nlmsg_seq, NLM_F_MULTI, + netdev, + &survey) < 0) +@@ -6448,7 +6448,7 @@ static int nl80211_testmode_dump(struct + } + + while (1) { +- void *hdr = nl80211hdr_put(skb, NETLINK_CB(cb->skb).portid, ++ void *hdr = nl80211hdr_put(skb, NETLINK_CB_PORTID(cb->skb), + cb->nlh->nlmsg_seq, NLM_F_MULTI, + NL80211_CMD_TESTMODE); + struct nlattr *tmdata; +@@ -6527,7 +6527,7 @@ struct sk_buff *cfg80211_testmode_alloc_ + return NULL; + + return __cfg80211_testmode_alloc_skb(rdev, approxlen, +- rdev->testmode_info->snd_portid, ++ genl_info_snd_portid(rdev->testmode_info), + rdev->testmode_info->snd_seq, + GFP_KERNEL); + } +@@ -6887,7 +6887,7 @@ static int nl80211_remain_on_channel(str + if (!msg) + return -ENOMEM; + +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_REMAIN_ON_CHANNEL); + + if (IS_ERR(hdr)) { +@@ -7106,7 +7106,7 @@ static int nl80211_register_mgmt(struct + if (!rdev->ops->mgmt_tx) + return -EOPNOTSUPP; + +- return cfg80211_mlme_register_mgmt(wdev, info->snd_portid, frame_type, ++ return cfg80211_mlme_register_mgmt(wdev, genl_info_snd_portid(info), frame_type, + nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]), + nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH])); + } +@@ -7176,7 +7176,7 @@ static int nl80211_tx_mgmt(struct sk_buf + if (!msg) + return -ENOMEM; + +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_FRAME); + + if (IS_ERR(hdr)) { +@@ -7291,7 +7291,7 @@ static int nl80211_get_power_save(struct + if (!msg) + return -ENOMEM; + +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_GET_POWER_SAVE); + if (!hdr) { + err = -ENOBUFS; +@@ -7583,7 +7583,7 @@ static int nl80211_get_wowlan(struct sk_ + if (!msg) + return -ENOMEM; + +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_GET_WOWLAN); + if (!hdr) + goto nla_put_failure; +@@ -8007,7 +8007,7 @@ static int nl80211_register_unexpected_f + if (wdev->ap_unexpected_nlportid) + return -EBUSY; + +- wdev->ap_unexpected_nlportid = info->snd_portid; ++ wdev->ap_unexpected_nlportid = genl_info_snd_portid(info); + return 0; + } + +@@ -8037,7 +8037,7 @@ static int nl80211_probe_client(struct s + if (!msg) + return -ENOMEM; + +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_PROBE_CLIENT); + + if (IS_ERR(hdr)) { +@@ -8081,13 +8081,13 @@ static int nl80211_register_beacons(stru + /* First, check if already registered. */ + spin_lock_bh(&rdev->beacon_registrations_lock); + list_for_each_entry(reg, &rdev->beacon_registrations, list) { +- if (reg->nlportid == info->snd_portid) { ++ if (reg->nlportid == genl_info_snd_portid(info)) { + rv = -EALREADY; + goto out_err; + } + } + /* Add it to the list */ +- nreg->nlportid = info->snd_portid; ++ nreg->nlportid = genl_info_snd_portid(info); + list_add(&nreg->list, &rdev->beacon_registrations); + + spin_unlock_bh(&rdev->beacon_registrations_lock); +@@ -8160,7 +8160,7 @@ static int nl80211_get_protocol_features + if (!msg) + return -ENOMEM; + +- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0, ++ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0, + NL80211_CMD_GET_PROTOCOL_FEATURES); + if (!hdr) + goto nla_put_failure; +@@ -10565,12 +10565,12 @@ static int nl80211_netlink_notify(struct + + list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) { + list_for_each_entry_rcu(wdev, &rdev->wdev_list, list) +- cfg80211_mlme_unregister_socket(wdev, notify->portid); ++ cfg80211_mlme_unregister_socket(wdev, netlink_notify_portid(notify)); + + spin_lock_bh(&rdev->beacon_registrations_lock); + list_for_each_entry_safe(reg, tmp, &rdev->beacon_registrations, + list) { +- if (reg->nlportid == notify->portid) { ++ if (reg->nlportid == netlink_notify_portid(notify)) { + list_del(®->list); + kfree(reg); + break; diff --git a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch new file mode 100644 index 00000000..ff7abf75 --- /dev/null +++ b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch @@ -0,0 +1,46 @@ +On older kernels, we can't do this workaround, so if you use +an old 64-bit kernel with compat you'd better upgrade. + +For more details of this work around refer to this commit +upstream that deals with the code added: + +commit 645e77def93f1dd0e211c7244fbe152dac8a7100 +Author: Johannes Berg <johannes.berg@intel.com> +Date: Fri Mar 1 14:03:49 2013 +0100 + + nl80211: increase wiphy dump size dynamically + + Given a device with many channels capabilities the wiphy + information can still overflow even though its size in + 3.9 was reduced to 3.8 levels. For new userspace and + kernel 3.10 we're going to implement a new "split dump" + protocol that can use multiple messages per wiphy. + + For now though, add a workaround to be able to send more + information to userspace. Since generic netlink doesn't + have a way to set the minimum dump size globally, and we + wouldn't really want to set it globally anyway, increase + the size only when needed, as described in the comments. + As userspace might not be prepared for large buffers, we + can only use 4k. + + Also increase the size for the get_wiphy command. + +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -1600,6 +1600,7 @@ static int nl80211_dump_wiphy(struct sk_ + &cb->args[2], + &cb->args[3]); + if (ret < 0) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) + /* + * If sending the wiphy data didn't fit (ENOBUFS + * or EMSGSIZE returned), this SKB is still +@@ -1620,6 +1621,7 @@ static int nl80211_dump_wiphy(struct sk_ + mutex_unlock(&cfg80211_mutex); + return 1; + } ++#endif + idx--; + break; + } diff --git a/patches/collateral-evolutions/network/02-ksize.patch b/patches/collateral-evolutions/network/02-ksize.patch new file mode 100644 index 00000000..934e2fae --- /dev/null +++ b/patches/collateral-evolutions/network/02-ksize.patch @@ -0,0 +1,37 @@ +ksize() was added as of 2.6.29, it gives you the actual +size of the allocated data. Since we have no support for +this we simply do not optimize for it and deal with +large alloocations for the IEs. + +We technically could backport this as + +define ksize(bleh) SOME_LARGE_NUMBER + +but doing it this way emphasis careful review +of the situation. + +--- a/drivers/net/wireless/orinoco/wext.c ++++ b/drivers/net/wireless/orinoco/wext.c +@@ -31,8 +31,22 @@ static int orinoco_set_key(struct orinoc + enum orinoco_alg alg, const u8 *key, int key_len, + const u8 *seq, int seq_len) + { ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,28) ++ int len; ++ if (!unlikely(ZERO_OR_NULL_PTR(priv->keys[index].key))) { ++ len = priv->keys[index].key_len; ++ memset(priv->keys[index].key, 0, len); ++ kfree(priv->keys[index].key); ++ } ++ if (!unlikely(ZERO_OR_NULL_PTR(priv->keys[index].seq))) { ++ len = priv->keys[index].seq_len; ++ memset(priv->keys[index].seq, 0, len); ++ kfree(priv->keys[index].seq); ++ } ++#else + kzfree(priv->keys[index].key); + kzfree(priv->keys[index].seq); ++#endif + + if (key_len) { + priv->keys[index].key = kzalloc(key_len, GFP_ATOMIC); diff --git a/patches/collateral-evolutions/network/03-rfkill.patch b/patches/collateral-evolutions/network/03-rfkill.patch new file mode 100644 index 00000000..5797d9f3 --- /dev/null +++ b/patches/collateral-evolutions/network/03-rfkill.patch @@ -0,0 +1,66 @@ +rfkill was re-implemented on 2.6.31. We port it to +older kernels with a simple hack, just rename the +module as a new one rfkill_backport, and every +exported symbol gets redefined with a _backport +postfix through compat-2.6.31.h. The changes below +are the ones we could not do through compat-2.6.31.h + +Do older kernels have /dev/rfkill ? I not then we can +just keep /dev/rfkill and not /dev/rfkill_backport. + +Note that 2.6.31 added netdevice notifier upon interface +dev_open() which on cfg80211 will check if checks to see +if rfkill is enabled (or if the mode of operation is not +supported) on the cfg80211_netdev_notifier_call() and if +so deny bringing the interface up. This was added via +commit: + +3b8bcfd5d31ea0fec58681d035544ace707d2536 + +Since older kernels will not have the notifier call +on dev_open() if we *really want* to port this we could have +mac80211's subif_open() call : + + ret = call_netdevice_notifiers(NETDEV_PRE_UP, dev); + ret = notifier_to_errno(ret); + if (ret) + return ret; + +This would do the policing from within mac80211. + +--- a/net/rfkill/Makefile ++++ b/net/rfkill/Makefile +@@ -2,8 +2,8 @@ + # Makefile for the RF switch subsystem. + # + +-rfkill-y += core.o +-rfkill-$(CONFIG_RFKILL_INPUT) += input.o +-obj-$(CONFIG_RFKILL) += rfkill.o ++rfkill_backport-y += core.o ++rfkill_backport-$(CONFIG_RFKILL_BACKPORT_INPUT) += input.o ++obj-$(CONFIG_RFKILL_BACKPORT) += rfkill_backport.o + obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o + obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o +--- a/net/rfkill/input.c ++++ b/net/rfkill/input.c +@@ -230,7 +230,7 @@ static int rfkill_connect(struct input_h + + handle->dev = dev; + handle->handler = handler; +- handle->name = "rfkill"; ++ handle->name = "rfkill_backport"; + + /* causes rfkill_start() to be called */ + error = input_register_handle(handle); +--- a/net/rfkill/core.c ++++ b/net/rfkill/core.c +@@ -826,7 +826,7 @@ static int rfkill_resume(struct device * + } + + static struct class rfkill_class = { +- .name = "rfkill", ++ .name = "rfkill_backport", + .dev_release = rfkill_release, + .dev_attrs = rfkill_dev_attrs, + .dev_uevent = rfkill_dev_uevent, diff --git a/patches/collateral-evolutions/network/04-netns.patch b/patches/collateral-evolutions/network/04-netns.patch new file mode 100644 index 00000000..51345b6e --- /dev/null +++ b/patches/collateral-evolutions/network/04-netns.patch @@ -0,0 +1,149 @@ +The only other namespace change. Note that pach 01-netdev.patch +also has some other namespace changes there, look at that file +for the other changes. It'd be nice to figure out a way to +bring thise here cleanly and seprately but they touch the same +files... + +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -6740,7 +6740,9 @@ static int nl80211_wiphy_netns(struct sk + if (!net_eq(wiphy_net(&rdev->wiphy), net)) + err = cfg80211_switch_netns(rdev, net); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + put_net(net); ++#endif + return err; + } + +--- a/net/wireless/core.c ++++ b/net/wireless/core.c +@@ -160,6 +160,7 @@ int cfg80211_dev_rename(struct cfg80211_ + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + int cfg80211_switch_netns(struct cfg80211_registered_device *rdev, + struct net *net) + { +@@ -204,6 +205,7 @@ int cfg80211_switch_netns(struct cfg8021 + + return 0; + } ++#endif + + static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data) + { +@@ -372,7 +374,9 @@ struct wiphy *wiphy_new(const struct cfg + rdev->wiphy.flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT; + #endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + wiphy_net_set(&rdev->wiphy, &init_net); ++#endif + + rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block; + rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev), +@@ -919,8 +923,10 @@ static int cfg80211_netdev_notifier_call + wdev->identifier = ++rdev->wdev_id; + list_add_rcu(&wdev->list, &rdev->wdev_list); + rdev->devlist_generation++; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + /* can only change netns with wiphy */ + dev->features |= NETIF_F_NETNS_LOCAL; ++#endif + + if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, + "phy80211")) { +@@ -1081,6 +1087,7 @@ static struct notifier_block cfg80211_ne + .notifier_call = cfg80211_netdev_notifier_call, + }; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + static void __net_exit cfg80211_pernet_exit(struct net *net) + { + struct cfg80211_registered_device *rdev; +@@ -1098,14 +1105,17 @@ static void __net_exit cfg80211_pernet_e + static struct pernet_operations cfg80211_pernet_ops = { + .exit = cfg80211_pernet_exit, + }; ++#endif + + static int __init cfg80211_init(void) + { + int err; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + err = register_pernet_device(&cfg80211_pernet_ops); + if (err) + goto out_fail_pernet; ++#endif + + err = wiphy_sysfs_init(); + if (err) +@@ -1142,8 +1152,10 @@ out_fail_nl80211: + out_fail_notifier: + wiphy_sysfs_exit(); + out_fail_sysfs: ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + unregister_pernet_device(&cfg80211_pernet_ops); + out_fail_pernet: ++#endif + return err; + } + subsys_initcall(cfg80211_init); +@@ -1155,7 +1167,9 @@ static void __exit cfg80211_exit(void) + unregister_netdevice_notifier(&cfg80211_netdev_notifier); + wiphy_sysfs_exit(); + regulatory_exit(); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + unregister_pernet_device(&cfg80211_pernet_ops); ++#endif + destroy_workqueue(cfg80211_wq); + } + module_exit(cfg80211_exit); +--- a/net/wireless/wext-core.c ++++ b/net/wireless/wext-core.c +@@ -367,6 +367,7 @@ static int __init wireless_nlevent_init( + subsys_initcall(wireless_nlevent_init); + + /* Process events generated by the wireless layer or the driver. */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + static void wireless_nlevent_process(struct work_struct *work) + { + struct sk_buff *skb; +@@ -382,6 +383,20 @@ static void wireless_nlevent_process(str + + rtnl_unlock(); + } ++#else ++static void wireless_nlevent_process(struct work_struct *work) ++{ ++ struct sk_buff *skb; ++ struct net *net; ++ ++ rtnl_lock(); ++ ++ while ((skb = skb_dequeue(&net->wext_nlevents))) ++ rtnl_notify(skb, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC); ++ ++ rtnl_unlock(); ++} ++#endif + + static DECLARE_WORK(wireless_nlevent_work, wireless_nlevent_process); + +--- a/net/wireless/wext-proc.c ++++ b/net/wireless/wext-proc.c +@@ -98,7 +98,11 @@ static void *wireless_dev_seq_start(stru + return SEQ_START_TOKEN; + + off = 1; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + for_each_netdev(net, dev) ++#else ++ for_each_netdev(net) ++#endif + if (off++ == *pos) + return dev; + return NULL; diff --git a/patches/collateral-evolutions/network/05-usb.patch b/patches/collateral-evolutions/network/05-usb.patch new file mode 100644 index 00000000..4303b565 --- /dev/null +++ b/patches/collateral-evolutions/network/05-usb.patch @@ -0,0 +1,26 @@ +USB opt soft_unbid was added as of 2.6.27. + +--- a/drivers/net/wireless/p54/p54usb.c ++++ b/drivers/net/wireless/p54/p54usb.c +@@ -1137,7 +1137,9 @@ static struct usb_driver p54u_driver = { + .resume = p54u_resume, + .reset_resume = p54u_resume, + #endif /* CONFIG_PM */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + .soft_unbind = 1, ++#endif + .disable_hub_initiated_lpm = 1, + }; + +--- a/drivers/net/wireless/ath/ath9k/hif_usb.c ++++ b/drivers/net/wireless/ath/ath9k/hif_usb.c +@@ -1370,7 +1370,9 @@ static struct usb_driver ath9k_hif_usb_d + .reset_resume = ath9k_hif_usb_resume, + #endif + .id_table = ath9k_hif_usb_ids, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + .soft_unbind = 1, ++#endif + .disable_hub_initiated_lpm = 1, + }; + diff --git a/patches/collateral-evolutions/network/06-header-changes.patch b/patches/collateral-evolutions/network/06-header-changes.patch new file mode 100644 index 00000000..647ce845 --- /dev/null +++ b/patches/collateral-evolutions/network/06-header-changes.patch @@ -0,0 +1,176 @@ + +Every kernel release there are a few changes to headers +made. Some code gets shifted around between headers or +new headers are defined. This patch deals with such +cases. + +--- a/drivers/net/wireless/ath/ath6kl/htc_pipe.c ++++ b/drivers/net/wireless/ath/ath6kl/htc_pipe.c +@@ -18,6 +18,10 @@ + #include "debug.h" + #include "hif-ops.h" + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++#include <asm/unaligned.h> ++#endif ++ + #define HTC_PACKET_CONTAINER_ALLOCATION 32 + #define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CTRL_MSG_LEN + HTC_HDR_LENGTH) + +--- a/drivers/net/wireless/b43/phy_common.h ++++ b/drivers/net/wireless/b43/phy_common.h +@@ -3,6 +3,9 @@ + + #include <linux/types.h> + #include <linux/nl80211.h> ++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28)) ++#include <asm/atomic.h> ++#endif + + struct b43_wldev; + +--- a/drivers/net/wireless/rtlwifi/base.c ++++ b/drivers/net/wireless/rtlwifi/base.c +@@ -36,6 +36,7 @@ + #include "regd.h" + + #include <linux/ip.h> ++#include <linux/in.h> + #include <linux/module.h> + + /* +--- a/drivers/net/wireless/ti/wl1251/main.c ++++ b/drivers/net/wireless/ti/wl1251/main.c +@@ -24,6 +24,9 @@ + #include <linux/firmware.h> + #include <linux/delay.h> + #include <linux/irq.h> ++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28)) ++#include <linux/device.h> ++#endif + #include <linux/crc32.h> + #include <linux/etherdevice.h> + #include <linux/vmalloc.h> +--- a/drivers/net/wireless/ti/wl1251/spi.c ++++ b/drivers/net/wireless/ti/wl1251/spi.c +@@ -24,6 +24,9 @@ + #include <linux/module.h> + #include <linux/slab.h> + #include <linux/crc7.h> ++#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,28)) ++#include <linux/device.h> ++#endif + #include <linux/spi/spi.h> + #include <linux/wl12xx.h> + +--- a/net/mac80211/key.c ++++ b/net/mac80211/key.c +@@ -24,6 +24,9 @@ + #include "aes_ccm.h" + #include "aes_cmac.h" + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++#include <asm/unaligned.h> ++#endif + + /** + * DOC: Key handling basics +--- a/net/mac80211/pm.c ++++ b/net/mac80211/pm.c +@@ -1,5 +1,6 @@ + #include <net/mac80211.h> + #include <net/rtnetlink.h> ++#include <linux/export.h> + + #include "ieee80211_i.h" + #include "mesh.h" +--- a/net/bluetooth/bnep/sock.c ++++ b/net/bluetooth/bnep/sock.c +@@ -26,6 +26,7 @@ + + #include <linux/export.h> + #include <linux/file.h> ++#include <linux/compat.h> + + #include "bnep.h" + +--- a/net/bluetooth/hci_sock.c ++++ b/net/bluetooth/hci_sock.c +@@ -25,6 +25,7 @@ + /* Bluetooth HCI sockets. */ + + #include <linux/export.h> ++#include <linux/compat.h> + #include <asm/unaligned.h> + + #include <net/bluetooth/bluetooth.h> +--- a/net/bluetooth/hidp/sock.c ++++ b/net/bluetooth/hidp/sock.c +@@ -22,6 +22,7 @@ + + #include <linux/export.h> + #include <linux/file.h> ++#include <linux/compat.h> + + #include "hidp.h" + +--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c ++++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c +@@ -20,6 +20,7 @@ + #include <linux/moduleparam.h> + #include <linux/inetdevice.h> + #include <linux/export.h> ++#include <asm/unaligned.h> + + #include "core.h" + #include "cfg80211.h" +--- a/drivers/net/wireless/mwifiex/usb.c ++++ b/drivers/net/wireless/mwifiex/usb.c +@@ -19,6 +19,7 @@ + + #include "main.h" + #include "usb.h" ++#include <linux/usb/audio.h> + + #define USB_VERSION "1.0" + +--- a/net/wireless/util.c ++++ b/net/wireless/util.c +@@ -10,6 +10,7 @@ + #include <net/cfg80211.h> + #include <net/ip.h> + #include <net/dsfield.h> ++#include <asm/unaligned.h> + #include "core.h" + #include "rdev-ops.h" + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -20,6 +20,7 @@ + #include <linux/ieee80211.h> + #include <net/cfg80211.h> + #include <asm/unaligned.h> ++#include <net/if_inet6.h> + + /** + * DOC: Introduction +--- a/drivers/net/wireless/ti/wlcore/event.c ++++ b/drivers/net/wireless/ti/wlcore/event.c +@@ -21,6 +21,7 @@ + * + */ + ++#include <linux/export.h> + #include "wlcore.h" + #include "debug.h" + #include "io.h" +--- a/drivers/net/wireless/ti/wlcore/scan.c ++++ b/drivers/net/wireless/ti/wlcore/scan.c +@@ -22,6 +22,7 @@ + */ + + #include <linux/ieee80211.h> ++#include <linux/export.h> + + #include "wlcore.h" + #include "debug.h" diff --git a/patches/collateral-evolutions/network/07-change-default-rate-alg.patch b/patches/collateral-evolutions/network/07-change-default-rate-alg.patch new file mode 100644 index 00000000..0584f9d8 --- /dev/null +++ b/patches/collateral-evolutions/network/07-change-default-rate-alg.patch @@ -0,0 +1,34 @@ + +Your current kernels configuration (.config and linux/autoconf.h) +are always respected when compiling external modules. Because +of this if you are using an old kernel which preferred the +PID rate control algorithm we cannot force it to use minstrel +instead. Minstrel is now the default rate control algorithm +and we want you to use it. To let you use it we redefine here +the CONFIG_MAC80211_RC_DEFAULT to CONFIG_COMPAT_MAC80211_RC_DEFAULT +and define CONFIG_COMPAT_MAC80211_RC_DEFAULT on config.mk. +Through the compat autoconf we then get it also defined there +at compilation time. + +--- a/net/mac80211/rate.c ++++ b/net/mac80211/rate.c +@@ -24,7 +24,7 @@ struct rate_control_alg { + static LIST_HEAD(rate_ctrl_algs); + static DEFINE_MUTEX(rate_ctrl_mutex); + +-static char *ieee80211_default_rc_algo = CONFIG_MAC80211_RC_DEFAULT; ++static char *ieee80211_default_rc_algo = CONFIG_COMPAT_MAC80211_RC_DEFAULT; + module_param(ieee80211_default_rc_algo, charp, 0644); + MODULE_PARM_DESC(ieee80211_default_rc_algo, + "Default rate control algorithm for mac80211 to use"); +@@ -120,8 +120,8 @@ ieee80211_rate_control_ops_get(const cha + ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo); + + /* try built-in one if specific alg requested but not found */ +- if (!ops && strlen(CONFIG_MAC80211_RC_DEFAULT)) +- ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT); ++ if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT)) ++ ops = ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT); + kparam_unblock_sysfs_write(ieee80211_default_rc_algo); + + return ops; diff --git a/patches/collateral-evolutions/network/08-rename-config-options.patch b/patches/collateral-evolutions/network/08-rename-config-options.patch new file mode 100644 index 00000000..c2ce7b73 --- /dev/null +++ b/patches/collateral-evolutions/network/08-rename-config-options.patch @@ -0,0 +1,192 @@ +This file renames CONFIG_ options that may be defined in older +kernels but that we know we can *safely* rename to other config +option names to ensure we disable building these options at +through this framework. An example here is ath9k's rate control +aglorithm is always selected by default via CONFIG_ATH9K_RATE_CONTROL. +By renaming this to CONFIG_COMPAT_ATH9K_RATE_CONTROL we have +the flexibility to disable it for a replacement driver. + +In kernel 2.6.26 and older CONFIG_IWL4965 was build as an extra +module, but now it is directly included in the iwlagn. + +CONFIG_IWL4965 has to be set to y, to build correctly. + +zd1211rw does not build with kernel < 2.6.28, but it is often activated +in the kernel config of older kernels. We rename the option to +deactivate it on older kernels. +CONFIG_BT_L2CAP and CONFIG_BT_SCO are boolean now, but often set to m +in the kernel config. + +CONFIG_BT_HIDP does not build with older kernel versions. + +--- a/drivers/net/wireless/Makefile ++++ b/drivers/net/wireless/Makefile +@@ -21,7 +21,7 @@ obj-$(CONFIG_PRISM54) += prism54/ + obj-$(CONFIG_HOSTAP) += hostap/ + obj-$(CONFIG_B43) += b43/ + obj-$(CONFIG_B43LEGACY) += b43legacy/ +-obj-$(CONFIG_ZD1211RW) += zd1211rw/ ++obj-$(CONFIG_COMPAT_ZD1211RW) += zd1211rw/ + obj-$(CONFIG_RTL8180) += rtl818x/ + obj-$(CONFIG_RTL8187) += rtl818x/ + obj-$(CONFIG_RTLWIFI) += rtlwifi/ +@@ -49,11 +49,11 @@ obj-$(CONFIG_P54_COMMON) += p54/ + + obj-$(CONFIG_ATH_CARDS) += ath/ + +-obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o ++obj-$(CONFIG_COMPAT_MAC80211_HWSIM) += mac80211_hwsim.o + + obj-$(CONFIG_WL_TI) += ti/ + +-obj-$(CONFIG_MWIFIEX) += mwifiex/ ++obj-$(CONFIG_COMPAT_MWIFIEX) += mwifiex/ + + obj-$(CONFIG_BRCMFMAC) += brcm80211/ + obj-$(CONFIG_BRCMSMAC) += brcm80211/ +--- a/drivers/net/wireless/iwlegacy/Makefile ++++ b/drivers/net/wireless/iwlegacy/Makefile +@@ -5,7 +5,7 @@ iwlegacy-$(CONFIG_IWLEGACY_DEBUGFS) += d + iwlegacy-objs += $(iwlegacy-m) + + # 4965 +-obj-$(CONFIG_IWL4965) += iwl4965.o ++obj-$(CONFIG_COMPAT_IWL4965) += iwl4965.o + iwl4965-objs := 4965.o 4965-mac.o 4965-rs.o 4965-calib.o + iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += 4965-debug.o + +--- a/drivers/net/wireless/iwlegacy/common.h ++++ b/drivers/net/wireless/iwlegacy/common.h +@@ -1348,7 +1348,7 @@ struct il_priv { + + } _3945; + #endif +-#if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE) ++#if defined(CONFIG_COMPAT_IWL4965) || defined(CONFIG_COMPAT_IWL4965_MODULE) + struct { + struct il_rx_phy_res last_phy_res; + bool last_phy_res_valid; +--- a/drivers/net/wireless/libertas/Makefile ++++ b/drivers/net/wireless/libertas/Makefile +@@ -17,5 +17,5 @@ libertas_spi-objs += if_spi.o + obj-$(CONFIG_LIBERTAS) += libertas.o + obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o + obj-$(CONFIG_LIBERTAS_CS) += libertas_cs.o +-obj-$(CONFIG_LIBERTAS_SDIO) += libertas_sdio.o ++obj-$(CONFIG_COMPAT_LIBERTAS_SDIO) += libertas_sdio.o + obj-$(CONFIG_LIBERTAS_SPI) += libertas_spi.o +--- a/drivers/net/wireless/zd1211rw/Makefile ++++ b/drivers/net/wireless/zd1211rw/Makefile +@@ -1,4 +1,4 @@ +-obj-$(CONFIG_ZD1211RW) += zd1211rw.o ++obj-$(CONFIG_COMPAT_ZD1211RW) += zd1211rw.o + + zd1211rw-objs := zd_chip.o zd_mac.o \ + zd_rf_al2230.o zd_rf_rf2959.o \ +--- a/net/bluetooth/Makefile ++++ b/net/bluetooth/Makefile +@@ -6,7 +6,7 @@ obj-$(CONFIG_BT) += bluetooth.o + obj-$(CONFIG_BT_RFCOMM) += rfcomm/ + obj-$(CONFIG_BT_BNEP) += bnep/ + obj-$(CONFIG_BT_CMTP) += cmtp/ +-obj-$(CONFIG_BT_HIDP) += hidp/ ++obj-$(CONFIG_COMPAT_BT_HIDP) += hidp/ + + bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \ + hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \ +--- a/net/bluetooth/hidp/Makefile ++++ b/net/bluetooth/hidp/Makefile +@@ -2,6 +2,6 @@ + # Makefile for the Linux Bluetooth HIDP layer + # + +-obj-$(CONFIG_BT_HIDP) += hidp.o ++obj-$(CONFIG_COMPAT_BT_HIDP) += hidp.o + + hidp-objs := core.o sock.o +--- a/drivers/net/wireless/ti/wl1251/Makefile ++++ b/drivers/net/wireless/ti/wl1251/Makefile +@@ -4,7 +4,7 @@ wl1251_spi-objs += spi.o + wl1251_sdio-objs += sdio.o + + obj-$(CONFIG_WL1251) += wl1251.o +-obj-$(CONFIG_WL1251_SPI) += wl1251_spi.o +-obj-$(CONFIG_WL1251_SDIO) += wl1251_sdio.o ++obj-$(CONFIG_COMPAT_WL1251_SPI)+= wl1251_spi.o ++obj-$(CONFIG_COMPAT_WL1251_SDIO)+= wl1251_sdio.o + + ccflags-y += -D__CHECK_ENDIAN__ +--- a/drivers/net/wireless/ath/ath9k/Makefile ++++ b/drivers/net/wireless/ath/ath9k/Makefile +@@ -8,7 +8,7 @@ ath9k-y += beacon.o \ + antenna.o + + ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o +-ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o ++ath9k-$(CONFIG_COMPAT_ATH9K_RATE_CONTROL) += rc.o + ath9k-$(CONFIG_ATH9K_PCI) += pci.o + ath9k-$(CONFIG_ATH9K_AHB) += ahb.o + ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o +--- a/drivers/net/wireless/ath/ath9k/init.c ++++ b/drivers/net/wireless/ath/ath9k/init.c +@@ -809,7 +809,7 @@ void ath9k_set_hw_capab(struct ath_softc + sc->ant_rx = hw->wiphy->available_antennas_rx; + sc->ant_tx = hw->wiphy->available_antennas_tx; + +-#ifdef CONFIG_ATH9K_RATE_CONTROL ++#ifdef CONFIG_COMPAT_ATH9K_RATE_CONTROL + hw->rate_control_algorithm = "ath9k_rate_control"; + #endif + +--- a/drivers/net/wireless/ath/ath9k/rc.h ++++ b/drivers/net/wireless/ath/ath9k/rc.h +@@ -231,7 +231,7 @@ static inline void ath_debug_stat_retrie + } + #endif + +-#ifdef CONFIG_ATH9K_RATE_CONTROL ++#ifdef CONFIG_COMPAT_ATH9K_RATE_CONTROL + int ath_rate_control_register(void); + void ath_rate_control_unregister(void); + #else +--- a/net/bluetooth/rfcomm/Makefile ++++ b/net/bluetooth/rfcomm/Makefile +@@ -5,4 +5,4 @@ + obj-$(CONFIG_BT_RFCOMM) += rfcomm.o + + rfcomm-y := core.o sock.o +-rfcomm-$(CONFIG_BT_RFCOMM_TTY) += tty.o ++rfcomm-$(CONFIG_COMPAT_BT_RFCOMM_TTY) += tty.o +--- a/include/net/bluetooth/rfcomm.h ++++ b/include/net/bluetooth/rfcomm.h +@@ -351,7 +351,7 @@ struct rfcomm_dev_list_req { + + int rfcomm_dev_ioctl(struct sock *sk, unsigned int cmd, void __user *arg); + +-#ifdef CONFIG_BT_RFCOMM_TTY ++#ifdef CONFIG_COMPAT_BT_RFCOMM_TTY + int rfcomm_init_ttys(void); + void rfcomm_cleanup_ttys(void); + #else +--- a/net/bluetooth/rfcomm/sock.c ++++ b/net/bluetooth/rfcomm/sock.c +@@ -860,7 +860,7 @@ static int rfcomm_sock_ioctl(struct sock + err = bt_sock_ioctl(sock, cmd, arg); + + if (err == -ENOIOCTLCMD) { +-#ifdef CONFIG_BT_RFCOMM_TTY ++#ifdef CONFIG_COMPAT_BT_RFCOMM_TTY + lock_sock(sk); + err = rfcomm_dev_ioctl(sk, cmd, (void __user *) arg); + release_sock(sk); +--- a/drivers/net/wireless/mwifiex/Makefile ++++ b/drivers/net/wireless/mwifiex/Makefile +@@ -41,7 +41,7 @@ mwifiex-y += uap_txrx.o + mwifiex-y += cfg80211.o + mwifiex-y += ethtool.o + mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o +-obj-$(CONFIG_MWIFIEX) += mwifiex.o ++obj-$(CONFIG_COMPAT_MWIFIEX) += mwifiex.o + + mwifiex_sdio-y += sdio.o + obj-$(CONFIG_MWIFIEX_SDIO) += mwifiex_sdio.o diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch new file mode 100644 index 00000000..fcc721d0 --- /dev/null +++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding.patch @@ -0,0 +1,62 @@ +This is a tricky one. + +Consider a kernel that has this code in net/wireless/wext-core.c: + +#ifdef CONFIG_CFG80211_WEXT + if (dev->ieee80211_ptr && dev->ieee80211_ptr->wiphy) + handlers = dev->ieee80211_ptr->wiphy->wext; +#endif +#ifdef CONFIG_WIRELESS_EXT + if (dev->wireless_handlers) + handlers = dev->wireless_handlers; +#endif + +If a kernel is compiled without CONFIG_WIRELESS_EXT then +compat-drivers can't do wireless extensions against it. +However, if the kernel is compiled with CONFIG_CFG80211_WEXT +then it will try to get the wext handlers from struct wiphy. + +Now, struct wiphy in the base kernel and struct wiphy in +compat-drivers don't match, so the kernel crashes!! + +To fix this, add lots of padding to compat-drivers's +struct wiphy so that the "wext" pointer is guaranteed +to be NULL. + +Make sure the padding is larger than the struct so we +don't ever run into this again because the wext pointer +moved due to struct enlargements. + + +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -2561,6 +2561,9 @@ struct wiphy_wowlan_support { + struct wiphy { + /* assign these fields before you register the wiphy */ + ++#define WIPHY_COMPAT_PAD_SIZE 2048 ++ u8 padding[WIPHY_COMPAT_PAD_SIZE]; ++ + /* permanent MAC address(es) */ + u8 perm_addr[ETH_ALEN]; + u8 addr_mask[ETH_ALEN]; +--- a/net/wireless/core.c ++++ b/net/wireless/core.c +@@ -316,6 +316,17 @@ struct wiphy *wiphy_new(const struct cfg + struct cfg80211_registered_device *rdev; + int alloc_size; + ++ /* ++ * Make sure the padding is >= the rest of the struct so that we ++ * always keep it large enough to pad out the entire original ++ * kernel's struct. We really only need to make sure it's larger ++ * than the kernel compat is compiled against, but since it'll ++ * only increase in size make sure it's larger than the current ++ * version of it. Subtract since it's included. ++ */ ++ BUILD_BUG_ON(WIPHY_COMPAT_PAD_SIZE < ++ sizeof(struct wiphy) - WIPHY_COMPAT_PAD_SIZE); ++ + WARN_ON(ops->add_key && (!ops->del_key || !ops->set_default_key)); + WARN_ON(ops->auth && (!ops->assoc || !ops->deauth || !ops->disassoc)); + WARN_ON(ops->connect && !ops->disconnect); diff --git a/patches/collateral-evolutions/network/09-threaded-irq.patch b/patches/collateral-evolutions/network/09-threaded-irq.patch new file mode 100644 index 00000000..ecd1765c --- /dev/null +++ b/patches/collateral-evolutions/network/09-threaded-irq.patch @@ -0,0 +1,181 @@ +The 2.6.31 kernel has threaded IRQ support and b43 is the first +wireless driver that makes use of it. To support threaded IRSs +on older kernels we built our own struct compat_threaded_irq +to queue_work() onto it as the kernel thread be running the +thread in process context as well. + +--- a/drivers/net/wireless/b43/main.c ++++ b/drivers/net/wireless/b43/main.c +@@ -4243,8 +4243,13 @@ redo: + if (b43_bus_host_is_sdio(dev->dev)) { + b43_sdio_free_irq(dev); + } else { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ compat_synchronize_threaded_irq(&dev->irq_compat); ++ compat_free_threaded_irq(&dev->irq_compat); ++#else + synchronize_irq(dev->dev->irq); + free_irq(dev->dev->irq, dev); ++#endif + } + mutex_lock(&wl->mutex); + dev = wl->current_dev; +@@ -4290,9 +4295,17 @@ static int b43_wireless_core_start(struc + goto out; + } + } else { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ err = compat_request_threaded_irq(&dev->irq_compat, ++ dev->dev->irq, ++ b43_interrupt_handler, ++ b43_interrupt_thread_handler, ++ IRQF_SHARED, KBUILD_MODNAME, dev); ++#else + err = request_threaded_irq(dev->dev->irq, b43_interrupt_handler, + b43_interrupt_thread_handler, + IRQF_SHARED, KBUILD_MODNAME, dev); ++#endif + if (err) { + b43err(dev->wl, "Cannot request IRQ-%d\n", + dev->dev->irq); +@@ -5115,6 +5128,10 @@ static int b43_setup_bands(struct b43_wl + + static void b43_wireless_core_detach(struct b43_wldev *dev) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ if (dev->dev->sdev->bus->bustype != SSB_BUSTYPE_SDIO) ++ compat_destroy_threaded_irq(&dev->irq_compat); ++#endif + /* We release firmware that late to not be required to re-request + * is all the time when we reinit the core. */ + b43_release_firmware(dev); +--- a/drivers/net/wireless/b43/b43.h ++++ b/drivers/net/wireless/b43/b43.h +@@ -872,6 +872,9 @@ struct b43_wldev { + unsigned int tx_count; + unsigned int rx_count; + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + }; + + /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ +--- a/drivers/net/wireless/iwlwifi/pcie/internal.h ++++ b/drivers/net/wireless/iwlwifi/pcie/internal.h +@@ -311,6 +311,9 @@ struct iwl_trans_pcie { + + /*protect hw register */ + spinlock_t reg_lock; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + }; + + /** +--- a/drivers/net/wireless/iwlwifi/pcie/trans.c ++++ b/drivers/net/wireless/iwlwifi/pcie/trans.c +@@ -773,12 +773,21 @@ void iwl_trans_pcie_free(struct iwl_tran + { + struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ compat_synchronize_threaded_irq(&trans_pcie->irq_compat); ++#else + synchronize_irq(trans_pcie->pci_dev->irq); ++#endif + + iwl_pcie_tx_free(trans); + iwl_pcie_rx_free(trans); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ compat_free_threaded_irq(&trans_pcie->irq_compat); ++ compat_destroy_threaded_irq(&trans_pcie->irq_compat); ++#else + free_irq(trans_pcie->pci_dev->irq, trans); ++#endif + iwl_pcie_free_ict(trans); + + pci_disable_msi(trans_pcie->pci_dev); +@@ -1566,9 +1575,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s + if (iwl_pcie_alloc_ict(trans)) + goto out_free_cmd_pool; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ if (compat_request_threaded_irq(&trans_pcie->irq_compat, ++ pdev->irq, iwl_pcie_isr_ict, ++ iwl_pcie_irq_handler, ++ IRQF_SHARED, DRV_NAME, trans)) { ++#else + if (request_threaded_irq(pdev->irq, iwl_pcie_isr_ict, + iwl_pcie_irq_handler, + IRQF_SHARED, DRV_NAME, trans)) { ++#endif + IWL_ERR(trans, "Error allocating IRQ %d\n", pdev->irq); + goto out_free_ict; + } +--- a/drivers/net/wireless/ti/wlcore/main.c ++++ b/drivers/net/wireless/ti/wlcore/main.c +@@ -6054,13 +6054,24 @@ static void wlcore_nvs_cb(const struct f + wl->platform_quirks = pdata->platform_quirks; + wl->if_ops = pdev_data->if_ops; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) ++ irqflags = IRQF_TRIGGER_RISING; ++#else + if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ) + irqflags = IRQF_TRIGGER_RISING; + else + irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT; ++#endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ ret = compat_request_threaded_irq(&wl->irq_compat, wl->irq, ++ NULL, wlcore_irq, ++ irqflags, ++ pdev->name, wl); ++#else + ret = request_threaded_irq(wl->irq, NULL, wlcore_irq, + irqflags, pdev->name, wl); ++#endif + if (ret < 0) { + wl1271_error("request_irq() failed: %d", ret); + goto out_free_nvs; +@@ -6135,7 +6146,11 @@ out_unreg: + wl1271_unregister_hw(wl); + + out_irq: ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ compat_free_threaded_irq(&wl->irq_compat); ++#else + free_irq(wl->irq, wl); ++#endif + + out_free_nvs: + kfree(wl->nvs); +@@ -6181,7 +6196,12 @@ int wlcore_remove(struct platform_device + disable_irq_wake(wl->irq); + } + wl1271_unregister_hw(wl); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ compat_free_threaded_irq(&wl->irq_compat); ++ compat_destroy_threaded_irq(&wl->irq_compat); ++#else + free_irq(wl->irq, wl); ++#endif + wlcore_free_hw(wl); + + return 0; +--- a/drivers/net/wireless/ti/wlcore/wlcore.h ++++ b/drivers/net/wireless/ti/wlcore/wlcore.h +@@ -175,7 +175,9 @@ struct wl1271 { + bool initialized; + struct ieee80211_hw *hw; + bool mac80211_registered; +- ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + struct device *dev; + struct platform_device *pdev; + diff --git a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch new file mode 100644 index 00000000..2e2aca0c --- /dev/null +++ b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch @@ -0,0 +1,47 @@ +The patch "wext: refactor" by Johannes Berg refactored +wext code so that new kernels no longer get the wext +handlers through struct netdevice, instead they get +it through the struct wiphy which is cfg80211 specific. + +For old kernels this means you get not wext handlers +anymore when backporting code, this adds the wext handler +back to the netdevice wireless_handlers to let compat +users use wext again. + +We do this for every kernel version because the struct wiphy +is changing from kernel version to version. At least the +struct from kernel 2.6.33 and 2.6.34 are incompatible and +the kernel would dereference some wrong type in the struct +and oops. The old interface is not affected by this. This +will cause that CONFIG_CFG80211_WEXT still depends on +CONFIG_WIRELESS_EXT in compat-drivers. + +--- a/net/wireless/core.c ++++ b/net/wireless/core.c +@@ -373,10 +373,6 @@ struct wiphy *wiphy_new(const struct cfg + INIT_WORK(&rdev->sched_scan_results_wk, __cfg80211_sched_scan_results); + INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk, + cfg80211_dfs_channels_update_work); +-#ifdef CONFIG_CFG80211_WEXT +- rdev->wiphy.wext = &cfg80211_wext_handler; +-#endif +- + device_initialize(&rdev->wiphy.dev); + rdev->wiphy.dev.class = &ieee80211_class; + rdev->wiphy.dev.platform_data = rdev; +@@ -947,6 +943,15 @@ static int cfg80211_netdev_notifier_call + wdev->sme_state = CFG80211_SME_IDLE; + mutex_unlock(&rdev->devlist_mtx); + #ifdef CONFIG_CFG80211_WEXT ++#ifdef CONFIG_WIRELESS_EXT ++ if (!dev->wireless_handlers) ++ dev->wireless_handlers = &cfg80211_wext_handler; ++#else ++ printk_once(KERN_WARNING "cfg80211: wext will not work because " ++ "kernel was compiled with CONFIG_WIRELESS_EXT=n. " ++ "Tools using wext interface, like iwconfig will " ++ "not work.\n"); ++#endif + wdev->wext.default_key = -1; + wdev->wext.default_mgmt_key = -1; + wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC; diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch new file mode 100644 index 00000000..4d9ae952 --- /dev/null +++ b/patches/collateral-evolutions/network/11-dev-pm-ops.patch @@ -0,0 +1,379 @@ +The 2.6.29 kernel has new struct dev_pm_ops [1] which are used +on the pci device to distinguish power management hooks for suspend +to RAM and hibernation. Older kernels don't have these so we need +to resort back to the good ol' suspend/resume. Fortunately the calls +are not so different so it should be possible to resuse the same +calls on compat code with only slight modifications. + +[1] http://lxr.linux.no/#linux+v2.6.29/include/linux/pm.h#L170 + +--- a/drivers/bcma/host_pci.c ++++ b/drivers/bcma/host_pci.c +@@ -257,6 +257,9 @@ static int bcma_host_pci_resume(struct d + return bcma_bus_resume(bus); + } + ++compat_pci_suspend(bcma_host_pci_suspend) ++compat_pci_resume(bcma_host_pci_resume) ++ + static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, + bcma_host_pci_resume); + #define BCMA_PM_OPS (&bcma_pm_ops) +@@ -285,7 +288,12 @@ static struct pci_driver bcma_pci_bridge + .id_table = bcma_pci_bridge_tbl, + .probe = bcma_host_pci_probe, + .remove = bcma_host_pci_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = BCMA_PM_OPS, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = bcma_host_pci_suspend_compat, ++ .resume = bcma_host_pci_resume_compat, ++#endif + }; + + int __init bcma_host_pci_init(void) +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -2743,6 +2743,9 @@ static const struct pci_error_handlers a + .resume = atl1c_io_resume, + }; + ++compat_pci_suspend(atl1c_suspend) ++compat_pci_resume(atl1c_resume) ++ + static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume); + + static struct pci_driver atl1c_driver = { +@@ -2752,7 +2755,12 @@ static struct pci_driver atl1c_driver = + .remove = atl1c_remove, + .shutdown = atl1c_shutdown, + .err_handler = &atl1c_err_handler, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = &atl1c_pm_ops, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = atl1c_suspend_compat, ++ .resume = atl1c_resume_compat, ++#endif + }; + + /** +--- a/drivers/net/ethernet/atheros/atlx/atl1.c ++++ b/drivers/net/ethernet/atheros/atlx/atl1.c +@@ -2877,6 +2877,9 @@ static int atl1_resume(struct device *de + return 0; + } + ++compat_pci_suspend(atl1_suspend) ++compat_pci_resume(atl1_resume) ++ + static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume); + #define ATL1_PM_OPS (&atl1_pm_ops) + +@@ -3147,7 +3150,12 @@ static struct pci_driver atl1_driver = { + .probe = atl1_probe, + .remove = atl1_remove, + .shutdown = atl1_shutdown, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = ATL1_PM_OPS, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = atl1_suspend_compat, ++ .resume = atl1_resume_compat, ++#endif + }; + + /** +--- a/drivers/net/wireless/ath/ath5k/pci.c ++++ b/drivers/net/wireless/ath/ath5k/pci.c +@@ -326,6 +326,9 @@ static int ath5k_pci_resume(struct devic + return 0; + } + ++compat_pci_suspend(ath5k_pci_suspend) ++compat_pci_resume(ath5k_pci_resume) ++ + static SIMPLE_DEV_PM_OPS(ath5k_pm_ops, ath5k_pci_suspend, ath5k_pci_resume); + #define ATH5K_PM_OPS (&ath5k_pm_ops) + #else +@@ -337,7 +340,12 @@ static struct pci_driver ath5k_pci_drive + .id_table = ath5k_pci_id_table, + .probe = ath5k_pci_probe, + .remove = ath5k_pci_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = ATH5K_PM_OPS, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = ath5k_pci_suspend_compat, ++ .resume = ath5k_pci_resume_compat, ++#endif + }; + + module_pci_driver(ath5k_pci_driver); +--- a/drivers/net/wireless/ath/ath9k/pci.c ++++ b/drivers/net/wireless/ath/ath9k/pci.c +@@ -310,6 +310,9 @@ static int ath_pci_resume(struct device + return 0; + } + ++compat_pci_suspend(ath_pci_suspend); ++compat_pci_resume(ath_pci_resume); ++ + static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume); + + #define ATH9K_PM_OPS (&ath9k_pm_ops) +@@ -328,7 +331,12 @@ static struct pci_driver ath_pci_driver + .id_table = ath_pci_id_table, + .probe = ath_pci_probe, + .remove = ath_pci_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = ATH9K_PM_OPS, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = ath_pci_suspend_compat, ++ .resume = ath_pci_resume_compat, ++#endif + }; + + int ath_pci_init(void) +--- a/drivers/net/wireless/iwlegacy/3945-mac.c ++++ b/drivers/net/wireless/iwlegacy/3945-mac.c +@@ -3909,7 +3909,12 @@ static struct pci_driver il3945_driver = + .id_table = il3945_hw_card_ids, + .probe = il3945_pci_probe, + .remove = il3945_pci_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = IL_LEGACY_PM_OPS, ++#elif defined(CONFIG_PM) ++ .suspend = il_pci_suspend_compat, ++ .resume = il_pci_resume_compat, ++#endif + }; + + static int __init +--- a/drivers/net/wireless/iwlegacy/4965-mac.c ++++ b/drivers/net/wireless/iwlegacy/4965-mac.c +@@ -6803,7 +6803,12 @@ static struct pci_driver il4965_driver = + .id_table = il4965_hw_card_ids, + .probe = il4965_pci_probe, + .remove = il4965_pci_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = IL_LEGACY_PM_OPS, ++#elif defined(CONFIG_PM) ++ .suspend = il_pci_suspend_compat, ++ .resume = il_pci_resume_compat, ++#endif + }; + + static int __init +--- a/drivers/net/wireless/iwlegacy/common.c ++++ b/drivers/net/wireless/iwlegacy/common.c +@@ -4935,8 +4935,17 @@ il_pci_resume(struct device *device) + return 0; + } + ++compat_pci_suspend(il_pci_suspend) ++compat_pci_resume(il_pci_resume) ++ + SIMPLE_DEV_PM_OPS(il_pm_ops, il_pci_suspend, il_pci_resume); ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + EXPORT_SYMBOL(il_pm_ops); ++#else ++EXPORT_SYMBOL(il_pci_suspend_compat); ++EXPORT_SYMBOL(il_pci_resume_compat); ++#endif + + #endif /* CONFIG_PM_SLEEP */ + +--- a/drivers/net/wireless/iwlegacy/common.h ++++ b/drivers/net/wireless/iwlegacy/common.h +@@ -1833,7 +1833,14 @@ __le32 il_add_beacon_time(struct il_priv + u32 beacon_interval); + + #ifdef CONFIG_PM ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) ++int il_pci_suspend_compat(struct pci_dev *pdev, pm_message_t state); ++int il_pci_resume_compat(struct pci_dev *pdev); ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)) ++extern struct dev_pm_ops il_pm_ops; ++#else + extern const struct dev_pm_ops il_pm_ops; ++#endif + + #define IL_LEGACY_PM_OPS (&il_pm_ops) + +--- a/drivers/net/wireless/iwlwifi/pcie/drv.c ++++ b/drivers/net/wireless/iwlwifi/pcie/drv.c +@@ -347,6 +347,9 @@ static int iwl_pci_resume(struct device + return iwl_trans_resume(iwl_trans); + } + ++compat_pci_suspend(iwl_pci_suspend) ++compat_pci_resume(iwl_pci_resume) ++ + static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); + + #define IWL_PM_OPS (&iwl_dev_pm_ops) +@@ -362,7 +365,12 @@ static struct pci_driver iwl_pci_driver + .id_table = iwl_hw_card_ids, + .probe = iwl_pci_probe, + .remove = iwl_pci_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = IWL_PM_OPS, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = iwl_pci_suspend_compat, ++ .resume = iwl_pci_resume_compat, ++#endif + }; + + int __must_check iwl_pci_register_driver(void) +--- a/drivers/net/wireless/libertas/if_spi.c ++++ b/drivers/net/wireless/libertas/if_spi.c +@@ -1249,6 +1249,7 @@ static int libertas_spi_remove(struct sp + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + static int if_spi_suspend(struct device *dev) + { + struct spi_device *spi = to_spi_device(dev); +@@ -1282,6 +1283,7 @@ static const struct dev_pm_ops if_spi_pm + .suspend = if_spi_suspend, + .resume = if_spi_resume, + }; ++#endif + + static struct spi_driver libertas_spi_driver = { + .probe = if_spi_probe, +@@ -1289,7 +1291,9 @@ static struct spi_driver libertas_spi_dr + .driver = { + .name = "libertas_spi", + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .pm = &if_spi_pm_ops, ++#endif + }, + }; + +--- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c ++++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +@@ -372,6 +372,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use + MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); + MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); + ++compat_pci_suspend(rtl_pci_suspend); ++compat_pci_resume(rtl_pci_resume); ++ + static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); + + static struct pci_driver rtl92ce_driver = { +@@ -379,7 +382,12 @@ static struct pci_driver rtl92ce_driver + .id_table = rtl92ce_pci_ids, + .probe = rtl_pci_probe, + .remove = rtl_pci_disconnect, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = &rtlwifi_pm_ops, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = rtl_pci_suspend_compat, ++ .resume = rtl_pci_resume_compat, ++#endif + }; + + module_pci_driver(rtl92ce_driver); +--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c ++++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c +@@ -378,6 +378,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use + MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); + MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); + ++compat_pci_suspend(rtl_pci_suspend); ++compat_pci_resume(rtl_pci_resume); ++ + static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); + + static struct pci_driver rtl92de_driver = { +@@ -385,7 +388,12 @@ static struct pci_driver rtl92de_driver + .id_table = rtl92de_pci_ids, + .probe = rtl_pci_probe, + .remove = rtl_pci_disconnect, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = &rtlwifi_pm_ops, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = rtl_pci_suspend_compat, ++ .resume = rtl_pci_resume_compat, ++#endif + }; + + /* add global spin lock to solve the problem that +--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c ++++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +@@ -429,6 +429,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use + MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); + MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); + ++compat_pci_suspend(rtl_pci_suspend); ++compat_pci_resume(rtl_pci_resume); ++ + static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); + + static struct pci_driver rtl92se_driver = { +@@ -436,7 +439,12 @@ static struct pci_driver rtl92se_driver + .id_table = rtl92se_pci_ids, + .probe = rtl_pci_probe, + .remove = rtl_pci_disconnect, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = &rtlwifi_pm_ops, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = rtl_pci_suspend_compat, ++ .resume = rtl_pci_resume_compat, ++#endif + }; + + module_pci_driver(rtl92se_driver); +--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c ++++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c +@@ -367,6 +367,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use + MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); + MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); + ++compat_pci_suspend(rtl_pci_suspend); ++compat_pci_resume(rtl_pci_resume); ++ + static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); + + static struct pci_driver rtl8723ae_driver = { +@@ -374,7 +377,12 @@ static struct pci_driver rtl8723ae_drive + .id_table = rtl8723ae_pci_ids, + .probe = rtl_pci_probe, + .remove = rtl_pci_disconnect, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = &rtlwifi_pm_ops, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = rtl_pci_suspend_compat, ++ .resume = rtl_pci_resume_compat, ++#endif + }; + + module_pci_driver(rtl8723ae_driver); +--- a/drivers/net/wireless/p54/p54pci.c ++++ b/drivers/net/wireless/p54/p54pci.c +@@ -684,6 +684,9 @@ static int p54p_resume(struct device *de + return pci_set_power_state(pdev, PCI_D0); + } + ++compat_pci_suspend(p54p_suspend); ++compat_pci_resume(p54p_resume); ++ + static SIMPLE_DEV_PM_OPS(p54pci_pm_ops, p54p_suspend, p54p_resume); + + #define P54P_PM_OPS (&p54pci_pm_ops) +@@ -696,7 +699,12 @@ static struct pci_driver p54p_driver = { + .id_table = p54p_table, + .probe = p54p_probe, + .remove = p54p_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = P54P_PM_OPS, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = p54p_suspend_compat, ++ .resume = p54p_resume_compat, ++#endif + }; + + module_pci_driver(p54p_driver); diff --git a/patches/collateral-evolutions/network/12-iw_handler-changes.patch b/patches/collateral-evolutions/network/12-iw_handler-changes.patch new file mode 100644 index 00000000..d7a6a6dd --- /dev/null +++ b/patches/collateral-evolutions/network/12-iw_handler-changes.patch @@ -0,0 +1,14 @@ +--- a/drivers/net/wireless/ipw2x00/ipw2100.c ++++ b/drivers/net/wireless/ipw2x00/ipw2100.c +@@ -6089,7 +6089,11 @@ static struct net_device *ipw2100_alloc_ + netdev_attach_ops(dev, &ipw2100_netdev_ops); + dev->ethtool_ops = &ipw2100_ethtool_ops; + dev->wireless_handlers = &ipw2100_wx_handler_def; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + priv->wireless_data.libipw = priv->ieee; ++#else ++ priv->wireless_data.ieee80211 = (struct ieee80211_device *) priv->ieee; ++#endif + dev->wireless_data = &priv->wireless_data; + dev->watchdog_timeo = 3 * HZ; + dev->irq = 0; diff --git a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch new file mode 100644 index 00000000..3d497dfd --- /dev/null +++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch @@ -0,0 +1,24 @@ +We can't possibly backport the wifi TX status since +skb_shinfo()->tx_flags used to be a union and there +is no way to make the & work properly in that case. +So we need to just ifdef this part out. + + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -2035,6 +2035,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s + goto fail_rcu; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) + if (unlikely(!multicast && skb->sk && + skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { + struct sk_buff *orig_skb = skb; +@@ -2063,6 +2064,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s + skb = orig_skb; + } + } ++#endif + + /* + * If the skb is shared we need to obtain our own copy. diff --git a/patches/collateral-evolutions/network/14-device-type.patch b/patches/collateral-evolutions/network/14-device-type.patch new file mode 100644 index 00000000..b5163991 --- /dev/null +++ b/patches/collateral-evolutions/network/14-device-type.patch @@ -0,0 +1,56 @@ +Kernels >= 2.6.32 can identify the type of device netdevice +so that sysfs can be used to get this. We never really had a +systematic way of doing this -- now we do through the +SET_NETDEV_DEVTYPE() macro. For older kernels we make the +SET_NETDEV_DEVTYPE() be a no-op this means the wireless type +we define is unused so we ucomment it simply to avoid a +compile warning. + +--- a/net/wireless/core.c ++++ b/net/wireless/core.c +@@ -839,9 +839,11 @@ void cfg80211_unregister_wdev(struct wir + } + EXPORT_SYMBOL(cfg80211_unregister_wdev); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + static struct device_type wiphy_type = { + .name = "wlan", + }; ++#endif + + void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev, + enum nl80211_iftype iftype, int num) +--- a/net/bluetooth/bnep/core.c ++++ b/net/bluetooth/bnep/core.c +@@ -526,9 +526,11 @@ static struct device *bnep_get_device(st + return conn ? &conn->dev : NULL; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + static struct device_type bnep_type = { + .name = "bluetooth", + }; ++#endif + + int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock) + { +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -1363,13 +1363,17 @@ static const struct net_device_ops usbne + + // precondition: never called in_interrupt + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + static struct device_type wlan_type = { + .name = "wlan", + }; ++#endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + static struct device_type wwan_type = { + .name = "wwan", + }; ++#endif + + int + usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) diff --git a/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch new file mode 100644 index 00000000..09c2ffe3 --- /dev/null +++ b/patches/collateral-evolutions/network/15-symbol-export-conflicts.patch @@ -0,0 +1,18 @@ +In kernel < 2.6.32 libipw also exports ieee80211_rx. +To avoid conflicts with the other export we rename our. + +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -3317,7 +3317,12 @@ void ieee80211_rx(struct ieee80211_hw *h + drop: + kfree_skb(skb); + } ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + EXPORT_SYMBOL(ieee80211_rx); ++#else ++EXPORT_SYMBOL(mac80211_ieee80211_rx); ++#endif ++ + + /* This is a version of the rx handler that can be called from hard irq + * context. Post the skb on the queue and schedule the tasklet */ diff --git a/patches/collateral-evolutions/network/16-bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth.patch new file mode 100644 index 00000000..5ca9f4ce --- /dev/null +++ b/patches/collateral-evolutions/network/16-bluetooth.patch @@ -0,0 +1,575 @@ +These changes are required to backport blueooth. A lot can be optimized +here still, but for now we keep this here. + +--- a/drivers/bluetooth/hci_ldisc.c ++++ b/drivers/bluetooth/hci_ldisc.c +@@ -297,8 +297,13 @@ static int hci_uart_tty_open(struct tty_ + /* FIXME: why is this needed. Note don't use ldisc_ref here as the + open path is before the ldisc is referencable */ + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) + if (tty->ldisc->ops->flush_buffer) + tty->ldisc->ops->flush_buffer(tty); ++#else ++ if (tty->ldisc.ops->flush_buffer) ++ tty->ldisc.ops->flush_buffer(tty); ++#endif + tty_driver_flush_buffer(tty); + + return 0; +@@ -524,7 +529,11 @@ static int hci_uart_tty_ioctl(struct tty + return hu->hdev_flags; + + default: ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) + err = n_tty_ioctl_helper(tty, file, cmd, arg); ++#else ++ err = n_tty_ioctl(tty, file, cmd, arg); ++#endif + break; + } + +--- a/net/bluetooth/af_bluetooth.c ++++ b/net/bluetooth/af_bluetooth.c +@@ -103,8 +103,12 @@ void bt_sock_unregister(int proto) + } + EXPORT_SYMBOL(bt_sock_unregister); + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int bt_sock_create(struct net *net, struct socket *sock, int proto, + int kern) ++#else ++static int bt_sock_create(struct net *net, struct socket *sock, int proto) ++#endif + { + int err; + +@@ -122,7 +126,11 @@ static int bt_sock_create(struct net *ne + read_lock(&bt_proto_lock); + + if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) { ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + err = bt_proto[proto]->create(net, sock, proto, kern); ++#else ++ err = bt_proto[proto]->create(net, sock, proto); ++#endif + if (!err) + bt_sock_reclassify_lock(sock->sk, proto); + module_put(bt_proto[proto]->owner); +@@ -455,7 +463,11 @@ int bt_sock_ioctl(struct socket *sock, u + if (sk->sk_state == BT_LISTEN) + return -EINVAL; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk); ++#else ++ amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc); ++#endif + if (amount < 0) + amount = 0; + err = put_user(amount, (int __user *) arg); +--- a/net/bluetooth/cmtp/capi.c ++++ b/net/bluetooth/cmtp/capi.c +@@ -384,7 +384,11 @@ static void cmtp_reset_ctr(struct capi_c + + BT_DBG("ctrl %p", ctrl); + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) + capi_ctr_down(ctrl); ++#else ++ capi_ctr_reseted(ctrl); ++#endif + + atomic_inc(&session->terminate); + wake_up_process(session->task); +--- a/net/bluetooth/hci_sock.c ++++ b/net/bluetooth/hci_sock.c +@@ -884,8 +884,13 @@ drop: + goto done; + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + static int hci_sock_setsockopt(struct socket *sock, int level, int optname, + char __user *optval, unsigned int len) ++#else ++static int hci_sock_setsockopt(struct socket *sock, int level, int optname, ++ char __user *optval, int len) ++#endif + { + struct hci_ufilter uf = { .opcode = 0 }; + struct sock *sk = sock->sk; +@@ -1059,8 +1064,12 @@ static struct proto hci_sk_proto = { + .obj_size = sizeof(struct hci_pinfo) + }; + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int hci_sock_create(struct net *net, struct socket *sock, int protocol, + int kern) ++#else ++static int hci_sock_create(struct net *net, struct socket *sock, int protocol) ++#endif + { + struct sock *sk; + +--- a/net/bluetooth/hci_sysfs.c ++++ b/net/bluetooth/hci_sysfs.c +@@ -72,7 +72,11 @@ static struct attribute_group bt_link_gr + .attrs = bt_link_attrs, + }; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + static const struct attribute_group *bt_link_groups[] = { ++#else ++static struct attribute_group *bt_link_groups[] = { ++#endif + &bt_link_group, + NULL + }; +@@ -141,7 +145,11 @@ void hci_conn_del_sysfs(struct hci_conn + dev = device_find_child(&conn->dev, NULL, __match_tty); + if (!dev) + break; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)) + device_move(dev, NULL, DPM_ORDER_DEV_LAST); ++#else ++ device_move(dev, NULL); ++#endif + put_device(dev); + } + +@@ -379,7 +387,11 @@ static struct attribute_group bt_host_gr + .attrs = bt_host_attrs, + }; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + static const struct attribute_group *bt_host_groups[] = { ++#else ++static struct attribute_group *bt_host_groups[] = { ++#endif + &bt_host_group, + NULL + }; +--- a/net/bluetooth/hidp/core.c ++++ b/net/bluetooth/hidp/core.c +@@ -383,6 +383,7 @@ err: + return ret; + } + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, + unsigned char report_type) + { +@@ -441,6 +442,16 @@ err: + mutex_unlock(&session->report_mutex); + return ret; + } ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) ++static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count) ++{ ++ if (hidp_send_ctrl_message(hid->driver_data, ++ HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE, ++ data, count)) ++ return -ENOMEM; ++ return count; ++} ++#endif + + static void hidp_idle_timeout(unsigned long arg) + { +@@ -743,8 +754,14 @@ static int hidp_session(void *arg) + } + + if (session->hid) { ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) + hid_destroy_device(session->hid); + session->hid = NULL; ++#else ++ if (session->hid->claimed & HID_CLAIMED_INPUT) ++ hidinput_disconnect(session->hid); ++ hid_free_device(session->hid); ++#endif + } + + /* Wakeup user-space polling for socket errors */ +@@ -855,6 +872,70 @@ static void hidp_close(struct hid_device + { + } + ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27)) ++static const struct { ++ __u16 idVendor; ++ __u16 idProduct; ++ unsigned quirks; ++} hidp_blacklist[] = { ++ /* Apple wireless Mighty Mouse */ ++ { 0x05ac, 0x030c, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, ++ ++ { } /* Terminating entry */ ++}; ++static void hidp_setup_quirks(struct hid_device *hid) ++{ ++ unsigned int n; ++ ++ for (n = 0; hidp_blacklist[n].idVendor; n++) ++ if (hidp_blacklist[n].idVendor == le16_to_cpu(hid->vendor) && ++ hidp_blacklist[n].idProduct == le16_to_cpu(hid->product)) ++ hid->quirks = hidp_blacklist[n].quirks; ++} ++ ++static void hidp_setup_hid(struct hidp_session *session, ++ struct hidp_connadd_req *req) ++{ ++ struct hid_device *hid = session->hid; ++ struct hid_report *report; ++ bdaddr_t src, dst; ++ ++ session->hid = hid; ++ ++ hid->driver_data = session; ++ ++ baswap(&src, &bt_sk(session->ctrl_sock->sk)->src); ++ baswap(&dst, &bt_sk(session->ctrl_sock->sk)->dst); ++ ++ hid->bus = BUS_BLUETOOTH; ++ hid->vendor = req->vendor; ++ hid->product = req->product; ++ hid->version = req->version; ++ hid->country = req->country; ++ ++ strncpy(hid->name, req->name, 128); ++ strncpy(hid->phys, batostr(&src), 64); ++ strncpy(hid->uniq, batostr(&dst), 64); ++ ++ hid->dev = hidp_get_device(session); ++ hid->hid_open = hidp_open; ++ hid->hid_close = hidp_close; ++ ++ hid->hidinput_input_event = hidp_hidinput_event; ++ ++ hidp_setup_quirks(hid); ++ ++ list_for_each_entry(report, &hid->report_enum[HID_INPUT_REPORT].report_list, list) ++ hidp_send_report(session, report); ++ ++ list_for_each_entry(report, &hid->report_enum[HID_FEATURE_REPORT].report_list, list) ++ hidp_send_report(session, report); ++ ++ if (hidinput_connect(hid) == 0) ++ hid->claimed |= HID_CLAIMED_INPUT; ++} ++#else ++ + static int hidp_parse(struct hid_device *hid) + { + struct hidp_session *session = hid->driver_data; +@@ -946,7 +1027,9 @@ static int hidp_setup_hid(struct hidp_se + hid->dev.parent = &session->conn->dev; + hid->ll_driver = &hidp_hid_driver; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) + hid->hid_get_raw_report = hidp_get_raw_report; ++#endif + hid->hid_output_raw_report = hidp_output_raw_report; + + /* True if device is blacklisted in drivers/hid/hid-core.c */ +@@ -964,6 +1047,7 @@ fault: + + return err; + } ++#endif + + int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock) + { +@@ -979,6 +1063,39 @@ int hidp_add_connection(struct hidp_conn + + BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size); + ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27)) ++ if (req->rd_size > 0) { ++ unsigned char *buf = kmalloc(req->rd_size, GFP_KERNEL); ++ ++ if (!buf) { ++ kfree(session); ++ return -ENOMEM; ++ } ++ ++ if (copy_from_user(buf, req->rd_data, req->rd_size)) { ++ kfree(buf); ++ kfree(session); ++ return -EFAULT; ++ } ++ ++ session->hid = hid_parse_report(buf, req->rd_size); ++ ++ kfree(buf); ++ ++ if (!session->hid) { ++ kfree(session); ++ return -EINVAL; ++ } ++ } ++ ++ if (!session->hid) { ++ session->input = input_allocate_device(); ++ if (!session->input) { ++ kfree(session); ++ return -ENOMEM; ++ } ++ } ++#endif + down_write(&hidp_session_sem); + + s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst); +@@ -1026,6 +1143,7 @@ int hidp_add_connection(struct hidp_conn + + __hidp_link_session(session); + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) + if (req->rd_size > 0) { + err = hidp_setup_hid(session, req); + if (err && err != -ENODEV) +@@ -1037,6 +1155,16 @@ int hidp_add_connection(struct hidp_conn + if (err < 0) + goto purge; + } ++#else ++ if (session->input) { ++ err = hidp_setup_input(session, req); ++ if (err < 0) ++ goto failed; ++ } ++ ++ if (session->hid) ++ hidp_setup_hid(session, req); ++#endif + + hidp_set_timer(session); + +@@ -1095,6 +1223,7 @@ unlink: + session->input = NULL; + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) + if (session->hid) { + hid_destroy_device(session->hid); + session->hid = NULL; +@@ -1108,10 +1237,15 @@ purge: + + skb_queue_purge(&session->ctrl_transmit); + skb_queue_purge(&session->intr_transmit); ++#endif + + failed: + up_write(&hidp_session_sem); + ++#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27)) ++ if (session->hid) ++ hid_free_device(session->hid); ++#endif + kfree(session); + return err; + } +--- a/net/bluetooth/rfcomm/sock.c ++++ b/net/bluetooth/rfcomm/sock.c +@@ -304,8 +304,13 @@ static struct sock *rfcomm_sock_alloc(st + return sk; + } + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int rfcomm_sock_create(struct net *net, struct socket *sock, + int protocol, int kern) ++#else ++static int rfcomm_sock_create(struct net *net, struct socket *sock, ++ int protocol) ++#endif + { + struct sock *sk; + +@@ -660,7 +665,11 @@ static int rfcomm_sock_setsockopt_old(st + return err; + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) ++#else ++static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen) ++#endif + { + struct sock *sk = sock->sk; + struct bt_security sec; +--- a/net/bluetooth/rfcomm/tty.c ++++ b/net/bluetooth/rfcomm/tty.c +@@ -708,8 +708,12 @@ static int rfcomm_tty_open(struct tty_st + remove_wait_queue(&dev->wait, &wait); + + if (err == 0) ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)) + device_move(dev->tty_dev, rfcomm_get_device(dev), + DPM_ORDER_DEV_AFTER_PARENT); ++#else ++ device_move(dev->tty_dev, rfcomm_get_device(dev)); ++#endif + + rfcomm_tty_copy_pending(dev); + +@@ -733,7 +737,11 @@ static void rfcomm_tty_close(struct tty_ + if (!--dev->port.count) { + spin_unlock_irqrestore(&dev->port.lock, flags); + if (dev->tty_dev->parent) ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)) + device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST); ++#else ++ device_move(dev->tty_dev, NULL); ++#endif + + /* Close DLC and dettach TTY */ + rfcomm_dlc_close(dev->dlc, 0); +@@ -809,7 +817,11 @@ static int rfcomm_tty_write_room(struct + return room; + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) + static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) ++#else ++static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) ++#endif + { + BT_DBG("tty %p cmd 0x%02x", tty, cmd); + +@@ -1068,7 +1080,11 @@ static void rfcomm_tty_hangup(struct tty + } + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) + static int rfcomm_tty_tiocmget(struct tty_struct *tty) ++#else ++static int rfcomm_tty_tiocmget(struct tty_struct *tty, struct file *filp) ++#endif + { + struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; + +@@ -1077,7 +1093,11 @@ static int rfcomm_tty_tiocmget(struct tt + return dev->modem_status; + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) + static int rfcomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear) ++#else ++static int rfcomm_tty_tiocmset(struct tty_struct *tty, struct file *filp, unsigned int set, unsigned int clear) ++#endif + { + struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; + struct rfcomm_dlc *dlc = dev->dlc; +--- a/net/bluetooth/sco.c ++++ b/net/bluetooth/sco.c +@@ -423,8 +423,12 @@ static struct sock *sco_sock_alloc(struc + return sk; + } + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int sco_sock_create(struct net *net, struct socket *sock, int protocol, + int kern) ++#else ++static int sco_sock_create(struct net *net, struct socket *sock, int protocol) ++#endif + { + struct sock *sk; + +@@ -675,7 +679,11 @@ static int sco_sock_recvmsg(struct kiocb + return bt_sock_recvmsg(iocb, sock, msg, len, flags); + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) ++#else ++static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen) ++#endif + { + struct sock *sk = sock->sk; + int err = 0; +--- a/net/bluetooth/bnep/sock.c ++++ b/net/bluetooth/bnep/sock.c +@@ -186,8 +186,12 @@ static struct proto bnep_proto = { + .obj_size = sizeof(struct bt_sock) + }; + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int bnep_sock_create(struct net *net, struct socket *sock, int protocol, + int kern) ++#else ++static int bnep_sock_create(struct net *net, struct socket *sock, int protocol) ++#endif + { + struct sock *sk; + +--- a/net/bluetooth/cmtp/sock.c ++++ b/net/bluetooth/cmtp/sock.c +@@ -195,8 +195,12 @@ static struct proto cmtp_proto = { + .obj_size = sizeof(struct bt_sock) + }; + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol, + int kern) ++#else ++static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol) ++#endif + { + struct sock *sk; + +--- a/net/bluetooth/hidp/sock.c ++++ b/net/bluetooth/hidp/sock.c +@@ -235,8 +235,12 @@ static struct proto hidp_proto = { + .obj_size = sizeof(struct bt_sock) + }; + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int hidp_sock_create(struct net *net, struct socket *sock, int protocol, + int kern) ++#else ++static int hidp_sock_create(struct net *net, struct socket *sock, int protocol) ++#endif + { + struct sock *sk; + +--- a/net/bluetooth/l2cap_sock.c ++++ b/net/bluetooth/l2cap_sock.c +@@ -573,8 +573,13 @@ static int l2cap_sock_setsockopt_old(str + return err; + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) + static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, + char __user *optval, unsigned int optlen) ++#else ++static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ++ char __user *optval, int optlen) ++#endif + { + struct sock *sk = sock->sk; + struct l2cap_chan *chan = l2cap_pi(sk)->chan; +@@ -1225,8 +1230,12 @@ static struct sock *l2cap_sock_alloc(str + return sk; + } + ++#if defined(CONFIG_COMPAT_BT_SOCK_CREATE_NEEDS_KERN) + static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol, + int kern) ++#else ++static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol) ++#endif + { + struct sock *sk; + +@@ -1238,7 +1247,11 @@ static int l2cap_sock_create(struct net + sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) + return -ESOCKTNOSUPPORT; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32)) + if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW)) ++#else ++ if (sock->type == SOCK_RAW && !capable(CAP_NET_RAW)) ++#endif + return -EPERM; + + sock->ops = &l2cap_sock_ops; diff --git a/patches/collateral-evolutions/network/17-netdev-queue.patch b/patches/collateral-evolutions/network/17-netdev-queue.patch new file mode 100644 index 00000000..9dbe17b5 --- /dev/null +++ b/patches/collateral-evolutions/network/17-netdev-queue.patch @@ -0,0 +1,47 @@ +This patch addresses changes made by usage of new symbols +like unregister_netdevice_queue() which are not possible to backport +due to their reliance on internal symbols on net/core/dev.c + +The patch that introduced this on mac80211 was: + + mac80211: Speedup ieee80211_remove_interfaces() + + Speedup ieee80211_remove_interfaces() by factorizing synchronize_rcu() calls + + Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> + Reviewed-by: Johannes Berg <johannes@sipsolutions.net> + Signed-off-by: John W. Linville <linville@tuxdriver.com> + +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1643,6 +1643,7 @@ void ieee80211_sdata_stop(struct ieee802 + * Remove all interfaces, may only be called at hardware unregistration + * time because it doesn't do RCU-safe list removals. + */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) + void ieee80211_remove_interfaces(struct ieee80211_local *local) + { + struct ieee80211_sub_if_data *sdata, *tmp; +@@ -1670,6 +1671,22 @@ void ieee80211_remove_interfaces(struct + kfree(sdata); + } + } ++#else ++void ieee80211_remove_interfaces(struct ieee80211_local *local) ++{ ++ struct ieee80211_sub_if_data *sdata, *tmp; ++ ++ ASSERT_RTNL(); ++ ++ list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { ++ mutex_lock(&local->iflist_mtx); ++ list_del(&sdata->list); ++ mutex_unlock(&local->iflist_mtx); ++ ++ unregister_netdevice(sdata->dev); ++ } ++} ++#endif + + static int netdev_notify(struct notifier_block *nb, + unsigned long state, diff --git a/patches/collateral-evolutions/network/18-rename-usb-net-symbols.patch b/patches/collateral-evolutions/network/18-rename-usb-net-symbols.patch new file mode 100644 index 00000000..ecb8b0a0 --- /dev/null +++ b/patches/collateral-evolutions/network/18-rename-usb-net-symbols.patch @@ -0,0 +1,53 @@ +Rename config names for usbnet to deactivate them also if activated in +the main kernel configuration. This is needed because +usb_autopm_put_interface_async and usb_autopm_get_interface_async are +not backported to kernel 2.6.28 and earlier. +Remove this patch if these symbols are backported. + +--- a/drivers/net/usb/Makefile ++++ b/drivers/net/usb/Makefile +@@ -10,7 +10,7 @@ obj-$(CONFIG_USB_HSO) += hso.o + obj-$(CONFIG_USB_NET_AX8817X) += asix.o + asix-y := asix_devices.o asix_common.o ax88172a.o + obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o +-obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o ++obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o + obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o + obj-$(CONFIG_USB_NET_DM9601) += dm9601.o + obj-$(CONFIG_USB_NET_SMSC75XX) += smsc75xx.o +@@ -18,11 +18,11 @@ obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95 + obj-$(CONFIG_USB_NET_GL620A) += gl620a.o + obj-$(CONFIG_USB_NET_NET1080) += net1080.o + obj-$(CONFIG_USB_NET_PLUSB) += plusb.o +-obj-$(CONFIG_USB_NET_RNDIS_HOST) += rndis_host.o ++obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o + obj-$(CONFIG_USB_NET_CDC_SUBSET) += cdc_subset.o + obj-$(CONFIG_USB_NET_ZAURUS) += zaurus.o + obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o +-obj-$(CONFIG_USB_USBNET) += usbnet.o ++obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o + obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o + obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o + obj-$(CONFIG_USB_NET_KALMIA) += kalmia.o +--- a/drivers/net/usb/cdc_ether.c ++++ b/drivers/net/usb/cdc_ether.c +@@ -33,7 +33,7 @@ + #include <linux/usb/usbnet.h> + + +-#if defined(CONFIG_USB_NET_RNDIS_HOST) || defined(CONFIG_USB_NET_RNDIS_HOST_MODULE) ++#if defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST) || defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST_MODULE) + + static int is_rndis(struct usb_interface_descriptor *desc) + { +--- a/drivers/net/wireless/Makefile ++++ b/drivers/net/wireless/Makefile +@@ -30,7 +30,7 @@ obj-$(CONFIG_RTLWIFI) += rtlwifi/ + obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o + obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o + +-obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o ++obj-$(CONFIG_USB_NET_COMPAT_RNDIS_WLAN) += rndis_wlan.o + + obj-$(CONFIG_USB_ZD1201) += zd1201.o + obj-$(CONFIG_LIBERTAS) += libertas/ diff --git a/patches/collateral-evolutions/network/21-capi-proc_fops.patch b/patches/collateral-evolutions/network/21-capi-proc_fops.patch new file mode 100644 index 00000000..7dc92f40 --- /dev/null +++ b/patches/collateral-evolutions/network/21-capi-proc_fops.patch @@ -0,0 +1,73 @@ +Backport kernel patch 9a58a80a701bdb2d220cdab4914218df5b48d781 +proc_fops: convert drivers/isdn/ to seq_file + +--- a/net/bluetooth/cmtp/capi.c ++++ b/net/bluetooth/cmtp/capi.c +@@ -21,8 +21,10 @@ + */ + + #include <linux/export.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + #include <linux/proc_fs.h> + #include <linux/seq_file.h> ++#endif + #include <linux/types.h> + #include <linux/errno.h> + #include <linux/kernel.h> +@@ -522,6 +524,7 @@ static char *cmtp_procinfo(struct capi_c + return "CAPI Message Transport Protocol"; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int cmtp_proc_show(struct seq_file *m, void *v) + { + struct capi_ctr *ctrl = m->private; +@@ -554,6 +557,36 @@ static const struct file_operations cmtp + .release = single_release, + }; + ++#else ++ ++static int cmtp_ctr_read_proc(char *page, char **start, off_t off, int count, int *eof, struct capi_ctr *ctrl) ++{ ++ struct cmtp_session *session = ctrl->driverdata; ++ struct cmtp_application *app; ++ struct list_head *p, *n; ++ int len = 0; ++ ++ len += sprintf(page + len, "%s\n\n", cmtp_procinfo(ctrl)); ++ len += sprintf(page + len, "addr %s\n", session->name); ++ len += sprintf(page + len, "ctrl %d\n", session->num); ++ ++ list_for_each_safe(p, n, &session->applications) { ++ app = list_entry(p, struct cmtp_application, list); ++ len += sprintf(page + len, "appl %d -> %d\n", app->appl, app->mapping); ++ } ++ ++ if (off + count >= len) ++ *eof = 1; ++ ++ if (len < off) ++ return 0; ++ ++ *start = page + off; ++ ++ return ((count < len - off) ? count : len - off); ++} ++#endif ++ + int cmtp_attach_device(struct cmtp_session *session) + { + unsigned char buf[4]; +@@ -592,7 +625,11 @@ int cmtp_attach_device(struct cmtp_sessi + session->ctrl.send_message = cmtp_send_message; + + session->ctrl.procinfo = cmtp_procinfo; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + session->ctrl.proc_fops = &cmtp_proc_fops; ++#else ++ session->ctrl.ctr_read_proc = cmtp_ctr_read_proc; ++#endif + + if (attach_capi_ctr(&session->ctrl) < 0) { + BT_ERR("Can't attach new controller"); diff --git a/patches/collateral-evolutions/network/22-multiqueue.patch b/patches/collateral-evolutions/network/22-multiqueue.patch new file mode 100644 index 00000000..8049f382 --- /dev/null +++ b/patches/collateral-evolutions/network/22-multiqueue.patch @@ -0,0 +1,43 @@ +Backport multiqueue support for kernels 2.6.23-27 + +The 2.6.23 kernel added some initial multiqueue support. +That release relied on the on the notion of struct +net_device_subqueue attached to the netdevice struct +as an array. The 2.6.27 renamed these to struct netdev_queue, +and enhanced MQ support by providing locks separately onto +each queue. MQ support on 2.6.27 also extended each netdev +to be able to assign a select_queue callback to be used by +core networking for prior to pushing the skb out to the device +driver so that queue selection can be dealt with and +customized internally on the driver. + +For kernels 2.6.23..2.6.26 then we backport MQ support by +using the equivalent calls on the struct netdev_queue to +the struct net_device_subqueue. The performance penalty +here is just that all these queues share a common lock +so stateful operations on one queue would imply a delay +on other queues. + +The select_queue callback was only added as of 2.6.27 via +commit eae792b7 so for kernels 2.6.23 up to 2.6.27 we must +ensure we do the selection of the queue once the core +networking calls mac80211's dev_hard_start_xmit() +(ndo_start_xmit() callback on newer kernels). + +This patch thus only addresses the lack of select_queue on +kernels older than 2.6.27, naming differences are handled +in compat. + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -1512,6 +1512,10 @@ void ieee80211_xmit(struct ieee80211_sub + } + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)) ++ /* Older kernels do not have the select_queue callback */ ++ skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, skb)); ++#endif + ieee80211_set_qos_hdr(sdata, skb); + ieee80211_tx(sdata, skb, false, band); + } diff --git a/patches/collateral-evolutions/network/24-pcmcia.patch b/patches/collateral-evolutions/network/24-pcmcia.patch new file mode 100644 index 00000000..f0c7c295 --- /dev/null +++ b/patches/collateral-evolutions/network/24-pcmcia.patch @@ -0,0 +1,1414 @@ +--- a/drivers/bluetooth/bluecard_cs.c ++++ b/drivers/bluetooth/bluecard_cs.c +@@ -158,7 +158,12 @@ static void bluecard_detach(struct pcmci + static void bluecard_activity_led_timeout(u_long arg) + { + bluecard_info_t *info = (bluecard_info_t *)arg; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif ++ + + if (!test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) + return; +@@ -175,7 +180,11 @@ static void bluecard_activity_led_timeou + + static void bluecard_enable_activity_led(bluecard_info_t *info) + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + + if (!test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) + return; +@@ -231,7 +240,11 @@ static void bluecard_write_wakeup(blueca + } + + do { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + unsigned int offset; + unsigned char command; + unsigned long ready_bit; +@@ -378,7 +391,11 @@ static void bluecard_receive(bluecard_in + return; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + if (test_bit(XMIT_SENDING_READY, &(info->tx_state))) + bluecard_enable_activity_led(info); +@@ -507,7 +524,11 @@ static irqreturn_t bluecard_interrupt(in + if (!test_bit(CARD_READY, &(info->hw_state))) + return IRQ_HANDLED; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + spin_lock(&(info->lock)); + +@@ -629,7 +650,11 @@ static int bluecard_hci_open(struct hci_ + return 0; + + if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + + /* Enable LED */ + outb(0x08 | 0x20, iobase + 0x30); +@@ -649,7 +674,11 @@ static int bluecard_hci_close(struct hci + bluecard_hci_flush(hdev); + + if (test_bit(CARD_HAS_PCCARD_ID, &(info->hw_state))) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + + /* Disable LED */ + outb(0x00, iobase + 0x30); +@@ -705,7 +734,11 @@ static int bluecard_hci_ioctl(struct hci + + static int bluecard_open(bluecard_info_t *info) + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + struct hci_dev *hdev; + unsigned char id; + +@@ -821,7 +854,11 @@ static int bluecard_open(bluecard_info_t + + static int bluecard_close(bluecard_info_t *info) + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + struct hci_dev *hdev = info->hdev; + + if (!hdev) +@@ -856,7 +893,18 @@ static int bluecard_probe(struct pcmcia_ + info->p_dev = link; + link->priv = info; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; ++ ++ link->irq.Handler = bluecard_interrupt; ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + link->config_flags |= CONF_ENABLE_IRQ; ++#else ++ link->conf.Attributes = CONF_ENABLE_IRQ; ++ link->conf.IntType = INT_MEMORY_AND_IO; ++#endif + + return bluecard_config(link); + } +@@ -873,15 +921,30 @@ static int bluecard_config(struct pcmcia + bluecard_info_t *info = link->priv; + int i, n; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + link->config_index = 0x20; ++#else ++ link->conf.ConfigIndex = 0x20; ++#endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; + link->resource[0]->end = 64; + link->io_lines = 6; ++#else ++ link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; ++ link->io.NumPorts1 = 64; ++ link->io.IOAddrLines = 6; ++#endif + + for (n = 0; n < 0x400; n += 0x40) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + link->resource[0]->start = n ^ 0x300; + i = pcmcia_request_io(link); ++#else ++ link->io.BasePort1 = n ^ 0x300; ++ i = pcmcia_request_io(link, &link->io); ++#endif + if (i == 0) + break; + } +@@ -889,9 +952,15 @@ static int bluecard_config(struct pcmcia + if (i != 0) + goto failed; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + i = pcmcia_request_irq(link, bluecard_interrupt); + if (i != 0) + goto failed; ++#else ++ i = pcmcia_request_irq(link, &link->irq); ++ if (i != 0) ++ link->irq.AssignedIRQ = 0; ++#endif + + i = pcmcia_enable_device(link); + if (i != 0) +@@ -929,7 +998,13 @@ MODULE_DEVICE_TABLE(pcmcia, bluecard_ids + + static struct pcmcia_driver bluecard_driver = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + .name = "bluecard_cs", ++#else ++ .drv = { ++ .name = "bluecard_cs", ++ }, ++#endif + .probe = bluecard_probe, + .remove = bluecard_detach, + .id_table = bluecard_ids, +--- a/drivers/bluetooth/bt3c_cs.c ++++ b/drivers/bluetooth/bt3c_cs.c +@@ -186,7 +186,11 @@ static void bt3c_write_wakeup(bt3c_info_ + return; + + do { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + register struct sk_buff *skb; + int len; + +@@ -224,7 +228,11 @@ static void bt3c_receive(bt3c_info_t *in + return; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + avail = bt3c_read(iobase, 0x7006); + //printk("bt3c_cs: receiving %d bytes\n", avail); +@@ -345,7 +353,11 @@ static irqreturn_t bt3c_interrupt(int ir + /* our irq handler is shared */ + return IRQ_NONE; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + spin_lock(&(info->lock)); + +@@ -473,7 +485,11 @@ static int bt3c_load_firmware(bt3c_info_ + unsigned int iobase, size, addr, fcs, tmp; + int i, err = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + /* Reset */ + bt3c_io_write(iobase, 0x8040, 0x0404); +@@ -645,8 +661,27 @@ static int bt3c_probe(struct pcmcia_devi + info->p_dev = link; + link->priv = info; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP | + CONF_AUTO_SET_IO; ++#else ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; ++ link->resource[0]->end = 8; ++#else ++ link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; ++ link->io.NumPorts1= 8; ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; ++ ++ link->irq.Handler = bt3c_interrupt; ++#endif ++ ++ link->conf.Attributes = CONF_ENABLE_IRQ; ++ link->conf.IntType = INT_MEMORY_AND_IO; ++#endif + + return bt3c_config(link); + } +@@ -657,6 +692,7 @@ static void bt3c_detach(struct pcmcia_de + bt3c_release(link); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data) + { + int *try = priv_data; +@@ -695,6 +731,63 @@ static int bt3c_check_config_notpicky(st + } + return -ENODEV; + } ++#else ++static int bt3c_check_config(struct pcmcia_device *p_dev, ++ cistpl_cftable_entry_t *cf, ++ cistpl_cftable_entry_t *dflt, ++ unsigned int vcc, ++ void *priv_data) ++{ ++ unsigned long try = (unsigned long) priv_data; ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK; ++#endif ++ ++ if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) ++ p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; ++ if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && ++ (cf->io.win[0].base != 0)) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ p_dev->resource[0]->start = cf->io.win[0].base; ++ if (!pcmcia_request_io(p_dev)) ++#else ++ p_dev->io.BasePort1 = cf->io.win[0].base; ++ p_dev->io.IOAddrLines = (try == 0) ? 16 : ++ cf->io.flags & CISTPL_IO_LINES_MASK; ++ if (!pcmcia_request_io(p_dev, &p_dev->io)) ++#endif ++ return 0; ++ } ++ return -ENODEV; ++} ++ ++static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev, ++ cistpl_cftable_entry_t *cf, ++ cistpl_cftable_entry_t *dflt, ++ unsigned int vcc, ++ void *priv_data) ++{ ++ static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; ++ int j; ++ ++ if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) { ++ for (j = 0; j < 5; j++) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ p_dev->resource[0]->start = base[j]; ++ p_dev->io_lines = base[j] ? 16 : 3; ++ if (!pcmcia_request_io(p_dev)) ++#else ++ p_dev->io.BasePort1 = base[j]; ++ p_dev->io.IOAddrLines = base[j] ? 16 : 3; ++ if (!pcmcia_request_io(p_dev, &p_dev->io)) ++#endif ++ return 0; ++ } ++ } ++ return -ENODEV; ++} ++#endif + + static int bt3c_config(struct pcmcia_device *link) + { +@@ -718,9 +811,15 @@ static int bt3c_config(struct pcmcia_dev + goto failed; + + found_port: ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + i = pcmcia_request_irq(link, &bt3c_interrupt); + if (i != 0) + goto failed; ++#else ++ i = pcmcia_request_irq(link, &link->irq); ++ if (i != 0) ++ link->irq.AssignedIRQ = 0; ++#endif + + i = pcmcia_enable_device(link); + if (i != 0) +@@ -755,7 +854,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids); + + static struct pcmcia_driver bt3c_driver = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + .name = "bt3c_cs", ++#else ++ .drv = { ++ .name = "bt3c_cs", ++ }, ++#endif + .probe = bt3c_probe, + .remove = bt3c_detach, + .id_table = bt3c_ids, +--- a/drivers/bluetooth/btuart_cs.c ++++ b/drivers/bluetooth/btuart_cs.c +@@ -140,7 +140,11 @@ static void btuart_write_wakeup(btuart_i + } + + do { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + register struct sk_buff *skb; + int len; + +@@ -181,7 +185,11 @@ static void btuart_receive(btuart_info_t + return; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + do { + info->hdev->stat.byte_rx++; +@@ -295,7 +303,11 @@ static irqreturn_t btuart_interrupt(int + /* our irq handler is shared */ + return IRQ_NONE; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + spin_lock(&(info->lock)); + +@@ -352,7 +364,11 @@ static void btuart_change_speed(btuart_i + return; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + spin_lock_irqsave(&(info->lock), flags); + +@@ -471,7 +487,11 @@ static int btuart_hci_ioctl(struct hci_d + static int btuart_open(btuart_info_t *info) + { + unsigned long flags; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + struct hci_dev *hdev; + + spin_lock_init(&(info->lock)); +@@ -538,7 +558,11 @@ static int btuart_open(btuart_info_t *in + static int btuart_close(btuart_info_t *info) + { + unsigned long flags; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + struct hci_dev *hdev = info->hdev; + + if (!hdev) +@@ -574,8 +598,27 @@ static int btuart_probe(struct pcmcia_de + info->p_dev = link; + link->priv = info; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP | + CONF_AUTO_SET_IO; ++#else ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; ++ link->resource[0]->end = 8; ++#else ++ link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; ++ link->io.NumPorts1= 8; ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; ++ ++ link->irq.Handler = btuart_interrupt; ++#endif ++ ++ link->conf.Attributes = CONF_ENABLE_IRQ; ++ link->conf.IntType = INT_MEMORY_AND_IO; ++#endif + + return btuart_config(link); + } +@@ -586,6 +629,7 @@ static void btuart_detach(struct pcmcia_ + btuart_release(link); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data) + { + int *try = priv_data; +@@ -624,6 +668,63 @@ static int btuart_check_config_notpicky( + } + return -ENODEV; + } ++#else ++static int btuart_check_config(struct pcmcia_device *p_dev, ++ cistpl_cftable_entry_t *cf, ++ cistpl_cftable_entry_t *dflt, ++ unsigned int vcc, ++ void *priv_data) ++{ ++ int *try = priv_data; ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK; ++#endif ++ ++ if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM)) ++ p_dev->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000; ++ if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && ++ (cf->io.win[0].base != 0)) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ p_dev->resource[0]->start = cf->io.win[0].base; ++ if (!pcmcia_request_io(p_dev)) ++#else ++ p_dev->io.BasePort1 = cf->io.win[0].base; ++ p_dev->io.IOAddrLines = (*try == 0) ? 16 : ++ cf->io.flags & CISTPL_IO_LINES_MASK; ++ if (!pcmcia_request_io(p_dev, &p_dev->io)) ++#endif ++ return 0; ++ } ++ return -ENODEV; ++} ++ ++static int btuart_check_config_notpicky(struct pcmcia_device *p_dev, ++ cistpl_cftable_entry_t *cf, ++ cistpl_cftable_entry_t *dflt, ++ unsigned int vcc, ++ void *priv_data) ++{ ++ static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; ++ int j; ++ ++ if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) { ++ for (j = 0; j < 5; j++) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ p_dev->resource[0]->start = base[j]; ++ p_dev->io_lines = base[j] ? 16 : 3; ++ if (!pcmcia_request_io(p_dev)) ++#else ++ p_dev->io.BasePort1 = base[j]; ++ p_dev->io.IOAddrLines = base[j] ? 16 : 3; ++ if (!pcmcia_request_io(p_dev, &p_dev->io)) ++#endif ++ return 0; ++ } ++ } ++ return -ENODEV; ++} ++#endif + + static int btuart_config(struct pcmcia_device *link) + { +@@ -647,9 +748,15 @@ static int btuart_config(struct pcmcia_d + goto failed; + + found_port: ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + i = pcmcia_request_irq(link, btuart_interrupt); + if (i != 0) + goto failed; ++#else ++ i = pcmcia_request_irq(link, &link->irq); ++ if (i != 0) ++ link->irq.AssignedIRQ = 0; ++#endif + + i = pcmcia_enable_device(link); + if (i != 0) +@@ -683,7 +790,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids); + + static struct pcmcia_driver btuart_driver = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + .name = "btuart_cs", ++#else ++ .drv = { ++ .name = "btuart_cs", ++ }, ++#endif + .probe = btuart_probe, + .remove = btuart_detach, + .id_table = btuart_ids, +--- a/drivers/bluetooth/dtl1_cs.c ++++ b/drivers/bluetooth/dtl1_cs.c +@@ -144,7 +144,11 @@ static void dtl1_write_wakeup(dtl1_info_ + } + + do { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + register struct sk_buff *skb; + int len; + +@@ -209,7 +213,11 @@ static void dtl1_receive(dtl1_info_t *in + return; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + do { + info->hdev->stat.byte_rx++; +@@ -296,7 +304,11 @@ static irqreturn_t dtl1_interrupt(int ir + /* our irq handler is shared */ + return IRQ_NONE; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + iobase = info->p_dev->resource[0]->start; ++#else ++ iobase = info->p_dev->io.BasePort1; ++#endif + + spin_lock(&(info->lock)); + +@@ -451,7 +463,11 @@ static int dtl1_hci_ioctl(struct hci_dev + static int dtl1_open(dtl1_info_t *info) + { + unsigned long flags; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + struct hci_dev *hdev; + + spin_lock_init(&(info->lock)); +@@ -495,8 +511,13 @@ static int dtl1_open(dtl1_info_t *info) + outb(UART_LCR_WLEN8, iobase + UART_LCR); /* Reset DLAB */ + outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase + UART_MCR); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + info->ri_latch = inb(info->p_dev->resource[0]->start + UART_MSR) + & UART_MSR_RI; ++#else ++ info->ri_latch = inb(info->p_dev->io.BasePort1 + UART_MSR) ++ & UART_MSR_RI; ++#endif + + /* Turn on interrupts */ + outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER); +@@ -521,7 +542,11 @@ static int dtl1_open(dtl1_info_t *info) + static int dtl1_close(dtl1_info_t *info) + { + unsigned long flags; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + unsigned int iobase = info->p_dev->resource[0]->start; ++#else ++ unsigned int iobase = info->p_dev->io.BasePort1; ++#endif + struct hci_dev *hdev = info->hdev; + + if (!hdev) +@@ -557,7 +582,24 @@ static int dtl1_probe(struct pcmcia_devi + info->p_dev = link; + link->priv = info; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; ++#else ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; ++ link->resource[0]->end = 8; ++#else ++ link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; ++ link->io.NumPorts1= 8; ++#endif ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; ++ link->irq.Handler = dtl1_interrupt; ++#endif ++ ++ link->conf.Attributes = CONF_ENABLE_IRQ; ++ link->conf.IntType = INT_MEMORY_AND_IO; ++#endif + + return dtl1_config(link); + } +@@ -571,6 +613,7 @@ static void dtl1_detach(struct pcmcia_de + pcmcia_disable_device(link); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data) + { + if ((p_dev->resource[1]->end) || (p_dev->resource[1]->end < 8)) +@@ -581,6 +624,29 @@ static int dtl1_confcheck(struct pcmcia_ + + return pcmcia_request_io(p_dev); + } ++#else ++static int dtl1_confcheck(struct pcmcia_device *p_dev, ++ cistpl_cftable_entry_t *cf, ++ cistpl_cftable_entry_t *dflt, ++ unsigned int vcc, ++ void *priv_data) ++{ ++ if ((cf->io.nwin != 1) || (cf->io.win[0].len <= 8)) ++ return -ENODEV; ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ p_dev->resource[0]->start = cf->io.win[0].base; ++ p_dev->resource[0]->end = cf->io.win[0].len; /*yo */ ++ p_dev->io_lines = cf->io.flags & CISTPL_IO_LINES_MASK; ++ return pcmcia_request_io(p_dev); ++#else ++ p_dev->io.BasePort1 = cf->io.win[0].base; ++ p_dev->io.NumPorts1 = cf->io.win[0].len; /*yo */ ++ p_dev->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK; ++ return pcmcia_request_io(p_dev, &p_dev->io); ++#endif ++} ++#endif + + static int dtl1_config(struct pcmcia_device *link) + { +@@ -588,14 +654,24 @@ static int dtl1_config(struct pcmcia_dev + int ret; + + /* Look for a generic full-sized window */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + link->resource[0]->end = 8; ++#else ++ link->io.NumPorts1 = 8; ++#endif + ret = pcmcia_loop_config(link, dtl1_confcheck, NULL); + if (ret) + goto failed; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ret = pcmcia_request_irq(link, dtl1_interrupt); + if (ret) + goto failed; ++#else ++ ret = pcmcia_request_irq(link, &link->irq); ++ if (ret != 0) ++ link->irq.AssignedIRQ = 0; ++#endif + + ret = pcmcia_enable_device(link); + if (ret) +@@ -623,7 +699,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); + + static struct pcmcia_driver dtl1_driver = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + .name = "dtl1_cs", ++#else ++ .drv = { ++ .name = "dtl1_cs", ++ }, ++#endif + .probe = dtl1_probe, + .remove = dtl1_detach, + .id_table = dtl1_ids, +--- a/drivers/net/wireless/b43/pcmcia.c ++++ b/drivers/net/wireless/b43/pcmcia.c +@@ -63,6 +63,9 @@ static int b43_pcmcia_resume(struct pcmc + static int b43_pcmcia_probe(struct pcmcia_device *dev) + { + struct ssb_bus *ssb; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) ++ win_req_t win; ++#endif + int err = -ENOMEM; + int res = 0; + +@@ -72,6 +75,7 @@ static int b43_pcmcia_probe(struct pcmci + + err = -ENODEV; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + dev->config_flags |= CONF_ENABLE_IRQ; + + dev->resource[2]->flags |= WIN_ENABLE | WIN_DATA_WIDTH_16 | +@@ -79,21 +83,46 @@ static int b43_pcmcia_probe(struct pcmci + dev->resource[2]->start = 0; + dev->resource[2]->end = SSB_CORE_SIZE; + res = pcmcia_request_window(dev, dev->resource[2], 250); ++#else ++ dev->conf.Attributes = CONF_ENABLE_IRQ; ++ dev->conf.IntType = INT_MEMORY_AND_IO; ++ ++ win.Attributes = WIN_ENABLE | WIN_DATA_WIDTH_16 | ++ WIN_USE_WAIT; ++ win.Base = 0; ++ win.Size = SSB_CORE_SIZE; ++ win.AccessSpeed = 250; ++ res = pcmcia_request_window(dev, &win, &dev->win); ++#endif + if (res != 0) + goto err_kfree_ssb; +- ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + res = pcmcia_map_mem_page(dev, dev->resource[2], 0); ++#else ++ res = pcmcia_map_mem_page(dev, dev->win, 0); ++#endif + if (res != 0) + goto err_disable; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + if (!dev->irq) ++#else ++ dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; ++ dev->irq.Handler = NULL; /* The handler is registered later. */ ++ res = pcmcia_request_irq(dev, &dev->irq); ++ if (res != 0) ++#endif + goto err_disable; + + res = pcmcia_enable_device(dev); + if (res != 0) + goto err_disable; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + err = ssb_bus_pcmciabus_register(ssb, dev, dev->resource[2]->start); ++#else ++ err = ssb_bus_pcmciabus_register(ssb, dev, win.Base); ++#endif + if (err) + goto err_disable; + dev->priv = ssb; +@@ -122,7 +151,13 @@ static void b43_pcmcia_remove(struct pcm + + static struct pcmcia_driver b43_pcmcia_driver = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + .name = "b43-pcmcia", ++#else ++ .drv = { ++ .name = "b43-pcmcia", ++ }, ++#endif + .id_table = b43_pcmcia_tbl, + .probe = b43_pcmcia_probe, + .remove = b43_pcmcia_remove, +--- a/drivers/net/wireless/libertas/if_cs.c ++++ b/drivers/net/wireless/libertas/if_cs.c +@@ -757,7 +757,11 @@ static void if_cs_prog_firmware(struct l + goto out; + + /* Now actually get the IRQ */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ret = request_irq(card->p_dev->irq, if_cs_interrupt, ++#else ++ ret = request_irq(card->p_dev->irq.AssignedIRQ, if_cs_interrupt, ++#endif + IRQF_SHARED, DRV_NAME, card); + if (ret) { + pr_err("error in request_irq\n"); +@@ -775,7 +779,11 @@ static void if_cs_prog_firmware(struct l + priv->fw_ready = 1; + if (lbs_start_card(priv) != 0) { + pr_err("could not activate card\n"); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + free_irq(card->p_dev->irq, card); ++#else ++ free_irq(card->p_dev->irq.AssignedIRQ, card); ++#endif + } + + out: +@@ -824,7 +832,11 @@ static void if_cs_release(struct pcmcia_ + + lbs_deb_enter(LBS_DEB_CS); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + free_irq(p_dev->irq, card); ++#else ++ free_irq(p_dev->irq.AssignedIRQ, card); ++#endif + pcmcia_disable_device(p_dev); + if (card->iobase) + ioport_unmap(card->iobase); +@@ -832,7 +844,7 @@ static void if_cs_release(struct pcmcia_ + lbs_deb_leave(LBS_DEB_CS); + } + +- ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + static int if_cs_ioprobe(struct pcmcia_device *p_dev, void *priv_data) + { + p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; +@@ -842,9 +854,39 @@ static int if_cs_ioprobe(struct pcmcia_d + pr_err("wrong CIS (check number of IO windows)\n"); + return -ENODEV; + } ++#else ++static int if_cs_ioprobe(struct pcmcia_device *p_dev, ++ cistpl_cftable_entry_t *cfg, ++ cistpl_cftable_entry_t *dflt, ++ unsigned int vcc, ++ void *priv_data) ++{ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) ++ p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; ++ p_dev->resource[0]->start = cfg->io.win[0].base; ++ p_dev->resource[0]->end = cfg->io.win[0].len; ++#else ++ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; ++ p_dev->io.BasePort1 = cfg->io.win[0].base; ++ p_dev->io.NumPorts1 = cfg->io.win[0].len; ++#endif ++ ++ /* Do we need to allocate an interrupt? */ ++ p_dev->conf.Attributes |= CONF_ENABLE_IRQ; ++ ++ /* IO window settings */ ++ if (cfg->io.nwin != 1) { ++ pr_err("wrong CIS (check number of IO windows)\n"); ++ return -ENODEV; ++ } ++#endif + + /* This reserves IO space but doesn't actually enable it */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + return pcmcia_request_io(p_dev); ++#else ++ return pcmcia_request_io(p_dev, &p_dev->io); ++#endif + } + + static int if_cs_probe(struct pcmcia_device *p_dev) +@@ -863,7 +905,16 @@ static int if_cs_probe(struct pcmcia_dev + card->p_dev = p_dev; + p_dev->priv = card; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + p_dev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; ++#else ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; ++ p_dev->irq.Handler = NULL; ++#endif ++ p_dev->conf.Attributes = 0; ++ p_dev->conf.IntType = INT_MEMORY_AND_IO; ++#endif + + if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) { + pr_err("error in pcmcia_loop_config\n"); +@@ -875,12 +926,26 @@ static int if_cs_probe(struct pcmcia_dev + * a handler to the interrupt, unless the 'Handler' member of + * the irq structure is initialized. + */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + if (!p_dev->irq) + goto out1; ++#else ++ if (p_dev->conf.Attributes & CONF_ENABLE_IRQ) { ++ ret = pcmcia_request_irq(p_dev, &p_dev->irq); ++ if (ret) { ++ pr_err("error in pcmcia_request_irq\n"); ++ goto out1; ++ } ++ } ++#endif + + /* Initialize io access */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + card->iobase = ioport_map(p_dev->resource[0]->start, + resource_size(p_dev->resource[0])); ++#else ++ card->iobase = ioport_map(p_dev->io.BasePort1, p_dev->io.NumPorts1); ++#endif + if (!card->iobase) { + pr_err("error in ioport_map\n"); + ret = -EIO; +@@ -894,7 +959,17 @@ static int if_cs_probe(struct pcmcia_dev + } + + /* Finally, report what we've done */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + lbs_deb_cs("irq %d, io %pR", p_dev->irq, p_dev->resource[0]); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) ++ lbs_deb_cs("irq %d, io 0x%04x-0x%04x\n", ++ p_dev->irq, p_dev->io.BasePort1, ++ p_dev->io.BasePort1 + p_dev->io.NumPorts1 - 1); ++#else ++ lbs_deb_cs("irq %d, io 0x%04x-0x%04x\n", ++ p_dev->irq.AssignedIRQ, p_dev->io.BasePort1, ++ p_dev->io.BasePort1 + p_dev->io.NumPorts1 - 1); ++#endif + + /* + * Most of the libertas cards can do unaligned register access, but some +@@ -1001,7 +1076,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids); + + static struct pcmcia_driver lbs_driver = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + .name = DRV_NAME, ++#else ++ .drv = { ++ .name = DRV_NAME, ++ }, ++#endif + .probe = if_cs_probe, + .remove = if_cs_detach, + .id_table = if_cs_ids, +--- a/drivers/net/wireless/orinoco/orinoco_cs.c ++++ b/drivers/net/wireless/orinoco/orinoco_cs.c +@@ -78,7 +78,11 @@ orinoco_cs_hard_reset(struct orinoco_pri + /* We need atomic ops here, because we're not holding the lock */ + set_bit(0, &card->hard_reset_in_progress); + ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,27) ++ err = pcmcia_reset_card(link, NULL); ++#else + err = pcmcia_reset_card(link->socket); ++#endif + if (err) + return err; + +@@ -108,6 +112,16 @@ orinoco_cs_probe(struct pcmcia_device *l + card->p_dev = link; + link->priv = priv; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ /* Interrupt setup */ ++ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; ++ link->irq.Handler = orinoco_interrupt; ++#endif ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) ++ link->conf.Attributes = 0; ++ link->conf.IntType = INT_MEMORY_AND_IO; ++#endif ++ + return orinoco_cs_config(link); + } /* orinoco_cs_attach */ + +@@ -122,6 +136,7 @@ static void orinoco_cs_detach(struct pcm + free_orinocodev(priv); + } /* orinoco_cs_detach */ + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + static int orinoco_cs_config_check(struct pcmcia_device *p_dev, void *priv_data) + { + if (p_dev->config_index == 0) +@@ -129,6 +144,98 @@ static int orinoco_cs_config_check(struc + + return pcmcia_request_io(p_dev); + }; ++#else ++static int orinoco_cs_config_check(struct pcmcia_device *p_dev, ++ cistpl_cftable_entry_t *cfg, ++ cistpl_cftable_entry_t *dflt, ++ unsigned int vcc, ++ void *priv_data) ++{ ++ if (cfg->index == 0) ++ goto next_entry; ++ ++ /* Use power settings for Vcc and Vpp if present */ ++ /* Note that the CIS values need to be rescaled */ ++ if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { ++ if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) { ++ DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n", ++ __func__, vcc, ++ cfg->vcc.param[CISTPL_POWER_VNOM] / 10000); ++ if (!ignore_cis_vcc) ++ goto next_entry; ++ } ++ } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) { ++ if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) { ++ DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n", ++ __func__, vcc, ++ dflt->vcc.param[CISTPL_POWER_VNOM] / 10000); ++ if (!ignore_cis_vcc) ++ goto next_entry; ++ } ++ } ++ ++ if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) ++ p_dev->conf.Vpp = ++ cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000; ++ else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM)) ++ p_dev->conf.Vpp = ++ dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000; ++ ++ /* Do we need to allocate an interrupt? */ ++ p_dev->conf.Attributes |= CONF_ENABLE_IRQ; ++ ++ /* IO window settings */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ p_dev->resource[0]->end = p_dev->resource[1]->end = 0; ++#else ++ p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; ++#endif ++ if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { ++ cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK; ++ p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; ++ p_dev->resource[0]->flags |= ++ pcmcia_io_cfg_data_width(io->flags); ++ p_dev->resource[0]->start = io->win[0].base; ++ p_dev->resource[0]->end = io->win[0].len; ++#else ++ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; ++ if (!(io->flags & CISTPL_IO_8BIT)) ++ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; ++ if (!(io->flags & CISTPL_IO_16BIT)) ++ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; ++ p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; ++ p_dev->io.BasePort1 = io->win[0].base; ++ p_dev->io.NumPorts1 = io->win[0].len; ++#endif ++ if (io->nwin > 1) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ p_dev->resource[1]->flags = p_dev->resource[0]->flags; ++ p_dev->resource[1]->start = io->win[1].base; ++ p_dev->resource[1]->end = io->win[1].len; ++#else ++ p_dev->io.Attributes2 = p_dev->io.Attributes1; ++ p_dev->io.BasePort2 = io->win[1].base; ++ p_dev->io.NumPorts2 = io->win[1].len; ++#endif ++ } ++ ++ /* This reserves IO space but doesn't actually enable it */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ if (pcmcia_request_io(p_dev) != 0) ++#else ++ if (pcmcia_request_io(p_dev, &p_dev->io) != 0) ++#endif ++ goto next_entry; ++ } ++ return 0; ++ ++next_entry: ++ pcmcia_disable_device(p_dev); ++ return -ENODEV; ++}; ++#endif + + static int + orinoco_cs_config(struct pcmcia_device *link) +@@ -138,10 +245,12 @@ orinoco_cs_config(struct pcmcia_device * + int ret; + void __iomem *mem; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + link->config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC | + CONF_AUTO_SET_IO | CONF_ENABLE_IRQ; + if (ignore_cis_vcc) + link->config_flags &= ~CONF_AUTO_CHECK_VCC; ++#endif + ret = pcmcia_loop_config(link, orinoco_cs_config_check, NULL); + if (ret) { + if (!ignore_cis_vcc) +@@ -151,8 +260,12 @@ orinoco_cs_config(struct pcmcia_device * + goto failed; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) + mem = ioport_map(link->resource[0]->start, + resource_size(link->resource[0])); ++#else ++ mem = ioport_map(link->io.BasePort1, link->io.NumPorts1); ++#endif + if (!mem) + goto failed; + +@@ -161,7 +274,11 @@ orinoco_cs_config(struct pcmcia_device * + * called. */ + hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ret = pcmcia_request_irq(link, orinoco_interrupt); ++#else ++ ret = pcmcia_request_irq(link, &link->irq); ++#endif + if (ret) + goto failed; + +@@ -176,8 +293,16 @@ orinoco_cs_config(struct pcmcia_device * + } + + /* Register an interface with the stack */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + if (orinoco_if_add(priv, link->resource[0]->start, + link->irq, NULL) != 0) { ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) ++ if (orinoco_if_add(priv, link->io.BasePort1, ++ link->irq, NULL) != 0) { ++#else ++ if (orinoco_if_add(priv, link->io.BasePort1, ++ link->irq.AssignedIRQ, NULL) != 0) { ++#endif + printk(KERN_ERR PFX "orinoco_if_add() failed\n"); + goto failed; + } +@@ -331,7 +456,13 @@ MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_i + + static struct pcmcia_driver orinoco_driver = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + .name = DRIVER_NAME, ++#else ++ .drv = { ++ .name = DRIVER_NAME, ++ }, ++#endif + .probe = orinoco_cs_probe, + .remove = orinoco_cs_detach, + .id_table = orinoco_cs_ids, +--- a/drivers/net/wireless/orinoco/spectrum_cs.c ++++ b/drivers/net/wireless/orinoco/spectrum_cs.c +@@ -170,6 +170,16 @@ spectrum_cs_probe(struct pcmcia_device * + card->p_dev = link; + link->priv = priv; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ /* Interrupt setup */ ++ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; ++ link->irq.Handler = orinoco_interrupt; ++#endif ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) ++ link->conf.Attributes = 0; ++ link->conf.IntType = INT_MEMORY_AND_IO; ++#endif ++ + return spectrum_cs_config(link); + } /* spectrum_cs_attach */ + +@@ -184,6 +194,7 @@ static void spectrum_cs_detach(struct pc + free_orinocodev(priv); + } /* spectrum_cs_detach */ + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + static int spectrum_cs_config_check(struct pcmcia_device *p_dev, + void *priv_data) + { +@@ -192,6 +203,98 @@ static int spectrum_cs_config_check(stru + + return pcmcia_request_io(p_dev); + }; ++#else ++static int spectrum_cs_config_check(struct pcmcia_device *p_dev, ++ cistpl_cftable_entry_t *cfg, ++ cistpl_cftable_entry_t *dflt, ++ unsigned int vcc, ++ void *priv_data) ++{ ++ if (cfg->index == 0) ++ goto next_entry; ++ ++ /* Use power settings for Vcc and Vpp if present */ ++ /* Note that the CIS values need to be rescaled */ ++ if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) { ++ if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) { ++ DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n", ++ __func__, vcc, ++ cfg->vcc.param[CISTPL_POWER_VNOM] / 10000); ++ if (!ignore_cis_vcc) ++ goto next_entry; ++ } ++ } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) { ++ if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) { ++ DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n", ++ __func__, vcc, ++ dflt->vcc.param[CISTPL_POWER_VNOM] / 10000); ++ if (!ignore_cis_vcc) ++ goto next_entry; ++ } ++ } ++ ++ if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) ++ p_dev->conf.Vpp = ++ cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000; ++ else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM)) ++ p_dev->conf.Vpp = ++ dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000; ++ ++ /* Do we need to allocate an interrupt? */ ++ p_dev->conf.Attributes |= CONF_ENABLE_IRQ; ++ ++ /* IO window settings */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ p_dev->resource[0]->end = p_dev->resource[1]->end = 0; ++#else ++ p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0; ++#endif ++ if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { ++ cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK; ++ p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH; ++ p_dev->resource[0]->flags |= ++ pcmcia_io_cfg_data_width(io->flags); ++ p_dev->resource[0]->start = io->win[0].base; ++ p_dev->resource[0]->end = io->win[0].len; ++#else ++ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; ++ if (!(io->flags & CISTPL_IO_8BIT)) ++ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16; ++ if (!(io->flags & CISTPL_IO_16BIT)) ++ p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; ++ p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK; ++ p_dev->io.BasePort1 = io->win[0].base; ++ p_dev->io.NumPorts1 = io->win[0].len; ++#endif ++ if (io->nwin > 1) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ p_dev->resource[1]->flags = p_dev->resource[0]->flags; ++ p_dev->resource[1]->start = io->win[1].base; ++ p_dev->resource[1]->end = io->win[1].len; ++#else ++ p_dev->io.Attributes2 = p_dev->io.Attributes1; ++ p_dev->io.BasePort2 = io->win[1].base; ++ p_dev->io.NumPorts2 = io->win[1].len; ++#endif ++ } ++ ++ /* This reserves IO space but doesn't actually enable it */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++ if (pcmcia_request_io(p_dev) != 0) ++#else ++ if (pcmcia_request_io(p_dev, &p_dev->io) != 0) ++#endif ++ goto next_entry; ++ } ++ return 0; ++ ++next_entry: ++ pcmcia_disable_device(p_dev); ++ return -ENODEV; ++}; ++#endif + + static int + spectrum_cs_config(struct pcmcia_device *link) +@@ -201,10 +304,12 @@ spectrum_cs_config(struct pcmcia_device + int ret; + void __iomem *mem; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + link->config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC | + CONF_AUTO_SET_IO | CONF_ENABLE_IRQ; + if (ignore_cis_vcc) + link->config_flags &= ~CONF_AUTO_CHECK_VCC; ++#endif + ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL); + if (ret) { + if (!ignore_cis_vcc) +@@ -214,8 +319,12 @@ spectrum_cs_config(struct pcmcia_device + goto failed; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) + mem = ioport_map(link->resource[0]->start, + resource_size(link->resource[0])); ++#else ++ mem = ioport_map(link->io.BasePort1, link->io.NumPorts1); ++#endif + if (!mem) + goto failed; + +@@ -225,7 +334,11 @@ spectrum_cs_config(struct pcmcia_device + hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); + hw->eeprom_pda = true; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ret = pcmcia_request_irq(link, orinoco_interrupt); ++#else ++ ret = pcmcia_request_irq(link, &link->irq); ++#endif + if (ret) + goto failed; + +@@ -244,8 +357,16 @@ spectrum_cs_config(struct pcmcia_device + } + + /* Register an interface with the stack */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + if (orinoco_if_add(priv, link->resource[0]->start, + link->irq, NULL) != 0) { ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) ++ if (orinoco_if_add(priv, link->io.BasePort1, ++ link->irq, NULL) != 0) { ++#else ++ if (orinoco_if_add(priv, link->io.BasePort1, ++ link->irq.AssignedIRQ, NULL) != 0) { ++#endif + printk(KERN_ERR PFX "orinoco_if_add() failed\n"); + goto failed; + } +@@ -311,7 +432,13 @@ MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ + + static struct pcmcia_driver orinoco_driver = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + .name = DRIVER_NAME, ++#else ++ .drv = { ++ .name = DRIVER_NAME, ++ }, ++#endif + .probe = spectrum_cs_probe, + .remove = spectrum_cs_detach, + .suspend = spectrum_cs_suspend, +--- a/drivers/ssb/main.c ++++ b/drivers/ssb/main.c +@@ -517,7 +517,11 @@ static int ssb_devices_register(struct s + break; + case SSB_BUSTYPE_PCMCIA: + #ifdef CONFIG_SSB_PCMCIAHOST ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + sdev->irq = bus->host_pcmcia->irq; ++#else ++ sdev->irq = bus->host_pcmcia->irq.AssignedIRQ; ++#endif + dev->parent = &bus->host_pcmcia->dev; + #endif + break; diff --git a/patches/collateral-evolutions/network/25-multicast-list_head.patch b/patches/collateral-evolutions/network/25-multicast-list_head.patch new file mode 100644 index 00000000..a20aa547 --- /dev/null +++ b/patches/collateral-evolutions/network/25-multicast-list_head.patch @@ -0,0 +1,872 @@ +Backport commit 22bedad3ce112d5ca1eaf043d4990fa2ed698c87: + net: convert multicast list to list_head + + Converts the list and the core manipulating with it to be the same as uc_list. + + +uses two functions for adding/removing mc address (normal and "global" + variant) instead of a function parameter. + +removes dev_mcast.c completely. + +exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for + manipulation with lists on a sandbox (used in bonding and 80211 drivers) + +This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 + +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -410,7 +410,11 @@ static void atl1c_set_multi(struct net_d + + /* comoute mc addresses' hash value ,and put it into hash table */ + netdev_for_each_mc_addr(ha, netdev) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + hash_value = atl1c_hash_mc_addr(hw, ha->addr); ++#else ++ hash_value = atl1c_hash_mc_addr(hw, ha->dmi_addr); ++#endif + atl1c_hash_set(hw, hash_value); + } + } +--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c ++++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +@@ -308,7 +308,11 @@ static void atl1e_set_multi(struct net_d + + /* comoute mc addresses' hash value ,and put it into hash table */ + netdev_for_each_mc_addr(ha, netdev) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + hash_value = atl1e_hash_mc_addr(hw, ha->addr); ++#else ++ hash_value = atl1e_hash_mc_addr(hw, ha->dmi_addr); ++#endif + atl1e_hash_set(hw, hash_value); + } + } +--- a/drivers/net/ethernet/atheros/atlx/atl2.c ++++ b/drivers/net/ethernet/atheros/atlx/atl2.c +@@ -159,7 +159,11 @@ static void atl2_set_multi(struct net_de + + /* comoute mc addresses' hash value ,and put it into hash table */ + netdev_for_each_mc_addr(ha, netdev) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + hash_value = atl2_hash_mc_addr(hw, ha->addr); ++#else ++ hash_value = atl2_hash_mc_addr(hw, ha->dmi_addr); ++#endif + atl2_hash_set(hw, hash_value); + } + } +--- a/drivers/net/ethernet/atheros/atlx/atlx.c ++++ b/drivers/net/ethernet/atheros/atlx/atlx.c +@@ -149,7 +149,11 @@ static void atlx_set_multi(struct net_de + + /* compute mc addresses' hash value ,and put it into hash table */ + netdev_for_each_mc_addr(ha, netdev) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + hash_value = atlx_hash_mc_addr(hw, ha->addr); ++#else ++ hash_value = atlx_hash_mc_addr(hw, ha->dmi_addr); ++#endif + atlx_hash_set(hw, hash_value); + } + } +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -1693,7 +1693,11 @@ static int __b44_load_mcast(struct b44 * + netdev_for_each_mc_addr(ha, dev) { + if (i == num_ents) + break; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + __b44_cam_write(bp, ha->addr, i++ + 1); ++#else ++ __b44_cam_write(bp, ha->dmi_addr, i++ + 1); ++#endif + } + return i+1; + } +--- a/drivers/net/wireless/adm8211.c ++++ b/drivers/net/wireless/adm8211.c +@@ -1320,19 +1320,37 @@ static void adm8211_bss_info_changed(str + } + + static u64 adm8211_prepare_multicast(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, struct dev_addr_list *ha) ++#endif + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + unsigned int bit_nr; +- u32 mc_filter[2]; + struct netdev_hw_addr *ha; ++#else ++ unsigned int bit_nr, i; ++#endif ++ u32 mc_filter[2]; + + mc_filter[1] = mc_filter[0] = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + netdev_hw_addr_list_for_each(ha, mc_list) { + bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; ++#else ++ for (i = 0; i < mc_count; i++) { ++ if (!ha) ++ break; ++ bit_nr = ether_crc(ETH_ALEN, ha->dmi_addr) >> 26; ++#endif + + bit_nr &= 0x3F; + mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ ha = ha->next; ++#endif + } + + return mc_filter[0] | ((u64)(mc_filter[1]) << 32); +--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c ++++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c +@@ -318,20 +318,42 @@ ath5k_bss_info_changed(struct ieee80211_ + + static u64 + ath5k_prepare_multicast(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, struct dev_addr_list *ha) ++#endif + { + u32 mfilt[2], val; + u8 pos; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr *ha; ++#else ++ int i; ++#endif + + mfilt[0] = 0; + mfilt[1] = 1; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + netdev_hw_addr_list_for_each(ha, mc_list) { ++#else ++ for (i = 0; i < mc_count; i++) { ++ if (!ha) ++ break; ++#endif + /* calculate XOR of eight 6-bit values */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + val = get_unaligned_le32(ha->addr + 0); ++#else ++ val = get_unaligned_le32(ha->dmi_addr + 0); ++#endif + pos = (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + val = get_unaligned_le32(ha->addr + 3); ++#else ++ val = get_unaligned_le32(ha->dmi_addr + 3); ++#endif + pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; + pos &= 0x3f; + mfilt[pos / 32] |= (1 << (pos % 32)); +@@ -340,6 +362,9 @@ ath5k_prepare_multicast(struct ieee80211 + * need to inform below not to reset the mcast */ + /* ath5k_hw_set_mcast_filterindex(ah, + * ha->addr[5]); */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ ha = ha->next; ++#endif + } + + return ((u64)(mfilt[1]) << 32) | mfilt[0]; +--- a/drivers/net/wireless/ath/carl9170/main.c ++++ b/drivers/net/wireless/ath/carl9170/main.c +@@ -967,17 +967,35 @@ out: + return err; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static u64 carl9170_op_prepare_multicast(struct ieee80211_hw *hw, + struct netdev_hw_addr_list *mc_list) ++#else ++static u64 carl9170_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count, ++ struct dev_addr_list *ha) ++#endif + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr *ha; ++#else ++ int i; ++#endif + u64 mchash; + + /* always get broadcast frames */ + mchash = 1ULL << (0xff >> 2); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + netdev_hw_addr_list_for_each(ha, mc_list) + mchash |= 1ULL << (ha->addr[5] >> 2); ++#else ++ for (i = 0; i < mc_count; i++) { ++ if (WARN_ON(!ha)) ++ break; ++ mchash |= 1ULL << (ha->dmi_addr[5] >> 2); ++ ha = ha->next; ++ } ++#endif + + return mchash; + } +--- a/drivers/net/wireless/libertas/main.c ++++ b/drivers/net/wireless/libertas/main.c +@@ -349,18 +349,34 @@ static int lbs_add_mcast_addrs(struct cm + netif_addr_lock_bh(dev); + cnt = netdev_mc_count(dev); + netdev_for_each_mc_addr(ha, dev) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + if (mac_in_list(cmd->maclist, nr_addrs, ha->addr)) { ++#else ++ if (mac_in_list(cmd->maclist, nr_addrs, ha->dmi_addr)) { ++#endif + lbs_deb_net("mcast address %s:%pM skipped\n", dev->name, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ha->addr); ++#else ++ ha->dmi_addr); ++#endif + cnt--; + continue; + } + + if (i == MRVDRV_MAX_MULTICAST_LIST_SIZE) + break; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + memcpy(&cmd->maclist[6*i], ha->addr, ETH_ALEN); ++#else ++ memcpy(&cmd->maclist[6*i], ha->dmi_addr, ETH_ALEN); ++#endif + lbs_deb_net("mcast address %s:%pM added to filter\n", dev->name, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ha->addr); ++#else ++ ha->dmi_addr); ++#endif + i++; + cnt--; + } +--- a/drivers/net/wireless/libertas_tf/main.c ++++ b/drivers/net/wireless/libertas_tf/main.c +@@ -421,20 +421,36 @@ static int lbtf_op_config(struct ieee802 + } + + static u64 lbtf_op_prepare_multicast(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, struct dev_addr_list *ha) ++#endif + { + struct lbtf_private *priv = hw->priv; + int i; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr *ha; + int mc_count = netdev_hw_addr_list_count(mc_list); ++#endif + + if (!mc_count || mc_count > MRVDRV_MAX_MULTICAST_LIST_SIZE) + return mc_count; + + priv->nr_of_multicastmacaddr = mc_count; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + i = 0; + netdev_hw_addr_list_for_each(ha, mc_list) + memcpy(&priv->multicastlist[i++], ha->addr, ETH_ALEN); ++#else ++ for (i = 0; i < mc_count; i++) { ++ if (!ha) ++ break; ++ memcpy(&priv->multicastlist[i], ha->da_addr, ++ ETH_ALEN); ++ ha = ha->next; ++ } ++#endif + + return mc_count; + } +--- a/drivers/net/wireless/mwifiex/sta_ioctl.c ++++ b/drivers/net/wireless/mwifiex/sta_ioctl.c +@@ -43,7 +43,11 @@ int mwifiex_copy_mcast_addr(struct mwifi + struct netdev_hw_addr *ha; + + netdev_for_each_mc_addr(ha, dev) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + memcpy(&mlist->mac_list[i++], ha->addr, ETH_ALEN); ++#else ++ memcpy(&mlist->mac_list[i++], ha->dmi_addr, ETH_ALEN); ++#endif + + return i; + } +--- a/drivers/net/wireless/mwifiex/debugfs.c ++++ b/drivers/net/wireless/mwifiex/debugfs.c +@@ -215,7 +215,11 @@ mwifiex_info_read(struct file *file, cha + + netdev_for_each_mc_addr(ha, netdev) + p += sprintf(p, "multicast_address[%d]=\"%pM\"\n", ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + i++, ha->addr); ++#else ++ i++, ha->dmi_addr); ++#endif + } + + p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes); +--- a/drivers/net/wireless/mwl8k.c ++++ b/drivers/net/wireless/mwl8k.c +@@ -2656,15 +2656,21 @@ struct mwl8k_cmd_mac_multicast_adr { + + static struct mwl8k_cmd_pkt * + __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, struct dev_addr_list *ha) ++#endif + { + struct mwl8k_priv *priv = hw->priv; + struct mwl8k_cmd_mac_multicast_adr *cmd; + int size; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + int mc_count = 0; + + if (mc_list) + mc_count = netdev_hw_addr_list_count(mc_list); ++#endif + + if (allmulti || mc_count > priv->num_mcaddrs) { + allmulti = 1; +@@ -2685,13 +2691,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee + if (allmulti) { + cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST); + } else if (mc_count) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr *ha; + int i = 0; ++#else ++ int i; ++#endif + + cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_MULTICAST); + cmd->numaddr = cpu_to_le16(mc_count); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + netdev_hw_addr_list_for_each(ha, mc_list) { + memcpy(cmd->addr[i], ha->addr, ETH_ALEN); ++#else ++ for (i = 0; i < mc_count && ha; i++) { ++ if (ha->da_addrlen != ETH_ALEN) { ++ kfree(cmd); ++ return NULL; ++ } ++ memcpy(cmd->addr[i], ha->da_addr, ETH_ALEN); ++ ha = ha->next; ++#endif + } + } + +@@ -5022,7 +5042,11 @@ mwl8k_bss_info_changed(struct ieee80211_ + } + + static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, struct dev_addr_list *ha) ++#endif + { + struct mwl8k_cmd_pkt *cmd; + +@@ -5033,7 +5057,11 @@ static u64 mwl8k_prepare_multicast(struc + * we'll end up throwing this packet away and creating a new + * one in mwl8k_configure_filter(). + */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + cmd = __mwl8k_cmd_mac_multicast_adr(hw, 0, mc_list); ++#else ++ cmd = __mwl8k_cmd_mac_multicast_adr(hw, 0, mc_count, ha); ++#endif + + return (unsigned long)cmd; + } +@@ -5155,7 +5183,11 @@ static void mwl8k_configure_filter(struc + */ + if (*total_flags & FIF_ALLMULTI) { + kfree(cmd); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + cmd = __mwl8k_cmd_mac_multicast_adr(hw, 1, NULL); ++#else ++ cmd = __mwl8k_cmd_mac_multicast_adr(hw, 1, 0, NULL); ++#endif + } + + if (cmd != NULL) { +--- a/drivers/net/wireless/orinoco/hw.c ++++ b/drivers/net/wireless/orinoco/hw.c +@@ -1093,7 +1093,11 @@ int __orinoco_hw_set_multicast_list(stru + netdev_for_each_mc_addr(ha, dev) { + if (i == mc_count) + break; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + memcpy(mclist.addr[i++], ha->addr, ETH_ALEN); ++#else ++ memcpy(mclist.addr[i++], ha->dmi_addr, ETH_ALEN); ++#endif + } + + err = hw->ops->write_ltv(hw, USER_BAP, +--- a/drivers/net/wireless/orinoco/hw.h ++++ b/drivers/net/wireless/orinoco/hw.h +@@ -22,6 +22,9 @@ + + /* Forward declarations */ + struct orinoco_private; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++struct dev_addr_list; ++#endif + + int determine_fw_capabilities(struct orinoco_private *priv, char *fw_name, + size_t fw_name_len, u32 *hw_ver); +--- a/drivers/net/wireless/p54/main.c ++++ b/drivers/net/wireless/p54/main.c +@@ -364,11 +364,18 @@ out: + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static u64 p54_prepare_multicast(struct ieee80211_hw *dev, + struct netdev_hw_addr_list *mc_list) ++#else ++static u64 p54_prepare_multicast(struct ieee80211_hw *dev, int mc_count, ++ struct dev_addr_list *ha) ++#endif + { + struct p54_common *priv = dev->priv; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr *ha; ++#endif + int i; + + BUILD_BUG_ON(ARRAY_SIZE(priv->mc_maclist) != +@@ -378,12 +385,23 @@ static u64 p54_prepare_multicast(struct + * Otherwise the firmware will drop it and ARP will no longer work. + */ + i = 1; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + priv->mc_maclist_num = netdev_hw_addr_list_count(mc_list) + i; + netdev_hw_addr_list_for_each(ha, mc_list) { + memcpy(&priv->mc_maclist[i], ha->addr, ETH_ALEN); ++#else ++ priv->mc_maclist_num = mc_count + i; ++ while (i <= mc_count) { ++ if (!ha) ++ break; ++ memcpy(&priv->mc_maclist[i], ha->dmi_addr, ETH_ALEN); ++#endif + i++; + if (i >= ARRAY_SIZE(priv->mc_maclist)) + break; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) ++ ha = ha->next; ++#endif + } + + return 1; /* update */ +--- a/drivers/net/wireless/rndis_wlan.c ++++ b/drivers/net/wireless/rndis_wlan.c +@@ -1629,7 +1629,11 @@ static void set_multicast_list(struct us + + netdev_for_each_mc_addr(ha, usbdev->net) + memcpy(mc_addrs + i++ * ETH_ALEN, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ha->addr, ETH_ALEN); ++#else ++ ha->dmi_addr, ETH_ALEN); ++#endif + } + netif_addr_unlock_bh(usbdev->net); + +--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c ++++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c +@@ -818,10 +818,19 @@ static void rtl8180_bss_info_changed(str + } + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static u64 rtl8180_prepare_multicast(struct ieee80211_hw *dev, + struct netdev_hw_addr_list *mc_list) ++#else ++static u64 rtl8180_prepare_multicast(struct ieee80211_hw *dev, int mc_count, ++ struct dev_addr_list *mc_list) ++#endif + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + return netdev_hw_addr_list_count(mc_list); ++#else ++ return mc_count; ++#endif + } + + static void rtl8180_configure_filter(struct ieee80211_hw *dev, +--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c ++++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c +@@ -1290,9 +1290,17 @@ static void rtl8187_bss_info_changed(str + } + + static u64 rtl8187_prepare_multicast(struct ieee80211_hw *dev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, struct dev_addr_list *mc_list) ++#endif + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + return netdev_hw_addr_list_count(mc_list); ++#else ++ return mc_count; ++#endif + } + + static void rtl8187_configure_filter(struct ieee80211_hw *dev, +--- a/drivers/net/wireless/ti/wlcore/main.c ++++ b/drivers/net/wireless/ti/wlcore/main.c +@@ -2952,11 +2952,20 @@ struct wl1271_filter_params { + u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; + }; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, + struct netdev_hw_addr_list *mc_list) ++#else ++static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count, ++ struct dev_addr_list *mc_list) ++#endif + { + struct wl1271_filter_params *fp; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr *ha; ++#else ++ int i; ++#endif + + fp = kzalloc(sizeof(*fp), GFP_ATOMIC); + if (!fp) { +@@ -2965,16 +2974,40 @@ static u64 wl1271_op_prepare_multicast(s + } + + /* update multicast filtering parameters */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + fp->mc_list_length = 0; + if (netdev_hw_addr_list_count(mc_list) > ACX_MC_ADDRESS_GROUP_MAX) { ++#else ++ fp->enabled = true; ++ if (mc_count > ACX_MC_ADDRESS_GROUP_MAX) { ++ mc_count = 0; ++#endif + fp->enabled = false; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + } else { + fp->enabled = true; + netdev_hw_addr_list_for_each(ha, mc_list) { ++#else ++ } ++ ++ fp->mc_list_length = 0; ++ for (i = 0; i < mc_count; i++) { ++ if (mc_list->da_addrlen == ETH_ALEN) { ++#endif + memcpy(fp->mc_list[fp->mc_list_length], ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ha->addr, ETH_ALEN); ++#else ++ mc_list->da_addr, ETH_ALEN); ++#endif + fp->mc_list_length++; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + } ++#else ++ } else ++ wl1271_warning("Unknown mc address length."); ++ mc_list = mc_list->next; ++#endif + } + + return (u64)(unsigned long)fp; +--- a/drivers/net/wireless/zd1211rw/zd_mac.c ++++ b/drivers/net/wireless/zd1211rw/zd_mac.c +@@ -1215,17 +1215,34 @@ static void zd_process_intr(struct work_ + + + static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, struct dev_addr_list *ha) ++#endif + { + struct zd_mac *mac = zd_hw_mac(hw); + struct zd_mc_hash hash; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr *ha; ++#else ++ int i; ++#endif + + zd_mc_clear(&hash); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + netdev_hw_addr_list_for_each(ha, mc_list) { + dev_dbg_f(zd_mac_dev(mac), "mc addr %pM\n", ha->addr); + zd_mc_add_addr(&hash, ha->addr); ++#else ++ for (i = 0; i < mc_count; i++) { ++ if (!ha) ++ break; ++ dev_dbg_f(zd_mac_dev(mac), "mc addr %pM\n", ha->dmi_addr); ++ zd_mc_add_addr(&hash, ha->dmi_addr); ++ ha = ha->next; ++#endif + } + + return hash.low | ((u64)hash.high << 32); +--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +@@ -103,7 +103,11 @@ static void _brcmf_set_multicast_list(st + netdev_for_each_mc_addr(ha, ndev) { + if (!cnt) + break; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + memcpy(bufp, ha->addr, ETH_ALEN); ++#else ++ memcpy(bufp, ha->dmi_addr, ETH_ALEN); ++#endif + bufp += ETH_ALEN; + cnt--; + } +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -2604,14 +2604,24 @@ struct ieee80211_ops { + void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); + + u64 (*prepare_multicast)(struct ieee80211_hw *hw, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list); ++#else ++ int mc_count, struct dev_addr_list *mc_list); ++#endif + void (*configure_filter)(struct ieee80211_hw *hw, + unsigned int changed_flags, + unsigned int *total_flags, + u64 multicast); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + void (*set_multicast_list)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, bool allmulti, + struct netdev_hw_addr_list *mc_list); ++#else ++ void (*set_multicast_list)(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, bool allmulti, ++ int mc_count, struct dev_addr_list *ha); ++#endif + + int (*set_tim)(struct ieee80211_hw *hw, struct ieee80211_sta *sta, + bool set); +--- a/net/bluetooth/bnep/netdev.c ++++ b/net/bluetooth/bnep/netdev.c +@@ -93,8 +93,13 @@ static void bnep_net_set_mc_list(struct + netdev_for_each_mc_addr(ha, dev) { + if (i == BNEP_MAX_MULTICAST_FILTERS) + break; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); + memcpy(__skb_put(skb, ETH_ALEN), ha->addr, ETH_ALEN); ++#else ++ memcpy(__skb_put(skb, ETH_ALEN), ha->dmi_addr, ETH_ALEN); ++ memcpy(__skb_put(skb, ETH_ALEN), ha->dmi_addr, ETH_ALEN); ++#endif + + i++; + } +--- a/net/mac80211/driver-ops.h ++++ b/net/mac80211/driver-ops.h +@@ -227,20 +227,35 @@ static inline void drv_bss_info_changed( + } + + static inline u64 drv_prepare_multicast(struct ieee80211_local *local, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list *mc_list) ++#else ++ int mc_count, ++ struct dev_addr_list *mc_list) ++#endif + { + u64 ret = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + trace_drv_prepare_multicast(local, mc_list->count); ++#else ++ trace_drv_prepare_multicast(local, mc_count); ++#endif + + if (local->ops->prepare_multicast) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + ret = local->ops->prepare_multicast(&local->hw, mc_list); ++#else ++ ret = local->ops->prepare_multicast(&local->hw, mc_count, ++ mc_list); ++#endif + + trace_drv_return_u64(local, ret); + + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static inline void drv_set_multicast_list(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, + struct netdev_hw_addr_list *mc_list) +@@ -256,6 +271,23 @@ static inline void drv_set_multicast_lis + allmulti, mc_list); + trace_drv_return_void(local); + } ++#else ++static inline void drv_set_multicast_list(struct ieee80211_local *local, ++ struct ieee80211_sub_if_data *sdata, ++ int mc_count, struct dev_addr_list *ha) ++{ ++ bool allmulti = sdata->flags & IEEE80211_SDATA_ALLMULTI; ++ ++ trace_drv_set_multicast_list(local, sdata, mc_count); ++ ++ check_sdata_in_driver(sdata); ++ ++ if (local->ops->set_multicast_list) ++ local->ops->set_multicast_list(&local->hw, &sdata->vif, ++ allmulti, mc_count, ha); ++ trace_drv_return_void(local); ++} ++#endif + + static inline void drv_configure_filter(struct ieee80211_local *local, + unsigned int changed_flags, +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -907,7 +907,12 @@ struct ieee80211_local { + struct work_struct reconfig_filter; + + /* aggregated multicast list */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + struct netdev_hw_addr_list mc_list; ++#else ++ struct dev_addr_list *mc_list; ++ int mc_count; ++#endif + + bool tim_in_locked_section; /* see ieee80211_beacon_get() */ + +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -743,8 +743,13 @@ static void ieee80211_do_stop(struct iee + if (sdata->dev) { + netif_addr_lock_bh(sdata->dev); + spin_lock_bh(&local->filter_lock); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + __hw_addr_unsync(&local->mc_list, &sdata->dev->mc, + sdata->dev->addr_len); ++#else ++ __dev_addr_unsync(&local->mc_list, &local->mc_count, ++ &sdata->dev->mc_list, &sdata->dev->mc_count); ++#endif + spin_unlock_bh(&local->filter_lock); + netif_addr_unlock_bh(sdata->dev); + +@@ -927,10 +932,20 @@ static void ieee80211_set_multicast_list + if (sdata->vif.type != NL80211_IFTYPE_MONITOR && + sdata->vif.type != NL80211_IFTYPE_AP_VLAN && + sdata->vif.type != NL80211_IFTYPE_AP) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + drv_set_multicast_list(local, sdata, &dev->mc); ++#else ++ drv_set_multicast_list(local, sdata, dev->mc_count, ++ dev->mc_list); ++#endif + + spin_lock_bh(&local->filter_lock); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + __hw_addr_sync(&local->mc_list, &dev->mc, dev->addr_len); ++#else ++ __dev_addr_sync(&local->mc_list, &local->mc_count, ++ &dev->mc_list, &dev->mc_count); ++#endif + spin_unlock_bh(&local->filter_lock); + ieee80211_queue_work(&local->hw, &local->reconfig_filter); + } +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -71,7 +71,11 @@ void ieee80211_configure_filter(struct i + spin_lock_bh(&local->filter_lock); + changed_flags = local->filter_flags ^ new_flags; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + mc = drv_prepare_multicast(local, &local->mc_list); ++#else ++ mc = drv_prepare_multicast(local, local->mc_count, local->mc_list); ++#endif + spin_unlock_bh(&local->filter_lock); + + /* be a bit nasty */ +@@ -592,9 +596,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( + wiphy->vht_capa_mod_mask = &mac80211_vht_capa_mod_mask; + + INIT_LIST_HEAD(&local->interfaces); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + + __hw_addr_init(&local->mc_list); + ++#endif + mutex_init(&local->iflist_mtx); + mutex_init(&local->mtx); + +--- a/drivers/net/wireless/ath/ath6kl/main.c ++++ b/drivers/net/wireless/ath/ath6kl/main.c +@@ -1205,7 +1205,11 @@ static void ath6kl_set_multicast_list(st + list_for_each_entry_safe(mc_filter, tmp, &vif->mc_filter, list) { + found = false; + netdev_for_each_mc_addr(ha, ndev) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + if (memcmp(ha->addr, mc_filter->hw_addr, ++#else ++ if (memcmp(ha->dmi_addr, mc_filter->hw_addr, ++#endif + ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) { + found = true; + break; +@@ -1239,7 +1243,11 @@ static void ath6kl_set_multicast_list(st + netdev_for_each_mc_addr(ha, ndev) { + found = false; + list_for_each_entry(mc_filter, &vif->mc_filter, list) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + if (memcmp(ha->addr, mc_filter->hw_addr, ++#else ++ if (memcmp(ha->dmi_addr, mc_filter->hw_addr, ++#endif + ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) { + found = true; + break; +@@ -1254,7 +1262,11 @@ static void ath6kl_set_multicast_list(st + goto out; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + memcpy(mc_filter->hw_addr, ha->addr, ++#else ++ memcpy(mc_filter->hw_addr, ha->dmi_addr, ++#endif + ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE); + /* Set the multicast filter */ + ath6kl_dbg(ATH6KL_DBG_TRC, diff --git a/patches/collateral-evolutions/network/26-sdio-quirks.patch b/patches/collateral-evolutions/network/26-sdio-quirks.patch new file mode 100644 index 00000000..d9340f61 --- /dev/null +++ b/patches/collateral-evolutions/network/26-sdio-quirks.patch @@ -0,0 +1,32 @@ +The quirks attribute is not available on older kernels. + +--- a/drivers/net/wireless/libertas/if_sdio.c ++++ b/drivers/net/wireless/libertas/if_sdio.c +@@ -877,6 +877,7 @@ static int if_sdio_power_on(struct if_sd + if (ret) + goto release; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + /* For 1-bit transfers to the 8686 model, we need to enable the + * interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0 + * bit to allow access to non-vendor registers. */ +@@ -895,6 +896,7 @@ static int if_sdio_power_on(struct if_sd + if (ret) + goto disable; + } ++#endif + + card->ioport = sdio_readb(func, IF_SDIO_IOPORT, &ret); + if (ret) +--- a/drivers/net/wireless/mwifiex/sdio.c ++++ b/drivers/net/wireless/mwifiex/sdio.c +@@ -75,7 +75,9 @@ mwifiex_sdio_probe(struct sdio_func *fun + + card->func = func; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE; ++#endif + + sdio_claim_host(func); + ret = sdio_enable_func(func); diff --git a/patches/collateral-evolutions/network/27-hermes-read-pda-conflict.patch b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict.patch new file mode 100644 index 00000000..4be543fc --- /dev/null +++ b/patches/collateral-evolutions/network/27-hermes-read-pda-conflict.patch @@ -0,0 +1,56 @@ +Rename read_pda to something else because this symbol is used in a +define for something else in arch/um/include/asm/pda.h on older kernels. + +--- a/drivers/net/wireless/orinoco/fw.c ++++ b/drivers/net/wireless/orinoco/fw.c +@@ -123,7 +123,7 @@ orinoco_dl_firmware(struct orinoco_priva + dev_dbg(dev, "Attempting to download firmware %s\n", firmware); + + /* Read current plug data */ +- err = hw->ops->read_pda(hw, pda, fw->pda_addr, fw->pda_size); ++ err = hw->ops->read_pda_h(hw, pda, fw->pda_addr, fw->pda_size); + dev_dbg(dev, "Read PDA returned %d\n", err); + if (err) + goto free; +@@ -225,7 +225,7 @@ symbol_dl_image(struct orinoco_private * + if (!pda) + return -ENOMEM; + +- ret = hw->ops->read_pda(hw, pda, fw->pda_addr, fw->pda_size); ++ ret = hw->ops->read_pda_h(hw, pda, fw->pda_addr, fw->pda_size); + if (ret) + goto free; + } +--- a/drivers/net/wireless/orinoco/hermes.c ++++ b/drivers/net/wireless/orinoco/hermes.c +@@ -767,7 +767,7 @@ static const struct hermes_ops hermes_op + .write_ltv = hermes_write_ltv, + .bap_pread = hermes_bap_pread, + .bap_pwrite = hermes_bap_pwrite, +- .read_pda = hermes_read_pda, ++ .read_pda_h = hermes_read_pda, + .program_init = hermesi_program_init, + .program_end = hermesi_program_end, + .program = hermes_program_bytes, +--- a/drivers/net/wireless/orinoco/hermes.h ++++ b/drivers/net/wireless/orinoco/hermes.h +@@ -393,7 +393,7 @@ struct hermes_ops { + u16 id, u16 offset); + int (*bap_pwrite)(struct hermes *hw, int bap, const void *buf, + int len, u16 id, u16 offset); +- int (*read_pda)(struct hermes *hw, __le16 *pda, ++ int (*read_pda_h)(struct hermes *hw, __le16 *pda, + u32 pda_addr, u16 pda_len); + int (*program_init)(struct hermes *hw, u32 entry_point); + int (*program_end)(struct hermes *hw); +--- a/drivers/net/wireless/orinoco/orinoco_usb.c ++++ b/drivers/net/wireless/orinoco/orinoco_usb.c +@@ -1553,7 +1553,7 @@ static const struct hermes_ops ezusb_ops + .read_ltv = ezusb_read_ltv, + .write_ltv = ezusb_write_ltv, + .bap_pread = ezusb_bap_pread, +- .read_pda = ezusb_read_pda, ++ .read_pda_h = ezusb_read_pda, + .program_init = ezusb_program_init, + .program_end = ezusb_program_end, + .program = ezusb_program, diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend.patch new file mode 100644 index 00000000..8ac92fe6 --- /dev/null +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend.patch @@ -0,0 +1,199 @@ +Starting with commit 66fceb69b72ff7e9cd8da2ca70033982d5376e0e +"libertas: Added callback functions to support SDIO suspend/resume." +libertas uses new functions from the in kernel sdio framework for +suspend and resume that are not backported. + +--- a/drivers/net/wireless/ath/ath6kl/sdio.c ++++ b/drivers/net/wireless/ath/ath6kl/sdio.c +@@ -817,6 +817,7 @@ out: + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int ath6kl_set_sdio_pm_caps(struct ath6kl *ar) + { + struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar); +@@ -950,6 +951,17 @@ static int ath6kl_sdio_resume(struct ath + + return 0; + } ++#else ++static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow) ++{ ++ return 0; ++} ++ ++static int ath6kl_sdio_resume(struct ath6kl *ar) ++{ ++ return 0; ++} ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ + + /* set the window address register (using 4-byte register access ). */ + static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr) +@@ -1263,7 +1275,7 @@ static const struct ath6kl_hif_ops ath6k + .stop = ath6kl_sdio_stop, + }; + +-#ifdef CONFIG_PM_SLEEP ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + + /* + * Empty handlers so that mmc subsystem doesn't remove us entirely during +@@ -1413,7 +1425,9 @@ static struct sdio_driver ath6kl_sdio_dr + .id_table = ath6kl_sdio_devices, + .probe = ath6kl_sdio_probe, + .remove = ath6kl_sdio_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + .drv.pm = ATH6KL_SDIO_PM_OPS, ++#endif + }; + + static int __init ath6kl_sdio_init(void) +--- a/drivers/net/wireless/libertas/if_sdio.c ++++ b/drivers/net/wireless/libertas/if_sdio.c +@@ -1345,6 +1345,7 @@ static void if_sdio_remove(struct sdio_f + lbs_deb_leave(LBS_DEB_SDIO); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int if_sdio_suspend(struct device *dev) + { + struct sdio_func *func = dev_to_sdio_func(dev); +@@ -1403,15 +1404,18 @@ static const struct dev_pm_ops if_sdio_p + .suspend = if_sdio_suspend, + .resume = if_sdio_resume, + }; ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ + + static struct sdio_driver if_sdio_driver = { + .name = "libertas_sdio", + .id_table = if_sdio_ids, + .probe = if_sdio_probe, + .remove = if_sdio_remove, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + .drv = { + .pm = &if_sdio_pm_ops, + }, ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ + }; + + /*******************************************************************/ +--- a/drivers/net/wireless/mwifiex/sdio.c ++++ b/drivers/net/wireless/mwifiex/sdio.c +@@ -129,8 +129,10 @@ mwifiex_sdio_remove(struct sdio_func *fu + wait_for_completion(&adapter->fw_load); + + if (user_rmmod) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + if (adapter->is_suspended) + mwifiex_sdio_resume(adapter->dev); ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ + + for (i = 0; i < adapter->priv_num; i++) + if ((GET_BSS_ROLE(adapter->priv[i]) == +@@ -147,6 +149,7 @@ mwifiex_sdio_remove(struct sdio_func *fu + kfree(card); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + /* + * SDIO suspend. + * +@@ -246,6 +249,7 @@ static int mwifiex_sdio_resume(struct de + + return 0; + } ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ + + /* Device ID for SD8786 */ + #define SDIO_DEVICE_ID_MARVELL_8786 (0x9116) +@@ -264,10 +268,12 @@ static const struct sdio_device_id mwifi + + MODULE_DEVICE_TABLE(sdio, mwifiex_ids); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static const struct dev_pm_ops mwifiex_sdio_pm_ops = { + .suspend = mwifiex_sdio_suspend, + .resume = mwifiex_sdio_resume, + }; ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ + + static struct sdio_driver mwifiex_sdio = { + .name = "mwifiex_sdio", +@@ -276,7 +282,9 @@ static struct sdio_driver mwifiex_sdio = + .remove = mwifiex_sdio_remove, + .drv = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + .pm = &mwifiex_sdio_pm_ops, ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ + } + }; + +--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +@@ -71,7 +71,7 @@ static bool + brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev) + { + bool is_err = false; +-#ifdef CONFIG_PM_SLEEP ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + is_err = atomic_read(&sdiodev->suspend); + #endif + return is_err; +@@ -80,7 +80,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ + static void + brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq) + { +-#ifdef CONFIG_PM_SLEEP ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + int retry = 0; + while (atomic_read(&sdiodev->suspend) && retry++ != 30) + wait_event_timeout(*wq, false, HZ/100); +@@ -546,7 +546,7 @@ static void brcmf_ops_sdio_remove(struct + brcmf_dbg(TRACE, "Exit\n"); + } + +-#ifdef CONFIG_PM_SLEEP ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int brcmf_sdio_suspend(struct device *dev) + { + mmc_pm_flag_t sdio_flags; +@@ -596,7 +596,7 @@ static struct sdio_driver brcmf_sdmmc_dr + .remove = brcmf_ops_sdio_remove, + .name = "brcmfmac", + .id_table = brcmf_sdmmc_ids, +-#ifdef CONFIG_PM_SLEEP ++#if defined(CONFIG_PM_SLEEP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + .drv = { + .pm = &brcmf_sdio_pm_ops, + }, +--- a/drivers/bluetooth/btmrvl_sdio.c ++++ b/drivers/bluetooth/btmrvl_sdio.c +@@ -1050,6 +1050,7 @@ static void btmrvl_sdio_remove(struct sd + } + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + static int btmrvl_sdio_suspend(struct device *dev) + { + struct sdio_func *func = dev_to_sdio_func(dev); +@@ -1145,6 +1146,7 @@ static const struct dev_pm_ops btmrvl_sd + .suspend = btmrvl_sdio_suspend, + .resume = btmrvl_sdio_resume, + }; ++#endif + + static struct sdio_driver bt_mrvl_sdio = { + .name = "btmrvl_sdio", +@@ -1153,7 +1155,9 @@ static struct sdio_driver bt_mrvl_sdio = + .remove = btmrvl_sdio_remove, + .drv = { + .owner = THIS_MODULE, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) + .pm = &btmrvl_sdio_pm_ops, ++#endif + } + }; + diff --git a/patches/collateral-evolutions/network/30-bridge-port.patch b/patches/collateral-evolutions/network/30-bridge-port.patch new file mode 100644 index 00000000..f7b4ea75 --- /dev/null +++ b/patches/collateral-evolutions/network/30-bridge-port.patch @@ -0,0 +1,45 @@ +The patch titled: + + bridge: use rx_handler_data pointer to store net_bridge_port pointer + +by Jiri Pirko <jpirko@redhat.com> moved the br_ports pointer +out of the netdev which older kernels relied on and then added +a flag to the netdev to check for it as follows: + +- dev->br_port) { ++ (dev->priv_flags & IFF_BRIDGE_PORT)) { + +So to backport this we instead rely on a br_port_exists() call +which compat.git provides and depending on the kernel it will either +check for the dev->br_port or the IFF_BRIDGE_PORT flag. A patch +to get the blow code merged upstream and to use br_port_exists() +everywhere else will be submitted but not sure if it will be +accepted. + +This patch can be removed once we get br_port_exists() accessible +to drivers and not just private bridge code. If that patch doesn't +get accepted upstream we'l have to carry this patch around for +compat-drivers. + +--- a/net/wireless/util.c ++++ b/net/wireless/util.c +@@ -816,7 +816,7 @@ int cfg80211_change_iface(struct cfg8021 + return -EOPNOTSUPP; + + /* if it's part of a bridge, reject changing type to station/ibss */ +- if ((dev->priv_flags & IFF_BRIDGE_PORT) && ++ if (br_port_exists(dev) && + (ntype == NL80211_IFTYPE_ADHOC || + ntype == NL80211_IFTYPE_STATION || + ntype == NL80211_IFTYPE_P2P_CLIENT)) +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -2298,7 +2298,7 @@ static int nl80211_valid_4addr(struct cf + enum nl80211_iftype iftype) + { + if (!use_4addr) { +- if (netdev && (netdev->priv_flags & IFF_BRIDGE_PORT)) ++ if (netdev && br_port_exists(netdev)) + return -EBUSY; + return 0; + } diff --git a/patches/collateral-evolutions/network/32-remove-ns-type.patch b/patches/collateral-evolutions/network/32-remove-ns-type.patch new file mode 100644 index 00000000..9f25775b --- /dev/null +++ b/patches/collateral-evolutions/network/32-remove-ns-type.patch @@ -0,0 +1,28 @@ +--- a/net/wireless/sysfs.c ++++ b/net/wireless/sysfs.c +@@ -133,12 +133,14 @@ static int wiphy_resume(struct device *d + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static const void *wiphy_namespace(struct device *d) + { + struct wiphy *wiphy = container_of(d, struct wiphy, dev); + + return wiphy_net(wiphy); + } ++#endif + + struct class ieee80211_class = { + .name = "ieee80211", +@@ -148,8 +150,10 @@ struct class ieee80211_class = { + .dev_uevent = wiphy_uevent, + .suspend = wiphy_suspend, + .resume = wiphy_resume, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + .ns_type = &net_ns_type_operations, + .namespace = wiphy_namespace, ++#endif + }; + + int wiphy_sysfs_init(void) diff --git a/patches/collateral-evolutions/network/35-fix-makefile-includes.patch b/patches/collateral-evolutions/network/35-fix-makefile-includes.patch new file mode 100644 index 00000000..d0e0089c --- /dev/null +++ b/patches/collateral-evolutions/network/35-fix-makefile-includes.patch @@ -0,0 +1,71 @@ +When some other headers are included in some makefile it must be +relative to the current object file processed. When giving the full +path the make process will search in the kernel tree for the headers. + +--- a/drivers/net/wireless/rtl818x/rtl8180/Makefile ++++ b/drivers/net/wireless/rtl818x/rtl8180/Makefile +@@ -2,4 +2,4 @@ rtl8180-objs := dev.o rtl8225.o sa2400. + + obj-$(CONFIG_RTL8180) += rtl8180.o + +-ccflags-y += -Idrivers/net/wireless/rtl818x ++ccflags-y += -I$(obj)/.. +--- a/drivers/net/wireless/rtl818x/rtl8187/Makefile ++++ b/drivers/net/wireless/rtl818x/rtl8187/Makefile +@@ -2,4 +2,4 @@ rtl8187-objs := dev.o rtl8225.o leds.o + + obj-$(CONFIG_RTL8187) += rtl8187.o + +-ccflags-y += -Idrivers/net/wireless/rtl818x ++ccflags-y += -I$(obj)/.. +--- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile ++++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile +@@ -16,8 +16,8 @@ + # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + ccflags-y += \ +- -Idrivers/net/wireless/brcm80211/brcmfmac \ +- -Idrivers/net/wireless/brcm80211/include ++ -I$(obj) \ ++ -I$(obj)/../include + + ccflags-y += -D__CHECK_ENDIAN__ + +--- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile ++++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile +@@ -17,9 +17,9 @@ + + ccflags-y := \ + -D__CHECK_ENDIAN__ \ +- -Idrivers/net/wireless/brcm80211/brcmsmac \ +- -Idrivers/net/wireless/brcm80211/brcmsmac/phy \ +- -Idrivers/net/wireless/brcm80211/include ++ -I$(obj) \ ++ -I$(obj)/phy \ ++ -I$(obj)/../include + + BRCMSMAC_OFILES := \ + mac80211_if.o \ +--- a/drivers/net/wireless/brcm80211/brcmutil/Makefile ++++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile +@@ -16,8 +16,8 @@ + # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + ccflags-y := \ +- -Idrivers/net/wireless/brcm80211/brcmutil \ +- -Idrivers/net/wireless/brcm80211/include ++ -I$(obj) \ ++ -I$(obj)/../include + + BRCMUTIL_OFILES := \ + utils.o +--- a/net/wireless/Makefile ++++ b/net/wireless/Makefile +@@ -20,6 +20,6 @@ CFLAGS_trace.o := -I$(src) + ccflags-y += -D__CHECK_ENDIAN__ + + $(obj)/regdb.c: $(src)/db.txt $(src)/genregdb.awk +- @$(AWK) -f $(srctree)/$(src)/genregdb.awk < $< > $@ ++ @$(AWK) -f $(src)/genregdb.awk < $< > $@ + + clean-files := regdb.c diff --git a/patches/collateral-evolutions/network/36-workqueue.patch b/patches/collateral-evolutions/network/36-workqueue.patch new file mode 100644 index 00000000..c2c6bbd6 --- /dev/null +++ b/patches/collateral-evolutions/network/36-workqueue.patch @@ -0,0 +1,16 @@ +Backport commit 99b88a0ecbdbc6df03527292571b2b442965814a +The rest is backported in include/linux/compat-2.6.37.h + +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -1152,6 +1152,10 @@ static void __exit ieee80211_exit(void) + rc80211_minstrel_ht_exit(); + rc80211_minstrel_exit(); + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) ++ flush_scheduled_work(); ++#endif ++ + ieee80211s_stop(); + + ieee80211_iface_exit(); diff --git a/patches/collateral-evolutions/network/37-vsnprintk.patch b/patches/collateral-evolutions/network/37-vsnprintk.patch new file mode 100644 index 00000000..2a3d3044 --- /dev/null +++ b/patches/collateral-evolutions/network/37-vsnprintk.patch @@ -0,0 +1,35 @@ +--- a/drivers/net/wireless/ath/main.c ++++ b/drivers/net/wireless/ath/main.c +@@ -59,6 +59,7 @@ struct sk_buff *ath_rxbuf_alloc(struct a + } + EXPORT_SYMBOL(ath_rxbuf_alloc); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + void ath_printk(const char *level, const struct ath_common* common, + const char *fmt, ...) + { +@@ -78,4 +79,24 @@ void ath_printk(const char *level, const + + va_end(args); + } ++#else ++void ath_printk(const char *level, const struct ath_common* common, ++ const char *fmt, ...) ++{ ++ va_list args; ++ ++ va_start(args, fmt); ++ ++ if (common && common->hw && common->hw->wiphy) ++ printk("%sath: %s: ", ++ level, wiphy_name(common->hw->wiphy)); ++ else ++ printk("%sath: ", level); ++ ++ vprintk(fmt, args); ++ ++ va_end(args); ++} ++#endif ++ + EXPORT_SYMBOL(ath_printk); diff --git a/patches/collateral-evolutions/network/38-led-max-brightness.patch b/patches/collateral-evolutions/network/38-led-max-brightness.patch new file mode 100644 index 00000000..1495815c --- /dev/null +++ b/patches/collateral-evolutions/network/38-led-max-brightness.patch @@ -0,0 +1,36 @@ +--- a/drivers/net/wireless/iwlegacy/common.c ++++ b/drivers/net/wireless/iwlegacy/common.c +@@ -562,7 +562,9 @@ il_leds_init(struct il_priv *il) + kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy)); + il->led.brightness_set = il_led_brightness_set; + il->led.blink_set = il_led_blink_set; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + il->led.max_brightness = 1; ++#endif + + switch (mode) { + case IL_LED_DEFAULT: +--- a/drivers/net/wireless/iwlwifi/dvm/led.c ++++ b/drivers/net/wireless/iwlwifi/dvm/led.c +@@ -187,7 +187,9 @@ void iwl_leds_init(struct iwl_priv *priv + wiphy_name(priv->hw->wiphy)); + priv->led.brightness_set = iwl_led_brightness_set; + priv->led.blink_set = iwl_led_blink_set; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + priv->led.max_brightness = 1; ++#endif + + switch (mode) { + case IWL_LED_DEFAULT: +--- a/drivers/net/wireless/iwlwifi/mvm/led.c ++++ b/drivers/net/wireless/iwlwifi/mvm/led.c +@@ -108,7 +108,9 @@ int iwl_mvm_leds_init(struct iwl_mvm *mv + mvm->led.name = kasprintf(GFP_KERNEL, "%s-led", + wiphy_name(mvm->hw->wiphy)); + mvm->led.brightness_set = iwl_led_brightness_set; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + mvm->led.max_brightness = 1; ++#endif + + if (mode == IWL_LED_RF_STATE) + mvm->led.default_trigger = diff --git a/patches/collateral-evolutions/network/39-remove_blink_set.patch b/patches/collateral-evolutions/network/39-remove_blink_set.patch new file mode 100644 index 00000000..dc9af73f --- /dev/null +++ b/patches/collateral-evolutions/network/39-remove_blink_set.patch @@ -0,0 +1,56 @@ +--- a/drivers/net/wireless/iwlegacy/common.c ++++ b/drivers/net/wireless/iwlegacy/common.c +@@ -540,6 +540,7 @@ il_led_brightness_set(struct led_classde + il_led_cmd(il, on, 0); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) + static int + il_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on, + unsigned long *delay_off) +@@ -548,6 +549,7 @@ il_led_blink_set(struct led_classdev *le + + return il_led_cmd(il, *delay_on, *delay_off); + } ++#endif + + void + il_leds_init(struct il_priv *il) +@@ -561,7 +563,9 @@ il_leds_init(struct il_priv *il) + il->led.name = + kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy)); + il->led.brightness_set = il_led_brightness_set; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) + il->led.blink_set = il_led_blink_set; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + il->led.max_brightness = 1; + #endif +--- a/drivers/net/wireless/iwlwifi/dvm/led.c ++++ b/drivers/net/wireless/iwlwifi/dvm/led.c +@@ -162,6 +162,7 @@ static void iwl_led_brightness_set(struc + iwl_led_cmd(priv, on, 0); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) + static int iwl_led_blink_set(struct led_classdev *led_cdev, + unsigned long *delay_on, + unsigned long *delay_off) +@@ -170,6 +171,7 @@ static int iwl_led_blink_set(struct led_ + + return iwl_led_cmd(priv, *delay_on, *delay_off); + } ++#endif + + void iwl_leds_init(struct iwl_priv *priv) + { +@@ -186,7 +188,9 @@ void iwl_leds_init(struct iwl_priv *priv + priv->led.name = kasprintf(GFP_KERNEL, "%s-led", + wiphy_name(priv->hw->wiphy)); + priv->led.brightness_set = iwl_led_brightness_set; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) + priv->led.blink_set = iwl_led_blink_set; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + priv->led.max_brightness = 1; + #endif diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features.patch b/patches/collateral-evolutions/network/40-netdev-hw-features.patch new file mode 100644 index 00000000..b96b5994 --- /dev/null +++ b/patches/collateral-evolutions/network/40-netdev-hw-features.patch @@ -0,0 +1,372 @@ +This reverts the commits that deal with hw_features and +set_features, fix_features for kernels < 2.6.39. + +Below is one example commit being reverted, but we also do +this for ath6kl and any driver that uses this in this file. + +commit 782d640afd15af7a1faf01cfe566ca4ac511319d +Author: MichaÅ‚ MirosÅ‚aw <mirq-linux@rere.qmqm.pl> +Date: Thu Apr 7 07:32:18 2011 +0000 + + net: atl*: convert to hw_features + + Things left as they were: + - atl1: is RX checksum really enabled? + - atl2: copy-paste from atl1, with-errors-on-modify I presume + - atl1c: there's a bug: MTU can't be changed if device is not up + + Signed-off-by: MichaÅ‚ MirosÅ‚aw <mirq-linux@rere.qmqm.pl> + Signed-off-by: David S. Miller <davem@davemloft.net> + +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c +@@ -114,6 +114,13 @@ static int atl1c_set_settings(struct net + return 0; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++static u32 atl1c_get_tx_csum(struct net_device *netdev) ++{ ++ return (netdev->features & NETIF_F_HW_CSUM) != 0; ++} ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ ++ + static u32 atl1c_get_msglevel(struct net_device *netdev) + { + struct atl1c_adapter *adapter = netdev_priv(netdev); +@@ -301,6 +308,11 @@ static const struct ethtool_ops atl1c_et + .get_link = ethtool_op_get_link, + .get_eeprom_len = atl1c_get_eeprom_len, + .get_eeprom = atl1c_get_eeprom, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++ .get_tx_csum = atl1c_get_tx_csum, ++ .get_sg = ethtool_op_get_sg, ++ .set_sg = ethtool_op_set_sg, ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ + }; + + void atl1c_set_ethtool_ops(struct net_device *netdev) +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -491,6 +491,7 @@ static void atl1c_set_rxbufsize(struct a + roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + static netdev_features_t atl1c_fix_features(struct net_device *netdev, + netdev_features_t features) + { +@@ -519,6 +520,7 @@ static int atl1c_set_features(struct net + + return 0; + } ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + + /** + * atl1c_change_mtu - Change the Maximum Transfer Unit +@@ -551,8 +553,19 @@ static int atl1c_change_mtu(struct net_d + netdev->mtu = new_mtu; + adapter->hw.max_frame_size = new_mtu; + atl1c_set_rxbufsize(adapter, netdev); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++ if (new_mtu > MAX_TSO_FRAME_SIZE) { ++ adapter->netdev->features &= ~NETIF_F_TSO; ++ adapter->netdev->features &= ~NETIF_F_TSO6; ++ } else { ++ adapter->netdev->features |= NETIF_F_TSO; ++ adapter->netdev->features |= NETIF_F_TSO6; ++ } ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ + atl1c_down(adapter); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + netdev_update_features(netdev); ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + atl1c_up(adapter); + clear_bit(__AT_RESETTING, &adapter->flags); + } +@@ -2459,8 +2472,10 @@ static const struct net_device_ops atl1c + .ndo_set_mac_address = atl1c_set_mac_addr, + .ndo_set_rx_mode = atl1c_set_multi, + .ndo_change_mtu = atl1c_change_mtu, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + .ndo_fix_features = atl1c_fix_features, + .ndo_set_features = atl1c_set_features, ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + .ndo_do_ioctl = atl1c_ioctl, + .ndo_tx_timeout = atl1c_tx_timeout, + .ndo_get_stats = atl1c_get_stats, +@@ -2479,6 +2494,7 @@ static int atl1c_init_netdev(struct net_ + atl1c_set_ethtool_ops(netdev); + + /* TODO: add when ready */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + netdev->hw_features = NETIF_F_SG | + NETIF_F_HW_CSUM | + NETIF_F_HW_VLAN_RX | +@@ -2486,6 +2502,14 @@ static int atl1c_init_netdev(struct net_ + NETIF_F_TSO6; + netdev->features = netdev->hw_features | + NETIF_F_HW_VLAN_TX; ++#else ++ netdev->features = NETIF_F_SG | ++ NETIF_F_HW_CSUM | ++ NETIF_F_HW_VLAN_TX | ++ NETIF_F_HW_VLAN_RX | ++ NETIF_F_TSO | ++ NETIF_F_TSO6; ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + return 0; + } + +--- a/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c ++++ b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c +@@ -384,6 +384,11 @@ static const struct ethtool_ops atl1e_et + .get_eeprom_len = atl1e_get_eeprom_len, + .get_eeprom = atl1e_get_eeprom, + .set_eeprom = atl1e_set_eeprom, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++ .set_tx_csum = ethtool_op_set_tx_hw_csum, ++ .set_sg = ethtool_op_set_sg, ++ .set_tso = ethtool_op_set_tso, ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ + }; + + void atl1e_set_ethtool_ops(struct net_device *netdev) +--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c ++++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +@@ -375,6 +375,7 @@ static int atl1e_set_mac_addr(struct net + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + static netdev_features_t atl1e_fix_features(struct net_device *netdev, + netdev_features_t features) + { +@@ -400,6 +401,7 @@ static int atl1e_set_features(struct net + + return 0; + } ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + + /** + * atl1e_change_mtu - Change the Maximum Transfer Unit +@@ -1925,7 +1927,11 @@ void atl1e_down(struct atl1e_adapter *ad + * reschedule our watchdog timer */ + set_bit(__AT_DOWN, &adapter->flags); + ++#if defined(NETIF_F_LLTX) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + netif_stop_queue(netdev); ++#else ++ netif_tx_disable(netdev); ++#endif + + /* reset MAC to disable all RX/TX */ + atl1e_reset_hw(&adapter->hw); +@@ -2195,8 +2201,10 @@ static const struct net_device_ops atl1e + .ndo_set_rx_mode = atl1e_set_multi, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = atl1e_set_mac_addr, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + .ndo_fix_features = atl1e_fix_features, + .ndo_set_features = atl1e_set_features, ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + .ndo_change_mtu = atl1e_change_mtu, + .ndo_do_ioctl = atl1e_ioctl, + .ndo_tx_timeout = atl1e_tx_timeout, +@@ -2216,10 +2224,15 @@ static int atl1e_init_netdev(struct net_ + netdev->watchdog_timeo = AT_TX_WATCHDOG; + atl1e_set_ethtool_ops(netdev); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO | + NETIF_F_HW_VLAN_RX; + netdev->features = netdev->hw_features | NETIF_F_LLTX | + NETIF_F_HW_VLAN_TX; ++#else ++ netdev->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO | ++ NETIF_F_HW_VLAN_RX | NETIF_F_LLTX | NETIF_F_HW_VLAN_TX; ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + + return 0; + } +--- a/drivers/net/ethernet/atheros/atlx/atl1.c ++++ b/drivers/net/ethernet/atheros/atlx/atl1.c +@@ -2917,8 +2917,10 @@ static const struct net_device_ops atl1_ + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = atl1_set_mac, + .ndo_change_mtu = atl1_change_mtu, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + .ndo_fix_features = atlx_fix_features, + .ndo_set_features = atlx_set_features, ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + .ndo_do_ioctl = atlx_ioctl, + .ndo_tx_timeout = atlx_tx_timeout, + #ifdef CONFIG_NET_POLL_CONTROLLER +@@ -3028,11 +3030,13 @@ static int atl1_probe(struct pci_dev *pd + netdev->features |= NETIF_F_SG; + netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + netdev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_TSO | + NETIF_F_HW_VLAN_RX; + + /* is this valid? see atl1_setup_mac_ctrl() */ + netdev->features |= NETIF_F_RXCSUM; ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + + /* + * patch for some L1 of old version, +@@ -3645,6 +3649,14 @@ static int atl1_set_pauseparam(struct ne + return 0; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++/* FIXME: is this right? -- CHS */ ++static u32 atl1_get_rx_csum(struct net_device *netdev) ++{ ++ return 1; ++} ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ ++ + static void atl1_get_strings(struct net_device *netdev, u32 stringset, + u8 *data) + { +@@ -3717,4 +3729,10 @@ static const struct ethtool_ops atl1_eth + .nway_reset = atl1_nway_reset, + .get_ethtool_stats = atl1_get_ethtool_stats, + .get_sset_count = atl1_get_sset_count, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++ .get_rx_csum = atl1_get_rx_csum, ++ .set_tx_csum = ethtool_op_set_tx_hw_csum, ++ .set_sg = ethtool_op_set_sg, ++ .set_tso = ethtool_op_set_tso, ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ + }; +--- a/drivers/net/ethernet/atheros/atlx/atl2.c ++++ b/drivers/net/ethernet/atheros/atlx/atl2.c +@@ -396,6 +396,7 @@ static void atl2_restore_vlan(struct atl + atl2_vlan_mode(adapter->netdev, adapter->netdev->features); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + static netdev_features_t atl2_fix_features(struct net_device *netdev, + netdev_features_t features) + { +@@ -421,6 +422,7 @@ static int atl2_set_features(struct net_ + + return 0; + } ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + + static void atl2_intr_rx(struct atl2_adapter *adapter) + { +@@ -1319,8 +1321,10 @@ static const struct net_device_ops atl2_ + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = atl2_set_mac, + .ndo_change_mtu = atl2_change_mtu, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + .ndo_fix_features = atl2_fix_features, + .ndo_set_features = atl2_set_features, ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + .ndo_do_ioctl = atl2_ioctl, + .ndo_tx_timeout = atl2_tx_timeout, + #ifdef CONFIG_NET_POLL_CONTROLLER +@@ -1417,8 +1421,12 @@ static int atl2_probe(struct pci_dev *pd + + err = -EIO; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + netdev->hw_features = NETIF_F_SG | NETIF_F_HW_VLAN_RX; ++#endif ++#if defined(NETIF_F_HW_VLAN_TX) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); ++#endif + + /* Init PHY as early as possible due to power saving issue */ + atl2_phy_init(&adapter->hw); +@@ -1838,6 +1846,13 @@ static int atl2_set_settings(struct net_ + return 0; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++static u32 atl2_get_tx_csum(struct net_device *netdev) ++{ ++ return (netdev->features & NETIF_F_HW_CSUM) != 0; ++} ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ ++ + static u32 atl2_get_msglevel(struct net_device *netdev) + { + return 0; +@@ -2107,6 +2122,14 @@ static const struct ethtool_ops atl2_eth + .get_eeprom_len = atl2_get_eeprom_len, + .get_eeprom = atl2_get_eeprom, + .set_eeprom = atl2_set_eeprom, ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++ .get_tx_csum = atl2_get_tx_csum, ++ .get_sg = ethtool_op_get_sg, ++ .set_sg = ethtool_op_set_sg, ++#ifdef NETIF_F_TSO ++ .get_tso = ethtool_op_get_tso, ++#endif ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ + }; + + static void atl2_set_ethtool_ops(struct net_device *netdev) +--- a/drivers/net/ethernet/atheros/atlx/atlx.c ++++ b/drivers/net/ethernet/atheros/atlx/atlx.c +@@ -254,6 +254,7 @@ static void atlx_restore_vlan(struct atl + atlx_vlan_mode(adapter->netdev, adapter->netdev->features); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + static netdev_features_t atlx_fix_features(struct net_device *netdev, + netdev_features_t features) + { +@@ -279,5 +280,6 @@ static int atlx_set_features(struct net_ + + return 0; + } ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + + #endif /* ATLX_C */ +--- a/drivers/net/wireless/ath/ath6kl/main.c ++++ b/drivers/net/wireless/ath/ath6kl/main.c +@@ -1116,6 +1116,7 @@ static struct net_device_stats *ath6kl_g + return &vif->net_stats; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + static int ath6kl_set_features(struct net_device *dev, + netdev_features_t features) + { +@@ -1148,6 +1149,7 @@ static int ath6kl_set_features(struct ne + + return err; + } ++#endif + + static void ath6kl_set_multicast_list(struct net_device *ndev) + { +@@ -1295,7 +1297,9 @@ static const struct net_device_ops ath6k + .ndo_stop = ath6kl_close, + .ndo_start_xmit = ath6kl_data_tx, + .ndo_get_stats = ath6kl_get_stats, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + .ndo_set_features = ath6kl_set_features, ++#endif + .ndo_set_rx_mode = ath6kl_set_multicast_list, + }; + +@@ -1312,7 +1316,11 @@ void init_netdev(struct net_device *dev) + WMI_MAX_TX_META_SZ + + ATH6KL_HTC_ALIGN_BYTES, 4); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + dev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_RXCSUM; ++#else ++ dev->features |= NETIF_F_IP_CSUM; ++#endif + + return; + } diff --git a/patches/collateral-evolutions/network/42-netlink_seq.patch b/patches/collateral-evolutions/network/42-netlink_seq.patch new file mode 100644 index 00000000..be712784 --- /dev/null +++ b/patches/collateral-evolutions/network/42-netlink_seq.patch @@ -0,0 +1,12 @@ +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -5669,7 +5669,9 @@ static int nl80211_dump_scan(struct sk_b + spin_lock_bh(&rdev->bss_lock); + cfg80211_bss_expire(rdev); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) + cb->seq = rdev->bss_generation; ++#endif + + list_for_each_entry(scan, &rdev->bss_list, list) { + if (++idx <= start) diff --git a/patches/collateral-evolutions/network/43-rename_pm_qos_request.patch b/patches/collateral-evolutions/network/43-rename_pm_qos_request.patch new file mode 100644 index 00000000..d000d913 --- /dev/null +++ b/patches/collateral-evolutions/network/43-rename_pm_qos_request.patch @@ -0,0 +1,14 @@ +--- a/drivers/net/wireless/ipw2x00/ipw2100.c ++++ b/drivers/net/wireless/ipw2x00/ipw2100.c +@@ -175,7 +175,11 @@ that only one external action is invoked + #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver" + #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)) ++static struct pm_qos_request_list ipw2100_pm_qos_req; ++#else + static struct pm_qos_request ipw2100_pm_qos_req; ++#endif + + /* Debugging stuff */ + #ifdef CONFIG_IPW2100_DEBUG diff --git a/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing.patch b/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing.patch new file mode 100644 index 00000000..9c9858dd --- /dev/null +++ b/patches/collateral-evolutions/network/44-deactivate-mac80211-tracing.patch @@ -0,0 +1,27 @@ +Do not activate the mac80211 tracing for kernels <= 2.6.32 + +--- a/net/mac80211/Makefile ++++ b/net/mac80211/Makefile +@@ -25,7 +25,9 @@ mac80211-y := \ + wme.o \ + event.o \ + chan.o \ +- trace.o mlme.o ++ mlme.o ++ ++mac80211-$(CONFIG_COMPAT_MAC80211_DRIVER_API_TRACER) += trace.o + + mac80211-$(CONFIG_MAC80211_LEDS) += led.o + mac80211-$(CONFIG_MAC80211_DEBUGFS) += \ +--- a/net/wireless/Makefile ++++ b/net/wireless/Makefile +@@ -10,7 +10,8 @@ obj-$(CONFIG_WEXT_SPY) += wext-spy.o + obj-$(CONFIG_WEXT_PRIV) += wext-priv.o + + cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o +-cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ++cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o ++cfg80211-$(CONFIG_COMPAT_CFG80211_DRIVER_API_TRACER) += trace.o + cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o + cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o + cfg80211-$(CONFIG_CFG80211_INTERNAL_REGDB) += regdb.o diff --git a/patches/collateral-evolutions/network/45-remove-platform-id-table.patch b/patches/collateral-evolutions/network/45-remove-platform-id-table.patch new file mode 100644 index 00000000..c2a040da --- /dev/null +++ b/patches/collateral-evolutions/network/45-remove-platform-id-table.patch @@ -0,0 +1,23 @@ +--- a/drivers/net/wireless/ti/wl12xx/main.c ++++ b/drivers/net/wireless/ti/wl12xx/main.c +@@ -1815,16 +1815,20 @@ out: + return wlcore_remove(pdev); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + static const struct platform_device_id wl12xx_id_table[] = { + { "wl12xx", 0 }, + { } /* Terminating Entry */ + }; + MODULE_DEVICE_TABLE(platform, wl12xx_id_table); ++#endif + + static struct platform_driver wl12xx_driver = { + .probe = wl12xx_probe, + .remove = wl12xx_remove, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + .id_table = wl12xx_id_table, ++#endif + .driver = { + .name = "wl12xx_driver", + .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/46-use_other_workqueue.patch b/patches/collateral-evolutions/network/46-use_other_workqueue.patch new file mode 100644 index 00000000..4f5ba875 --- /dev/null +++ b/patches/collateral-evolutions/network/46-use_other_workqueue.patch @@ -0,0 +1,31 @@ +Old kernel versions do not support WQ_HIGHPRI and WQ_MEM_RECLAIM so we +should use create_singlethread_workqueue() which was used at this +position before. + +--- a/net/bluetooth/hci_core.c ++++ b/net/bluetooth/hci_core.c +@@ -2066,16 +2066,24 @@ int hci_register_dev(struct hci_dev *hde + list_add(&hdev->list, &hci_dev_list); + write_unlock(&hci_dev_list_lock); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND | + WQ_MEM_RECLAIM, 1); ++#else ++ hdev->workqueue = create_singlethread_workqueue(hdev->name); ++#endif + if (!hdev->workqueue) { + error = -ENOMEM; + goto err; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + hdev->req_workqueue = alloc_workqueue(hdev->name, + WQ_HIGHPRI | WQ_UNBOUND | + WQ_MEM_RECLAIM, 1); ++#else ++ hdev->req_workqueue = create_singlethread_workqueue(hdev->name); ++#endif + if (!hdev->req_workqueue) { + destroy_workqueue(hdev->workqueue); + error = -ENOMEM; diff --git a/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue.patch b/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue.patch new file mode 100644 index 00000000..573b5794 --- /dev/null +++ b/patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue.patch @@ -0,0 +1,17 @@ +The struct netdev_queue does not have the attribute trans_start in +kernel < 2.6.31. trans_start on struct net_device does the same +on older kernels. + +--- a/drivers/net/wireless/mwifiex/init.c ++++ b/drivers/net/wireless/mwifiex/init.c +@@ -371,8 +371,10 @@ void mwifiex_set_trans_start(struct net_ + { + int i; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)) + for (i = 0; i < dev->num_tx_queues; i++) + netdev_get_tx_queue(dev, i)->trans_start = jiffies; ++#endif + + dev->trans_start = jiffies; + } diff --git a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch new file mode 100644 index 00000000..670394c0 --- /dev/null +++ b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch @@ -0,0 +1,38 @@ +Use skb_get_queue_mapping() for getting the queue_mapping member of +skb. Some old kernels do not have the member queue_mapping, but this +function always returns something. + +--- a/drivers/net/wireless/b43/main.c ++++ b/drivers/net/wireless/b43/main.c +@@ -3456,11 +3456,11 @@ static void b43_op_tx(struct ieee80211_h + } + B43_WARN_ON(skb_shinfo(skb)->nr_frags); + +- skb_queue_tail(&wl->tx_queue[skb->queue_mapping], skb); +- if (!wl->tx_queue_stopped[skb->queue_mapping]) { ++ skb_queue_tail(&wl->tx_queue[skb_get_queue_mapping(skb)], skb); ++ if (!wl->tx_queue_stopped[skb_get_queue_mapping(skb)]) { + ieee80211_queue_work(wl->hw, &wl->tx_work); + } else { +- ieee80211_stop_queue(wl->hw, skb->queue_mapping); ++ ieee80211_stop_queue(wl->hw, skb_get_queue_mapping(skb)); + } + } + +--- a/drivers/net/wireless/b43legacy/main.c ++++ b/drivers/net/wireless/b43legacy/main.c +@@ -2529,11 +2529,11 @@ static void b43legacy_op_tx(struct ieee8 + } + B43legacy_WARN_ON(skb_shinfo(skb)->nr_frags); + +- skb_queue_tail(&wl->tx_queue[skb->queue_mapping], skb); +- if (!wl->tx_queue_stopped[skb->queue_mapping]) ++ skb_queue_tail(&wl->tx_queue[skb_get_queue_mapping(skb)], skb); ++ if (!wl->tx_queue_stopped[skb_get_queue_mapping(skb)]) + ieee80211_queue_work(wl->hw, &wl->tx_work); + else +- ieee80211_stop_queue(wl->hw, skb->queue_mapping); ++ ieee80211_stop_queue(wl->hw, skb_get_queue_mapping(skb)); + } + + static int b43legacy_op_conf_tx(struct ieee80211_hw *hw, diff --git a/patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup.patch b/patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup.patch new file mode 100644 index 00000000..5997a752 --- /dev/null +++ b/patches/collateral-evolutions/network/50-libertas-olpc-ec-wakeup.patch @@ -0,0 +1,23 @@ +This section of the libertas driver calls functions that simply don't +exist before the release of 3.1. This code in question was an addition, +not a change from any existing code. It is safe to simply remove it for +older kernels. + +--- a/drivers/net/wireless/libertas/if_usb.c ++++ b/drivers/net/wireless/libertas/if_usb.c +@@ -962,6 +962,7 @@ static int if_usb_suspend(struct usb_int + goto out; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) + #ifdef CONFIG_OLPC + if (machine_is_olpc()) { + if (priv->wol_criteria == EHS_REMOVE_WAKEUP) +@@ -970,6 +971,7 @@ static int if_usb_suspend(struct usb_int + olpc_ec_wakeup_set(EC_SCI_SRC_WLAN); + } + #endif ++#endif + + ret = lbs_suspend(priv); + if (ret) diff --git a/patches/collateral-evolutions/network/52-tty-dev.patch b/patches/collateral-evolutions/network/52-tty-dev.patch new file mode 100644 index 00000000..659aa692 --- /dev/null +++ b/patches/collateral-evolutions/network/52-tty-dev.patch @@ -0,0 +1,32 @@ + +tty->dev does not exist until 2.6.37. Typically +subsystems will assign the tty device to a child +to make a symlink under /sys/class/foobar. An example +is the bluetooth subsystem. + +commit 7f4b2b04c88377af30c022f36c060190182850fb +Author: Andrei Warkentin <andreiw@motorola.com> +Date: Fri Feb 11 17:19:26 2011 -0600 + + Bluetooth: Make hci a child of the corresponding tty device. + + Make /sys/class/bluetooth/hciX a symlink to + path under corresponding tty. + + Signed-off-by: Andrei Warkentin <andreiw@motorola.com> + Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> + + +--- a/drivers/bluetooth/hci_ldisc.c ++++ b/drivers/bluetooth/hci_ldisc.c +@@ -421,7 +421,10 @@ static int hci_uart_register_dev(struct + hdev->close = hci_uart_close; + hdev->flush = hci_uart_flush; + hdev->send = hci_uart_send_frame; ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,36)) + SET_HCIDEV_DEV(hdev, hu->tty->dev); ++#endif + + if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags)) + set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); diff --git a/patches/collateral-evolutions/network/53-pr_fmt.patch b/patches/collateral-evolutions/network/53-pr_fmt.patch new file mode 100644 index 00000000..f2fc5a57 --- /dev/null +++ b/patches/collateral-evolutions/network/53-pr_fmt.patch @@ -0,0 +1,715 @@ +This is the correct way to use pr_fmt. This helps avoid +compiler warnings. This is going to be sent upstream. + +--- a/drivers/bcma/bcma_private.h ++++ b/drivers/bcma/bcma_private.h +@@ -1,10 +1,10 @@ + #ifndef LINUX_BCMA_PRIVATE_H_ + #define LINUX_BCMA_PRIVATE_H_ + +-#ifndef pr_fmt ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +-#endif + ++#include <linux/printk.h> + #include <linux/bcma/bcma.h> + #include <linux/delay.h> + +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -10,9 +10,11 @@ + * Distribute under GPL. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/moduleparam.h> + #include <linux/types.h> +--- a/drivers/net/wireless/iwlegacy/3945-mac.c ++++ b/drivers/net/wireless/iwlegacy/3945-mac.c +@@ -27,9 +27,11 @@ + * + *****************************************************************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/init.h> + #include <linux/pci.h> +--- a/drivers/net/wireless/iwlegacy/4965-mac.c ++++ b/drivers/net/wireless/iwlegacy/4965-mac.c +@@ -27,9 +27,11 @@ + * + *****************************************************************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/init.h> + #include <linux/pci.h> +--- a/drivers/net/wireless/libertas/cfg.c ++++ b/drivers/net/wireless/libertas/cfg.c +@@ -6,8 +6,10 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/hardirq.h> + #include <linux/sched.h> + #include <linux/wait.h> +--- a/drivers/net/wireless/libertas/if_usb.c ++++ b/drivers/net/wireless/libertas/if_usb.c +@@ -2,8 +2,10 @@ + * This file contains functions used in USB interface module. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/delay.h> + #include <linux/module.h> + #include <linux/firmware.h> +--- a/drivers/net/wireless/libertas/if_sdio.c ++++ b/drivers/net/wireless/libertas/if_sdio.c +@@ -26,9 +26,11 @@ + * if_sdio_card_to_host() to pad the data. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/slab.h> + #include <linux/firmware.h> +--- a/drivers/net/wireless/libertas/if_spi.c ++++ b/drivers/net/wireless/libertas/if_spi.c +@@ -17,8 +17,10 @@ + * (at your option) any later version. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/hardirq.h> + #include <linux/interrupt.h> + #include <linux/module.h> +--- a/drivers/net/wireless/libertas/rx.c ++++ b/drivers/net/wireless/libertas/rx.c +@@ -2,8 +2,10 @@ + * This file contains the handling of RX in wlan driver. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/etherdevice.h> + #include <linux/hardirq.h> + #include <linux/slab.h> +--- a/drivers/net/wireless/libertas/if_cs.c ++++ b/drivers/net/wireless/libertas/if_cs.c +@@ -21,8 +21,10 @@ + + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/slab.h> + #include <linux/delay.h> +--- a/drivers/net/wireless/libertas/mesh.c ++++ b/drivers/net/wireless/libertas/mesh.c +@@ -1,5 +1,7 @@ ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/delay.h> + #include <linux/etherdevice.h> + #include <linux/hardirq.h> +--- a/drivers/net/wireless/libertas/main.c ++++ b/drivers/net/wireless/libertas/main.c +@@ -4,8 +4,10 @@ + * thread etc.. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/delay.h> + #include <linux/etherdevice.h> +--- a/drivers/net/wireless/libertas_tf/cmd.c ++++ b/drivers/net/wireless/libertas_tf/cmd.c +@@ -7,8 +7,10 @@ + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + */ ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/hardirq.h> + #include <linux/slab.h> + #include <linux/export.h> +--- a/drivers/net/wireless/libertas_tf/if_usb.c ++++ b/drivers/net/wireless/libertas_tf/if_usb.c +@@ -9,11 +9,13 @@ + */ + #define DRV_NAME "lbtf_usb" + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include "libertas_tf.h" + #include "if_usb.h" + ++#include <linux/printk.h> + #include <linux/delay.h> + #include <linux/module.h> + #include <linux/firmware.h> +--- a/drivers/net/wireless/libertas_tf/main.c ++++ b/drivers/net/wireless/libertas_tf/main.c +@@ -7,8 +7,10 @@ + * the Free Software Foundation; either version 2 of the License, or (at + * your option) any later version. + */ ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/hardirq.h> + #include <linux/slab.h> + +--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c ++++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c +@@ -14,9 +14,11 @@ + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/delay.h> + #include <linux/cordic.h> + +--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c ++++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +@@ -16,8 +16,10 @@ + */ + + #define __UNDEF_NO_VERSION__ ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/etherdevice.h> + #include <linux/sched.h> + #include <linux/firmware.h> +--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c ++++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c +@@ -15,8 +15,10 @@ + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/pci_ids.h> + #include <linux/if_ether.h> + #include <net/cfg80211.h> +--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c ++++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c +@@ -14,8 +14,10 @@ + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/netdevice.h> + #include <linux/module.h> + +--- a/net/bluetooth/lib.c ++++ b/net/bluetooth/lib.c +@@ -24,9 +24,11 @@ + + /* Bluetooth kernel library. */ + ++#undef pr_fmt + #define pr_fmt(fmt) "Bluetooth: " fmt + + #include <linux/export.h> ++#include <linux/printk.h> + + #include <net/bluetooth/bluetooth.h> + +--- a/net/wireless/lib80211.c ++++ b/net/wireless/lib80211.c +@@ -13,8 +13,10 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/ctype.h> + #include <linux/ieee80211.h> +--- a/net/wireless/reg.c ++++ b/net/wireless/reg.c +@@ -42,9 +42,11 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/export.h> + #include <linux/slab.h> + #include <linux/list.h> +--- a/net/wireless/core.c ++++ b/net/wireless/core.c +@@ -4,8 +4,10 @@ + * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/if.h> + #include <linux/module.h> + #include <linux/err.h> +--- a/net/wireless/lib80211_crypt_tkip.c ++++ b/net/wireless/lib80211_crypt_tkip.c +@@ -10,8 +10,10 @@ + * more details. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/err.h> + #include <linux/module.h> + #include <linux/init.h> +--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c ++++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c +@@ -16,8 +16,10 @@ + * File contents: support functions for PCI/PCIe + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/delay.h> + + #include <defs.h> +--- a/drivers/net/wireless/rtlwifi/wifi.h ++++ b/drivers/net/wireless/rtlwifi/wifi.h +@@ -30,8 +30,10 @@ + #ifndef __RTL_WIFI_H__ + #define __RTL_WIFI_H__ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/sched.h> + #include <linux/firmware.h> + #include <linux/etherdevice.h> +--- a/drivers/net/wireless/ath/main.c ++++ b/drivers/net/wireless/ath/main.c +@@ -14,9 +14,11 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/module.h> + + #include "ath.h" +--- a/drivers/net/wireless/ath/regd.c ++++ b/drivers/net/wireless/ath/regd.c +@@ -14,9 +14,11 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <linux/kernel.h> ++#include <linux/printk.h> + #include <linux/export.h> + #include <net/cfg80211.h> + #include <net/mac80211.h> +--- a/drivers/net/wireless/ath/ath5k/initvals.c ++++ b/drivers/net/wireless/ath/ath5k/initvals.c +@@ -19,8 +19,11 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "ath5k.h" + #include "reg.h" + #include "debug.h" +--- a/drivers/net/wireless/ath/ath5k/desc.c ++++ b/drivers/net/wireless/ath/ath5k/desc.c +@@ -21,8 +21,11 @@ + Hardware Descriptor Functions + \******************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "ath5k.h" + #include "reg.h" + #include "debug.h" +--- a/drivers/net/wireless/ath/ath5k/dma.c ++++ b/drivers/net/wireless/ath/ath5k/dma.c +@@ -29,8 +29,11 @@ + * status registers (ISR). + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "ath5k.h" + #include "reg.h" + #include "debug.h" +--- a/drivers/net/wireless/ath/ath5k/qcu.c ++++ b/drivers/net/wireless/ath/ath5k/qcu.c +@@ -20,8 +20,11 @@ + Queue Control Unit, DCF Control Unit Functions + \********************************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "ath5k.h" + #include "reg.h" + #include "debug.h" +--- a/drivers/net/wireless/ath/ath5k/phy.c ++++ b/drivers/net/wireless/ath/ath5k/phy.c +@@ -22,8 +22,10 @@ + * PHY related functions * + \***********************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/delay.h> + #include <linux/slab.h> + #include <asm/unaligned.h> +--- a/drivers/net/wireless/ath/ath5k/reset.c ++++ b/drivers/net/wireless/ath/ath5k/reset.c +@@ -23,10 +23,12 @@ + Reset function and helpers + \****************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <asm/unaligned.h> + ++#include <linux/printk.h> + #include <linux/pci.h> /* To determine if a card is pci-e */ + #include <linux/log2.h> + #include <linux/platform_device.h> +--- a/drivers/net/wireless/ath/ath5k/attach.c ++++ b/drivers/net/wireless/ath/ath5k/attach.c +@@ -20,8 +20,10 @@ + * Attach/Detach Functions and helpers * + \*************************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/pci.h> + #include <linux/slab.h> + #include "ath5k.h" +--- a/drivers/net/wireless/ath/ath5k/base.c ++++ b/drivers/net/wireless/ath/ath5k/base.c +@@ -40,8 +40,10 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/delay.h> + #include <linux/dma-mapping.h> +--- a/drivers/net/wireless/ath/ath5k/led.c ++++ b/drivers/net/wireless/ath/ath5k/led.c +@@ -39,8 +39,10 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/pci.h> + #include "ath5k.h" + +--- a/drivers/net/wireless/ath/ath5k/ani.c ++++ b/drivers/net/wireless/ath/ath5k/ani.c +@@ -14,8 +14,11 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "ath5k.h" + #include "reg.h" + #include "debug.h" +--- a/drivers/net/wireless/ath/ath5k/sysfs.c ++++ b/drivers/net/wireless/ath/ath5k/sysfs.c +@@ -1,5 +1,7 @@ ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/device.h> + #include <linux/pci.h> + +--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c ++++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c +@@ -41,11 +41,14 @@ + * + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + + #include <net/mac80211.h> + #include <asm/unaligned.h> + ++#include <linux/printk.h> ++ + #include "ath5k.h" + #include "base.h" + #include "reg.h" +--- a/drivers/net/wireless/ath/ath5k/pci.c ++++ b/drivers/net/wireless/ath/ath5k/pci.c +@@ -14,8 +14,10 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/nl80211.h> + #include <linux/pci.h> + #include <linux/pci-aspm.h> +--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c ++++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c +@@ -15,8 +15,10 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/moduleparam.h> + #include <linux/inetdevice.h> + #include <linux/export.h> +--- a/drivers/net/wireless/ath/ath6kl/init.c ++++ b/drivers/net/wireless/ath/ath6kl/init.c +@@ -16,8 +16,10 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/moduleparam.h> + #include <linux/errno.h> + #include <linux/export.h> +--- a/drivers/net/wireless/ath/ath6kl/main.c ++++ b/drivers/net/wireless/ath/ath6kl/main.c +@@ -15,8 +15,11 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "core.h" + #include "hif-ops.h" + #include "cfg80211.h" +--- a/drivers/net/wireless/ath/ath6kl/txrx.c ++++ b/drivers/net/wireless/ath/ath6kl/txrx.c +@@ -15,8 +15,11 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "core.h" + #include "debug.h" + #include "htc-ops.h" +--- a/drivers/net/wireless/ath/ath9k/init.c ++++ b/drivers/net/wireless/ath/ath9k/init.c +@@ -14,8 +14,10 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/dma-mapping.h> + #include <linux/slab.h> + #include <linux/ath9k_platform.h> +--- a/drivers/net/wireless/ath/ath9k/pci.c ++++ b/drivers/net/wireless/ath/ath9k/pci.c +@@ -14,8 +14,10 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/nl80211.h> + #include <linux/pci.h> + #include <linux/pci-aspm.h> +--- a/drivers/net/wireless/ath/ath9k/htc_hst.c ++++ b/drivers/net/wireless/ath/ath9k/htc_hst.c +@@ -14,8 +14,11 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "htc.h" + + static int htc_issue_send(struct htc_target *target, struct sk_buff* skb, +--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c +@@ -14,8 +14,11 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> ++ + #include "htc.h" + + MODULE_AUTHOR("Atheros Communications"); +--- a/drivers/net/wireless/iwlwifi/dvm/main.c ++++ b/drivers/net/wireless/iwlwifi/dvm/main.c +@@ -27,8 +27,10 @@ + * + *****************************************************************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/init.h> +--- a/drivers/net/wireless/iwlwifi/pcie/drv.c ++++ b/drivers/net/wireless/iwlwifi/pcie/drv.c +@@ -61,8 +61,10 @@ + * + *****************************************************************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/module.h> + #include <linux/pci.h> + #include <linux/pci-aspm.h> +--- a/drivers/net/wireless/ath/ath5k/eeprom.c ++++ b/drivers/net/wireless/ath/ath5k/eeprom.c +@@ -21,8 +21,10 @@ + * EEPROM access functions and helpers * + \*************************************/ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/slab.h> + + #include "ath5k.h" +--- a/drivers/net/wireless/ath/ath5k/debug.c ++++ b/drivers/net/wireless/ath/ath5k/debug.c +@@ -58,8 +58,10 @@ + * THE POSSIBILITY OF SUCH DAMAGES. + */ + ++#undef pr_fmt + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + ++#include <linux/printk.h> + #include <linux/export.h> + #include <linux/moduleparam.h> + diff --git a/patches/collateral-evolutions/network/54-get_ts_info.patch b/patches/collateral-evolutions/network/54-get_ts_info.patch new file mode 100644 index 00000000..5e5764f3 --- /dev/null +++ b/patches/collateral-evolutions/network/54-get_ts_info.patch @@ -0,0 +1,39 @@ +Linux 3.5 will have get_ts_info to support the Precision Time Protocol. + +http://linuxptp.sourceforge.net/ +http://en.wikipedia.org/wiki/Precision_Time_Protocol + +We cannot backport this support given that this introduces +a data structure change on the ethtool_ops. + +commit c8f3a8c31069137fe0100e6920558f1a7487ef3c +Author: Richard Cochran <richardcochran@gmail.com> +Date: Tue Apr 3 22:59:17 2012 +0000 + + ethtool: Introduce a method for getting time stamping capabilities. + + This commit adds a new ethtool ioctl that exposes the SO_TIMESTAMPING + capabilities of a network interface. In addition, user space programs + can use this ioctl to discover the PTP Hardware Clock (PHC) device + associated with the interface. + + Since software receive time stamps are handled by the stack, the generic + ethtool code can answer the query correctly in case the MAC or PHY + drivers lack special time stamping features. + + Signed-off-by: Richard Cochran <richardcochran@gmail.com> + Reviewed-by: Ben Hutchings <bhutchings@solarflare.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -933,7 +933,9 @@ static const struct ethtool_ops usbnet_e + .get_drvinfo = usbnet_get_drvinfo, + .get_msglevel = usbnet_get_msglevel, + .set_msglevel = usbnet_set_msglevel, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .get_ts_info = ethtool_op_get_ts_info, ++#endif + }; + + /*-------------------------------------------------------------------------*/ diff --git a/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch b/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch new file mode 100644 index 00000000..72f24802 --- /dev/null +++ b/patches/collateral-evolutions/network/55-iwlwifi-msg-trace-fix.patch @@ -0,0 +1,70 @@ +In recent kernels, %pV will copy the va_list before using it. +This isn't true for all kernels, so copy the va_list for use +by the dev_*() functions, otherwise the kernel will crash if +the message is printed and traced. + +--- a/drivers/net/wireless/iwlwifi/iwl-debug.c ++++ b/drivers/net/wireless/iwlwifi/iwl-debug.c +@@ -76,13 +76,16 @@ void __iwl_ ##fn(struct device *dev, con + struct va_format vaf = { \ + .fmt = fmt, \ + }; \ +- va_list args; \ ++ va_list args1, args2; \ + \ +- va_start(args, fmt); \ +- vaf.va = &args; \ ++ va_start(args1, fmt); \ ++ va_copy(args2, args1); \ ++ vaf.va = &args2; \ + dev_ ##fn(dev, "%pV", &vaf); \ ++ va_end(args2); \ ++ vaf.va = &args1; \ + trace_iwlwifi_ ##fn(&vaf); \ +- va_end(args); \ ++ va_end(args1); \ + } + + __iwl_fn(warn) +@@ -101,13 +104,18 @@ void __iwl_err(struct device *dev, bool + va_list args; + + va_start(args, fmt); +- vaf.va = &args; + if (!trace_only) { ++ va_list args2; ++ ++ va_copy(args2, args); ++ vaf.va = &args2; + if (rfkill_prefix) + dev_err(dev, "(RFKILL) %pV", &vaf); + else + dev_err(dev, "%pV", &vaf); ++ va_end(args2); + } ++ vaf.va = &args; + trace_iwlwifi_err(&vaf); + va_end(args); + } +@@ -124,13 +132,19 @@ void __iwl_dbg(struct device *dev, + va_list args; + + va_start(args, fmt); +- vaf.va = &args; + #ifdef CONFIG_IWLWIFI_DEBUG + if (iwl_have_debug_level(level) && +- (!limit || net_ratelimit())) ++ (!limit || net_ratelimit())) { ++ va_list args2; ++ ++ va_copy(args2, args); ++ vaf.va = &args2; + dev_dbg(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U', + function, &vaf); ++ va_end(args2); ++ } + #endif ++ vaf.va = &args; + trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf); + va_end(args); + } diff --git a/patches/collateral-evolutions/network/56-mac80211-trace-fix.patch b/patches/collateral-evolutions/network/56-mac80211-trace-fix.patch new file mode 100644 index 00000000..183cec25 --- /dev/null +++ b/patches/collateral-evolutions/network/56-mac80211-trace-fix.patch @@ -0,0 +1,79 @@ +--- a/net/mac80211/trace.c ++++ b/net/mac80211/trace.c +@@ -15,12 +15,16 @@ void __sdata_info(const char *fmt, ...) + struct va_format vaf = { + .fmt = fmt, + }; +- va_list args; ++ va_list args, args2; + + va_start(args, fmt); +- vaf.va = &args; + ++ va_copy(args2, args); ++ vaf.va = &args2; + pr_info("%pV", &vaf); ++ va_end(args2); ++ ++ vaf.va = &args; + trace_mac80211_info(&vaf); + va_end(args); + } +@@ -33,10 +37,16 @@ void __sdata_dbg(bool print, const char + va_list args; + + va_start(args, fmt); +- vaf.va = &args; + +- if (print) ++ if (print) { ++ va_list args2; ++ ++ va_copy(args2, args); ++ vaf.va = &args2; + pr_debug("%pV", &vaf); ++ va_end(args2); ++ } ++ vaf.va = &args; + trace_mac80211_dbg(&vaf); + va_end(args); + } +@@ -46,12 +56,16 @@ void __sdata_err(const char *fmt, ...) + struct va_format vaf = { + .fmt = fmt, + }; +- va_list args; ++ va_list args, args2; + + va_start(args, fmt); +- vaf.va = &args; + ++ va_copy(args2, args); ++ vaf.va = &args2; + pr_err("%pV", &vaf); ++ va_end(args2); ++ ++ vaf.va = &args; + trace_mac80211_err(&vaf); + va_end(args); + } +@@ -64,10 +78,16 @@ void __wiphy_dbg(struct wiphy *wiphy, bo + va_list args; + + va_start(args, fmt); +- vaf.va = &args; + +- if (print) +- wiphy_dbg(wiphy, "%pV", &vaf); ++ if (print) { ++ va_list args2; ++ ++ va_copy(args2, args); ++ vaf.va = &args2; ++ pr_debug("%pV", &vaf); ++ va_end(args2); ++ } ++ vaf.va = &args; + trace_mac80211_dbg(&vaf); + va_end(args); + } diff --git a/patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch new file mode 100644 index 00000000..db7cc803 --- /dev/null +++ b/patches/collateral-evolutions/network/57-iwlwifi-debug-fix.patch @@ -0,0 +1,19 @@ +Due to compat including linux/device.h before we do, +we don't get a chance to #define DEBUG to get our +debugging prints. This patch replaces dev_dbg with +dev_printk to make them show up again. + +--- a/drivers/net/wireless/iwlwifi/iwl-debug.c ++++ b/drivers/net/wireless/iwlwifi/iwl-debug.c +@@ -139,8 +139,9 @@ void __iwl_dbg(struct device *dev, + + va_copy(args2, args); + vaf.va = &args2; +- dev_dbg(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U', +- function, &vaf); ++ dev_printk(KERN_DEBUG, dev, "%c %s %pV", ++ in_interrupt() ? 'I' : 'U', ++ function, &vaf); + va_end(args2); + } + #endif diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch new file mode 100644 index 00000000..81011518 --- /dev/null +++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch @@ -0,0 +1,31 @@ +You cannot backport assignment of netdev->addr_assign_type +given that its part of the netdev data structure only in future +kernels. + +mcgrof@tux ~/linux-next (git::master)$ git describe --contains c1f79426 +v2.6.36-rc1~571^2~104 + +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -2622,7 +2622,9 @@ static int atl1c_probe(struct pci_dev *p + } + if (atl1c_read_mac_addr(&adapter->hw)) { + /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + netdev->addr_assign_type = NET_ADDR_RANDOM; ++#endif + } + memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); + if (netif_msg_probe(adapter)) +--- a/drivers/net/ethernet/atheros/atlx/atl1.c ++++ b/drivers/net/ethernet/atheros/atlx/atl1.c +@@ -3060,7 +3060,9 @@ static int atl1_probe(struct pci_dev *pd + /* copy the MAC address out of the EEPROM */ + if (atl1_read_mac_addr(&adapter->hw)) { + /* mark random mac */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + netdev->addr_assign_type = NET_ADDR_RANDOM; ++#endif + } + memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); + diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch new file mode 100644 index 00000000..458ba4cf --- /dev/null +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch @@ -0,0 +1,276 @@ +--- a/drivers/bluetooth/ath3k.c ++++ b/drivers/bluetooth/ath3k.c +@@ -473,7 +473,9 @@ static struct usb_driver ath3k_driver = + .probe = ath3k_probe, + .disconnect = ath3k_disconnect, + .id_table = ath3k_table, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(ath3k_driver); +--- a/drivers/bluetooth/bcm203x.c ++++ b/drivers/bluetooth/bcm203x.c +@@ -273,7 +273,9 @@ static struct usb_driver bcm203x_driver + .probe = bcm203x_probe, + .disconnect = bcm203x_disconnect, + .id_table = bcm203x_table, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(bcm203x_driver); +--- a/drivers/bluetooth/bfusb.c ++++ b/drivers/bluetooth/bfusb.c +@@ -745,7 +745,9 @@ static struct usb_driver bfusb_driver = + .probe = bfusb_probe, + .disconnect = bfusb_disconnect, + .id_table = bfusb_table, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(bfusb_driver); +--- a/drivers/bluetooth/bpa10x.c ++++ b/drivers/bluetooth/bpa10x.c +@@ -504,7 +504,9 @@ static struct usb_driver bpa10x_driver = + .probe = bpa10x_probe, + .disconnect = bpa10x_disconnect, + .id_table = bpa10x_table, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(bpa10x_driver); +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -1234,7 +1234,9 @@ static struct usb_driver btusb_driver = + #endif + .id_table = btusb_table, + .supports_autosuspend = 1, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(btusb_driver); +--- a/drivers/net/usb/cdc_ether.c ++++ b/drivers/net/usb/cdc_ether.c +@@ -720,7 +720,9 @@ static struct usb_driver cdc_driver = { + .resume = usbnet_resume, + .reset_resume = usbnet_resume, + .supports_autosuspend = 1, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(cdc_driver); +--- a/drivers/net/usb/rndis_host.c ++++ b/drivers/net/usb/rndis_host.c +@@ -642,7 +642,9 @@ static struct usb_driver rndis_driver = + .disconnect = usbnet_disconnect, + .suspend = usbnet_suspend, + .resume = usbnet_resume, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(rndis_driver); +--- a/drivers/net/wireless/at76c50x-usb.c ++++ b/drivers/net/wireless/at76c50x-usb.c +@@ -2451,7 +2451,9 @@ static struct usb_driver at76_driver = { + .probe = at76_probe, + .disconnect = at76_disconnect, + .id_table = dev_table, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + static int __init at76_mod_init(void) +--- a/drivers/net/wireless/ath/ath6kl/usb.c ++++ b/drivers/net/wireless/ath/ath6kl/usb.c +@@ -1207,7 +1207,9 @@ static struct usb_driver ath6kl_usb_driv + .disconnect = ath6kl_usb_remove, + .id_table = ath6kl_usb_ids, + .supports_autosuspend = true, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + static int ath6kl_usb_init(void) +--- a/drivers/net/wireless/ath/ath9k/hif_usb.c ++++ b/drivers/net/wireless/ath/ath9k/hif_usb.c +@@ -1373,7 +1373,9 @@ static struct usb_driver ath9k_hif_usb_d + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + .soft_unbind = 1, + #endif ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + int ath9k_hif_usb_init(void) +--- a/drivers/net/wireless/ath/carl9170/usb.c ++++ b/drivers/net/wireless/ath/carl9170/usb.c +@@ -1166,7 +1166,9 @@ static struct usb_driver carl9170_driver + .resume = carl9170_usb_resume, + .reset_resume = carl9170_usb_resume, + #endif /* CONFIG_PM */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(carl9170_driver); +--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c +@@ -1498,7 +1498,9 @@ static struct usb_driver brcmf_usbdrvr = + .resume = brcmf_usb_resume, + .reset_resume = brcmf_usb_reset_resume, + .supports_autosuspend = 1, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + static void brcmf_release_fw(struct list_head *q) +--- a/drivers/net/wireless/libertas/if_usb.c ++++ b/drivers/net/wireless/libertas/if_usb.c +@@ -1015,7 +1015,9 @@ static struct usb_driver if_usb_driver = + .suspend = if_usb_suspend, + .resume = if_usb_resume, + .reset_resume = if_usb_resume, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(if_usb_driver); +--- a/drivers/net/wireless/libertas_tf/if_usb.c ++++ b/drivers/net/wireless/libertas_tf/if_usb.c +@@ -922,7 +922,9 @@ static struct usb_driver if_usb_driver = + .id_table = if_usb_table, + .suspend = if_usb_suspend, + .resume = if_usb_resume, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(if_usb_driver); +--- a/drivers/net/wireless/orinoco/orinoco_usb.c ++++ b/drivers/net/wireless/orinoco/orinoco_usb.c +@@ -1758,7 +1758,9 @@ static struct usb_driver orinoco_driver + .probe = ezusb_probe, + .disconnect = ezusb_disconnect, + .id_table = ezusb_table, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(orinoco_driver); +--- a/drivers/net/wireless/p54/p54usb.c ++++ b/drivers/net/wireless/p54/p54usb.c +@@ -1140,7 +1140,9 @@ static struct usb_driver p54u_driver = { + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + .soft_unbind = 1, + #endif ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(p54u_driver); +--- a/drivers/net/wireless/rndis_wlan.c ++++ b/drivers/net/wireless/rndis_wlan.c +@@ -3757,7 +3757,9 @@ static struct usb_driver rndis_wlan_driv + .disconnect = usbnet_disconnect, + .suspend = usbnet_suspend, + .resume = usbnet_resume, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(rndis_wlan_driver); +--- a/drivers/net/wireless/rt2x00/rt2500usb.c ++++ b/drivers/net/wireless/rt2x00/rt2500usb.c +@@ -1989,7 +1989,9 @@ static struct usb_driver rt2500usb_drive + .suspend = rt2x00usb_suspend, + .resume = rt2x00usb_resume, + .reset_resume = rt2x00usb_resume, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(rt2500usb_driver); +--- a/drivers/net/wireless/rt2x00/rt2800usb.c ++++ b/drivers/net/wireless/rt2x00/rt2800usb.c +@@ -1375,7 +1375,9 @@ static struct usb_driver rt2800usb_drive + .suspend = rt2x00usb_suspend, + .resume = rt2x00usb_resume, + .reset_resume = rt2x00usb_resume, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(rt2800usb_driver); +--- a/drivers/net/wireless/rt2x00/rt73usb.c ++++ b/drivers/net/wireless/rt2x00/rt73usb.c +@@ -2536,7 +2536,9 @@ static struct usb_driver rt73usb_driver + .suspend = rt2x00usb_suspend, + .resume = rt2x00usb_resume, + .reset_resume = rt2x00usb_resume, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(rt73usb_driver); +--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c ++++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c +@@ -1673,7 +1673,9 @@ static struct usb_driver rtl8187_driver + .id_table = rtl8187_table, + .probe = rtl8187_probe, + .disconnect = rtl8187_disconnect, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(rtl8187_driver); +--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c ++++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +@@ -384,7 +384,9 @@ static struct usb_driver rtl8192cu_drive + #ifdef CONFIG_AUTOSUSPEND + .supports_autosuspend = 1, + #endif ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + module_usb_driver(rtl8192cu_driver); +--- a/drivers/net/wireless/zd1211rw/zd_usb.c ++++ b/drivers/net/wireless/zd1211rw/zd_usb.c +@@ -1540,7 +1540,9 @@ static struct usb_driver driver = { + .disconnect = disconnect, + .pre_reset = pre_reset, + .post_reset = post_reset, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) + .disable_hub_initiated_lpm = 1, ++#endif + }; + + struct workqueue_struct *zd_workqueue; diff --git a/patches/collateral-evolutions/network/63-tty-termios.patch b/patches/collateral-evolutions/network/63-tty-termios.patch new file mode 100644 index 00000000..d84e303a --- /dev/null +++ b/patches/collateral-evolutions/network/63-tty-termios.patch @@ -0,0 +1,49 @@ +This patch requires a manual backport: + +commit adc8d746caa67fff4b53ba3e5163a6cbacc3b523 +Author: Alan Cox <alan@linux.intel.com> +Date: Sat Jul 14 15:31:47 2012 +0100 + + tty: move the termios object into the tty + + This will let us sort out a whole pile of tty related races. The + alternative would be to keep points and refcount the termios objects. + However + 1. They are tiny anyway + 2. Many devices don't use the stored copies + 3. We can remove a pty special case + + Signed-off-by: Alan Cox <alan@linux.intel.com> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +We cannot use compat.git for this given that the assignment +was not done through a static inline helper. + +--- a/drivers/bluetooth/hci_ath.c ++++ b/drivers/bluetooth/hci_ath.c +@@ -58,7 +58,11 @@ static int ath_wakeup_ar3k(struct tty_st + return status; + + /* Disable Automatic RTSCTS */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) + ktermios = tty->termios; ++#else ++ memcpy(&ktermios, tty->termios, sizeof(ktermios)); ++#endif + ktermios.c_cflag &= ~CRTSCTS; + tty_set_termios(tty, &ktermios); + +--- a/net/bluetooth/rfcomm/tty.c ++++ b/net/bluetooth/rfcomm/tty.c +@@ -868,7 +868,11 @@ static int rfcomm_tty_ioctl(struct tty_s + + static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) + struct ktermios *new = &tty->termios; ++#else ++ struct ktermios *new = tty->termios; ++#endif + int old_baud_rate = tty_termios_baud_rate(old); + int new_baud_rate = tty_termios_baud_rate(new); + diff --git a/patches/collateral-evolutions/network/64-b44-32bit-stats.patch b/patches/collateral-evolutions/network/64-b44-32bit-stats.patch new file mode 100644 index 00000000..0169ad94 --- /dev/null +++ b/patches/collateral-evolutions/network/64-b44-32bit-stats.patch @@ -0,0 +1,54 @@ +This patch requires a manual backport: + +commit eeda8585522bcc173f91d6254dfa63e871087c54 +Author: Kevin Groeneveld <kgroeneveld@gmail.com> +Date: Tue Jul 17 17:46:01 2012 +0000 + + b44: add 64 bit stats + + Add support for 64 bit stats to Broadcom b44 ethernet driver. + + Signed-off-by: Kevin Groeneveld <kgroeneveld@gmail.com> + Signed-off-by: Eric Dumazet <edumazet@google.com> + Signed-off-by: David S. Miller <davem@davemloft.net> + +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -31,6 +31,7 @@ + #include <linux/dma-mapping.h> + #include <linux/ssb/ssb.h> + #include <linux/slab.h> ++#include <linux/u64_stats_sync.h> + + #include <asm/uaccess.h> + #include <asm/io.h> +@@ -1638,10 +1639,17 @@ static int b44_close(struct net_device * + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + static struct rtnl_link_stats64 *b44_get_stats64(struct net_device *dev, + struct rtnl_link_stats64 *nstat) ++#else ++static struct net_device_stats *b44_get_stats(struct net_device *dev) ++#endif + { + struct b44 *bp = netdev_priv(dev); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) ++ struct net_device_stats *nstat = &dev->stats; ++#endif + struct b44_hw_stats *hwstat = &bp->hw_stats; + unsigned int start; + +@@ -2130,7 +2138,11 @@ static const struct net_device_ops b44_n + .ndo_open = b44_open, + .ndo_stop = b44_close, + .ndo_start_xmit = b44_start_xmit, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + .ndo_get_stats64 = b44_get_stats64, ++#else ++ .ndo_get_stats = b44_get_stats, ++#endif + .ndo_set_rx_mode = b44_set_rx_mode, + .ndo_set_mac_address = b44_set_mac_addr, + .ndo_validate_addr = eth_validate_addr, diff --git a/patches/collateral-evolutions/network/65-ignore-dismantle.patch b/patches/collateral-evolutions/network/65-ignore-dismantle.patch new file mode 100644 index 00000000..fde4ce24 --- /dev/null +++ b/patches/collateral-evolutions/network/65-ignore-dismantle.patch @@ -0,0 +1,23 @@ +The following patch makes use of the dismantle member in struct +net_device, this patch removes that access on older kernels. + +commit 9d5d496c3464b7ad0ba942b4ada5f27c07e07079 +Author: Daniel Drake <dsd@laptop.org> +Date: Mon Jul 30 22:58:04 2012 +0100 + + libertas: don't reset card on error when it is being removed + +--- a/drivers/net/wireless/libertas/main.c ++++ b/drivers/net/wireless/libertas/main.c +@@ -592,7 +592,11 @@ static int lbs_thread(void *data) + + /* Reset card, but only when it isn't in the process + * of being shutdown anyway. */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)) + if (!dev->dismantle && priv->reset_card) ++#else ++ if (priv->reset_card) ++#endif + priv->reset_card(priv); + } + priv->cmd_timed_out = 0; diff --git a/patches/collateral-evolutions/network/66-uapi-changes.patch b/patches/collateral-evolutions/network/66-uapi-changes.patch new file mode 100644 index 00000000..362f9bc1 --- /dev/null +++ b/patches/collateral-evolutions/network/66-uapi-changes.patch @@ -0,0 +1,29 @@ +The UAPI changes split up the kernel and userspace API +headers into separate directories. We provide backport +support for the new rfkill module to kernels older than +2.6.31. To allow us to dynamically provide only backport +support for those kernels we have a trick within compat +to provide its own include/linux/rfkill.h header which +then will include either your own kernel's rkfill.h or +include the one we are taking from linux-next. The one +we take from linux-next is renamed to rfkill_backport.h. +In order to allow the call to include your own kernel's +rfkill.h the compat rfkill.h uses include_next. The UAPI +changes would mean though that instead of getting your +own kernel's rfkill.h you'd end up getting the UAPI +header file. Fix this by ensuring that for new kernels +we linux_next into the user's kernels rfkill.h and if +the kernel is old we still to the rfkill_backport.h +naming scheme. + +--- a/include/linux/rfkill_backport.h ++++ b/include/linux/rfkill_backport.h +@@ -18,7 +18,7 @@ + #ifndef __RFKILL_H + #define __RFKILL_H + +-#include <uapi/linux/rfkill.h> ++#include <uapi/linux/rfkill_backport.h> + + /* don't allow anyone to use these in the kernel */ + enum rfkill_user_states { diff --git a/patches/collateral-evolutions/network/67-fix-section-mismatch.patch b/patches/collateral-evolutions/network/67-fix-section-mismatch.patch new file mode 100644 index 00000000..15126b6f --- /dev/null +++ b/patches/collateral-evolutions/network/67-fix-section-mismatch.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/wireless/ath/ath5k/led.c ++++ b/drivers/net/wireless/ath/ath5k/led.c +@@ -55,7 +55,7 @@ + #define ATH_POLARITY(data) ((data) & 0xff) + + /* Devices we match on for LED config info (typically laptops) */ +-static DEFINE_PCI_DEVICE_TABLE(ath5k_led_devices) = { ++static const struct pci_device_id ath5k_led_devices[] = { + /* AR5211 */ + { PCI_VDEVICE(ATHEROS, PCI_DEVICE_ID_ATHEROS_AR5211), ATH_LED(0, 0) }, + /* HP Compaq nc6xx, nc4000, nx6000 */ diff --git a/patches/collateral-evolutions/network/67-ipv6-dev-list.patch b/patches/collateral-evolutions/network/67-ipv6-dev-list.patch new file mode 100644 index 00000000..6c816271 --- /dev/null +++ b/patches/collateral-evolutions/network/67-ipv6-dev-list.patch @@ -0,0 +1,22 @@ +This backports: + +commit 502a2ffd7376ae27cfde6172257db0ff9d8cfec2 +Author: stephen hemminger <shemminger@vyatta.com> +Date: Wed Mar 17 20:31:13 2010 +0000 + + ipv6: convert idev_list to list macros + +--- a/drivers/net/wireless/iwlwifi/mvm/d3.c ++++ b/drivers/net/wireless/iwlwifi/mvm/d3.c +@@ -101,7 +101,11 @@ void iwl_mvm_ipv6_addr_change(struct iee + int idx = 0; + + read_lock_bh(&idev->lock); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + list_for_each_entry(ifa, &idev->addr_list, if_list) { ++#else ++ for (ifa = idev->addr_list; ifa; ifa = ifa->if_next) { ++#endif + mvmvif->target_ipv6_addrs[idx] = ifa->addr; + idx++; + if (idx >= IWL_PROTO_OFFLOAD_NUM_IPV6_ADDRS) diff --git a/patches/collateral-evolutions/network/69-wowlan-no-socket.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket.patch new file mode 100644 index 00000000..225043e2 --- /dev/null +++ b/patches/collateral-evolutions/network/69-wowlan-no-socket.patch @@ -0,0 +1,13 @@ +__sock_create() is not available on kernel version < 2.6.37. + +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -7728,7 +7728,7 @@ static int nl80211_parse_wowlan_tcp(stru + port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]); + else + port = 0; +-#ifdef CONFIG_INET ++#if defined(CONFIG_INET) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + /* allocate a socket and port for it and use it */ + err = __sock_create(wiphy_net(&rdev->wiphy), PF_INET, SOCK_STREAM, + IPPROTO_TCP, &cfg->sock, 1); diff --git a/patches/collateral-evolutions/network/70-umode_t-api-change.patch b/patches/collateral-evolutions/network/70-umode_t-api-change.patch new file mode 100644 index 00000000..dd6ec686 --- /dev/null +++ b/patches/collateral-evolutions/network/70-umode_t-api-change.patch @@ -0,0 +1,28 @@ +--- a/drivers/net/wireless/ath/ath9k/debug.c ++++ b/drivers/net/wireless/ath/ath9k/debug.c +@@ -1217,7 +1217,11 @@ static const struct file_operations fops + + static struct dentry *create_buf_file_handler(const char *filename, + struct dentry *parent, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) + umode_t mode, ++#else ++ int mode, ++#endif + struct rchan_buf *buf, + int *is_global) + { +--- a/drivers/gpu/drm/drm_sysfs.c ++++ b/drivers/gpu/drm/drm_sysfs.c +@@ -72,7 +72,11 @@ static int drm_class_resume(struct devic + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) + static char *drm_devnode(struct device *dev, umode_t *mode) ++#else ++static char *drm_devnode(struct device *dev, mode_t *mode) ++#endif + { + return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev)); + } diff --git a/patches/collateral-evolutions/network/71-bin_attribute-api-change.patch b/patches/collateral-evolutions/network/71-bin_attribute-api-change.patch new file mode 100644 index 00000000..24256608 --- /dev/null +++ b/patches/collateral-evolutions/network/71-bin_attribute-api-change.patch @@ -0,0 +1,14 @@ +--- a/drivers/net/wireless/ti/wlcore/main.c ++++ b/drivers/net/wireless/ti/wlcore/main.c +@@ -5518,7 +5518,11 @@ static ssize_t wl1271_sysfs_show_hw_pg_v + static DEVICE_ATTR(hw_pg_ver, S_IRUGO, + wl1271_sysfs_show_hw_pg_ver, NULL); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + static ssize_t wl1271_sysfs_read_fwlog(struct file *filp, struct kobject *kobj, ++#else ++static ssize_t wl1271_sysfs_read_fwlog(struct kobject *kobj, ++#endif + struct bin_attribute *bin_attr, + char *buffer, loff_t pos, size_t count) + { diff --git a/patches/collateral-evolutions/network/99-change-makefiles.patch b/patches/collateral-evolutions/network/99-change-makefiles.patch new file mode 100644 index 00000000..699799a9 --- /dev/null +++ b/patches/collateral-evolutions/network/99-change-makefiles.patch @@ -0,0 +1,102 @@ + +This patch removes all drivers we do not support +or do not want to support. This lets us build +only the wireless stuff. + +--- a/drivers/misc/eeprom/Makefile ++++ b/drivers/misc/eeprom/Makefile +@@ -1,7 +1 @@ +-obj-$(CONFIG_EEPROM_AT24) += at24.o +-obj-$(CONFIG_EEPROM_AT25) += at25.o +-obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o +-obj-$(CONFIG_EEPROM_MAX6875) += max6875.o + obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o +-obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o +-obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o +--- a/drivers/net/usb/Makefile ++++ b/drivers/net/usb/Makefile +@@ -2,35 +2,7 @@ + # Makefile for USB Network drivers + # + +-obj-$(CONFIG_USB_CATC) += catc.o +-obj-$(CONFIG_USB_KAWETH) += kaweth.o +-obj-$(CONFIG_USB_PEGASUS) += pegasus.o +-obj-$(CONFIG_USB_RTL8150) += rtl8150.o +-obj-$(CONFIG_USB_HSO) += hso.o +-obj-$(CONFIG_USB_NET_AX8817X) += asix.o +-asix-y := asix_devices.o asix_common.o ax88172a.o +-obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o + obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o +-obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o +-obj-$(CONFIG_USB_NET_DM9601) += dm9601.o +-obj-$(CONFIG_USB_NET_SMSC75XX) += smsc75xx.o +-obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o +-obj-$(CONFIG_USB_NET_GL620A) += gl620a.o +-obj-$(CONFIG_USB_NET_NET1080) += net1080.o +-obj-$(CONFIG_USB_NET_PLUSB) += plusb.o + obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o +-obj-$(CONFIG_USB_NET_CDC_SUBSET) += cdc_subset.o +-obj-$(CONFIG_USB_NET_ZAURUS) += zaurus.o +-obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o + obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o +-obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o +-obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o +-obj-$(CONFIG_USB_NET_KALMIA) += kalmia.o +-obj-$(CONFIG_USB_IPHETH) += ipheth.o +-obj-$(CONFIG_USB_SIERRA_NET) += sierra_net.o +-obj-$(CONFIG_USB_NET_CX82310_ETH) += cx82310_eth.o +-obj-$(CONFIG_USB_NET_CDC_NCM) += cdc_ncm.o +-obj-$(CONFIG_USB_VL600) += lg-vl600.o +-obj-$(CONFIG_USB_NET_QMI_WWAN) += qmi_wwan.o +-obj-$(CONFIG_USB_NET_CDC_MBIM) += cdc_mbim.o + +--- a/drivers/net/wireless/Makefile ++++ b/drivers/net/wireless/Makefile +@@ -7,18 +7,8 @@ obj-$(CONFIG_IPW2200) += ipw2x00/ + + obj-$(CONFIG_HERMES) += orinoco/ + +-obj-$(CONFIG_AIRO) += airo.o +-obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o +- +-obj-$(CONFIG_ATMEL) += atmel.o +-obj-$(CONFIG_PCI_ATMEL) += atmel_pci.o +-obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o +- + obj-$(CONFIG_AT76C50X_USB) += at76c50x-usb.o + +-obj-$(CONFIG_PRISM54) += prism54/ +- +-obj-$(CONFIG_HOSTAP) += hostap/ + obj-$(CONFIG_B43) += b43/ + obj-$(CONFIG_B43LEGACY) += b43legacy/ + obj-$(CONFIG_COMPAT_ZD1211RW) += zd1211rw/ +@@ -26,13 +16,8 @@ obj-$(CONFIG_RTL8180) += rtl818x/ + obj-$(CONFIG_RTL8187) += rtl818x/ + obj-$(CONFIG_RTLWIFI) += rtlwifi/ + +-# 16-bit wireless PCMCIA client drivers +-obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o +-obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o +- + obj-$(CONFIG_USB_NET_COMPAT_RNDIS_WLAN) += rndis_wlan.o + +-obj-$(CONFIG_USB_ZD1201) += zd1201.o + obj-$(CONFIG_LIBERTAS) += libertas/ + + obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ +--- a/net/wireless/Makefile ++++ b/net/wireless/Makefile +@@ -4,11 +4,6 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib8 + obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o + obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o + +-obj-$(CONFIG_WEXT_CORE) += wext-core.o +-obj-$(CONFIG_WEXT_PROC) += wext-proc.o +-obj-$(CONFIG_WEXT_SPY) += wext-spy.o +-obj-$(CONFIG_WEXT_PRIV) += wext-priv.o +- + cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o + cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o + cfg80211-$(CONFIG_COMPAT_CFG80211_DRIVER_API_TRACER) += trace.o diff --git a/patches/crap/README b/patches/crap/README new file mode 100644 index 00000000..ff1ae85c --- /dev/null +++ b/patches/crap/README @@ -0,0 +1,17 @@ + +compat-drivers crap patches +============================ + +If you are including patches into this directory you +must be fixing some critical bug for a customer which needs +immediate release or immediate testing. + +Alternatively you would use this to apply some sort of +crap code you are maintaining. + +You must have a really good reason to be adding files +in this directory. If possible you should explain your +reasoning of why the patch is getting included here and +not upstream and why it hasn't even yet been posted. + +You should avoid these patches at all costs. diff --git a/patches/linux-next-cherry-picks/README b/patches/linux-next-cherry-picks/README new file mode 100644 index 00000000..101a51ad --- /dev/null +++ b/patches/linux-next-cherry-picks/README @@ -0,0 +1,20 @@ +compat-drivers linux-next chery picked patches +============================================== + +We work hard to get patches in time onto the stable +tree but sometimes a few things slip out, and sometimes a +stable fix is simply too big in size to be merged into +stable. In such cases though we do believe some of these +patches are still relatively important to either enable new +hardware which escaped the late rc cycles or to correct some +behaviour which might be too late for stable. We apply +these patches by default as they will be supported on these +releases. + +The larger the number of patches you see in this directory +the more we should be ashamed. We should strive to reduce this +to 0 all the time. + +This directory will always be empty for bleeding edge +releases as bleeding edge releases are always based on +linux-next already. diff --git a/patches/linux-next-cherry-picks/network/.gitignore b/patches/linux-next-cherry-picks/network/.gitignore new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/patches/linux-next-cherry-picks/network/.gitignore diff --git a/patches/linux-next-pending/README b/patches/linux-next-pending/README new file mode 100644 index 00000000..092fc5fe --- /dev/null +++ b/patches/linux-next-pending/README @@ -0,0 +1,18 @@ + +compat-drivers linux-next-pending patches +========================================== + +You must have a really good reason to be adding files +in this directory. The requirement is your patches must have +been posted to a public mailing list for the subsystem you are +working on. Each patch you add here must have a really good +explanation on the top of the file which clarifies why the +patch has not yet been merged OR specify it on the commit log +when you add it on compat-drivers. + +We try to avoid having patch files because but we understand +if you might because you need to test code posted but not yet +merged into linux-next or a stable kernel release. This can happen +often during the merge window, when the maintainers are unavailable, +on vacation, suck at what they do, or for any other uncontrollable +reasons. diff --git a/patches/linux-next-pending/network/.gitignore b/patches/linux-next-pending/network/.gitignore new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/patches/linux-next-pending/network/.gitignore diff --git a/patches/pending-stable/.ignore b/patches/pending-stable/.ignore new file mode 100644 index 00000000..d95fa138 --- /dev/null +++ b/patches/pending-stable/.ignore @@ -0,0 +1 @@ +ath9k-lock-reset-and-PCU-start-stopping.patch diff --git a/patches/pending-stable/README b/patches/pending-stable/README new file mode 100644 index 00000000..52529d6e --- /dev/null +++ b/patches/pending-stable/README @@ -0,0 +1,23 @@ +compat-drivers pending-stable/ patches +======================================= + +Often right before the merge window we get a block on non +oops/regression fixes for stable fixes. Some stable fixes +often get propagated afterwards during the extraversion +maintenance of the kernels. Right before the merge window +circa rc4 and rc5 subsystem maintainers get pegged if they +throw in non oops/regression fixes for Linus or their +respective upstream maintainer. While this makes sense +for tree management and stable release considerations we +still need to get users some stable patches propagated. + +This directory is there to help with that. Only patches +which have been merged into linux-next.git will be included +in this directory which means you must post it and the maintainer +should have merged it and Stephen would have picked it up. + +This directory will always be empty for bleeding edge +releases as bleeding edge releases are always based on +linux-next already. This directory only makes sense for +stable release of the kernel, and it we will always try +to use it, in case there are stable fixes not yet propagated. diff --git a/patches/pending-stable/drm/.ignore b/patches/pending-stable/drm/.ignore new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/patches/pending-stable/drm/.ignore @@ -0,0 +1 @@ + diff --git a/patches/pending-stable/network/.gitignore b/patches/pending-stable/network/.gitignore new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/patches/pending-stable/network/.gitignore diff --git a/patches/unified-drivers/README.md b/patches/unified-drivers/README.md new file mode 100644 index 00000000..1f606908 --- /dev/null +++ b/patches/unified-drivers/README.md @@ -0,0 +1,17 @@ +# compat-driver unified driver backport patches + +compat-drivers supports developers to supply a unified +driver git tree which is being used to target support +for getting the driver in line with requirements for +linux-next. Once the driver gets upstream the driver +gets removed and we cherry pick updated version of the +driver directly from linux upstream. + +The code provided on this tree must try to adhere to +conventions for targetting inclusion into linux-next. +The compat-drivers patches/unified-drivers/ directory +allows for any additional required backport delta to +be addressed for the supplied driver. This allows +development and transformation of the driver to always +be targetting linux-next and allows for backporting +to be dealt with separately. diff --git a/patches/unified-drivers/network/0001-backport-alx.patch b/patches/unified-drivers/network/0001-backport-alx.patch new file mode 100644 index 00000000..ea343c41 --- /dev/null +++ b/patches/unified-drivers/network/0001-backport-alx.patch @@ -0,0 +1,125 @@ +This should go into patches/01-netdev.patch + +--- a/drivers/net/ethernet/atheros/alx/alx_main.c ++++ b/drivers/net/ethernet/atheros/alx/alx_main.c +@@ -98,7 +98,11 @@ static void __alx_set_rx_mode(struct net + + /* comoute mc addresses' hash value ,and put it into hash table */ + netdev_for_each_mc_addr(ha, netdev) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + alx_add_mc_addr(hw, ha->addr); ++#else ++ alx_add_mc_addr(hw, ha->dmi_addr); ++#endif + + ALX_MEM_W32(hw, ALX_HASH_TBL0, hw->mc_hash[0]); + ALX_MEM_W32(hw, ALX_HASH_TBL1, hw->mc_hash[1]); +@@ -130,8 +134,10 @@ static int alx_set_mac_address(struct ne + if (!is_valid_ether_addr(addr->sa_data)) + return -EADDRNOTAVAIL; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) + if (netdev->addr_assign_type & NET_ADDR_RANDOM) + netdev->addr_assign_type ^= NET_ADDR_RANDOM; ++#endif + + memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); + memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len); +@@ -1138,6 +1144,7 @@ static void alx_set_vlan_mode(struct alx + } + + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + static netdev_features_t alx_fix_features(struct net_device *netdev, + netdev_features_t features) + { +@@ -1170,6 +1177,7 @@ static int alx_set_features(struct net_d + + return 0; + } ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + + /* alx_change_mtu - Change the Maximum Transfer Unit */ + static int alx_change_mtu(struct net_device *netdev, int new_mtu) +@@ -1194,7 +1202,17 @@ static int alx_change_mtu(struct net_dev + adpt->hw.mtu = new_mtu; + adpt->rxbuf_size = new_mtu > ALX_DEF_RXBUF_SIZE ? + ALIGN(max_frame, 8) : ALX_DEF_RXBUF_SIZE; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) ++ if (new_mtu > (7*1024)) { ++ netdev->features &= ~NETIF_F_TSO; ++ netdev->features &= ~NETIF_F_TSO6; ++ } else { ++ netdev->features |= NETIF_F_TSO; ++ netdev->features |= NETIF_F_TSO6; ++ } ++#else + netdev_update_features(netdev); ++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */ + if (netif_running(netdev)) + alx_reinit(adpt, false); + } +@@ -2460,8 +2478,10 @@ static const struct net_device_ops alx_n + .ndo_change_mtu = alx_change_mtu, + .ndo_do_ioctl = alx_ioctl, + .ndo_tx_timeout = alx_tx_timeout, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + .ndo_fix_features = alx_fix_features, + .ndo_set_features = alx_set_features, ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + #ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = alx_poll_controller, + #endif +@@ -2563,7 +2583,7 @@ alx_probe(struct pci_dev *pdev, const st + goto err_iomap; + } + +- netdev->netdev_ops = &alx_netdev_ops; ++ netdev_attach_ops(netdev, &alx_netdev_ops); + alx_set_ethtool_ops(netdev); + netdev->irq = pdev->irq; + netdev->watchdog_timeo = ALX_WATCHDOG_TIME; +@@ -2608,12 +2628,21 @@ alx_probe(struct pci_dev *pdev, const st + } + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) + netdev->hw_features = NETIF_F_SG | + NETIF_F_HW_CSUM | + NETIF_F_HW_VLAN_RX | + NETIF_F_TSO | + NETIF_F_TSO6; + netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX; ++#else ++ netdev->features = NETIF_F_SG | ++ NETIF_F_HW_CSUM | ++ NETIF_F_HW_VLAN_RX | ++ NETIF_F_TSO | ++ NETIF_F_TSO6 | ++ NETIF_F_HW_VLAN_TX; ++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */ + + /* read permanent mac addr from register or eFuse */ + if (alx_get_perm_macaddr(hw, hw->perm_addr)) { +@@ -2789,6 +2818,8 @@ static struct pci_error_handlers alx_err + }; + + #ifdef CONFIG_PM_SLEEP ++compat_pci_suspend(alx_suspend); ++compat_pci_resume(alx_resume); + static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume); + #define ALX_PM_OPS (&alx_pm_ops) + #else +@@ -2802,7 +2833,12 @@ static struct pci_driver alx_driver = { + .remove = alx_remove, + .shutdown = alx_shutdown, + .err_handler = &alx_err_handler, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = ALX_PM_OPS, ++#elif defined(CONFIG_PM_SLEEP) ++ .suspend = alx_suspend_compat, ++ .resume = alx_resume_compat, ++#endif + }; + + diff --git a/patches/unified-drivers/network/0002-enable-alx.patch b/patches/unified-drivers/network/0002-enable-alx.patch new file mode 100644 index 00000000..9bf65bca --- /dev/null +++ b/patches/unified-drivers/network/0002-enable-alx.patch @@ -0,0 +1,9 @@ +Once upstream this will not be required. + +--- a/drivers/net/ethernet/atheros/Makefile ++++ b/drivers/net/ethernet/atheros/Makefile +@@ -6,3 +6,4 @@ obj-$(CONFIG_ATL1) += atlx/ + obj-$(CONFIG_ATL2) += atlx/ + obj-$(CONFIG_ATL1E) += atl1e/ + obj-$(CONFIG_ATL1C) += atl1c/ ++obj-$(CONFIG_ALX) += alx/ diff --git a/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch b/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch new file mode 100644 index 00000000..3ed96a43 --- /dev/null +++ b/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch @@ -0,0 +1,25 @@ +--- a/drivers/net/ethernet/atheros/alx/alx_ethtool.c ++++ b/drivers/net/ethernet/atheros/alx/alx_ethtool.c +@@ -1687,7 +1687,9 @@ static void alx_self_test(struct net_dev + { + struct alx_adapter *adpt = netdev_priv(netdev); + bool if_running = netif_running(netdev); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) + bool phy_lpback = etest->flags & ETH_TEST_FL_EXTERNAL_LB; ++#endif + + ALX_FLAG_SET(adpt, TESTING); + memset(data, 0, sizeof(u64) * ALX_TEST_LEN); +@@ -1707,10 +1709,12 @@ static void alx_self_test(struct net_dev + if (alx_diag_interrupt(adpt, &data[2])) + etest->flags |= ETH_TEST_FL_FAILED; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) + if (phy_lpback) + etest->flags |= ETH_TEST_FL_EXTERNAL_LB_DONE; + if (alx_diag_loopback(adpt, &data[3], phy_lpback)) + etest->flags |= ETH_TEST_FL_FAILED; ++#endif + + } else { + netif_info(adpt, hw, adpt->netdev, "online test start...\n"); diff --git a/patches/unified-drivers/network/0005-alx-intx-msi-workaround.patch b/patches/unified-drivers/network/0005-alx-intx-msi-workaround.patch new file mode 100644 index 00000000..e982c35e --- /dev/null +++ b/patches/unified-drivers/network/0005-alx-intx-msi-workaround.patch @@ -0,0 +1,16 @@ +For new kernels this is dealt with in drivers/pci/quirks.c +Since older kernels will not have this we add a hack to the +driver to deal with the PCI quirk. + +--- a/drivers/net/ethernet/atheros/alx/alx_main.c ++++ b/drivers/net/ethernet/atheros/alx/alx_main.c +@@ -1032,6 +1032,9 @@ static int alx_identify_hw(struct alx_ad + if (rev < ALX_REV_C0) { + hw->ptrn_ofs = 0x600; + hw->max_ptrns = 8; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ++ pdev->dev_flags |= PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG; ++#endif + } else { + hw->ptrn_ofs = 0x14000; + hw->max_ptrns = 16; diff --git a/scripts/admin-clean.sh b/scripts/admin-clean.sh new file mode 100755 index 00000000..dd266709 --- /dev/null +++ b/scripts/admin-clean.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +if [ -d net ] ; then + make clean +fi +rm -rf net +rm -rf drivers +rm -rf include +rm -rf compat +rm -rf udev +rm -f .compat_base_tree +rm -f .compat_base_tree_version +rm -f .compat_version +rm -f code-metrics.txt +echo "Cleaned compat-drivers" diff --git a/scripts/admin-refresh.sh b/scripts/admin-refresh.sh new file mode 100755 index 00000000..caf63e06 --- /dev/null +++ b/scripts/admin-refresh.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +./scripts/admin-clean.sh $@ +./scripts/admin-update.sh $@ diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh new file mode 100755 index 00000000..d4d7d0b2 --- /dev/null +++ b/scripts/admin-update.sh @@ -0,0 +1,999 @@ +#!/usr/bin/env bash +# +# Copyright 2007, 2008, 2010 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> +# +# Use this to update compat-drivers to the latest +# linux-next.git tree you have. +# +# Usage: you should have the latest pull of linux-next.git +# git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git +# We assume you have it on your ~/linux-next/ directory. If you do, +# just run this script from the compat-drivers directory. +# You can specify where your GIT_TREE is by doing: +# +# export GIT_TREE=/home/mcgrof/linux-next/ + +# Pretty colors +GREEN="\033[01;32m" +YELLOW="\033[01;33m" +NORMAL="\033[00m" +BLUE="\033[34m" +RED="\033[31m" +PURPLE="\033[35m" +CYAN="\033[36m" +UNDERLINE="\033[02m" + +# File in which code metrics will be written +CODE_METRICS=code-metrics.txt + +STABLE_PREFIX=".stable_" +PENDING_STABLE_DIR="patches/pending-stable" + +# The GIT URL's for linux-next and compat trees +GIT_URL="git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" +GIT_COMPAT_URL="git://github.com/mcgrof/compat.git" + +#################### +# Helper functions # +# ################## + +# Refresh patches using quilt +patchRefresh() { + if [ -d .pc ] ; then + OLD_PATCH_DIR=$(cat .pc/.quilt_patches) + if [ "$OLD_PATCH_DIR" != "$1" ] ; then + echo "found old quilt run for ${OLD_PATCH_DIR}, will skip it for ${1}" + return; + fi + fi + + if [ -d patches.orig ] ; then + rm -rf .pc patches/series + else + mkdir patches.orig + fi + + export QUILT_PATCHES=$1 + + mv -u $1/* patches.orig/ + + for i in patches.orig/*.patch; do + if [ ! -f "$i" ]; then + echo -e "${RED}No patches found in $1${NORMAL}" + break; + fi + echo -e "${GREEN}Refresh backport patch${NORMAL}: ${BLUE}${1}/$(basename $i)${NORMAL}" + quilt import $i + quilt push -f + RET=$? + if [[ $RET -ne 0 ]]; then + echo -e "${RED}Refreshing $i failed${NORMAL}, update it" + echo -e "use ${CYAN}quilt edit [filename]${NORMAL} to apply the failed part manually" + echo -e "use ${CYAN}quilt refresh${NORMAL} after the files are corrected and rerun this script" + cp patches.orig/README $1/README + exit $RET + fi + QUILT_DIFF_OPTS="-p" quilt refresh -p ab --no-index --no-timestamp + done + quilt pop -a + + rm -rf patches.orig .pc $1/series +} + +### +# usage() function +### +usage() { + printf "Usage: $0 [refresh] [ --help | -h | -b | -s | -n | -p | -c [ -u ] [subsystems] + where subsystems can be network, drm or both. Network is enabled by default.\n\n" + + printf "${GREEN}%10s${NORMAL} - Update all your patch offsets using quilt\n" "refresh" + printf "${GREEN}%10s${NORMAL} - Only copy over compat code, do not copy driver code\n" "-b" + printf "${GREEN}%10s${NORMAL} - Get and apply pending-stable/ fixes purging old files there\n" "-s" + printf "${GREEN}%10s${NORMAL} - Apply the patches from linux-next-cherry-picks directory\n" "-n" + printf "${GREEN}%10s${NORMAL} - Apply the patches from linux-next-pending directory\n" "-p" + printf "${GREEN}%10s${NORMAL} - Apply the patches from crap directory\n" "-c" + printf "${GREEN}%10s${NORMAL} - Apply the patches from unified directory\n" "-u" +} + +### +# Code metrics related functions +# 4 parameters get passed to them: +# (ORIG_CODE, CHANGES, ADD, DEL) +### +brag_backport() { + COMPAT_FILES_CODE=$(find ./ -type f -name \*.[ch] | egrep "^./compat/|include/linux/compat" | + xargs wc -l | tail -1 | awk '{print $1}') + let COMPAT_ALL_CHANGES=$2+$COMPAT_FILES_CODE + printf "${GREEN}%10s${NORMAL} - backport code changes\n" $2 + printf "${GREEN}%10s${NORMAL} - backport code additions\n" $3 + printf "${GREEN}%10s${NORMAL} - backport code deletions\n" $4 + printf "${GREEN}%10s${NORMAL} - backport from compat module\n" $COMPAT_FILES_CODE + printf "${GREEN}%10s${NORMAL} - total backport code\n" $COMPAT_ALL_CHANGES + printf "${RED}%10s${NORMAL} - %% of code consists of backport work\n" \ + $(perl -e 'printf("%.4f", 100 * '$COMPAT_ALL_CHANGES' / '$1');') +} + +nag_pending_stable() { + printf "${YELLOW}%10s${NORMAL} - Code changes brought in from pending-stable\n" $2 + printf "${YELLOW}%10s${NORMAL} - Code additions brought in from pending-stable\n" $3 + printf "${YELLOW}%10s${NORMAL} - Code deletions brought in from pending-stable\n" $4 + printf "${RED}%10s${NORMAL} - %% of code being cherry picked from pending-stable\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nag_next_cherry_pick() { + printf "${YELLOW}%10s${NORMAL} - Code changes brought in from linux-next\n" $2 + printf "${YELLOW}%10s${NORMAL} - Code additions brought in from linux-next\n" $3 + printf "${YELLOW}%10s${NORMAL} - Code deletions brought in from linux-next\n" $4 + printf "${RED}%10s${NORMAL} - %% of code being cherry picked from linux-next\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nag_pending() { + printf "${YELLOW}%10s${NORMAL} - Code changes posted but not yet merged\n" $2 + printf "${YELLOW}%10s${NORMAL} - Code additions posted but not yet merged\n" $3 + printf "${YELLOW}%10s${NORMAL} - Code deletions posted but not yet merged\n" $4 + printf "${RED}%10s${NORMAL} - %% of code not yet merged\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nag_crap() { + printf "${RED}%10s${NORMAL} - Crap changes not yet posted\n" $2 + printf "${RED}%10s${NORMAL} - Crap additions not yet posted\n" $3 + printf "${RED}%10s${NORMAL} - Crap deletions not yet posted\n" $4 + printf "${RED}%10s${NORMAL} - %% of crap code\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nag_unified() { + printf "${RED}%10s${NORMAL} - Unified driver backport changes required to backport\n" $2 + printf "${RED}%10s${NORMAL} - Unified driver backport additions required\n" $3 + printf "${RED}%10s${NORMAL} - Unified driver backport deletions required\n" $4 + printf "${RED}%10s${NORMAL} - %% of unified backport code\n" $(perl -e 'printf("%.4f", 100 * '$2' / '$1');') +} + +nagometer() { + CHANGES=0 + + ORIG_CODE=$2 + ADD=$(grep -Hc ^+ $1/*.patch| awk -F":" 'BEGIN {sum=0} {sum += $2} END { print sum}') + DEL=$(grep -Hc ^- $1/*.patch| awk -F":" 'BEGIN {sum=0} {sum += $2} END { print sum}') + # Total code is irrelevant unless you take into account each part, + # easier to just compare against the original code. + # let TOTAL_CODE=$ORIG_CODE+$ADD-$DEL + + let CHANGES=$ADD+$DEL + + case `dirname $1` in + "patches/collateral-evolutions") + brag_backport $ORIG_CODE $CHANGES $ADD $DEL + ;; + "patches/pending-stable") + nag_pending_stable $ORIG_CODE $CHANGES $ADD $DEL + ;; + "patches/linux-next-cherry-picks") + nag_next_cherry_pick $ORIG_CODE $CHANGES $ADD $DEL + ;; + "patches/linux-next-pending") + nag_pending $ORIG_CODE $CHANGES $ADD $DEL + ;; + "patches/crap") + nag_crap $ORIG_CODE $CHANGES $ADD $DEL + ;; + "patches/unified-drivers") + nag_unified $ORIG_CODE $CHANGES $ADD $DEL + ;; + *) + ;; + esac + +} + +# Copy each file in $1 into $2 +copyFiles() { + FILES=$1 + TARGET=$2 + for file in $FILES; do + echo "Copying $GIT_TREE/$TARGET/$file" + cp "$GIT_TREE/$TARGET/$file" $TARGET/ + done +} + +copyDirectories() { + DIRS=$1 + for dir in $DIRS; do + echo "Copying $GIT_TREE/$dir/*.[ch]" + cp $GIT_TREE/$dir/{Kconfig,Makefile,*.[ch]} $dir/ &> /dev/null + done +} + +# First check cmdline args to understand +# which patches to apply and which release tag to set. +# +# Release tags (with corresponding cmdline switches): +# --------------------------------------------------- +# s: Include pending-stable/ patches (-s) +# n: Include linux-next-cherry-picks/ patches (-n) +# p: Include linux-next-pending/ patches (-p) +# c: Include crap/ patches (-c) +# u: Include unified-drivers/ patches (-u) +# Note that the patches under patches/collateral-evolutions/{subsystem} +# are applied by default. +# +# If "refresh" is given as a cmdline argument, the script +# uses quilt to refresh the patches. This is useful if patches +# can not be applied correctly after a code update in $GIT_URL. +# +# A final parameter drm, wlan or both determines which subsystem +# drivers will be fetched in from the GIT repository. To retain +# compatibility with compat-wireless, wlan/bt/eth drivers are +# fetched in by default. +ENABLE_NETWORK=1 +ENABLE_DRM=1 +ENABLE_UNIFIED=0 +SUBSYSTEMS= +UNIFIED_DRIVERS= + +EXTRA_PATCHES="patches/collateral-evolutions" +REFRESH="n" +GET_STABLE_PENDING="n" +POSTFIX_RELEASE_TAG="" + +# User exported this variable +if [ -z $GIT_TREE ]; then + GIT_TREE="$HOME/linux-next" + if [ ! -d $GIT_TREE ]; then + echo "Please tell me where your linux-next git tree is." + echo "You can do this by exporting its location as follows:" + echo + echo " export GIT_TREE=$HOME/linux-next" + echo + echo "If you do not have one you can clone the repository:" + echo " git clone $GIT_URL" + echo + echo "Alternatively, you can use get-compat-trees script " + echo "from compat.git tree to fetch the necessary trees." + exit 1 + fi +else + echo "You said to use git tree at: $GIT_TREE for linux-next" +fi + +if [ -z $GIT_COMPAT_TREE ]; then + GIT_COMPAT_TREE="$HOME/compat" + if [ ! -d $GIT_COMPAT_TREE ]; then + echo "Please tell me where your compat git tree is." + echo "You can do this by exporting its location as follows:" + echo + echo " export GIT_COMPAT_TREE=$HOME/compat" + echo + echo "If you do not have one you can clone the repository:" + echo " git clone $GIT_COMPAT_URL" + echo + echo "Alternatively, you can use get-compat-trees script " + echo "from compat.git tree to fetch the necessary trees." + exit 1 + fi +else + echo "You said to use git tree at: $GIT_COMPAT_TREE for compat" +fi + +# Now define what files to copy from $GIT_URL +INCLUDE_NET_BT="hci_core.h + l2cap.h + bluetooth.h + rfcomm.h + hci.h + hci_mon.h + mgmt.h + sco.h + smp.h + a2mp.h + amp.h" + +# Required wlan headers from include/linux +INCLUDE_LINUX_WLAN="ieee80211.h + pci_ids.h + eeprom_93cx6.h + ath9k_platform.h + wl12xx.h + rndis.h + bcm47xx_wdt.h" + +# For rndis_wext +INCLUDE_LINUX_USB_WLAN="usbnet.h + rndis_host.h" + +# For rndis_wlan, we need a new rndis_host.ko, cdc_ether.ko and usbnet.ko +RNDIS_REQUIREMENTS="Makefile + rndis_host.c + cdc_ether.c + usbnet.c" + +# For libertas driver +INCLUDE_LINUX_LIBERTAS_WLAN="libertas_spi.h" + +# Required wlan headers from include/uapi/linux +INCLUDE_UAPI_LINUX_WLAN="nl80211.h + rfkill.h" + +# 802.11 related headers +INCLUDE_NET="cfg80211.h + cfg80211-wext.h + ieee80211_radiotap.h + lib80211.h + mac80211.h + regulatory.h" + +# Network related directories +NET_WLAN_DIRS="net/wireless + net/mac80211 + net/rfkill" + +# Bluetooth related directories +NET_BT_DIRS="net/bluetooth + net/bluetooth/bnep + net/bluetooth/cmtp + net/bluetooth/rfcomm + net/bluetooth/hidp" + +# Drivers that have their own directory +DRIVERS_WLAN="drivers/net/wireless/ath + drivers/net/wireless/ath/carl9170 + drivers/net/wireless/ath/ar5523 + drivers/net/wireless/ath/ath5k + drivers/net/wireless/ath/ath6kl + drivers/net/wireless/ath/ath9k + drivers/net/wireless/ath/wil6210 + drivers/ssb + drivers/bcma + drivers/net/wireless/b43 + drivers/net/wireless/b43legacy + drivers/net/wireless/brcm80211 + drivers/net/wireless/brcm80211/brcmfmac + drivers/net/wireless/brcm80211/brcmsmac + drivers/net/wireless/brcm80211/brcmsmac/phy + drivers/net/wireless/brcm80211/brcmutil + drivers/net/wireless/brcm80211/include + drivers/net/wireless/iwlegacy + drivers/net/wireless/iwlwifi + drivers/net/wireless/iwlwifi/pcie + drivers/net/wireless/iwlwifi/dvm + drivers/net/wireless/iwlwifi/mvm + drivers/net/wireless/rt2x00 + drivers/net/wireless/zd1211rw + drivers/net/wireless/libertas + drivers/net/wireless/p54 + drivers/net/wireless/rtl818x + drivers/net/wireless/rtl818x/rtl8180 + drivers/net/wireless/rtl818x/rtl8187 + drivers/net/wireless/rtlwifi + drivers/net/wireless/rtlwifi/rtl8192c + drivers/net/wireless/rtlwifi/rtl8192ce + drivers/net/wireless/rtlwifi/rtl8192cu + drivers/net/wireless/rtlwifi/rtl8192se + drivers/net/wireless/rtlwifi/rtl8192de + drivers/net/wireless/rtlwifi/rtl8723ae + drivers/net/wireless/libertas_tf + drivers/net/wireless/ipw2x00 + drivers/net/wireless/ti + drivers/net/wireless/ti/wl12xx + drivers/net/wireless/ti/wl1251 + drivers/net/wireless/ti/wlcore + drivers/net/wireless/ti/wl18xx + drivers/net/wireless/orinoco + drivers/net/wireless/mwifiex" + +# Staging drivers +STAGING_DRIVERS="" + +# Ethernet drivers having their own directory +DRIVERS_ETH="drivers/net/ethernet/atheros + drivers/net/ethernet/atheros/atl1c + drivers/net/ethernet/atheros/atl1e + drivers/net/ethernet/atheros/atlx" + +# Ethernet drivers that have their own file alone +DRIVERS_ETH_FILES="mdio.c" + +# Bluetooth drivers +DRIVERS_BT="drivers/bluetooth" + +# Drivers that belong the the wireless directory +DRIVERS_WLAN_FILES="adm8211.c + adm8211.h + at76c50x-usb.c + at76c50x-usb.h + mac80211_hwsim.c + mac80211_hwsim.h + mwl8k.c + rndis_wlan.c" + +# DRM drivers +DRIVERS_DRM="drivers/gpu/drm/ast + drivers/gpu/drm/cirrus + drivers/gpu/drm/gma500 + drivers/gpu/drm/i2c + drivers/gpu/drm/i810 + drivers/gpu/drm/i915 + drivers/gpu/drm/mgag200 + drivers/gpu/drm/nouveau + drivers/gpu/drm/radeon + drivers/gpu/drm/ttm + drivers/gpu/drm/via + drivers/gpu/drm/vmwgfx" + +# UDL uses the new dma-buf API, let's disable this for now +#DRIVERS="$DRIVERS drivers/gpu/drm/udl" + +rm -rf drivers/ +rm -f code-metrics.txt + +mkdir -p include/net/bluetooth \ + include/linux/usb \ + include/linux/unaligned \ + include/linux/spi \ + include/trace \ + include/pcmcia \ + include/crypto \ + include/uapi \ + include/uapi/linux \ + drivers/bcma \ + drivers/misc/eeprom \ + drivers/net/usb \ + drivers/net/ethernet/broadcom \ + drivers/platform/x86 \ + drivers/ssb \ + drivers/staging \ + $NET_WLAN_DIRS \ + $NET_BT_DIRS \ + $DRIVERS_WLAN \ + $DRIVERS_ETH \ + $DRIVERS_BT \ + $DRIVERS_DRM \ + drivers/video + + + +function refresh_compat() +{ + # Compat stuff + COMPAT="compat" + mkdir -p $COMPAT + echo "Copying $GIT_COMPAT_TREE/ files..." + cp $GIT_COMPAT_TREE/compat/*.[ch] $COMPAT/ + cp $GIT_COMPAT_TREE/compat/Makefile $COMPAT/ + cp -a $GIT_COMPAT_TREE/udev . + cp -a $GIT_COMPAT_TREE/scripts $COMPAT/ + cp $GIT_COMPAT_TREE/bin/ckmake $COMPAT/ + cp -a $GIT_COMPAT_TREE/include/linux/* include/linux/ + cp -a $GIT_COMPAT_TREE/include/net/* include/net/ + cp -a $GIT_COMPAT_TREE/include/trace/* include/trace/ + cp -a $GIT_COMPAT_TREE/include/pcmcia/* include/pcmcia/ + cp -a $GIT_COMPAT_TREE/include/crypto/* include/crypto/ +} + +function gen_compat_labels() +{ + + DIR="$PWD" + cd $GIT_TREE + GIT_DESCRIBE=$(git describe) + GIT_BRANCH=$(git branch --no-color |sed -n 's/^\* //p') + GIT_BRANCH=${GIT_BRANCH:-master} + GIT_REMOTE=$(git config branch.${GIT_BRANCH}.remote) + GIT_REMOTE=${GIT_REMOTE:-origin} + GIT_REMOTE_URL=$(git config remote.${GIT_REMOTE}.url) + GIT_REMOTE_URL=${GIT_REMOTE_URL:-unknown} + + cd $GIT_COMPAT_TREE + git describe > $DIR/.compat_base + cd $DIR + + echo -e "${GREEN}Updated${NORMAL} from local tree: ${BLUE}${GIT_TREE}${NORMAL}" + echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}" + cd $DIR + if [ -d ./.git ]; then + if [[ ${POSTFIX_RELEASE_TAG} != "" ]]; then + echo -e "$(git describe)-${POSTFIX_RELEASE_TAG}" > .compat_version + else + echo -e "$(git describe)" > .compat_version + fi + + cd $GIT_TREE + TREE_NAME=${GIT_REMOTE_URL##*/} + + echo $TREE_NAME > $DIR/.compat_base_tree + echo $GIT_DESCRIBE > $DIR/.compat_base_tree_version + + case $TREE_NAME in + "wireless-testing.git") # John's wireless-testing + echo -e "This is a ${RED}wireless-testing.git${NORMAL} compat-drivers release" + ;; + "linux-next.git") # The linux-next integration testing tree + echo -e "This is a ${RED}linux-next.git${NORMAL} compat-drivers release" + ;; + "linux-stable.git") # Greg's all stable tree + echo -e "This is a ${GREEN}linux-stable.git${NORMAL} compat-drivers release" + ;; + "linux-2.6.git") # Linus' 2.6 tree + echo -e "This is a ${GREEN}linux-2.6.git${NORMAL} compat-drivers release" + ;; + *) + ;; + esac + + cd $DIR + echo -e "\nBase tree: ${GREEN}$(cat .compat_base_tree)${NORMAL}" >> $CODE_METRICS + echo -e "Base tree version: ${PURPLE}$(cat .compat_base_tree_version)${NORMAL}" >> $CODE_METRICS + echo -e "compat.git: ${CYAN}$(cat .compat_base)${NORMAL}" >> $CODE_METRICS + echo -e "compat-drivers release: ${YELLOW}$(cat .compat_version)${NORMAL}" >> $CODE_METRICS + + fi + + + echo -e "Code metrics archive: ${GREEN}http://bit.ly/H6BTF7${NORMAL}" >> $CODE_METRICS + + cat $CODE_METRICS +} + + +if [ $# -ge 1 ]; then + if [ $# -gt 6 ]; then + usage $0 + exit + fi + while [ $# -ne 0 ]; do + case $1 in + "-b") + refresh_compat + gen_compat_labels + exit + ;; + "-s") + GET_STABLE_PENDING="y" + EXTRA_PATCHES="${EXTRA_PATCHES} patches/pending-stable" + EXTRA_PATCHES="${EXTRA_PATCHES} patches/pending-stable/backports/" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}s" + shift + ;; + "-n") + EXTRA_PATCHES="${EXTRA_PATCHES} patches/linux-next-cherry-picks" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}n" + shift + ;; + "-p") + EXTRA_PATCHES="${EXTRA_PATCHES} patches/linux-next-pending" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}p" + shift + ;; + "-c") + EXTRA_PATCHES="${EXTRA_PATCHES} patches/crap" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}c" + shift + ;; + "-u") + EXTRA_PATCHES="${EXTRA_PATCHES} patches/unified-drivers" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}u" + ENABLE_UNIFIED=1 + shift + ;; + "refresh") + REFRESH="y" + shift + ;; + "network") + ENABLE_NETWORK=1 + ENABLE_DRM=0 + shift + ;; + "drm") + ENABLE_DRM=1 + shift + ;; + "-h" | "--help") + usage $0 + exit + ;; + *) + echo "Unexpected argument passed: $1" + usage $0 + exit + ;; + esac + done + +fi + +# SUBSYSTEMS is used to select which patches to apply +if [[ "$ENABLE_NETWORK" == "1" ]]; then + SUBSYSTEMS="network" +fi + +if [[ "$ENABLE_DRM" == "1" ]]; then + SUBSYSTEMS+=" drm" +fi + +if [[ "$ENABLE_NETWORK" == "1" ]]; then + # WLAN and bluetooth files + copyFiles "$INCLUDE_LINUX_WLAN" "include/linux" + copyFiles "$INCLUDE_UAPI_LINUX_WLAN" "include/uapi/linux" + copyFiles "$INCLUDE_NET" "include/net" + copyFiles "$INCLUDE_NET_BT" "include/net/bluetooth" + copyFiles "$INCLUDE_LINUX_USB_WLAN" "include/linux/usb" + copyFiles "$INCLUDE_LINUX_LIBERTAS_WLAN" "include/linux/spi" + copyFiles "$DRIVERS_WLAN_FILES" "drivers/net/wireless" + copyFiles "$RNDIS_REQUIREMENTS" "drivers/net/usb" + + # Ethernet + copyFiles "$DRIVERS_ETH_FILES" "drivers/net/" + echo "compat_mdio-y += mdio.o" > drivers/net/Makefile + echo "obj-\$(CONFIG_COMPAT_MDIO) += compat_mdio.o" >> drivers/net/Makefile + copyDirectories "$DRIVERS_ETH" + cp $GIT_TREE/include/linux/mdio.h include/linux/ + cp $GIT_TREE/include/uapi/linux/mdio.h include/uapi/linux/ + + copyDirectories "$NET_WLAN_DIRS" + copyDirectories "$NET_BT_DIRS" + copyDirectories "$DRIVERS_BT" + copyDirectories "$DRIVERS_WLAN" + + cp -a $GIT_TREE/include/linux/ssb include/linux/ + cp -a $GIT_TREE/include/linux/bcma include/linux/ + cp -a $GIT_TREE/include/linux/rfkill.h include/linux/rfkill_backport.h + mv include/uapi/linux/rfkill.h include/uapi/linux/rfkill_backport.h + + # Misc + cp $GIT_TREE/drivers/misc/eeprom/{Makefile,eeprom_93cx6.c} drivers/misc/eeprom/ + + # Copy files needed for statically compiled regulatory rules database + cp $GIT_TREE/net/wireless/{db.txt,genregdb.awk} net/wireless/ + + # Top level wireless driver Makefile + cp $GIT_TREE/drivers/net/wireless/Makefile drivers/net/wireless + + # Broadcom case + DIR="drivers/net/ethernet/broadcom" + cp $GIT_TREE/$DIR/b44.[ch] drivers/net/ethernet/broadcom + # Not yet + echo "obj-\$(CONFIG_B44) += b44.o" > drivers/net/ethernet/broadcom/Makefile +fi + +if [[ "$ENABLE_DRM" == "1" ]]; then + # DRM drivers + copyDirectories "$DRIVERS_DRM" + + # Copy standalone drivers + echo "Copying $GIT_TREE/drivers/gpu/drm/*.[ch]" + cp $GIT_TREE/drivers/gpu/drm/{Makefile,*.[ch]} drivers/gpu/drm/ + + # Copy DRM headers + cp -a $GIT_TREE/include/drm include/ + + # Copy UAPI DRM headers + cp -a $GIT_TREE/include/uapi/drm include/uapi/ + + # drivers/gpu/drm/i915/intel_pm.c requires this + cp $GIT_TREE/drivers/platform/x86/intel_ips.h drivers/platform/x86 + + # Copy radeon reg_srcs for hostprogs + cp -a $GIT_TREE/drivers/gpu/drm/radeon/reg_srcs drivers/gpu/drm/radeon + + # Copy core/ from nouveau/ (Introduced after new code rewrite in 3.7) + cp -a $GIT_TREE/drivers/gpu/drm/nouveau/core drivers/gpu/drm/nouveau + + # Finally get the DRM top-level makefile + cp $GIT_TREE/drivers/gpu/drm/Makefile drivers/gpu/drm + + DIR="drivers/video" + cp $GIT_TREE/$DIR/hdmi.c $DIR + echo "obj-\$(CONFIG_COMPAT_HDMI) += hdmi.o" > $DIR/Makefile + cp $GIT_TREE/include/linux/hdmi.h include/linux/hdmi.h +else + touch drivers/gpu/drm/Makefile + touch drivers/video/Makefile +fi + +# Staging drivers in their own directory +for i in $STAGING_DRIVERS; do + if [ ! -d $GIT_TREE/$i ]; then + continue + fi + rm -rf $i + echo -e "Copying ${RED}STAGING${NORMAL} $GIT_TREE/$i/*.[ch]" + # staging drivers tend to have their own subdirs... + cp -a $GIT_TREE/$i drivers/staging/ +done + +UNIFIED_DRIVERS+="alx" + +unified_driver_git_tree() { + case $1 in + "alx") + echo "git://github.com/erikarn/alx.git" + ;; + *) + ;; + esac +} + +unified_driver_linux_next_target() { + case $1 in + "alx") + echo "drivers/net/ethernet/atheros/alx" + ;; + *) + ;; + esac +} + +unified_driver_get_linux_src() { + case $1 in + "alx") + make -C $DRV_SRC/ linux-src + + TARGET_NEXT_DIR="$(unified_driver_linux_next_target $i)" + + rm -rf $TARGET_NEXT_DIR + cp -a $DRV_SRC/target/linux/src $TARGET_NEXT_DIR + ;; + *) + echo "Unsupported unified driver: $1" + exit + ;; + esac +} + +if [[ "$ENABLE_UNIFIED" == "1" ]]; then + if [ -z $UNIFIED_SRC ]; then + UNIFIED_SRC="$HOME/unified" + if [ ! -d $UNIFIED_SRC ]; then + echo "The directory $UNIFIED_SRC does not exist" + echo + echo "Please tell me where your unified drivers are located" + echo "You can do this by exporting its location as follows:" + echo + echo " export UNIFIED_SRC=$HOME/unified" + echo + echo "If you have never downloaded unified driver code you" + echo "can simply re-run this script by first creating an" + echo "empty directory for on $HOME/unified, the script" + echo "will then tell you what trees to clone. The unified" + echo "drivers that we support in compat-drivers adhear to" + echo "a policy explained in unified/README.md" + exit 1 + fi + else + if [ ! -d $UNIFIED_SRC ]; then + echo "The directory $UNIFIED_SRC does not exist" + exit + fi + fi + + for i in $UNIFIED_DRIVERS; do + DRV_SRC="$UNIFIED_SRC/$i" + + if [ ! -d $DRV_SRC ]; then + echo -e "$DRV_SRC does not exist. You can clone this tree from:" + echo + unified_driver_git_tree $i + echo + echo "You should clone this into $UNIFIED_SRC directory or" + echo "later specify where you put it using the UNIFIED_SRC" + echo "environment variable" + exit 1 + fi + + unified_driver_get_linux_src $i + done +fi + + +# Finally copy MAINTAINERS file +cp $GIT_TREE/MAINTAINERS ./ + +refresh_compat + +# Clean up possible *.mod.c leftovers +find -type f -name "*.mod.c" -exec rm -f {} \; + +# files we suck in for wireless drivers +export NETWORK_STABLE=" + net/wireless/ + net/mac80211/ + net/rfkill/ + drivers/net/wireless/ + net/bluetooth/ + drivers/bluetooth/ + drivers/net/ethernet/atheros/atl1c/ + drivers/net/ethernet/atheros/atl1e/ + drivers/net/ethernet/atheros/atlx/ + include/uapi/linux/nl80211.h + include/uapi/linux/rfkill.h + include/linux/rfkill.h + include/net/mac80211.h + include/net/regulatory.h + include/net/bluetooth/amp.h + include/net/bluetooth/hci.h + include/net/bluetooth/hci_core.h + include/net/bluetooth/mgmt.h + include/net/cfg80211.h" + +export DRM_STABLE=" + include/uapi/drm + include/drm/ + drivers/gpu/drm/ + " + +get_stable_patches() { + SUBSYS=$1 + STABLE_TARGET="${PENDING_STABLE_DIR}/${SUBSYS}" + STABLE_FILE_LIST="${STABLE_PREFIX}${SUBSYS}" + STABLE_FILES=$(cat ${STABLE_FILE_LIST}) + + rm -rf $STABLE_TARGET + mkdir -p $STABLE_TARGET + + echo -e "${GREEN}Generating stable cherry picks for ${SUBSYS}... ${NORMAL}" + echo -e "\nUsing command on directory $PWD:" + + echo -e "\ngit format-patch --grep=\"stable@vger.kernel.org\" -o " + echo -e "\t$STABLE_TARGET ${LAST_STABLE_UPDATE}.. " + for i in $STABLE_FILES; do + echo -e "\t$i" + done + + git format-patch --grep="stable@vger.kernel.org" -o \ + $STABLE_TARGET ${LAST_STABLE_UPDATE}.. \ + $STABLE_FILES + + if [ ! -d ${LAST_DIR}/${STABLE_TARGET} ]; then + echo -e "Assumption that ${LAST_DIR}/${STABLE_TARGET} directory exists failed" + exit 1 + fi + + echo -e "${GREEN}Purging old stable cherry picks... ${NORMAL}" + rm -f ${LAST_DIR}/${STABLE_TARGET}/*.patch + + FOUND=$(find ${STABLE_TARGET}/ -maxdepth 1 -name \*.patch | wc -l) + if [ $FOUND -ne 0 ]; then + cp ${STABLE_TARGET}/*.patch ${LAST_DIR}/${STABLE_TARGET}/ + else + echo "No stable pending-stable $SUBSYS patches found on linux-next" + fi + if [ -f ${LAST_DIR}/${STABLE_TARGET}/.ignore ]; then + for i in $(cat ${LAST_DIR}/${STABLE_TARGET}/.ignore) ; do + echo -e "Skipping $i from generated stable patches..." + rm -f ${LAST_DIR}/${STABLE_TARGET}/*$i* + done + fi + echo -e "${GREEN}Updated stable cherry picks, review with git diff " + echo -e "and update hunks with ./scripts/admin-update.sh -s refresh${NORMAL}" +} + +# Stable pending, if -n was passed +if [[ "$GET_STABLE_PENDING" = y ]]; then + + if [ -z $NEXT_TREE ]; then + NEXT_TREE="/$HOME/linux-next" + if [ ! -d $NEXT_TREE ]; then + echo "Please tell me where your linux-next git tree is." + echo "You can do this by exporting its location as follows:" + echo + echo " export NEXT_TREE=$HOME/linux-next" + echo + echo "If you do not have one you can clone the repository:" + echo " git clone git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" + exit 1 + fi + else + echo "You said to use git tree at: $NEXT_TREE for linux-next" + fi + + LAST_DIR=$PWD + cd $GIT_TREE + if [ -f localversion* ]; then + echo -e "You should be using a stable tree to use the -s option" + exit 1 + fi + + # we now assume you are using a stable tree + cd $GIT_TREE + LAST_STABLE_UPDATE=$(git describe --abbrev=0) + cd $NEXT_TREE + + rm -rf $PENDING_STABLE_DIR + + git tag -l | grep $LAST_STABLE_UPDATE 2>&1 > /dev/null + if [[ $? -ne 0 ]]; then + echo -e "${BLUE}Tag $LAST_STABLE_UPDATE not found on $NEXT_TREE tree: bailing out${NORMAL}" + exit 1 + fi + + echo $NETWORK_STABLE > ${STABLE_PREFIX}network + echo $DRM_STABLE > ${STABLE_PREFIX}drm + + if [[ "$ENABLE_NETWORK" == "1" ]]; then + get_stable_patches network + fi + + if [[ "$ENABLE_DRM" == "1" ]]; then + get_stable_patches drm + fi + + rm -f ${STABLE_PREFIX}network ${STABLE_PREFIX}drm + cd $LAST_DIR + +fi + +ORIG_CODE=$(find ./ -type f -name \*.[ch] | + egrep -v "^./compat/|include/linux/compat" | + xargs wc -l | tail -1 | awk '{print $1}') +printf "\n${CYAN}compat-drivers code metrics${NORMAL}\n\n" > $CODE_METRICS +printf "${PURPLE}%10s${NORMAL} - Total upstream lines of code being pulled\n" $ORIG_CODE >> $CODE_METRICS + +for subsystem in $SUBSYSTEMS; do + + printf "\n ${YELLOW}$subsystem${NORMAL}\n ----------------------------------------\n" >> $CODE_METRICS + + for dir in $EXTRA_PATCHES; do + LAST_ELEM=$dir + done + + for dir in $EXTRA_PATCHES; do + PATCHDIR="$dir/$subsystem" + if [[ ! -d $PATCHDIR ]]; then + echo -e "${RED}Patches: $PATCHDIR empty, skipping...${NORMAL}" + continue + fi + if [[ "$REFRESH" = y ]]; then + patchRefresh $PATCHDIR + fi + + FOUND=$(find $PATCHDIR/ -maxdepth 1 -name \*.patch | wc -l) + if [ $FOUND -eq 0 ]; then + continue + fi + + for i in $(ls $PATCHDIR/*.patch); do + # GNU Patch does not yet support giving a different + # error return value for patches detected as reversed or + # already applied. We can add that support but for now + # we distinguish this by grep'ing the results. We nuke + # already applied patches, this typically would come from + # linux-next, on linux-stable branches given that there is + # no linearity between the two. + # + # To support this change however it means we now have + # the double amount of time it takes to apply patches + # given that we now need a dry run first. The algorithm + # for checking if a patch is reversed only works by + # analyzing the first hunk of a patch though so perhaps + # what we need on GNU Patch is a check for asking if + # a patch is reversed, that would not cause much + # overhead here, it would just dry run on the first + # hunk by reducing the search space considerably. + patch --dry-run -p1 -N -t < $i > /dev/null 2>&1 + RET=$? + if [[ $RET -ne 0 ]]; then + patch --dry-run -p1 -N -t < $i | grep "Reversed" > /dev/null 2>&1 + if [[ $? -eq 0 ]]; then + echo -e "${CYAN}Deleting${NORMAL} ${GREEN}already applied ${NORMAL}${BLUE}${i}" + rm -f $i + continue + fi + fi + + echo -e "${GREEN}Applying backport patch${NORMAL}: ${BLUE}$i${NORMAL}" + patch -p1 -N -t < $i + RET=$? + if [[ $RET -ne 0 ]]; then + echo -e "${RED}Patching $i failed${NORMAL}, update it" + exit $RET + fi + done + nagometer $PATCHDIR $ORIG_CODE >> $CODE_METRICS + done +done + +refresh_compat +gen_compat_labels + +./scripts/driver-select restore diff --git a/scripts/athenable b/scripts/athenable new file mode 100755 index 00000000..3ec16ad2 --- /dev/null +++ b/scripts/athenable @@ -0,0 +1,46 @@ +#!/bin/bash +# +# Copyright 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> +# +# Makes sure either ath5k or MadWifi are ready to be used. This allows +# us to choose any driver without blacklisting each other. + +. /usr/lib/compat-drivers/modlib.sh + +if [[ $UID -ne 0 ]]; then + echo "Run with root privileges" + exit +fi + +ATH5K="ath5k" +ATH9K="ath9k" +MADWIFI="ath_pci" +# Appended to module file at the end when we want to ignore one +IGNORE_SUFFIX=".ignore" +USAGE="Usage: $0 [ ath5k | madwifi ]" + +# Default behavior: disables any MadWifi driver present and makes sure +# ath5k is enabled +if [ $# -eq 0 ]; then + module_disable $MADWIFI + module_enable $ATH5K + module_enable $ATH9K + exit +elif [ $# -ne 1 ]; then + echo "$USAGE" + exit +fi + +MODULE=$1 +if [ "$MODULE" == "ath5k" ]; then + module_disable $MADWIFI + module_enable $ATH5K + module_enable $ATH9K +elif [ "$MODULE" == "madwifi" ]; then + module_disable $ATH5K + module_disable $ATH9K + module_enable $MADWIFI +else + echo "$USAGE" + exit +fi diff --git a/scripts/athload b/scripts/athload new file mode 100755 index 00000000..96b28c3c --- /dev/null +++ b/scripts/athload @@ -0,0 +1,57 @@ +#!/bin/bash +# Copyright 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> +# +# Loads ath5k or madwifi + +. /usr/lib/compat-drivers/modlib.sh + +if [[ $UID -ne 0 ]]; then + echo "Run with root privileges" + exit +fi + + +USAGE="Usage: $0 [ ath5k | madwifi ]" + +# Default behavior: unload MadWifi and load ath5k +if [ $# -eq 0 ]; then + athenable ath5k + exit +elif [ $# -ne 1 ]; then + echo "$USAGE" + exit +fi + +MODULE=$1 +if [ "$MODULE" == "ath5k" ]; then + madwifi-unload + athenable ath5k + modprobe ath5k + CHECK=`modprobe -l ath5k` + if [ ! -z $CHECK ]; then + echo "ath5k loaded successfully" + fi + modprobe ath9k + CHECK=`modprobe -l ath9k` + if [ ! -z $CHECK ]; then + echo "ath9k loaded successfully" + fi +elif [ "$MODULE" == "madwifi" ]; then + CHECK=`modprobe -l ath5k` + if [ ! -z $CHECK ]; then + echo "ath5k currently loaded, going to try to unload the module..." + modprobe -r --ignore-remove ath5k + fi + athenable madwifi + # MadWifi may be loaded, but it doesn't mean devices + # currently available were picked up + madwifi-unload 2>&1 > /dev/null + modprobe ath_pci + CHECK=`modprobe -l ath_pci` + if [ ! -z $CHECK ]; then + echo "MadWifi loaded successfully!" + fi +else + echo "$USAGE" + exit +fi diff --git a/scripts/b43enable b/scripts/b43enable new file mode 100755 index 00000000..2d2d22cb --- /dev/null +++ b/scripts/b43enable @@ -0,0 +1,59 @@ +#!/bin/bash +# +# Copyright 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> +# +# Makes sure either b43, b43legacy (new mac80211 drivers) or bcm43xx +# is enabled to be used. This allows us to choose any driver without +# blacklisting each other. + +. /usr/lib/compat-drivers/modlib.sh + +if [[ $UID -ne 0 ]]; then + echo "Run with root privileges" + exit +fi + +B43S="b43 b43legacy" +B43_OLD="bcm43xx" +B43_PROP="wl" + +# Appended to module file at the end when we want to ignore one +USAGE="Usage: $0 [ b43 | bcm43xx | wl ]" + +function enable_b43 { + module_disable $B43_OLD + module_disable $B43_PROP + for i in $B43S; do + module_enable $i + done +} + +# Default behavior: disables the old bcm43xx driver and enables b43 +# and b43legacy +if [ $# -eq 0 ]; then + enable_b43 + exit +elif [ $# -ne 1 ]; then + echo "$USAGE" + exit +fi + +MODULE=$1 +if [ "$MODULE" == "bcm43xx" ]; then + for i in $B43S; do + module_disable $i + done + module_disable $B43_PROP + module_enable $B43_OLD +elif [ "$MODULE" == "wl" ]; then + for i in $B43S; do + module_disable $i + done + module_disable $B43_OLD + module_enable $B43_PROP +elif [ "$MODULE" == "b43" ]; then + enable_b43 +else + echo "$USAGE" + exit +fi diff --git a/scripts/b43load b/scripts/b43load new file mode 100755 index 00000000..3e7a4d99 --- /dev/null +++ b/scripts/b43load @@ -0,0 +1,65 @@ +#!/bin/bash +# Copyright 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> +# +# Loads new broadcom drivers (b43 and b43legacy) or the old ones (bcm43xx) + +. /usr/lib/compat-drivers/modlib.sh + +if [[ $UID -ne 0 ]]; then + echo "Run with root privileges" + exit +fi + + +USAGE="Usage: $0 [ b43 | bcm43xx ]" + +# Default behavior: unload bcm43xx and load b43 and b43legacy +if [ $# -eq 0 ]; then + 1=b43 +elif [ $# -ne 1 ]; then + echo "$USAGE" + exit +fi + +MODULE=$1 +if [ "$MODULE" == "b43" ]; then + grep bcm43xx /proc/modules 2>&1 > /dev/null + if [ $? -eq 0 ]; then + echo Unloading $i... + modprobe -r --ignore-remove bcm43xx + fi + # Enables both b43 and b43legacy + b43enable b43 + modprobe b43 + modprobe b43legacy + CHECK=`modprobe -l b43` + if [ ! -z $CHECK ]; then + echo "b43 loaded successfully" + fi + CHECK=`modprobe -l b43legacy` + if [ ! -z $CHECK ]; then + echo "b43legacy loaded successfully" + fi +elif [ "$MODULE" == "bcm43xx" ]; then + CHECK=`modprobe -l b43` + if [ ! -z $CHECK ]; then + echo "b43 currently loaded, going to try to unload the module..." + modprobe -r --ignore-remove b43 + fi + CHECK=`modprobe -l b43legacy` + if [ ! -z $CHECK ]; then + echo "b43legacy currently loaded, going to try to unload the module..." + modprobe -r --ignore-remove b43legacy + fi + b43enable bcm43xx + # bcm43xx may be loaded already lets remove them first + modprobe -r --ignore-remov bcm43xx 2>&1 > /dev/null + modprobe bcm43xx + CHECK=`modprobe -l bcm43xx` + if [ ! -z $CHECK ]; then + echo "bcm43xx loaded successfully!" + fi +else + echo "$USAGE" + exit +fi diff --git a/scripts/btunload.sh b/scripts/btunload.sh new file mode 100755 index 00000000..cc566138 --- /dev/null +++ b/scripts/btunload.sh @@ -0,0 +1,14 @@ +#!/bin/bash +MODULES="$MODULES ath3k bcm203x bluecard_cs bnep bpa10x bt3c_cs btmrvl btmrvl_sdio btsdio" +MODULES="$MODULES btusb btuart_cs cmtp dtl1_cs hidp hci_vhci hci_uart rfcomm sco bluetooth l2cap" +echo Stoping bluetooth service.. +/etc/init.d/bluetooth stop +/etc/init.d/bluetooth status + +for i in $MODULES; do + grep ^$i /proc/modules 2>&1 > /dev/null + if [ $? -eq 0 ]; then + echo Unloading $i... + modprobe -r --ignore-remove $i + fi +done diff --git a/scripts/check_config.sh b/scripts/check_config.sh new file mode 100755 index 00000000..648c05bd --- /dev/null +++ b/scripts/check_config.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash +# This script checks the compat-drivers configuration file and if changes were made +# regenerates the compat_autoconf header. + +# These variables are expected to be exported: +#COMPAT_CONFIG_CW=$(PWD)/config.mk +#COMPAT_CONFIG=$(PWD)/.config +#CONFIG_CHECK=$(PWD)/.config.mk_md5sum.txt +#COMPAT_AUTOCONF=include/linux/compat_autoconf.h + + +function gen_compat_autoconf { + echo "./scripts/gen-compat-autoconf.sh $COMPAT_CONFIG $COMPAT_CONFIG_CW > $COMPAT_AUTOCONF" + ./scripts/gen-compat-autoconf.sh $COMPAT_CONFIG $COMPAT_CONFIG_CW > $COMPAT_AUTOCONF + md5sum $COMPAT_CONFIG $COMPAT_CONFIG_CW > $CONFIG_CHECK +} + +which md5sum 2>&1 > /dev/null +if [ $? -ne 0 ]; then + echo "md5sum required to detect changes on config file" + exit -1 +fi + +if [ ! -f $CONFIG_CHECK ]; then + gen_compat_autoconf + exit +fi + +md5sum -c $CONFIG_CHECK 2> /dev/null 1>/dev/null + +if [ $? -ne 0 ]; then + echo "Changes to compat-drivers's configuration was detected, regenerating autoconf..." + gen_compat_autoconf +fi + diff --git a/scripts/check_depmod b/scripts/check_depmod new file mode 100755 index 00000000..fbcdd27a --- /dev/null +++ b/scripts/check_depmod @@ -0,0 +1,83 @@ +#!/bin/bash +# Copyright 2009 Luis R. Rodriguez <mcgrof@gmail.com> +# +# Ensures your distribution likes to prefer updates/ over the kernel/ +# search updates built-in + +# Seems Mandriva has an $DEPMOD_DIR but it doesn't have any files, +# so lets deal with those distributions. +DEPMOD_CONF="/etc/depmod.conf" +DEPMOD_CONF_TMP="$DEPMOD_CONF.compat-drivers.old" +DEPMOD_DIR="/etc/depmod.d/" +COMPAT_DEPMOD_FILE=compat-drivers.conf +GREP_REGEX_UPDATES="^[[:space:]]*search.*[[:space:]]updates\([[:space:]]\|$\)" +GREP_REGEX_SEARCH="^[[:space:]]*search[[:space:]].\+$" +DEPMOD_CMD="depmod" + +function add_compat_depmod_conf { + echo "NOTE: Your distribution lacks an $DEPMOD_DIR directory with " + echo "updates/ directory being prioritized for modules, we're adding " + echo "one for you." + mkdir -p $DEPMOD_DIR + FIRST_FILE=$(ls $DEPMOD_DIR|head -1) + [ -n "$FIRST_FILE" ] && while [[ $FIRST_FILE < $COMPAT_DEPMOD_FILE ]]; do + COMPAT_DEPMOD_FILE="0$COMPAT_DEPMOD_FILE" + done + echo "search updates" > $DEPMOD_DIR/$COMPAT_DEPMOD_FILE +} + +function add_global_depmod_conf { + echo "NOTE: Your distribution lacks updates/ directory being" + echo "prioritized for modules, we're adding it to $DEPMOD_CONF." + rm -f $DEPMOD_CONF_TMP + [ -f $DEPMOD_CONF ] && cp -f $DEPMOD_CONF $DEPMOD_CONF_TMP + echo "search updates" > $DEPMOD_CONF + [ -f $DEPMOD_CONF_TMP ] && cat $DEPMOD_CONF_TMP >> $DEPMOD_CONF +} + +function depmod_updates_ok { + echo "depmod will prefer updates/ over kernel/ -- OK!" +} + +function add_depmod_conf { + if [ -f "$DEPMOD_CONF" ]; then + add_global_depmod_conf + else + DEPMOD_VERSION=$($DEPMOD_CMD --version | cut -d" " -f2 | sed "s/\.//") + if [[ $DEPMOD_VERSION -gt 36 ]]; then + add_compat_depmod_conf + else + add_global_depmod_conf + fi + fi +} + +# ============================================================================= +# === MAIN ==================================================================== +# ============================================================================= + +GREP_FILES="" +[ -f $DEPMOD_CONF ] && GREP_FILES="$DEPMOD_CONF" +if [ -d $DEPMOD_DIR ]; then + DEPMOD_FILE_COUNT=$(ls $DEPMOD_DIR | wc -l) + [[ $DEPMOD_FILE_COUNT -gt 0 ]] && GREP_FILES="$GREP_FILES $DEPMOD_DIR/*" +fi + +if [ -n "$GREP_FILES" ]; then + grep -q "$GREP_REGEX_SEARCH" $GREP_FILES + if [[ $? -eq 0 ]]; then + grep -q "$GREP_REGEX_UPDATES" $GREP_FILES + if [[ $? -eq 0 ]]; then + depmod_updates_ok + else + add_depmod_conf + fi + else + depmod_updates_ok + fi +else + depmod_updates_ok +fi + +exit 0 + diff --git a/scripts/compress_modules b/scripts/compress_modules new file mode 100755 index 00000000..cf2a76cd --- /dev/null +++ b/scripts/compress_modules @@ -0,0 +1,40 @@ +#!/bin/bash +# To be used by distributions using compressed modules + +COMPRESSION_FOUND="n" +COUNT=0; + +for i in $(modprobe -l mac80211); do + let COUNT=$COUNT+1 + i=${i##*/} + if [ "$i" = "mac80211.ko.gz" ]; then + COMPRESSION_FOUND="y" + continue + fi +done + +if [ $COUNT -gt 2 ]; then + echo "More than two mac80211 modules are detected, please report this." + exit +fi + +if [ $COMPRESSION_FOUND = "n" ]; then + exit +fi + +DIRS="$KLIB/$KMODDIR/net/mac80211/" +# This handles both drivers/net/ and drivers/net/wireless/ +DIRS="$DIRS $KLIB/$KMODDIR/net/" +DIRS="$DIRS $KLIB/$KMODDIR/drivers/ssb/" +DIRS="$DIRS $KLIB/$KMODDIR/drivers/net/usb/" +DIRS="$DIRS $KLIB/$KMODDIR/drivers/net/wireless/" +DIRS="$DIRS $KLIB/$KMODDIR/drivers/misc/eeprom/" + +for i in $DIRS; do + if [ ! -d $i ]; then + continue; + fi + for driver in $(find $i -type f -name *.ko); do + gzip -9 $driver + done +done diff --git a/scripts/driver-select b/scripts/driver-select new file mode 100755 index 00000000..862f43bf --- /dev/null +++ b/scripts/driver-select @@ -0,0 +1,565 @@ +#!/usr/bin/env bash +# Copyright 2009 Luis R. Rodriguez <mcgrof@gmail.com> +# +# This script allows you to select your compat-drivers driver and +# reduce compilation time. + +COMPAT_CONFIG_CW="config.mk" +DRIVERS_MAKEFILE="drivers/net/wireless/Makefile" +ATH_MAKEFILE="drivers/net/wireless/ath/Makefile" +ATH9K_MAKEFILE="drivers/net/wireless/ath/ath9k/Makefile" +BRCM80211_MAKEFILE="drivers/net/wireless/brcm80211/Makefile" +RT2X00_MAKEFILE="drivers/net/wireless/rt2x00/Makefile" +TI_MAKEFILE="drivers/net/wireless/ti/Makefile" +NET_WIRELESS_MAKEFILE="net/wireless/Makefile" +EEPROM_MAKEFILE="drivers/misc/eeprom/Makefile" +DRIVERS_NET_ATHEROS="drivers/net/ethernet/atheros/Makefile" +DRIVERS_NET_BROADCOM="drivers/net/ethernet/broadcom/Makefile" +DRIVERS_NET_USB_MAKEFILE="drivers/net/usb/Makefile" +SSB_MAKEFILE="drivers/ssb/Makefile" +BCMA_MAKEFILE="drivers/bcma/Makefile" + +# used to backup files from foo to foo.${BACKUP_EXT} +BACKUP_EXT="bk" + +# Pretty colors +GREEN="\033[01;32m" +YELLOW="\033[01;33m" +NORMAL="\033[00m" +BLUE="\033[34m" +RED="\033[31m" +PURPLE="\033[35m" +CYAN="\033[36m" +UNDERLINE="\033[02m" + +SUPPORTED_80211_DRIVERS="ath5k ath9k ath9k_ap ath9k_htc carl9170 ath6kl ar5523 wil6210 b43 zd1211rw rt2x00 wl1251 wl12xx brcmsmac brcmfmac mac80211_hwsim" + +# b43 needs some more work for driver-select, the SSB stuff, plus +# what if you update b44 but not b43? It will bust. +SUPPORTED_ETH_DRIVERS="atl1 atl2 atl1e atl1c alx" + +SUPPORTED_DRM_DRIVERS="i915" + +function usage { + echo -e "${GREEN}Usage${NORMAL}: ${BOLD}$0${NORMAL} [ ${PURPLE}<driver-name>${NORMAL} | ${CYAN}<driver-group-name>${NORMAL} | ${GREEN}restore${NORMAL} ]" + + # These should match the switch below. + echo -e "Supported 802.11 drivers:" + for i in $SUPPORTED_80211_DRIVERS; do + echo -e "\t${PURPLE}${i}${NORMAL}" + done + + echo + echo -e "Supported Ethernet drivers:" + for i in $SUPPORTED_ETH_DRIVERS; do + echo -e "\t${PURPLE}${i}${NORMAL}" + done + + echo -e "Supported DRM drivers:" + for i in $SUPPORTED_DRM_DRIVERS; do + echo -e "\t${PURPLE}${i}${NORMAL}" + done + + # These should match the switch below. + echo -e "\nSupported group drivers:" + echo -e "\t${CYAN}atheros${NORMAL} < ${PURPLE} ath5k ath9k carl9170 zd1211rw ath6kl wil6210 ar5523${NORMAL}>" + echo -e "\t${CYAN}ath${NORMAL} < ${PURPLE} ath5k ath9k carl9170 ath6kl wil6210 ar5523${NORMAL}>" + echo -e "\t${CYAN}brcm80211${NORMAL} < ${PURPLE} brcmsmac brcmfmac ${NORMAL}>" + echo -e "\t${CYAN}intel${NORMAL} < ${PURPLE} iwlwifi, iwlegacy ${NORMAL}>" + echo -e "\t${CYAN}rtl818x${NORMAL} < ${PURPLE} rtl8180 rtl8187 ${NORMAL}>" + echo -e "\t${CYAN}rtlwifi${NORMAL} < ${PURPLE} rtl8192ce ${NORMAL}>" + echo -e "\t${CYAN}ti${NORMAL} < ${PURPLE} wl1251 wl12xx (SPI and SDIO)${NORMAL}>" + + echo -e "\nSupported group drivers: Bluetooth & Ethernet:" + echo -e "\t${CYAN}atlxx${NORMAL} < ${PURPLE} atl1 atl2 atl1e alx${NORMAL}>" + echo -e "\t${CYAN}bt${NORMAL} < ${PURPLE} Linux bluetooth drivers ${NORMAL}>" + + echo -e "\nSupported group drivers: DRM:" + echo -e "\t${CYAN}drm${NORMAL} < ${PURPLE} i915${NORMAL}>" + + echo -e "Restoring compat-drivers:" + echo -e "\t${GREEN}restore${NORMAL}: you can use this option to restore compat-drivers to the original state" +} + +function backup_file { + if [ -f $1.${BACKUP_EXT} ]; then + echo -e "Backup exists: ${CYAN}${1}.${BACKUP_EXT}${NORMAL}" + return + fi + echo -e "Backing up makefile: ${CYAN}${1}.${BACKUP_EXT}${NORMAL}" + cp "${1}" "${1}.${BACKUP_EXT}" +} + +function disable_makefile +{ + backup_file $1 + echo > $1 +} + +function select_drivers_from_makefile +{ + MAKEFILE="$1" + shift + backup_file $MAKEFILE + CONFIGS="" + COUNT=0 + for i in $@; do + if [[ "$CONFIGS" = "" ]]; then + CONFIGS="$i" + else + CONFIGS="${CONFIGS}|$i" + fi + done + egrep "$CONFIGS" $MAKEFILE > ${MAKEFILE}.tmp + mv ${MAKEFILE}.tmp ${MAKEFILE} +} + +function select_drivers +{ + select_drivers_from_makefile $DRIVERS_MAKEFILE $@ +} + +function disable_lib80211 +{ + backup_file $NET_WIRELESS_MAKEFILE + perl -i -ne 'print if ! /LIB80211/ ' $NET_WIRELESS_MAKEFILE +} + +function disable_b44 { + backup_file $DRIVERS_NET_BROADCOM + perl -i -ne 'print if ! /CONFIG_B44/ ' $DRIVERS_NET_BROADCOM +} + +function disable_ssb +{ + disable_makefile ${SSB_MAKEFILE} + perl -i -ne 'print if ! /drivers\/ssb\//' Makefile +} + +function disable_bcma +{ + disable_makefile ${BCMA_MAKEFILE} + perl -i -ne 'print if ! /drivers\/bcma\//' Makefile +} + +function disable_rfkill +{ + backup_file Makefile + perl -i -ne 'print if ! /CONFIG_COMPAT_RFKILL/' Makefile +} + +function disable_eeprom +{ + disable_makefile ${EEPROM_MAKEFILE} + perl -i -ne 'print if ! /drivers\/misc\/eeprom\//' Makefile +} + +function disable_usbnet +{ + disable_makefile ${DRIVERS_NET_USB_MAKEFILE} + perl -i -ne 'print if ! /drivers\/net\/usb\//' Makefile +} + +function disable_usbnet { + perl -i -ne 'print if ! /CONFIG_COMPAT_NET_USB_MODULES/' Makefile +} + +function disable_ethernet { + perl -i -ne 'print if ! /CONFIG_COMPAT_NETWORK_MODULES/' Makefile +} + +function disable_var_03 { + perl -i -ne 'print if ! /CONFIG_COMPAT_VAR_MODULES/' Makefile +} + +function disable_bt { + perl -i -ne 'print if ! /CONFIG_COMPAT_BLUETOOTH/' Makefile +} + +function disable_80211 { + perl -i -ne 'print if ! /CONFIG_COMPAT_WIRELESS/' Makefile +} + +function disable_drm { + perl -i -ne 'print if ! /CONFIG_COMPAT_VIDEO_MODULES/' Makefile +} + +function disable_bt_usb_ethernet { + backup_file Makefile + disable_usbnet + disable_ethernet + disable_bt + disable_update-initramfs + disable_drm +} + +function disable_bt_usb_ethernet_var { + backup_file Makefile + disable_bt_usb_ethernet + disable_var_03 +} + +function enable_only_ethernet { + backup_file Makefile + backup_file $DRIVERS_NET_BROADCOM + backup_file $DRIVERS_NET_ATHEROS + disable_staging + disable_usbnet + disable_var_03 + disable_bt + disable_drm + # rfkill may be needed if you enable b44 as you may have b43 + disable_rfkill + disable_80211 +} + +function disable_var { + disable_ssb + disable_bcma + disable_usbnet + disable_eeprom + disable_update-initramfs +} + +function disable_var_01 { + disable_lib80211 + disable_var +} + +function disable_var_02 { + #var_01 with eeprom not disabled + disable_lib80211 + disable_ssb + disable_bcma + disable_usbnet + disable_update-initramfs +} + +function disable_staging { + backup_file Makefile + perl -i -ne 'print if ! /CONFIG_COMPAT_STAGING/ ' Makefile +} + +function disable_update-initramfs +{ + backup_file Makefile + perl -i -ne 'print if ! /update-initramfs/' Makefile +} + +function enable_only_drm { + backup_file Makefile + disable_ethernet + disable_staging + disable_usbnet + disable_var_03 + disable_bt + # rfkill may be needed if you enable b44 as you may have b43 + disable_rfkill + disable_80211 +} + +function select_ath_driver +{ + backup_file $ATH_MAKEFILE + perl -i -ne 'print if /'$1'/ || /CONFIG_ATH_/ || /ath-objs/ || /regd.o/ || /hw.o/ || /key.o/' $ATH_MAKEFILE + disable_var_01 +} + +function select_ath_no_common +{ + backup_file $ATH_MAKEFILE + perl -i -ne 'print if /'$1'/' $ATH_MAKEFILE + disable_var_01 +} + +function select_ath9k_driver +{ + select_ath_driver CONFIG_ATH9K_HW + # In the future here we'll add stuff to disable ath9k_htc +} + +function select_ath9k_driver_ap +{ + select_ath9k_driver + backup_file $COMPAT_CONFIG_CW + perl -i -ne 'print if ! /CONFIG_COMPAT_ATH9K_RATE_CONTROL/ ' $COMPAT_CONFIG_CW +} + +function select_ti_drivers +{ + select_drivers CONFIG_WL_TI + select_drivers_from_makefile $TI_MAKEFILE $@ +} + +function select_brcm80211_driver +{ + backup_file $BRCM80211_MAKEFILE + perl -i -ne 'print if /'$1'/ || /CONFIG_BRCMUTIL/ ' $BRCM80211_MAKEFILE +} + +function restore_file { + local ORIG="${1%%.${BACKUP_EXT}}" + cp $1 $ORIG + rm -f $1 + echo -e "Restored makefile: ${CYAN}${ORIG}${NORMAL} (and removed backup)" +} + +function restore_compat { + local FILES=$(find ./ -type f -name *\."${BACKUP_EXT}") + for i in $FILES; do + restore_file $i + done +} + +if [ $# -ne 1 ]; then + usage + exit +fi + +if [ ! -f .compat_version ]; then + echo "Must run $0 from the compat-drivers top level directory" + exit +fi + +if [[ ! -f built-in.o ]]; then + if [[ "$1" != "restore" ]]; then + echo -e "${PURPLE}Processing new driver-select request...${NORMAL}" + fi +fi + +# Always backup the top level Makefile, unless restoring +if [[ "$1" != "restore" ]]; then + backup_file Makefile +fi + +# If a user selects a new driver make sure we clean up for them +# first and also restore the backup makefiles then. Otherwise +# we'll be trying to leave drivers on Makefiles which are not +# already there from a previous run. +if [ -f built-in.o ]; then + echo -e "${PURPLE}Old build found, going to clean this up first...${NORMAL}" + make clean + echo -e "${PURPLE}Restoring Makefiles...${NORMAL}" + ./$0 restore +fi + +case $1 in + restore) + restore_compat + ;; +# Group drivers + atheros) + select_drivers CONFIG_ATH_CARDS \ + CONFIG_COMPAT_ZD1211RW + disable_staging + disable_bt_usb_ethernet_var + disable_var_01 + ;; + ath) + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + disable_var_01 + ;; + intel) + select_drivers CONFIG_IWLWIFI \ + CONFIG_IWLEGACY \ + CONFIG_IPW + disable_staging + disable_var + disable_bt + disable_ethernet + disable_usbnet + ;; + iwlwifi) + select_drivers CONFIG_IWLWIFI + disable_staging + disable_var_01 + disable_bt + disable_ethernet + disable_usbnet + ;; + iwlegacy) + select_drivers CONFIG_IWLEGACY + disable_staging + disable_var_01 + disable_bt + disable_ethernet + disable_usbnet + ;; + rtl818x) + select_drivers CONFIG_RTL8180 CONFIG_RTL8187 + disable_staging + disable_bt_usb_ethernet + disable_ssb + disable_bcma + disable_lib80211 + ;; + rtlwifi) + select_drivers CONFIG_RTL8192CE CONFIG_RTLWIFI + disable_staging + disable_bt_usb_ethernet_var + disable_lib80211 + ;; + ti) + select_drivers CONFIG_WL_TI + disable_bt_usb_ethernet_var + disable_staging + disable_var_01 + ;; + brcm80211) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_BRCMUTIL \ + CONFIG_BRCMFMAC \ + CONFIG_BRCMSMAC + ;; +# Singular modules + ath5k) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + select_ath_driver CONFIG_ATH5K + #patch -p1 < enable-older-kernels/enable-2.6.23.patch + ;; + ath9k) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + select_ath9k_driver + ;; + ath9k_ap) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + select_ath9k_driver_ap + ;; + carl9170) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + select_ath_driver CONFIG_CARL9170 + ;; + ath9k_htc) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + select_ath9k_driver + ;; + ath6kl) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + select_ath_driver CONFIG_ATH6KL + ;; + wil6210) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + select_ath_no_common CONFIG_WIL6210 + ;; + ar5523) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_ATH_CARDS + select_ath_no_common CONFIG_AR5523 + ;; + brcmsmac) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_BRCMSMAC + select_brcm80211_driver CONFIG_BRCMSMAC CONFIG_BRCMUTIL + ;; + brcmfmac) + disable_staging + disable_bt_usb_ethernet_var + select_drivers CONFIG_BRCMFMAC + select_brcm80211_driver CONFIG_BRCMFMAC CONFIG_BRCMUTIL + ;; + zd1211rw) + select_drivers CONFIG_COMPAT_ZD1211RW + disable_staging + disable_var_01 + ;; + b43) + disable_staging + disable_bt_usb_ethernet + disable_eeprom + disable_lib80211 + select_drivers CONFIG_B43 + ;; + rt2x00) + select_drivers CONFIG_RT2X00 + disable_staging + disable_bt_usb_ethernet + disable_var_02 + ;; + wl1251) + select_ti_drivers CONFIG_WL1251 + disable_staging + disable_var_01 + ;; + wl12xx) + select_ti_drivers CONFIG_WL12XX + disable_staging + disable_var_01 + ;; + wl18xx) + select_ti_drivers CONFIG_WL18XX + disable_staging + disable_var_01 + ;; + mac80211_hwsim) + select_drivers CONFIG_COMPAT_MAC80211_HWSIM + disable_staging + disable_bt_usb_ethernet_var + ;; +# Ethernet and Bluetooth drivers + atl1) + enable_only_ethernet + disable_b44 + echo -e "obj-\$(CONFIG_ATL1) += atlx/" > $DRIVERS_NET_ATHEROS + ;; + atl2) + enable_only_ethernet + disable_b44 + echo -e "obj-\$(CONFIG_ATL2) += atlx/" > $DRIVERS_NET_ATHEROS + ;; + atl1e) + enable_only_ethernet + disable_b44 + echo -e "obj-\$(CONFIG_ATL1E) += atl1e/" > $DRIVERS_NET_ATHEROS + ;; + atl1c) + enable_only_ethernet + disable_b44 + echo -e "obj-\$(CONFIG_ATL1C) += atl1c/" > $DRIVERS_NET_ATHEROS + ;; + alx) + enable_only_ethernet + disable_b44 + echo -e "obj-\$(CONFIG_ALX) += alx/" > $DRIVERS_NET_ATHEROS + ;; + atlxx) + select_drivers CONFIG_ATL1 CONFIG_ATL2 CONFIG_ATL1E CONFIG_ALX + enable_only_ethernet + disable_b44 + disable_update-initramfs + ;; + bt) + select_drivers CONFIG_BT + disable_var + disable_ethernet + disable_staging + disable_80211 + ;; + i915) + enable_only_drm + ;; + drm) + enable_only_drm + ;; + *) + echo "Unsupported driver" + exit + ;; +esac diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh index e52cc5aa..c9ab9da7 100755 --- a/scripts/gen-compat-autoconf.sh +++ b/scripts/gen-compat-autoconf.sh @@ -1,8 +1,6 @@ -#!/bin/bash -# -# Copyright 2012 Luis R. Rodriguez <mcgrof@frijolero.org> -# Copyright 2011 Hauke Mehrtens <hauke@hauke-m.de> -# Copyright 2011 John W. Linville <linville@tuxdriver.com> +#!/usr/bin/env bash +# +# Copyright 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> # # Use this to parse a small .config equivalent looking file to generate # our own autoconf.h. This file has defines for each config option @@ -14,23 +12,36 @@ # This indicates which is the oldest kernel we support # Update this if you are adding support for older kernels. OLDEST_KERNEL_SUPPORTED="2.6.24" +COMPAT_RELEASE=".compat_version" +KERNEL_RELEASE=".compat_base_tree_version" +MULT_DEP_FILE=".compat_pivot_dep" -if [ $# -ne 1 ]; then - echo "Usage $0 config-file" +if [ $# -ne 2 ]; then + echo "Usage $0 <generic-compat-config-file> <compat-drivers-config-file>" exit fi -COMPAT_CONFIG="$1" +COMPAT_CONFIG_1="$1" +COMPAT_CONFIG_2="$2" + +if [[ ! -f $COMPAT_CONFIG_1 || ! -f $COMPAT_CONFIG_2 ]]; then + echo "File $COMPAT_CONFIG_1 and $COMPAT_CONFIG_2 files must be present" + exit +fi -if [ ! -f $COMPAT_CONFIG ]; then - echo "File $1 is not a file" +if [ ! -f $COMPAT_RELEASE -o ! -f $KERNEL_RELEASE ]; then + echo "Error: $COMPAT_RELEASE or $KERNEL_RELEASE file is missing" exit fi +CREL=$(cat $COMPAT_RELEASE | tail -1) +KREL=$(cat $KERNEL_RELEASE | tail -1) +DATE=$(date) + # Defines a CONFIG_ option if not defined yet, this helps respect -# linux/autoconf.h +# linux/autoconf.h function define_config { - VAR=$1 + VAR=$1 VALUE=$2 case $VALUE in n) # Try to undefine it @@ -39,28 +50,89 @@ function define_config { y) echo "#ifndef $VAR" echo "#define $VAR 1" - echo "#endif /* $VAR */" + echo "#endif /* $VAR */ " ;; m) echo "#ifndef $VAR" echo "#define $VAR 1" - echo "#endif /* $VAR */" + echo "#endif /* $VAR */ " ;; - *) # Assume string - # XXX: add better checks to make sure what was on - # the right was indeed a string + [0-9]*) + # Leave integers as is + echo "#ifndef $VAR" + echo "#define $VAR $VALUE" + echo "#endif /* $VAR */ " + ;; + *) + # Escape every other thing with double quotes echo "#ifndef $VAR" echo "#define $VAR \"$VALUE\"" - echo "#endif /* $VAR */" + echo "#endif /* $VAR */ " ;; + esac } +# This deals with core compat-drivers kernel requirements. +function define_config_req { + VAR=$1 + echo "#ifndef $VAR" + echo -n "#error Compat-drivers requirement: $VAR must be enabled " + echo "in your kernel" + echo "#endif /* $VAR */" +} + +# This handles modules which have dependencies from the kernel +# which compat-drivers isn't providing yet either because +# the dependency is not available as kernel module or +# the module simply isn't provided by compat-drivers. +function define_config_dep { + VAR=$1 + VALUE=$2 + DEP=$3 + WARN_VAR="COMPAT_WARN_$VAR" + echo "#ifdef $DEP" + define_config $VAR $VALUE + echo "#else" + # XXX: figure out a way to warn only once + # define only once in case user tried to enable config option + # twice in config.mk + echo "#ifndef $WARN_VAR" + # Lets skip these for now.. they might be too annoying + #echo "#warning Skipping $VAR as $DEP was needed... " + #echo "#warning This just means $VAR won't be built and is not fatal." + echo "#define $WARN_VAR" + echo "#endif /* $VAR */" + echo "#endif /* $WARN_VAR */" +} + +# This handles options which have *multiple* dependencies from the kernel +function define_config_multiple_deps { + VAR=$1 + VALUE=$2 + DEP_ARRAY=$3 + + # First, put all ifdefs + for i in $(cat $MULT_DEP_FILE); do + echo "#ifdef $i" + done + + # Now put our option in the middle + define_config $VAR $VALUE + + # Now close all ifdefs + # First, put all ifdefs + for i in $(cat $MULT_DEP_FILE); do + echo "#endif" + done + +} + function kernel_version_req { VERSION=$(echo $1 | sed -e 's/\./,/g') echo "#if (LINUX_VERSION_CODE < KERNEL_VERSION($VERSION))" - echo "#error compat requirement: Linux >= $VERSION" - echo "#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION($VERSION) */" + echo "#error Compat-wireless requirement: Linux >= $VERSION" + echo "#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION($VERSION) */ " } cat <<EOF @@ -68,14 +140,21 @@ cat <<EOF #define COMPAT_AUTOCONF_INCLUDED /* * Automatically generated C config: don't edit + * $DATE + * compat-drivers: $CREL + * linux: $KREL */ +#define COMPAT_RELEASE "$CREL" +#define COMPAT_KERNEL_RELEASE "$KREL" EOF # Checks user is compiling against a kernel we support kernel_version_req $OLDEST_KERNEL_SUPPORTED # For each CONFIG_FOO=x option -for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else #CONFIG_' $COMPAT_CONFIG | sed 's/ /+/'); do +for i in $(egrep -h '^export CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else #CONFIG_' $COMPAT_CONFIG_1 $COMPAT_CONFIG_2 | \ + sed 's/export //' | \ + sed 's/ /+/'); do case $i in 'ifdef+CONFIG_'* ) echo "#$i" | sed -e 's/+/ /' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_3_\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(3,\2,0))/' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_2_6_\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,\2))/' -e 's/\(ifdef CONFIG_COMPAT_RHEL_\)\([0-9]*\)_\([0-9]*\)/if (defined(RHEL_MAJOR) \&\& RHEL_MAJOR == \2 \&\& RHEL_MINOR >= \3)/' -e 's/\(#ifdef \)\(CONFIG_[^:space:]*\)/#if defined(\2) || defined(\2_MODULE)/' @@ -95,6 +174,15 @@ for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else # Get the element on the right of the "=" VALUE=$(echo $i | cut -d"=" -f 2) + # Handle core kernel module depenencies here. + case $VAR in + # ignore this, we have a special hanlder for this at the botttom + # instead. We still need to keep this in config.mk to let Makefiles + # know its enabled so just ignore it here. + CONFIG_MAC80211_QOS) + continue + ;; + esac # Any other module which can *definitely* be built as a module goes here define_config $VAR $VALUE continue @@ -102,4 +190,21 @@ for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else esac done +# Deal with special cases. CONFIG_MAC80211_QOS is such a case. +# We handle this specially for different kernels we support. +if [ -f $KLIB_BUILD/Makefile ]; then + MAJORLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p') + SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^\(2\.6\|[3-9]\)\.\([0-9]\+\).*/\2/p') + if [ $MAJORLEVEL -eq 2 -a $SUBLEVEL -le 22 ]; then + define_config CONFIG_MAC80211_QOS y + else # kernel >= 2.6.23 + # CONFIG_MAC80211_QOS on these kernels requires + # CONFIG_NET_SCHED and CONFIG_NETDEVICES_MULTIQUEUE + rm -f $MULT_DEP_FILE + echo CONFIG_NET_SCHED >> $MULT_DEP_FILE + echo CONFIG_NETDEVICES_MULTIQUEUE >> $MULT_DEP_FILE + define_config_multiple_deps CONFIG_MAC80211_QOS y $ALL_DEPS + rm -f $MULT_DEP_FILE + fi +fi echo "#endif /* COMPAT_AUTOCONF_INCLUDED */" diff --git a/scripts/gen-release.sh b/scripts/gen-release.sh new file mode 100755 index 00000000..47518f25 --- /dev/null +++ b/scripts/gen-release.sh @@ -0,0 +1,311 @@ +#!/usr/bin/env bash +# Copyright 2009-2012 Luis R. Rodriguez <mcgrof@do-not-panic.com> +# +# You can use this to make compat-drivers releases: +# +# * daily linux-next.git based compat-drivers releases +# * linux-stable.git / linux.git stable releases +# +# The assumption is you have the linux-stable git tree on your $HOME +# +# git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git +# git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git +# +# You can add linux.git on to your linux-stable.git as a remote to get +# Linus's RC's and you should add linux-stable.git as a local remote +# to your linux-next.git so you can get then get the linux-stable tags +# for your linux-next.git tree. +# +# By default we refer to the GIT_TREE variable for where we are pulling +# code for a release and guestimate what type of release you want +# from that. By default we assume you want a daily linux-next.git tree +# release. + +# Pretty colors +GREEN="\033[01;32m" +YELLOW="\033[01;33m" +NORMAL="\033[00m" +BLUE="\033[34m" +RED="\033[31m" +PURPLE="\033[35m" +CYAN="\033[36m" +UNDERLINE="\033[02m" + +GIT_STABLE_URL="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" +GIT_NEXT_URL="git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" + +STABLE_TREE="linux-stable" +NEXT_TREE="linux-next" + +STAGING=/tmp/staging/compat-drivers/ + +GIT_DIRS="$GIT_DIRS $HOME/compat/" +GIT_DIRS="$GIT_DIRS $HOME/devel/compat-drivers/" +GIT_DIRS="$GIT_DIRS $HOME/linux-next/" +GIT_DIRS="$GIT_DIRS $HOME/linux-stable/" + +export GIT_DIRS="$GIT_DIRS" + +function usage() +{ + echo -e "Usage:" + echo -e "" + echo -e "export GIT_TREE=${HOME}/linux-stable/" + echo -e "or" + echo -e "export GIT_TREE=${HOME}/linux-next/" + echo -e "" + echo -e "${GREEN}$1${NORMAL} ${BLUE}[ -s | -n | -p | -c | -r | -k ]${NORMAL}" + echo -e "" + echo -e "-s apply ${BLUE}pending-stable/${NORMAL} patches" + echo -e "-n apply ${BLUE}linux-next-cherry-picks/${NORMAL} patches" + echo -e "-p apply ${BLUE}linux-next-pending/${NORMAL} patches" + echo -e "-c apply ${BLUE}crap/${NORMAL} patches" + echo -e "-u apply ${BLUE}unified-drivers/${NORMAL} patches" + echo -e "" + echo -e "-k run ${GREEN}git clean -x -d -f${NORMAL} for you, ${RED}not for the faint of heart${NORMAL}" + echo -e "-r release to kernel.org" + echo + echo Examples usages: + echo + echo -e "export GIT_TREE=${HOME}/linux-stable/" + echo -e "${PURPLE}${1} -s -n -p -c${NORMAL}" + echo or + echo -e "export GIT_TREE=${HOME}/linux-next/" + echo -e "${PURPLE}${1} -p -c${NORMAL}" + echo + exit +} + +UPDATE_ARGS="" +POSTFIX_RELEASE_TAG="-" +USE_KUP="" +FORCE_CLEAN="" + +if [ -z $GIT_TREE ]; then + export GIT_TREE=$HOME/$NEXT_TREE + if [ ! -d $GIT_TREE ]; then + echo "Please tell me where your linux-next or linux-stable git tree is." + echo "You can do this by exporting its location as follows:" + echo + echo " export GIT_TREE=${HOME}/linux-next/" + echo "or" + echo " export GIT_TREE=${HOME}/linux-stable/" + echo + echo "If you do not have one you can clone the repositories at:" + echo " git clone $GIT_STABLE_URL" + echo " git clone $GIT_NEXT_URL" + exit 1 + fi +else + echo "You said to use git tree at: $GIT_TREE" + GIT_DIRS="$GIT_DIRS $GIT_TREE" +fi + +COMPAT_DRIVERS_DIR=$(pwd) +COMPAT_DRIVERS_BRANCH=$(git branch | grep \* | awk '{print $2}') + +cd $GIT_TREE +# --abbrev=0 on branch should work but I guess it doesn't on some releases +EXISTING_BRANCH=$(git branch | grep \* | awk '{print $2}') + +# target branch we want to use from hpa's tree, by default +# this respects the existing branch on the target kernel. +# You can override the target branch by specifying an argument +# to this script. +TARGET_BRANCH="$EXISTING_BRANCH" +TARGET_TAG="$(git describe)" + +while [ $# -ne 0 ]; do + if [[ "$1" = "-s" ]]; then + UPDATE_ARGS="${UPDATE_ARGS} $1" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}s" + shift; continue; + fi + if [[ "$1" = "-n" ]]; then + UPDATE_ARGS="${UPDATE_ARGS} $1" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}n" + shift; continue; + fi + if [[ "$1" = "-p" ]]; then + UPDATE_ARGS="${UPDATE_ARGS} $1" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}p" + shift; continue; + fi + if [[ "$1" = "-c" ]]; then + UPDATE_ARGS="${UPDATE_ARGS} $1" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}c" + shift; continue; + fi + if [[ "$1" = "-u" ]]; then + UPDATE_ARGS="${UPDATE_ARGS} $1" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}u" + shift; continue; + fi + + if [[ "$1" = "-r" ]]; then + USE_KUP="1" + shift; continue; + fi + + if [[ "$1" = "-k" ]]; then + FORCE_CLEAN="1" + shift; continue; + fi + + echo -e "Unexpected argument passed: ${RED}${1}${NORMAL}" + usage $0 + exit +done + +BASE_TREE=$(basename $GIT_TREE) + +echo "On ${BASE_TREE}: $TARGET_BRANCH" + +# Lets now make sure you are on matching compat-drivers branch. +# This is a super hack, but let me know if you figure out a cleaner way +TARGET_KERNEL_RELEASE=$(make VERSION="linux-3" SUBLEVEL="" EXTRAVERSION=".y" kernelversion) +GENLOG_TARGET=$(make VERSION="3" SUBLEVEL="" EXTRAVERSION="" kernelversion) + +if [[ $COMPAT_DRIVERS_BRANCH != $TARGET_KERNEL_RELEASE && $BASE_TREE != "linux-next" ]]; then + echo -e "You are on the compat-drivers ${GREEN}${COMPAT_DRIVERS_BRANCH}${NORMAL} but are " + echo -en "on the ${RED}${TARGET_KERNEL_RELEASE}${NORMAL} branch... " + echo -e "try changing to that first." + + read -p "Do you still want to continue (y/N)? " + if [[ "${REPLY}" != "y" ]]; then + echo -e "Bailing out !" + exit + fi +fi + +cd $COMPAT_DRIVERS_DIR +CHANGELOG_FILE="ChangeLog-$(git describe| sed -e 's|compat-drivers-v||')" + + +if [[ $COMPAT_DRIVERS_BRANCH != "master" ]]; then + RELEASE=$(git describe --abbrev=0 | sed -e 's|\(v\)\([0-9]\)|\2|') +else + RELEASE=$(git describe --abbrev=0) +fi + +if [[ $POSTFIX_RELEASE_TAG != "-" ]]; then + RELEASE="${RELEASE}${POSTFIX_RELEASE_TAG}" +fi +RELEASE_TAR="$RELEASE.tar.bz2" + +rm -rf $STAGING +mkdir -p $STAGING +cp -a $COMPAT_DRIVERS_DIR $STAGING/$RELEASE +cd $STAGING/$RELEASE + +# Only use interactive paranoia for non-signed / uploaded to kernel.org releases +# If using kup note that we will from now on always be forcing a super clean +# release and will simply use git clean to help use remove all detected content +# that should not be on your local git tree as after a checkout. +PARANOIA="" +if [[ "$USE_KUP" != "1" ]]; then + PARANOIA="-i" +else + PARANOIA="-c" +fi + +if [[ "$FORCE_CLEAN" = "1" ]]; then + PARANOIA="$PARANOIA -c" +fi + +./scripts/git-paranoia $PARANOIA +if [[ $? -ne 0 ]]; then + if [[ "$USE_KUP" = "1" ]]; then + echo -e "Given that this is a targeted ${CYAN}kernel.org${NORMAL}" + echo -e "release we are bailing." + exit 1 + fi + echo + echo -e "Detected some tree content is not yet ${RED}GPG signed${NORMAL}..." + echo -e "Consider ${CYAN}baling out${NORMAL} and ${RED}carefully${NORMAL} reading the" + echo -e "implications of running ${GREEN}$0 -k${NORMAL} instead." + echo -e "If you make a release right now you may be included files" + echo -e "or code into the release you perhaps did not want to." + echo -e "" + read -p "Do you still want to continue (y/N)? " + if [[ "${REPLY}" != "y" ]]; then + echo -e "Bailing out !" + exit 1 + fi +fi + +./scripts/admin-update.sh $UPDATE_ARGS +rm -rf $STAGING/$RELEASE/.git + +# Remove any gunk +echo +echo "Cleaning up the release ..." +make clean 2>&1 > /dev/null +find ./ -type f -name *.orig | xargs rm -f +find ./ -type f -name *.rej | xargs rm -f + +cd $STAGING/ + +echo "Creating ${RELEASE}.tar ..." +tar -cf ${RELEASE}.tar $RELEASE/ +bzip2 -k -9 ${RELEASE}.tar + +# kup allows us to upload a compressed archive but wants us +# to sign the tarball alone, it will uncompress the +# compressed tarball, verify the tarball and then re-compress +# the tarball. +gpg --armor --detach-sign ${RELEASE}.tar + +echo +echo "compat-drivers release: $RELEASE" +echo "Size: $(du -h ${RELEASE_TAR})" +echo "sha1sum: $(sha1sum ${RELEASE_TAR})" +echo +echo "Release: ${STAGING}${RELEASE_TAR}" +echo "Release signature: ${STAGING}${RELEASE}.tar.asc" + +if [[ "$USE_KUP" != "1" ]]; then + exit 0 +fi + +# Where we dump backport releases onto kernel.org +KORG_BACKPORT="/pub/linux/kernel/projects/backports/" + +if [[ "$BASE_TREE" = "linux-next" ]]; then + YEAR=$(echo $TARGET_TAG | awk -F "-" '{print $2}' | cut -c 1-4) + MONTH=$(echo $TARGET_TAG | awk -F "-" '{print $2}' | cut -c 5-6) + DAY=$(echo $TARGET_TAG | awk -F "-" '{print $2}' | cut -c 7-8) + + + kup mkdir ${KORG_BACKPORT}/${YEAR} > /dev/null 2>&1 + kup mkdir ${KORG_BACKPORT}/${YEAR}/${MONTH} > /dev/null 2>&1 + kup mkdir ${KORG_BACKPORT}/${YEAR}/${MONTH}/${DAY} > /dev/null 2>&1 + + kup ls ${KORG_BACKPORT}/${YEAR}/${MONTH}/${DAY}/ | grep ${RELEASE}.tar.bz2 > /dev/null 2>&1 + if [[ $? -eq 0 ]]; then + echo -e "File ${KORG_BACKPORT}/${YEAR}/${MONTH}/${DAY}/${BLUE}${RELEASE}.tar.bz2${NORMAL} already exists" + fi + + kup put ${RELEASE}.tar.bz2 ${RELEASE}.tar.asc ${KORG_BACKPORT}/${YEAR}/${MONTH}/${DAY}/ +elif [[ "$BASE_TREE" = "linux-stable" ]]; then + TARGET_STABLE="${KORG_BACKPORT}/stable/${TARGET_TAG}" + + kup mkdir ${KORG_BACKPORT}/stable > /dev/null 2>&1 + kup mkdir ${TARGET_STABLE} > /dev/null 2>&1 + + kup ls ${TARGET_STABLE} | grep ${RELEASE}.tar.bz2 > /dev/null 2>&1 + if [[ $? -eq 0 ]]; then + echo -e "File ${TARGET_STABLE}/${RELEASE}.tar.bz2${NORMAL} already exists" + fi + + kup put ${RELEASE}.tar.bz2 ${RELEASE}.tar.asc ${TARGET_STABLE}/ + + cd $GIT_TREE + $STAGING/${RELEASE}/scripts/genlog-${GENLOG_TARGET} + + gpg --armor --detach-sign $CHANGELOG_FILE + kup put ${CHANGELOG_FILE} ${CHANGELOG_FILE}.asc ${TARGET_STABLE}/ +else + echo "Unsupported release type: $BASE_TREE" + exit 1 +fi diff --git a/scripts/genlog-3.7 b/scripts/genlog-3.7 new file mode 100755 index 00000000..80f8731f --- /dev/null +++ b/scripts/genlog-3.7 @@ -0,0 +1,116 @@ +#!/bin/bash + +COMPAT=$HOME/compat/.git +COMPAT_DRIVERS=$HOME/devel/compat-drivers/.git + +export GIT_DIR=${COMPAT_DRIVERS} + +OLD_VER=6 +let VER="7" +RC="-rc1" +LOG="ChangeLog-$(git describe| sed -e 's|compat-drivers-v||')" + +echo > $LOG + +echo -e "===============================================" >> $LOG +echo -e "ChangeLog for compat-drivers for linux-3.${VER}${RC}" >> $LOG +echo -e "===============================================" >> $LOG + +echo -e " +This is the ChangeLog for the Linux kernel project compat-drivers. +It provides a backport of a few Linux kernel subsystems down to +older kernels: + + * 802.11 + * Bluetooth + * Ethernet + * DRM + +For more details refer to the home pages: + +https://backports.wiki.kernel.org + +The compat-drivers project consists of code from three projects: + + * The Linux kernel: linux-stable.git + * Compat-wirelesS: compat-drivers.git + * Compat: compat.git + +The compat-drivers stable releases incorporates code from from +each of these git trees for the respective upstream Linux kernel +stable release. A branch called linux-3.x.y exists for each +stable release. Below we provide the ChangeLog of changes from +the previous branched release to the new branched release. + +Release: linux-3.${VER} + +" >> $LOG + +export GIT_DIR=${COMPAT} +echo -e "Updates from the compat.git project:" >> $LOG +echo -e "====================================\n" >> $LOG + +echo -e "git shortlog linux-3.${OLD_VER}.y..linux-3.${VER}.y\n" >> $LOG +git shortlog origin/linux-3.${OLD_VER}.y..HEAD >> $LOG + +export GIT_DIR=${COMPAT_DRIVERS} +echo -e "Updates from the compat-drivers.git project:" >> $LOG +echo -e "=============================================\n" >> $LOG +echo -e "git shortlog linux-3.${OLD_VER}.y..linux-3.${VER}.y\n" >> $LOG +git shortlog origin/linux-3.${OLD_VER}.y..HEAD >> $LOG + +echo -e "Updates from the Linux kernel:" >> $LOG +echo -e "=============================================\n" >> $LOG + +echo -e "We only include very specific changes for the supported" >> $LOG +echo -e "subsystems:\n" >> $LOG +echo -e " * 802.11" >> $LOG +echo -e " * Bluetooth" >> $LOG +echo -e " * Ethernet" >> $LOG +echo -e " * DRM " >> $LOG + +echo -e " +Generated by using: + +git log v3.${OLD_VER}${RC}..HEAD \ + net/wireless/ \ + net/mac80211/ \ + net/rfkill/ \ + drivers/net/wireless/ \ + net/bluetooth/ \ + drivers/bluetooth/ \ + drivers/gpu/drm/ \ + drivers/net/ethernet/atheros/atl1c/ \ + drivers/net/ethernet/atheros/atl1e/ \ + drivers/net/ethernet/atheros/atlx/ \ + include/uapi/linux/nl80211.h \ + include/linux/rfkill.h \ + include/uapi/rfkill.h \ + include/uapi/drm \ + include/net/cfg80211.h \ + include/net/regulatory.h \ + include/net/cfg80211.h >> $LOG + +git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git +" >> $LOG + +export GIT_DIR=${PWD}/.git/ +git log v3.${OLD_VER}..HEAD \ + net/wireless/ \ + net/mac80211/ \ + net/rfkill/ \ + drivers/net/wireless/ \ + net/bluetooth/ \ + drivers/bluetooth/ \ + drivers/gpu/drm/ \ + drivers/net/ethernet/atheros/atl1c/ \ + drivers/net/ethernet/atheros/atl1e/ \ + drivers/net/ethernet/atheros/atlx/ \ + include/uapi/linux/nl80211.h \ + include/linux/rfkill.h \ + include/uapi/linux/rfkill.h \ + include/uapi/drm \ + include/net/cfg80211.h \ + include/net/regulatory.h \ + include/net/cfg80211.h >> $LOG + diff --git a/scripts/genlog-3.8 b/scripts/genlog-3.8 new file mode 100755 index 00000000..72153cb2 --- /dev/null +++ b/scripts/genlog-3.8 @@ -0,0 +1,116 @@ +#!/bin/bash + +COMPAT=$HOME/compat/.git +COMPAT_WIRELESS=$HOME/devel/compat-drivers/.git + +OLD_VER=7 +let VER="8" +RC="-rc5" +export GIT_DIR=${COMPAT_WIRELESS} +CD_VER="$(git describe | sed -e 's|compat-drivers-v||g')" +LOG="ChangeLog-${CD_VER}" + +echo > $LOG + +echo -e "================================================================" >> $LOG +echo -e "ChangeLog for $(git describe) based on linux-3.${VER}${RC}" >> $LOG +echo -e "================================================================" >> $LOG + +echo -e " +This is the ChangeLog for the Linux kernel project compat-drivers. +It provides a backport of a few Linux kernel subsystems down to +older kernels: + + * 802.11 + * Bluetooth + * Ethernet + * DRM + +For more details refer to the home pages: + +https://backports.wiki.kernel.org + +The compat-drivers project consists of code from three projects: + + * The Linux kernel: linux-stable.git + * Compat-wirelesS: compat-drivers.git + * Compat: compat.git + +The compat-drivers stable releases incorporates code from from +each of these git trees for the respective upstream Linux kernel +stable release. A branch called linux-3.x.y exists for each +stable release. Below we provide the ChangeLog of changes from +the previous branched release to the new branched release. + +Release: linux-3.${VER} + +" >> $LOG + +export GIT_DIR=${COMPAT} +echo -e "Updates from the compat.git project:" >> $LOG +echo -e "====================================\n" >> $LOG + +echo -e "git shortlog linux-3.${OLD_VER}.y..linux-3.${VER}.y\n" >> $LOG +git shortlog origin/linux-3.${OLD_VER}.y..HEAD >> $LOG + +export GIT_DIR=${COMPAT_WIRELESS} +echo -e "Updates from the compat-drivers.git project:" >> $LOG +echo -e "=============================================\n" >> $LOG +echo -e "git shortlog linux-3.${OLD_VER}.y..linux-3.${VER}.y\n" >> $LOG +git shortlog origin/linux-3.${OLD_VER}.y..HEAD >> $LOG + +echo -e "Updates from the Linux kernel:" >> $LOG +echo -e "=============================================\n" >> $LOG + +echo -e "We only include very specific changes for the supported" >> $LOG +echo -e "subsystems:\n" >> $LOG +echo -e " * 802.11" >> $LOG +echo -e " * Bluetooth" >> $LOG +echo -e " * Ethernet" >> $LOG +echo -e " * DRM " >> $LOG + +echo -e " +Generated by using: + +git log v3.${OLD_VER}${RC}..HEAD \ + net/wireless/ \ + net/mac80211/ \ + net/rfkill/ \ + drivers/net/wireless/ \ + net/bluetooth/ \ + drivers/bluetooth/ \ + drivers/gpu/drm/ \ + drivers/net/ethernet/atheros/atl1c/ \ + drivers/net/ethernet/atheros/atl1e/ \ + drivers/net/ethernet/atheros/atlx/ \ + include/uapi/linux/nl80211.h \ + include/linux/rfkill.h \ + include/uapi/rfkill.h \ + include/uapi/drm \ + include/net/cfg80211.h \ + include/net/regulatory.h \ + include/net/cfg80211.h >> $LOG + +git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git +" >> $LOG + +export GIT_DIR=${PWD}/.git/ +git log v3.${OLD_VER}..HEAD \ + net/wireless/ \ + net/mac80211/ \ + net/rfkill/ \ + drivers/net/wireless/ \ + net/bluetooth/ \ + drivers/bluetooth/ \ + drivers/gpu/drm/ \ + drivers/net/ethernet/atheros/atl1c/ \ + drivers/net/ethernet/atheros/atl1e/ \ + drivers/net/ethernet/atheros/atlx/ \ + include/uapi/linux/nl80211.h \ + include/linux/rfkill.h \ + include/uapi/linux/rfkill.h \ + include/uapi/drm \ + include/net/cfg80211.h \ + include/net/regulatory.h \ + include/net/cfg80211.h >> $LOG + diff --git a/scripts/genlog-3.9 b/scripts/genlog-3.9 new file mode 100755 index 00000000..a9fdf075 --- /dev/null +++ b/scripts/genlog-3.9 @@ -0,0 +1,116 @@ +#!/bin/bash + +COMPAT=$HOME/compat/.git +COMPAT_WIRELESS=$HOME/devel/compat-drivers/.git + +OLD_VER=8 +let VER="9" +RC="-rc1" +export GIT_DIR=${COMPAT_WIRELESS} +CD_VER="$(git describe | sed -e 's|compat-drivers-v||g')" +LOG="ChangeLog-${CD_VER}" + +echo > $LOG + +echo -e "================================================================" >> $LOG +echo -e "ChangeLog for $(git describe) based on linux-3.${VER}${RC}" >> $LOG +echo -e "================================================================" >> $LOG + +echo -e " +This is the ChangeLog for the Linux kernel project compat-drivers. +It provides a backport of a few Linux kernel subsystems down to +older kernels: + + * 802.11 + * Bluetooth + * Ethernet + * DRM + +For more details refer to the home pages: + +https://backports.wiki.kernel.org + +The compat-drivers project consists of code from three projects: + + * The Linux kernel: linux-stable.git + * Compat-wirelesS: compat-drivers.git + * Compat: compat.git + +The compat-drivers stable releases incorporates code from from +each of these git trees for the respective upstream Linux kernel +stable release. A branch called linux-3.x.y exists for each +stable release. Below we provide the ChangeLog of changes from +the previous branched release to the new branched release. + +Release: linux-3.${VER} + +" >> $LOG + +export GIT_DIR=${COMPAT} +echo -e "Updates from the compat.git project:" >> $LOG +echo -e "====================================\n" >> $LOG + +echo -e "git shortlog linux-3.${OLD_VER}.y..linux-3.${VER}.y\n" >> $LOG +git shortlog origin/linux-3.${OLD_VER}.y..HEAD >> $LOG + +export GIT_DIR=${COMPAT_WIRELESS} +echo -e "Updates from the compat-drivers.git project:" >> $LOG +echo -e "=============================================\n" >> $LOG +echo -e "git shortlog linux-3.${OLD_VER}.y..linux-3.${VER}.y\n" >> $LOG +git shortlog origin/linux-3.${OLD_VER}.y..HEAD >> $LOG + +echo -e "Updates from the Linux kernel:" >> $LOG +echo -e "=============================================\n" >> $LOG + +echo -e "We only include very specific changes for the supported" >> $LOG +echo -e "subsystems:\n" >> $LOG +echo -e " * 802.11" >> $LOG +echo -e " * Bluetooth" >> $LOG +echo -e " * Ethernet" >> $LOG +echo -e " * DRM " >> $LOG + +echo -e " +Generated by using: + +git log v3.${OLD_VER}..HEAD \ + net/wireless/ \ + net/mac80211/ \ + net/rfkill/ \ + drivers/net/wireless/ \ + net/bluetooth/ \ + drivers/bluetooth/ \ + drivers/gpu/drm/ \ + drivers/net/ethernet/atheros/atl1c/ \ + drivers/net/ethernet/atheros/atl1e/ \ + drivers/net/ethernet/atheros/atlx/ \ + include/uapi/linux/nl80211.h \ + include/linux/rfkill.h \ + include/uapi/rfkill.h \ + include/uapi/drm \ + include/net/cfg80211.h \ + include/net/regulatory.h \ + include/net/cfg80211.h >> $LOG + +git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git +" >> $LOG + +export GIT_DIR=${PWD}/.git/ +git log v3.${OLD_VER}..HEAD \ + net/wireless/ \ + net/mac80211/ \ + net/rfkill/ \ + drivers/net/wireless/ \ + net/bluetooth/ \ + drivers/bluetooth/ \ + drivers/gpu/drm/ \ + drivers/net/ethernet/atheros/atl1c/ \ + drivers/net/ethernet/atheros/atl1e/ \ + drivers/net/ethernet/atheros/atlx/ \ + include/uapi/linux/nl80211.h \ + include/linux/rfkill.h \ + include/uapi/linux/rfkill.h \ + include/uapi/drm \ + include/net/cfg80211.h \ + include/net/regulatory.h \ + include/net/cfg80211.h >> $LOG + diff --git a/scripts/git-paranoia b/scripts/git-paranoia new file mode 100755 index 00000000..cfc18e6a --- /dev/null +++ b/scripts/git-paranoia @@ -0,0 +1,129 @@ +#!/bin/bash +# +# git-paranoia: for those parnaoid about what goes into releases based on git. +# +# Copyright 2012 Luis R. Rodriguez <mcgrof@do-not-panic.com> +# +# 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 the Free +# Software Foundation; either version 2 of the License, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 +# Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Pretty colors +GREEN="\033[01;32m" +YELLOW="\033[01;33m" +NORMAL="\033[00m" +BLUE="\033[34m" +RED="\033[31m" +PURPLE="\033[35m" +CYAN="\033[36m" +UNDERLINE="\033[02m" + +INTERACTIVE="0" +RUN_CLEAN="0" + +function usage() +{ + echo -e "Usage: ${GREEN}$1${NORMAL} ${BLUE}[ -i ]${NORMAL}" + echo -e "-i\tInteractive, allows user to override paranoia" + echo -e "-c\tRuns git clean -x -d for you. Not for the faint of heart" + echo + echo -e "Example usage:" + echo + echo -e "export GIT_DIRS=\"${HOME}/linux-stable/ ${HOME}/linux-next\"" + echo -e "$1" + echo + exit +} + +function __git_paranoia() +{ + for i in $GIT_DIRS; do + if [[ ! -d $i ]]; then + echo -e "${BLUE}$i${NORMAL} does not exist" + return 1 + fi + + cd $i; + + if [[ "$RUN_CLEAN" = "1" ]]; then + git clean -x -d -f + fi + + printf "Verifying ${BLUE}%15s\t${CYAN}%40s\t" $(basename $i) $(git describe) + git tag -v $(git describe --dirty) > /dev/null 2>&1 + if [[ $? -ne 0 || $(git status -s | wc -l) -ne 0 ]]; then + echo -e "[${RED}FAILED${NORMAL}]" + # We're paranoid, not only do we want the git tag to be GPG signed + # but we also want *no* unepxected content on the releases! If you have + # any files that do not belong into the git tree, nuke them, we won't do it + # for you! + if [[ $(git status -s | wc -l) -ne 0 || $(git clean -x -d -n | wc -l) -ne 0 ]]; then + echo -e "Detected some content which likely should not be released." + echo -e "In order to fix either run 'git clean -x -d -f' yourself or" + echo -e "run '$0 -c'" + echo -e "" + echo -e "Not commited content: (run: git clean -x -d -f to fix)" + git status -s + git clean -x -d -n | sed 's|^Would|Should|g' + fi + return 1 + else + echo -e "[${GREEN}OK!${NORMAL}]" + fi + done +} + +if [[ -z $GIT_DIRS ]]; then + GIT_DIRS="${PWD}" + STAT="$(git status > /dev/null 2>&1 && echo $?)" + if [[ $STAT -ne 0 ]]; then + echo -e "${RED}Error${NORMAL}:" + echo -e "${PWD} not a git tree. Jump into one or set the " + echo -e "${CYAN}GIT_DIRS${NORMAL} environment variable with your list of git trees" + echo + usage $0 + exit 1 + fi +fi + +while [ $# -ne 0 ]; do + if [[ "$1" = "-i" ]]; then + INTERACTIVE="1" + shift; continue; + fi + if [[ "$1" = "-c" ]]; then + RUN_CLEAN="1" + shift; continue; + fi + echo -e "Unexpected argument passed: ${RED}${1}${NORMAL}" + usage $0 + exit +done + +__git_paranoia + +if [[ $? -ne 0 ]]; then + echo + echo -e "Detected some tree content is not yet ${RED}GPG signed${NORMAL}..." + if [[ "$INTERACTIVE" = "0" ]]; then + exit 1 + fi + + read -p "Do you still want to continue (y/N)? " + if [[ "${REPLY}" != "y" ]]; then + echo -e "Bailing out !" + exit 1 + fi +fi + +exit 0 diff --git a/scripts/iwl-enable b/scripts/iwl-enable new file mode 100755 index 00000000..c29b71ee --- /dev/null +++ b/scripts/iwl-enable @@ -0,0 +1,56 @@ +#!/bin/bash +# +# Copyright 2007 Luis R. Rodriguez <lrodriguez@atheros.com> +# +# Makes sure either iwlagn (new) or iwl4965 (old) +# is enabled to be used. This allows us to choose any driver without +# blacklisting each other. + +. /usr/lib/compat-drivers/modlib.sh + +if [[ $UID -ne 0 ]]; then + echo "Run with root privileges" + exit +fi + +IWL_NEW="iwlagn" +IWL_OLD="iwl4965" + +# Appended to module file at the end when we want to ignore one +USAGE="Usage: $0 [ $IWL_NEW | $IWL_OLD | iwlwifi ]" + +function enable_iwlwifi { + for i in $IWL_OLD $IWL_NEW; do + module_disable $i + done + module_enable iwlwifi +} + +function enable_iwlagn { + module_disable $IWL_OLD + for i in $IWL_NEW; do + module_enable $i + done +} + +# Default behavior: disables the old iwl4965 driver and enables iwlagn +if [ $# -eq 0 ]; then + enable_iwlagn + exit +elif [ $# -ne 1 ]; then + echo "$USAGE" + exit +fi + +MODULE=$1 +if [ "$MODULE" == "iwl4965" ]; then + module_disable $IWL_NEW + module_enable $IWL_OLD +elif [ "$MODULE" == "iwlagn" ]; then + enable_iwlagn +elif [ "$MODULE" == "iwlwifi" ]; then + enable_iwlwifi +else + echo "$USAGE" + exit +fi diff --git a/scripts/iwl-load b/scripts/iwl-load new file mode 100755 index 00000000..a758902a --- /dev/null +++ b/scripts/iwl-load @@ -0,0 +1,58 @@ +#!/bin/bash +# Copyright 2008 Luis R. Rodriguez <lrodriguez@atheros.com> +# +# Loads new Intel iwl (iwlagn) or the old ones (iwl4965) + +. /usr/lib/compat-drivers/modlib.sh + +IWL_OLD="iwl4965" +IWL_NEW="iwlagn" + +if [[ $UID -ne 0 ]]; then + echo "Run with root privileges" + exit +fi + + +USAGE="Usage: $0 [ iwlagn | iwl4965 ]" + +# Default behavior: unload iwl4965 and load iwlagn +if [ $# -eq 0 ]; then + 1=iwlagn +elif [ $# -ne 1 ]; then + echo "$USAGE" + exit +fi + +MODULE=$1 +if [ "$MODULE" == "iwlagn" ]; then + grep iwl4965 /proc/modules 2>&1 > /dev/null + if [ $? -eq 0 ]; then + echo Unloading $i... + modprobe -r --ignore-remove iwl4965 + fi + # Enables both b43 and b43legacy + iwl-enable iwlagn + modprobe iwlagn + CHECK=`modprobe -l iwlagn` + if [ ! -z $CHECK ]; then + echo "iwlagn loaded successfully" + fi +elif [ "$MODULE" == "iwl4965" ]; then + CHECK=`modprobe -l iwlagn` + if [ ! -z $CHECK ]; then + echo "iwlagn currently loaded, going to try to unload the module..." + modprobe -r --ignore-remove iwlagn + fi + iwl-enable iwl4965 + # iwl4965 may be loaded already lets remove it first + modprobe -r --ignore-remov iwl4965 2>&1 > /dev/null + modprobe iwl4965 + CHECK=`modprobe -l iwl4965` + if [ ! -z $CHECK ]; then + echo "iwl4965 loaded successfully!" + fi +else + echo "$USAGE" + exit +fi diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile new file mode 100644 index 00000000..98dacf96 --- /dev/null +++ b/scripts/kconfig/Makefile @@ -0,0 +1,18 @@ +export COMPAT_BASE=$(shell cat $(PWD)/.compat_base) +export COMPAT_BASE_TREE=$(shell cat $(PWD)/.compat_base_tree) +export COMPAT_BASE_TREE_VERSION=$(shell cat $(PWD)/.compat_base_tree_version) +export COMPAT_PROJECT=compat-drivers +export COMPAT_VERSION=$(shell cat $(PWD)/.compat_version) + +menuconfig: + gcc -Wp,-MD,scripts/kconfig/.conf.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/conf.o scripts/kconfig/conf.c + gcc -Wp,-MD,scripts/kconfig/lxdialog/.checklist.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/checklist.o scripts/kconfig/lxdialog/checklist.c + gcc -Wp,-MD,scripts/kconfig/lxdialog/.inputbox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/inputbox.o scripts/kconfig/lxdialog/inputbox.c + gcc -Wp,-MD,scripts/kconfig/lxdialog/.menubox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/menubox.o scripts/kconfig/lxdialog/menubox.c + gcc -Wp,-MD,scripts/kconfig/lxdialog/.textbox.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/textbox.o scripts/kconfig/lxdialog/textbox.c + gcc -Wp,-MD,scripts/kconfig/lxdialog/.util.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/util.o scripts/kconfig/lxdialog/util.c + gcc -Wp,-MD,scripts/kconfig/lxdialog/.yesno.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/lxdialog/yesno.o scripts/kconfig/lxdialog/yesno.c + gcc -Wp,-MD,scripts/kconfig/.mconf.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -c -o scripts/kconfig/mconf.o scripts/kconfig/mconf.c + gcc -Wp,-MD,scripts/kconfig/.zconf.tab.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -DCURSES_LOC="<ncurses.h>" -DLOCALE -Iscripts/kconfig -c -o scripts/kconfig/zconf.tab.o scripts/kconfig/zconf.tab.c + gcc -o scripts/kconfig/mconf scripts/kconfig/mconf.o scripts/kconfig/zconf.tab.o scripts/kconfig/lxdialog/checklist.o scripts/kconfig/lxdialog/util.o scripts/kconfig/lxdialog/inputbox.o scripts/kconfig/lxdialog/textbox.o scripts/kconfig/lxdialog/yesno.o scripts/kconfig/lxdialog/menubox.o -lncurses + ./scripts/kconfig/mconf Kconfig diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c new file mode 100644 index 00000000..e39fcd81 --- /dev/null +++ b/scripts/kconfig/conf.c @@ -0,0 +1,706 @@ +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#include <locale.h> +#include <ctype.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> +#include <getopt.h> +#include <sys/stat.h> +#include <sys/time.h> + +#include "lkc.h" + +static void conf(struct menu *menu); +static void check_conf(struct menu *menu); +static void xfgets(char *str, int size, FILE *in); + +enum input_mode { + oldaskconfig, + silentoldconfig, + oldconfig, + allnoconfig, + allyesconfig, + allmodconfig, + alldefconfig, + randconfig, + defconfig, + savedefconfig, + listnewconfig, + olddefconfig, +} input_mode = oldaskconfig; + +static int indent = 1; +static int tty_stdio; +static int valid_stdin = 1; +static int sync_kconfig; +static int conf_cnt; +static char line[128]; +static struct menu *rootEntry; + +static void print_help(struct menu *menu) +{ + struct gstr help = str_new(); + + menu_get_ext_help(menu, &help); + + printf("\n%s\n", str_get(&help)); + str_free(&help); +} + +static void strip(char *str) +{ + char *p = str; + int l; + + while ((isspace(*p))) + p++; + l = strlen(p); + if (p != str) + memmove(str, p, l + 1); + if (!l) + return; + p = str + l - 1; + while ((isspace(*p))) + *p-- = 0; +} + +static void check_stdin(void) +{ + if (!valid_stdin) { + printf(_("aborted!\n\n")); + printf(_("Console input/output is redirected. ")); + printf(_("Run 'make oldconfig' to update configuration.\n\n")); + exit(1); + } +} + +static int conf_askvalue(struct symbol *sym, const char *def) +{ + enum symbol_type type = sym_get_type(sym); + + if (!sym_has_value(sym)) + printf(_("(NEW) ")); + + line[0] = '\n'; + line[1] = 0; + + if (!sym_is_changable(sym)) { + printf("%s\n", def); + line[0] = '\n'; + line[1] = 0; + return 0; + } + + switch (input_mode) { + case oldconfig: + case silentoldconfig: + if (sym_has_value(sym)) { + printf("%s\n", def); + return 0; + } + check_stdin(); + /* fall through */ + case oldaskconfig: + fflush(stdout); + xfgets(line, 128, stdin); + if (!tty_stdio) + printf("\n"); + return 1; + default: + break; + } + + switch (type) { + case S_INT: + case S_HEX: + case S_STRING: + printf("%s\n", def); + return 1; + default: + ; + } + printf("%s", line); + return 1; +} + +static int conf_string(struct menu *menu) +{ + struct symbol *sym = menu->sym; + const char *def; + + while (1) { + printf("%*s%s ", indent - 1, "", _(menu->prompt->text)); + printf("(%s) ", sym->name); + def = sym_get_string_value(sym); + if (sym_get_string_value(sym)) + printf("[%s] ", def); + if (!conf_askvalue(sym, def)) + return 0; + switch (line[0]) { + case '\n': + break; + case '?': + /* print help */ + if (line[1] == '\n') { + print_help(menu); + def = NULL; + break; + } + /* fall through */ + default: + line[strlen(line)-1] = 0; + def = line; + } + if (def && sym_set_string_value(sym, def)) + return 0; + } +} + +static int conf_sym(struct menu *menu) +{ + struct symbol *sym = menu->sym; + tristate oldval, newval; + + while (1) { + printf("%*s%s ", indent - 1, "", _(menu->prompt->text)); + if (sym->name) + printf("(%s) ", sym->name); + putchar('['); + oldval = sym_get_tristate_value(sym); + switch (oldval) { + case no: + putchar('N'); + break; + case mod: + putchar('M'); + break; + case yes: + putchar('Y'); + break; + } + if (oldval != no && sym_tristate_within_range(sym, no)) + printf("/n"); + if (oldval != mod && sym_tristate_within_range(sym, mod)) + printf("/m"); + if (oldval != yes && sym_tristate_within_range(sym, yes)) + printf("/y"); + if (menu_has_help(menu)) + printf("/?"); + printf("] "); + if (!conf_askvalue(sym, sym_get_string_value(sym))) + return 0; + strip(line); + + switch (line[0]) { + case 'n': + case 'N': + newval = no; + if (!line[1] || !strcmp(&line[1], "o")) + break; + continue; + case 'm': + case 'M': + newval = mod; + if (!line[1]) + break; + continue; + case 'y': + case 'Y': + newval = yes; + if (!line[1] || !strcmp(&line[1], "es")) + break; + continue; + case 0: + newval = oldval; + break; + case '?': + goto help; + default: + continue; + } + if (sym_set_tristate_value(sym, newval)) + return 0; +help: + print_help(menu); + } +} + +static int conf_choice(struct menu *menu) +{ + struct symbol *sym, *def_sym; + struct menu *child; + bool is_new; + + sym = menu->sym; + is_new = !sym_has_value(sym); + if (sym_is_changable(sym)) { + conf_sym(menu); + sym_calc_value(sym); + switch (sym_get_tristate_value(sym)) { + case no: + return 1; + case mod: + return 0; + case yes: + break; + } + } else { + switch (sym_get_tristate_value(sym)) { + case no: + return 1; + case mod: + printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu))); + return 0; + case yes: + break; + } + } + + while (1) { + int cnt, def; + + printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu))); + def_sym = sym_get_choice_value(sym); + cnt = def = 0; + line[0] = 0; + for (child = menu->list; child; child = child->next) { + if (!menu_is_visible(child)) + continue; + if (!child->sym) { + printf("%*c %s\n", indent, '*', _(menu_get_prompt(child))); + continue; + } + cnt++; + if (child->sym == def_sym) { + def = cnt; + printf("%*c", indent, '>'); + } else + printf("%*c", indent, ' '); + printf(" %d. %s", cnt, _(menu_get_prompt(child))); + if (child->sym->name) + printf(" (%s)", child->sym->name); + if (!sym_has_value(child->sym)) + printf(_(" (NEW)")); + printf("\n"); + } + printf(_("%*schoice"), indent - 1, ""); + if (cnt == 1) { + printf("[1]: 1\n"); + goto conf_childs; + } + printf("[1-%d", cnt); + if (menu_has_help(menu)) + printf("?"); + printf("]: "); + switch (input_mode) { + case oldconfig: + case silentoldconfig: + if (!is_new) { + cnt = def; + printf("%d\n", cnt); + break; + } + check_stdin(); + /* fall through */ + case oldaskconfig: + fflush(stdout); + xfgets(line, 128, stdin); + strip(line); + if (line[0] == '?') { + print_help(menu); + continue; + } + if (!line[0]) + cnt = def; + else if (isdigit(line[0])) + cnt = atoi(line); + else + continue; + break; + default: + break; + } + + conf_childs: + for (child = menu->list; child; child = child->next) { + if (!child->sym || !menu_is_visible(child)) + continue; + if (!--cnt) + break; + } + if (!child) + continue; + if (line[0] && line[strlen(line) - 1] == '?') { + print_help(child); + continue; + } + sym_set_choice_value(sym, child->sym); + for (child = child->list; child; child = child->next) { + indent += 2; + conf(child); + indent -= 2; + } + return 1; + } +} + +static void conf(struct menu *menu) +{ + struct symbol *sym; + struct property *prop; + struct menu *child; + + if (!menu_is_visible(menu)) + return; + + sym = menu->sym; + prop = menu->prompt; + if (prop) { + const char *prompt; + + switch (prop->type) { + case P_MENU: + if ((input_mode == silentoldconfig || + input_mode == listnewconfig || + input_mode == olddefconfig) && + rootEntry != menu) { + check_conf(menu); + return; + } + /* fall through */ + case P_COMMENT: + prompt = menu_get_prompt(menu); + if (prompt) + printf("%*c\n%*c %s\n%*c\n", + indent, '*', + indent, '*', _(prompt), + indent, '*'); + default: + ; + } + } + + if (!sym) + goto conf_childs; + + if (sym_is_choice(sym)) { + conf_choice(menu); + if (sym->curr.tri != mod) + return; + goto conf_childs; + } + + switch (sym->type) { + case S_INT: + case S_HEX: + case S_STRING: + conf_string(menu); + break; + default: + conf_sym(menu); + break; + } + +conf_childs: + if (sym) + indent += 2; + for (child = menu->list; child; child = child->next) + conf(child); + if (sym) + indent -= 2; +} + +static void check_conf(struct menu *menu) +{ + struct symbol *sym; + struct menu *child; + + if (!menu_is_visible(menu)) + return; + + sym = menu->sym; + if (sym && !sym_has_value(sym)) { + if (sym_is_changable(sym) || + (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { + if (input_mode == listnewconfig) { + if (sym->name && !sym_is_choice_value(sym)) { + printf("%s%s\n", CONFIG_, sym->name); + } + } else if (input_mode != olddefconfig) { + if (!conf_cnt++) + printf(_("*\n* Restart config...\n*\n")); + rootEntry = menu_get_parent_menu(menu); + conf(rootEntry); + } + } + } + + for (child = menu->list; child; child = child->next) + check_conf(child); +} + +static struct option long_opts[] = { + {"oldaskconfig", no_argument, NULL, oldaskconfig}, + {"oldconfig", no_argument, NULL, oldconfig}, + {"silentoldconfig", no_argument, NULL, silentoldconfig}, + {"defconfig", optional_argument, NULL, defconfig}, + {"savedefconfig", required_argument, NULL, savedefconfig}, + {"allnoconfig", no_argument, NULL, allnoconfig}, + {"allyesconfig", no_argument, NULL, allyesconfig}, + {"allmodconfig", no_argument, NULL, allmodconfig}, + {"alldefconfig", no_argument, NULL, alldefconfig}, + {"randconfig", no_argument, NULL, randconfig}, + {"listnewconfig", no_argument, NULL, listnewconfig}, + {"olddefconfig", no_argument, NULL, olddefconfig}, + /* + * oldnoconfig is an alias of olddefconfig, because people already + * are dependent on its behavior(sets new symbols to their default + * value but not 'n') with the counter-intuitive name. + */ + {"oldnoconfig", no_argument, NULL, olddefconfig}, + {NULL, 0, NULL, 0} +}; + +static void conf_usage(const char *progname) +{ + + printf("Usage: %s [option] <kconfig-file>\n", progname); + printf("[option] is _one_ of the following:\n"); + printf(" --listnewconfig List new options\n"); + printf(" --oldaskconfig Start a new configuration using a line-oriented program\n"); + printf(" --oldconfig Update a configuration using a provided .config as base\n"); + printf(" --silentoldconfig Same as oldconfig, but quietly, additionally update deps\n"); + printf(" --olddefconfig Same as silentoldconfig but sets new symbols to their default value\n"); + printf(" --oldnoconfig An alias of olddefconfig\n"); + printf(" --defconfig <file> New config with default defined in <file>\n"); + printf(" --savedefconfig <file> Save the minimal current configuration to <file>\n"); + printf(" --allnoconfig New config where all options are answered with no\n"); + printf(" --allyesconfig New config where all options are answered with yes\n"); + printf(" --allmodconfig New config where all options are answered with mod\n"); + printf(" --alldefconfig New config with all symbols set to default\n"); + printf(" --randconfig New config with random answer to all options\n"); +} + +int main(int ac, char **av) +{ + const char *progname = av[0]; + int opt; + const char *name, *defconfig_file = NULL /* gcc uninit */; + struct stat tmpstat; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + + tty_stdio = isatty(0) && isatty(1) && isatty(2); + + while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) { + input_mode = (enum input_mode)opt; + switch (opt) { + case silentoldconfig: + sync_kconfig = 1; + break; + case defconfig: + case savedefconfig: + defconfig_file = optarg; + break; + case randconfig: + { + struct timeval now; + unsigned int seed; + + /* + * Use microseconds derived seed, + * compensate for systems where it may be zero + */ + gettimeofday(&now, NULL); + + seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1)); + srand(seed); + break; + } + case oldaskconfig: + case oldconfig: + case allnoconfig: + case allyesconfig: + case allmodconfig: + case alldefconfig: + case listnewconfig: + case olddefconfig: + break; + case '?': + conf_usage(progname); + exit(1); + break; + } + } + if (ac == optind) { + printf(_("%s: Kconfig file missing\n"), av[0]); + conf_usage(progname); + exit(1); + } + name = av[optind]; + conf_parse(name); + //zconfdump(stdout); + if (sync_kconfig) { + name = conf_get_configname(); + if (stat(name, &tmpstat)) { + fprintf(stderr, _("***\n" + "*** Configuration file \"%s\" not found!\n" + "***\n" + "*** Please run some configurator (e.g. \"make oldconfig\" or\n" + "*** \"make menuconfig\" or \"make xconfig\").\n" + "***\n"), name); + exit(1); + } + } + + switch (input_mode) { + case defconfig: + if (!defconfig_file) + defconfig_file = conf_get_default_confname(); + if (conf_read(defconfig_file)) { + printf(_("***\n" + "*** Can't find default configuration \"%s\"!\n" + "***\n"), defconfig_file); + exit(1); + } + break; + case savedefconfig: + case silentoldconfig: + case oldaskconfig: + case oldconfig: + case listnewconfig: + case olddefconfig: + conf_read(NULL); + break; + case allnoconfig: + case allyesconfig: + case allmodconfig: + case alldefconfig: + case randconfig: + name = getenv("KCONFIG_ALLCONFIG"); + if (!name) + break; + if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) { + if (conf_read_simple(name, S_DEF_USER)) { + fprintf(stderr, + _("*** Can't read seed configuration \"%s\"!\n"), + name); + exit(1); + } + break; + } + switch (input_mode) { + case allnoconfig: name = "allno.config"; break; + case allyesconfig: name = "allyes.config"; break; + case allmodconfig: name = "allmod.config"; break; + case alldefconfig: name = "alldef.config"; break; + case randconfig: name = "allrandom.config"; break; + default: break; + } + if (conf_read_simple(name, S_DEF_USER) && + conf_read_simple("all.config", S_DEF_USER)) { + fprintf(stderr, + _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"), + name); + exit(1); + } + break; + default: + break; + } + + if (sync_kconfig) { + if (conf_get_changed()) { + name = getenv("KCONFIG_NOSILENTUPDATE"); + if (name && *name) { + fprintf(stderr, + _("\n*** The configuration requires explicit update.\n\n")); + return 1; + } + } + valid_stdin = tty_stdio; + } + + switch (input_mode) { + case allnoconfig: + conf_set_all_new_symbols(def_no); + break; + case allyesconfig: + conf_set_all_new_symbols(def_yes); + break; + case allmodconfig: + conf_set_all_new_symbols(def_mod); + break; + case alldefconfig: + conf_set_all_new_symbols(def_default); + break; + case randconfig: + conf_set_all_new_symbols(def_random); + break; + case defconfig: + conf_set_all_new_symbols(def_default); + break; + case savedefconfig: + break; + case oldaskconfig: + rootEntry = &rootmenu; + conf(&rootmenu); + input_mode = silentoldconfig; + /* fall through */ + case oldconfig: + case listnewconfig: + case olddefconfig: + case silentoldconfig: + /* Update until a loop caused no more changes */ + do { + conf_cnt = 0; + check_conf(&rootmenu); + } while (conf_cnt && + (input_mode != listnewconfig && + input_mode != olddefconfig)); + break; + } + + if (sync_kconfig) { + /* silentoldconfig is used during the build so we shall update autoconf. + * All other commands are only used to generate a config. + */ + if (conf_get_changed() && conf_write(NULL)) { + fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); + exit(1); + } + if (conf_write_autoconf()) { + fprintf(stderr, _("\n*** Error during update of the configuration.\n\n")); + return 1; + } + } else if (input_mode == savedefconfig) { + if (conf_write_defconfig(defconfig_file)) { + fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), + defconfig_file); + return 1; + } + } else if (input_mode != listnewconfig) { + if (conf_write(NULL)) { + fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); + exit(1); + } + } + return 0; +} + +/* + * Helper function to facilitate fgets() by Jean Sacren. + */ +void xfgets(char *str, int size, FILE *in) +{ + if (fgets(str, size, in) == NULL) + fprintf(stderr, "\nError in reading or end of file.\n"); +} diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c new file mode 100644 index 00000000..13ddf112 --- /dev/null +++ b/scripts/kconfig/confdata.c @@ -0,0 +1,1164 @@ +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#include <sys/stat.h> +#include <ctype.h> +#include <errno.h> +#include <fcntl.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> + +#include "lkc.h" + +static void conf_warning(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); + +static void conf_message(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); + +static const char *conf_filename; +static int conf_lineno, conf_warnings, conf_unsaved; + +const char conf_defname[] = "arch/$ARCH/defconfig"; + +static void conf_warning(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, "%s:%d:warning: ", conf_filename, conf_lineno); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); + conf_warnings++; +} + +static void conf_default_message_callback(const char *fmt, va_list ap) +{ + printf("#\n# "); + vprintf(fmt, ap); + printf("\n#\n"); +} + +static void (*conf_message_callback) (const char *fmt, va_list ap) = + conf_default_message_callback; +void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap)) +{ + conf_message_callback = fn; +} + +static void conf_message(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + if (conf_message_callback) + conf_message_callback(fmt, ap); +} + +const char *conf_get_configname(void) +{ + char *name = getenv("KCONFIG_CONFIG"); + + return name ? name : ".config"; +} + +const char *conf_get_autoconfig_name(void) +{ + char *name = getenv("KCONFIG_AUTOCONFIG"); + + return name ? name : "include/config/auto.conf"; +} + +static char *conf_expand_value(const char *in) +{ + struct symbol *sym; + const char *src; + static char res_value[SYMBOL_MAXLENGTH]; + char *dst, name[SYMBOL_MAXLENGTH]; + + res_value[0] = 0; + dst = name; + while ((src = strchr(in, '$'))) { + strncat(res_value, in, src - in); + src++; + dst = name; + while (isalnum(*src) || *src == '_') + *dst++ = *src++; + *dst = 0; + sym = sym_lookup(name, 0); + sym_calc_value(sym); + strcat(res_value, sym_get_string_value(sym)); + in = src; + } + strcat(res_value, in); + + return res_value; +} + +char *conf_get_default_confname(void) +{ + struct stat buf; + static char fullname[PATH_MAX+1]; + char *env, *name; + + name = conf_expand_value(conf_defname); + env = getenv(SRCTREE); + if (env) { + sprintf(fullname, "%s/%s", env, name); + if (!stat(fullname, &buf)) + return fullname; + } + return name; +} + +static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) +{ + char *p2; + + switch (sym->type) { + case S_TRISTATE: + if (p[0] == 'm') { + sym->def[def].tri = mod; + sym->flags |= def_flags; + break; + } + /* fall through */ + case S_BOOLEAN: + if (p[0] == 'y') { + sym->def[def].tri = yes; + sym->flags |= def_flags; + break; + } + if (p[0] == 'n') { + sym->def[def].tri = no; + sym->flags |= def_flags; + break; + } + conf_warning("symbol value '%s' invalid for %s", p, sym->name); + return 1; + case S_OTHER: + if (*p != '"') { + for (p2 = p; *p2 && !isspace(*p2); p2++) + ; + sym->type = S_STRING; + goto done; + } + /* fall through */ + case S_STRING: + if (*p++ != '"') + break; + for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) { + if (*p2 == '"') { + *p2 = 0; + break; + } + memmove(p2, p2 + 1, strlen(p2)); + } + if (!p2) { + conf_warning("invalid string found"); + return 1; + } + /* fall through */ + case S_INT: + case S_HEX: + done: + if (sym_string_valid(sym, p)) { + sym->def[def].val = strdup(p); + sym->flags |= def_flags; + } else { + conf_warning("symbol value '%s' invalid for %s", p, sym->name); + return 1; + } + break; + default: + ; + } + return 0; +} + +#define LINE_GROWTH 16 +static int add_byte(int c, char **lineptr, size_t slen, size_t *n) +{ + char *nline; + size_t new_size = slen + 1; + if (new_size > *n) { + new_size += LINE_GROWTH - 1; + new_size *= 2; + nline = realloc(*lineptr, new_size); + if (!nline) + return -1; + + *lineptr = nline; + *n = new_size; + } + + (*lineptr)[slen] = c; + + return 0; +} + +static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream) +{ + char *line = *lineptr; + size_t slen = 0; + + for (;;) { + int c = getc(stream); + + switch (c) { + case '\n': + if (add_byte(c, &line, slen, n) < 0) + goto e_out; + slen++; + /* fall through */ + case EOF: + if (add_byte('\0', &line, slen, n) < 0) + goto e_out; + *lineptr = line; + if (slen == 0) + return -1; + return slen; + default: + if (add_byte(c, &line, slen, n) < 0) + goto e_out; + slen++; + } + } + +e_out: + line[slen-1] = '\0'; + *lineptr = line; + return -1; +} + +int conf_read_simple(const char *name, int def) +{ + FILE *in = NULL; + char *line = NULL; + size_t line_asize = 0; + char *p, *p2; + struct symbol *sym; + int i, def_flags; + + if (name) { + in = zconf_fopen(name); + } else { + struct property *prop; + + name = conf_get_configname(); + in = zconf_fopen(name); + if (in) + goto load; + sym_add_change_count(1); + if (!sym_defconfig_list) { + if (modules_sym) + sym_calc_value(modules_sym); + return 1; + } + + for_all_defaults(sym_defconfig_list, prop) { + if (expr_calc_value(prop->visible.expr) == no || + prop->expr->type != E_SYMBOL) + continue; + name = conf_expand_value(prop->expr->left.sym->name); + in = zconf_fopen(name); + if (in) { + conf_message(_("using defaults found in %s"), + name); + goto load; + } + } + } + if (!in) + return 1; + +load: + conf_filename = name; + conf_lineno = 0; + conf_warnings = 0; + conf_unsaved = 0; + + def_flags = SYMBOL_DEF << def; + for_all_symbols(i, sym) { + sym->flags |= SYMBOL_CHANGED; + sym->flags &= ~(def_flags|SYMBOL_VALID); + if (sym_is_choice(sym)) + sym->flags |= def_flags; + switch (sym->type) { + case S_INT: + case S_HEX: + case S_STRING: + if (sym->def[def].val) + free(sym->def[def].val); + /* fall through */ + default: + sym->def[def].val = NULL; + sym->def[def].tri = no; + } + } + + while (compat_getline(&line, &line_asize, in) != -1) { + conf_lineno++; + sym = NULL; + if (line[0] == '#') { + if (memcmp(line + 2, CONFIG_, strlen(CONFIG_))) + continue; + p = strchr(line + 2 + strlen(CONFIG_), ' '); + if (!p) + continue; + *p++ = 0; + if (strncmp(p, "is not set", 10)) + continue; + if (def == S_DEF_USER) { + sym = sym_find(line + 2 + strlen(CONFIG_)); + if (!sym) { + sym_add_change_count(1); + goto setsym; + } + } else { + sym = sym_lookup(line + 2 + strlen(CONFIG_), 0); + if (sym->type == S_UNKNOWN) + sym->type = S_BOOLEAN; + } + if (sym->flags & def_flags) { + conf_warning("override: reassigning to symbol %s", sym->name); + } + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + sym->def[def].tri = no; + sym->flags |= def_flags; + break; + default: + ; + } + } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) { + p = strchr(line + strlen(CONFIG_), '='); + if (!p) + continue; + *p++ = 0; + p2 = strchr(p, '\n'); + if (p2) { + *p2-- = 0; + if (*p2 == '\r') + *p2 = 0; + } + if (def == S_DEF_USER) { + sym = sym_find(line + strlen(CONFIG_)); + if (!sym) { + sym_add_change_count(1); + goto setsym; + } + } else { + sym = sym_lookup(line + strlen(CONFIG_), 0); + if (sym->type == S_UNKNOWN) + sym->type = S_OTHER; + } + if (sym->flags & def_flags) { + conf_warning("override: reassigning to symbol %s", sym->name); + } + if (conf_set_sym_val(sym, def, def_flags, p)) + continue; + } else { + if (line[0] != '\r' && line[0] != '\n') + conf_warning("unexpected data"); + continue; + } +setsym: + if (sym && sym_is_choice_value(sym)) { + struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); + switch (sym->def[def].tri) { + case no: + break; + case mod: + if (cs->def[def].tri == yes) { + conf_warning("%s creates inconsistent choice state", sym->name); + cs->flags &= ~def_flags; + } + break; + case yes: + if (cs->def[def].tri != no) + conf_warning("override: %s changes choice state", sym->name); + cs->def[def].val = sym; + break; + } + cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri); + } + } + free(line); + fclose(in); + + if (modules_sym) + sym_calc_value(modules_sym); + return 0; +} + +int conf_read(const char *name) +{ + struct symbol *sym; + int i; + + sym_set_change_count(0); + + if (conf_read_simple(name, S_DEF_USER)) + return 1; + + for_all_symbols(i, sym) { + sym_calc_value(sym); + if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO)) + continue; + if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) { + /* check that calculated value agrees with saved value */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym)) + break; + if (!sym_is_choice(sym)) + continue; + /* fall through */ + default: + if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val)) + continue; + break; + } + } else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE)) + /* no previous value and not saved */ + continue; + conf_unsaved++; + /* maybe print value in verbose mode... */ + } + + for_all_symbols(i, sym) { + if (sym_has_value(sym) && !sym_is_choice_value(sym)) { + /* Reset values of generates values, so they'll appear + * as new, if they should become visible, but that + * doesn't quite work if the Kconfig and the saved + * configuration disagree. + */ + if (sym->visible == no && !conf_unsaved) + sym->flags &= ~SYMBOL_DEF_USER; + switch (sym->type) { + case S_STRING: + case S_INT: + case S_HEX: + /* Reset a string value if it's out of range */ + if (sym_string_within_range(sym, sym->def[S_DEF_USER].val)) + break; + sym->flags &= ~(SYMBOL_VALID|SYMBOL_DEF_USER); + conf_unsaved++; + break; + default: + break; + } + } + } + + sym_add_change_count(conf_warnings || conf_unsaved); + + return 0; +} + +/* + * Kconfig configuration printer + * + * This printer is used when generating the resulting configuration after + * kconfig invocation and `defconfig' files. Unset symbol might be omitted by + * passing a non-NULL argument to the printer. + * + */ +static void +kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (*value == 'n') { + bool skip_unset = (arg != NULL); + + if (!skip_unset) + fprintf(fp, "# %s%s is not set\n", + CONFIG_, sym->name); + return; + } + break; + default: + break; + } + + fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value); +} + +static void +kconfig_print_comment(FILE *fp, const char *value, void *arg) +{ + const char *p = value; + size_t l; + + for (;;) { + l = strcspn(p, "\n"); + fprintf(fp, "#"); + if (l) { + fprintf(fp, " "); + xfwrite(p, l, 1, fp); + p += l; + } + fprintf(fp, "\n"); + if (*p++ == '\0') + break; + } +} + +static struct conf_printer kconfig_printer_cb = +{ + .print_symbol = kconfig_print_symbol, + .print_comment = kconfig_print_comment, +}; + +/* + * Header printer + * + * This printer is used when generating the `include/generated/autoconf.h' file. + */ +static void +header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: { + const char *suffix = ""; + + switch (*value) { + case 'n': + break; + case 'm': + suffix = "_MODULE"; + /* fall through */ + default: + fprintf(fp, "#define %s%s%s 1\n", + CONFIG_, sym->name, suffix); + } + break; + } + case S_HEX: { + const char *prefix = ""; + + if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X')) + prefix = "0x"; + fprintf(fp, "#define %s%s %s%s\n", + CONFIG_, sym->name, prefix, value); + break; + } + case S_STRING: + case S_INT: + fprintf(fp, "#define %s%s %s\n", + CONFIG_, sym->name, value); + break; + default: + break; + } + +} + +static void +header_print_comment(FILE *fp, const char *value, void *arg) +{ + const char *p = value; + size_t l; + + fprintf(fp, "/*\n"); + for (;;) { + l = strcspn(p, "\n"); + fprintf(fp, " *"); + if (l) { + fprintf(fp, " "); + xfwrite(p, l, 1, fp); + p += l; + } + fprintf(fp, "\n"); + if (*p++ == '\0') + break; + } + fprintf(fp, " */\n"); +} + +static struct conf_printer header_printer_cb = +{ + .print_symbol = header_print_symbol, + .print_comment = header_print_comment, +}; + +/* + * Tristate printer + * + * This printer is used when generating the `include/config/tristate.conf' file. + */ +static void +tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + if (sym->type == S_TRISTATE && *value != 'n') + fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value)); +} + +static struct conf_printer tristate_printer_cb = +{ + .print_symbol = tristate_print_symbol, + .print_comment = kconfig_print_comment, +}; + +static void conf_write_symbol(FILE *fp, struct symbol *sym, + struct conf_printer *printer, void *printer_arg) +{ + const char *str; + + switch (sym->type) { + case S_OTHER: + case S_UNKNOWN: + break; + case S_STRING: + str = sym_get_string_value(sym); + str = sym_escape_string_value(str); + printer->print_symbol(fp, sym, str, printer_arg); + free((void *)str); + break; + default: + str = sym_get_string_value(sym); + printer->print_symbol(fp, sym, str, printer_arg); + } +} + +static void +conf_write_heading(FILE *fp, struct conf_printer *printer, void *printer_arg) +{ + char buf[256]; + + snprintf(buf, sizeof(buf), + "\n" + "Automatically generated file; DO NOT EDIT.\n" + "%s\n", + rootmenu.prompt->text); + + printer->print_comment(fp, buf, printer_arg); +} + +/* + * Write out a minimal config. + * All values that has default values are skipped as this is redundant. + */ +int conf_write_defconfig(const char *filename) +{ + struct symbol *sym; + struct menu *menu; + FILE *out; + + out = fopen(filename, "w"); + if (!out) + return 1; + + sym_clear_all_valid(); + + /* Traverse all menus to find all relevant symbols */ + menu = rootmenu.list; + + while (menu != NULL) + { + sym = menu->sym; + if (sym == NULL) { + if (!menu_is_visible(menu)) + goto next_menu; + } else if (!sym_is_choice(sym)) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE)) + goto next_menu; + sym->flags &= ~SYMBOL_WRITE; + /* If we cannot change the symbol - skip */ + if (!sym_is_changable(sym)) + goto next_menu; + /* If symbol equals to default value - skip */ + if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0) + goto next_menu; + + /* + * If symbol is a choice value and equals to the + * default for a choice - skip. + * But only if value is bool and equal to "y" and + * choice is not "optional". + * (If choice is "optional" then all values can be "n") + */ + if (sym_is_choice_value(sym)) { + struct symbol *cs; + struct symbol *ds; + + cs = prop_get_symbol(sym_get_choice_prop(sym)); + ds = sym_choice_default(cs); + if (!sym_is_optional(cs) && sym == ds) { + if ((sym->type == S_BOOLEAN) && + sym_get_tristate_value(sym) == yes) + goto next_menu; + } + } + conf_write_symbol(out, sym, &kconfig_printer_cb, NULL); + } +next_menu: + if (menu->list != NULL) { + menu = menu->list; + } + else if (menu->next != NULL) { + menu = menu->next; + } else { + while ((menu = menu->parent)) { + if (menu->next != NULL) { + menu = menu->next; + break; + } + } + } + } + fclose(out); + return 0; +} + +int conf_write(const char *name) +{ + FILE *out; + struct symbol *sym; + struct menu *menu; + const char *basename; + const char *str; + char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; + char *env; + + dirname[0] = 0; + if (name && name[0]) { + struct stat st; + char *slash; + + if (!stat(name, &st) && S_ISDIR(st.st_mode)) { + strcpy(dirname, name); + strcat(dirname, "/"); + basename = conf_get_configname(); + } else if ((slash = strrchr(name, '/'))) { + int size = slash - name + 1; + memcpy(dirname, name, size); + dirname[size] = 0; + if (slash[1]) + basename = slash + 1; + else + basename = conf_get_configname(); + } else + basename = name; + } else + basename = conf_get_configname(); + + sprintf(newname, "%s%s", dirname, basename); + env = getenv("KCONFIG_OVERWRITECONFIG"); + if (!env || !*env) { + sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid()); + out = fopen(tmpname, "w"); + } else { + *tmpname = 0; + out = fopen(newname, "w"); + } + if (!out) + return 1; + + conf_write_heading(out, &kconfig_printer_cb, NULL); + + if (!conf_get_changed()) + sym_clear_all_valid(); + + menu = rootmenu.list; + while (menu) { + sym = menu->sym; + if (!sym) { + if (!menu_is_visible(menu)) + goto next; + str = menu_get_prompt(menu); + fprintf(out, "\n" + "#\n" + "# %s\n" + "#\n", str); + } else if (!(sym->flags & SYMBOL_CHOICE)) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE)) + goto next; + sym->flags &= ~SYMBOL_WRITE; + + conf_write_symbol(out, sym, &kconfig_printer_cb, NULL); + } + +next: + if (menu->list) { + menu = menu->list; + continue; + } + if (menu->next) + menu = menu->next; + else while ((menu = menu->parent)) { + if (menu->next) { + menu = menu->next; + break; + } + } + } + fclose(out); + + if (*tmpname) { + strcat(dirname, basename); + strcat(dirname, ".old"); + rename(newname, dirname); + if (rename(tmpname, newname)) + return 1; + } + + conf_message(_("configuration written to %s"), newname); + + sym_set_change_count(0); + + return 0; +} + +static int conf_split_config(void) +{ + const char *name; + char path[PATH_MAX+1]; + char *s, *d, c; + struct symbol *sym; + struct stat sb; + int res, i, fd; + + name = conf_get_autoconfig_name(); + conf_read_simple(name, S_DEF_AUTO); + + if (chdir("include/config")) + return 1; + + res = 0; + for_all_symbols(i, sym) { + sym_calc_value(sym); + if ((sym->flags & SYMBOL_AUTO) || !sym->name) + continue; + if (sym->flags & SYMBOL_WRITE) { + if (sym->flags & SYMBOL_DEF_AUTO) { + /* + * symbol has old and new value, + * so compare them... + */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym_get_tristate_value(sym) == + sym->def[S_DEF_AUTO].tri) + continue; + break; + case S_STRING: + case S_HEX: + case S_INT: + if (!strcmp(sym_get_string_value(sym), + sym->def[S_DEF_AUTO].val)) + continue; + break; + default: + break; + } + } else { + /* + * If there is no old value, only 'no' (unset) + * is allowed as new value. + */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym_get_tristate_value(sym) == no) + continue; + break; + default: + break; + } + } + } else if (!(sym->flags & SYMBOL_DEF_AUTO)) + /* There is neither an old nor a new value. */ + continue; + /* else + * There is an old value, but no new value ('no' (unset) + * isn't saved in auto.conf, so the old value is always + * different from 'no'). + */ + + /* Replace all '_' and append ".h" */ + s = sym->name; + d = path; + while ((c = *s++)) { + c = tolower(c); + *d++ = (c == '_') ? '/' : c; + } + strcpy(d, ".h"); + + /* Assume directory path already exists. */ + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (fd == -1) { + if (errno != ENOENT) { + res = 1; + break; + } + /* + * Create directory components, + * unless they exist already. + */ + d = path; + while ((d = strchr(d, '/'))) { + *d = 0; + if (stat(path, &sb) && mkdir(path, 0755)) { + res = 1; + goto out; + } + *d++ = '/'; + } + /* Try it again. */ + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (fd == -1) { + res = 1; + break; + } + } + close(fd); + } +out: + if (chdir("../..")) + return 1; + + return res; +} + +int conf_write_autoconf(void) +{ + struct symbol *sym; + const char *name; + FILE *out, *tristate, *out_h; + int i; + + sym_clear_all_valid(); + + file_write_dep("include/config/auto.conf.cmd"); + + if (conf_split_config()) + return 1; + + out = fopen(".tmpconfig", "w"); + if (!out) + return 1; + + tristate = fopen(".tmpconfig_tristate", "w"); + if (!tristate) { + fclose(out); + return 1; + } + + out_h = fopen(".tmpconfig.h", "w"); + if (!out_h) { + fclose(out); + fclose(tristate); + return 1; + } + + conf_write_heading(out, &kconfig_printer_cb, NULL); + + conf_write_heading(tristate, &tristate_printer_cb, NULL); + + conf_write_heading(out_h, &header_printer_cb, NULL); + + for_all_symbols(i, sym) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE) || !sym->name) + continue; + + /* write symbol to auto.conf, tristate and header files */ + conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1); + + conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1); + + conf_write_symbol(out_h, sym, &header_printer_cb, NULL); + } + fclose(out); + fclose(tristate); + fclose(out_h); + + name = getenv("KCONFIG_AUTOHEADER"); + if (!name) + name = "include/generated/autoconf.h"; + if (rename(".tmpconfig.h", name)) + return 1; + name = getenv("KCONFIG_TRISTATE"); + if (!name) + name = "include/config/tristate.conf"; + if (rename(".tmpconfig_tristate", name)) + return 1; + name = conf_get_autoconfig_name(); + /* + * This must be the last step, kbuild has a dependency on auto.conf + * and this marks the successful completion of the previous steps. + */ + if (rename(".tmpconfig", name)) + return 1; + + return 0; +} + +static int sym_change_count; +static void (*conf_changed_callback)(void); + +void sym_set_change_count(int count) +{ + int _sym_change_count = sym_change_count; + sym_change_count = count; + if (conf_changed_callback && + (bool)_sym_change_count != (bool)count) + conf_changed_callback(); +} + +void sym_add_change_count(int count) +{ + sym_set_change_count(count + sym_change_count); +} + +bool conf_get_changed(void) +{ + return sym_change_count; +} + +void conf_set_changed_callback(void (*fn)(void)) +{ + conf_changed_callback = fn; +} + +static void randomize_choice_values(struct symbol *csym) +{ + struct property *prop; + struct symbol *sym; + struct expr *e; + int cnt, def; + + /* + * If choice is mod then we may have more items selected + * and if no then no-one. + * In both cases stop. + */ + if (csym->curr.tri != yes) + return; + + prop = sym_get_choice_prop(csym); + + /* count entries in choice block */ + cnt = 0; + expr_list_for_each_sym(prop->expr, e, sym) + cnt++; + + /* + * find a random value and set it to yes, + * set the rest to no so we have only one set + */ + def = (rand() % cnt); + + cnt = 0; + expr_list_for_each_sym(prop->expr, e, sym) { + if (def == cnt++) { + sym->def[S_DEF_USER].tri = yes; + csym->def[S_DEF_USER].val = sym; + } + else { + sym->def[S_DEF_USER].tri = no; + } + } + csym->flags |= SYMBOL_DEF_USER; + /* clear VALID to get value calculated */ + csym->flags &= ~(SYMBOL_VALID); +} + +static void set_all_choice_values(struct symbol *csym) +{ + struct property *prop; + struct symbol *sym; + struct expr *e; + + prop = sym_get_choice_prop(csym); + + /* + * Set all non-assinged choice values to no + */ + expr_list_for_each_sym(prop->expr, e, sym) { + if (!sym_has_value(sym)) + sym->def[S_DEF_USER].tri = no; + } + csym->flags |= SYMBOL_DEF_USER; + /* clear VALID to get value calculated */ + csym->flags &= ~(SYMBOL_VALID); +} + +void conf_set_all_new_symbols(enum conf_def_mode mode) +{ + struct symbol *sym, *csym; + int i, cnt; + + for_all_symbols(i, sym) { + if (sym_has_value(sym)) + continue; + switch (sym_get_type(sym)) { + case S_BOOLEAN: + case S_TRISTATE: + switch (mode) { + case def_yes: + sym->def[S_DEF_USER].tri = yes; + break; + case def_mod: + sym->def[S_DEF_USER].tri = mod; + break; + case def_no: + sym->def[S_DEF_USER].tri = no; + break; + case def_random: + cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2; + sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt); + break; + default: + continue; + } + if (!(sym_is_choice(sym) && mode == def_random)) + sym->flags |= SYMBOL_DEF_USER; + break; + default: + break; + } + + } + + sym_clear_all_valid(); + + /* + * We have different type of choice blocks. + * If curr.tri equals to mod then we can select several + * choice symbols in one block. + * In this case we do nothing. + * If curr.tri equals yes then only one symbol can be + * selected in a choice block and we set it to yes, + * and the rest to no. + */ + for_all_symbols(i, csym) { + if (sym_has_value(csym) || !sym_is_choice(csym)) + continue; + + sym_calc_value(csym); + if (mode == def_random) + randomize_choice_values(csym); + else + set_all_choice_values(csym); + } +} diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c new file mode 100644 index 00000000..d6626521 --- /dev/null +++ b/scripts/kconfig/expr.c @@ -0,0 +1,1168 @@ +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "lkc.h" + +#define DEBUG_EXPR 0 + +struct expr *expr_alloc_symbol(struct symbol *sym) +{ + struct expr *e = xcalloc(1, sizeof(*e)); + e->type = E_SYMBOL; + e->left.sym = sym; + return e; +} + +struct expr *expr_alloc_one(enum expr_type type, struct expr *ce) +{ + struct expr *e = xcalloc(1, sizeof(*e)); + e->type = type; + e->left.expr = ce; + return e; +} + +struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2) +{ + struct expr *e = xcalloc(1, sizeof(*e)); + e->type = type; + e->left.expr = e1; + e->right.expr = e2; + return e; +} + +struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2) +{ + struct expr *e = xcalloc(1, sizeof(*e)); + e->type = type; + e->left.sym = s1; + e->right.sym = s2; + return e; +} + +struct expr *expr_alloc_and(struct expr *e1, struct expr *e2) +{ + if (!e1) + return e2; + return e2 ? expr_alloc_two(E_AND, e1, e2) : e1; +} + +struct expr *expr_alloc_or(struct expr *e1, struct expr *e2) +{ + if (!e1) + return e2; + return e2 ? expr_alloc_two(E_OR, e1, e2) : e1; +} + +struct expr *expr_copy(const struct expr *org) +{ + struct expr *e; + + if (!org) + return NULL; + + e = xmalloc(sizeof(*org)); + memcpy(e, org, sizeof(*org)); + switch (org->type) { + case E_SYMBOL: + e->left = org->left; + break; + case E_NOT: + e->left.expr = expr_copy(org->left.expr); + break; + case E_EQUAL: + case E_UNEQUAL: + e->left.sym = org->left.sym; + e->right.sym = org->right.sym; + break; + case E_AND: + case E_OR: + case E_LIST: + e->left.expr = expr_copy(org->left.expr); + e->right.expr = expr_copy(org->right.expr); + break; + default: + printf("can't copy type %d\n", e->type); + free(e); + e = NULL; + break; + } + + return e; +} + +void expr_free(struct expr *e) +{ + if (!e) + return; + + switch (e->type) { + case E_SYMBOL: + break; + case E_NOT: + expr_free(e->left.expr); + return; + case E_EQUAL: + case E_UNEQUAL: + break; + case E_OR: + case E_AND: + expr_free(e->left.expr); + expr_free(e->right.expr); + break; + default: + printf("how to free type %d?\n", e->type); + break; + } + free(e); +} + +static int trans_count; + +#define e1 (*ep1) +#define e2 (*ep2) + +static void __expr_eliminate_eq(enum expr_type type, struct expr **ep1, struct expr **ep2) +{ + if (e1->type == type) { + __expr_eliminate_eq(type, &e1->left.expr, &e2); + __expr_eliminate_eq(type, &e1->right.expr, &e2); + return; + } + if (e2->type == type) { + __expr_eliminate_eq(type, &e1, &e2->left.expr); + __expr_eliminate_eq(type, &e1, &e2->right.expr); + return; + } + if (e1->type == E_SYMBOL && e2->type == E_SYMBOL && + e1->left.sym == e2->left.sym && + (e1->left.sym == &symbol_yes || e1->left.sym == &symbol_no)) + return; + if (!expr_eq(e1, e2)) + return; + trans_count++; + expr_free(e1); expr_free(e2); + switch (type) { + case E_OR: + e1 = expr_alloc_symbol(&symbol_no); + e2 = expr_alloc_symbol(&symbol_no); + break; + case E_AND: + e1 = expr_alloc_symbol(&symbol_yes); + e2 = expr_alloc_symbol(&symbol_yes); + break; + default: + ; + } +} + +void expr_eliminate_eq(struct expr **ep1, struct expr **ep2) +{ + if (!e1 || !e2) + return; + switch (e1->type) { + case E_OR: + case E_AND: + __expr_eliminate_eq(e1->type, ep1, ep2); + default: + ; + } + if (e1->type != e2->type) switch (e2->type) { + case E_OR: + case E_AND: + __expr_eliminate_eq(e2->type, ep1, ep2); + default: + ; + } + e1 = expr_eliminate_yn(e1); + e2 = expr_eliminate_yn(e2); +} + +#undef e1 +#undef e2 + +int expr_eq(struct expr *e1, struct expr *e2) +{ + int res, old_count; + + if (e1->type != e2->type) + return 0; + switch (e1->type) { + case E_EQUAL: + case E_UNEQUAL: + return e1->left.sym == e2->left.sym && e1->right.sym == e2->right.sym; + case E_SYMBOL: + return e1->left.sym == e2->left.sym; + case E_NOT: + return expr_eq(e1->left.expr, e2->left.expr); + case E_AND: + case E_OR: + e1 = expr_copy(e1); + e2 = expr_copy(e2); + old_count = trans_count; + expr_eliminate_eq(&e1, &e2); + res = (e1->type == E_SYMBOL && e2->type == E_SYMBOL && + e1->left.sym == e2->left.sym); + expr_free(e1); + expr_free(e2); + trans_count = old_count; + return res; + case E_LIST: + case E_RANGE: + case E_NONE: + /* panic */; + } + + if (DEBUG_EXPR) { + expr_fprint(e1, stdout); + printf(" = "); + expr_fprint(e2, stdout); + printf(" ?\n"); + } + + return 0; +} + +struct expr *expr_eliminate_yn(struct expr *e) +{ + struct expr *tmp; + + if (e) switch (e->type) { + case E_AND: + e->left.expr = expr_eliminate_yn(e->left.expr); + e->right.expr = expr_eliminate_yn(e->right.expr); + if (e->left.expr->type == E_SYMBOL) { + if (e->left.expr->left.sym == &symbol_no) { + expr_free(e->left.expr); + expr_free(e->right.expr); + e->type = E_SYMBOL; + e->left.sym = &symbol_no; + e->right.expr = NULL; + return e; + } else if (e->left.expr->left.sym == &symbol_yes) { + free(e->left.expr); + tmp = e->right.expr; + *e = *(e->right.expr); + free(tmp); + return e; + } + } + if (e->right.expr->type == E_SYMBOL) { + if (e->right.expr->left.sym == &symbol_no) { + expr_free(e->left.expr); + expr_free(e->right.expr); + e->type = E_SYMBOL; + e->left.sym = &symbol_no; + e->right.expr = NULL; + return e; + } else if (e->right.expr->left.sym == &symbol_yes) { + free(e->right.expr); + tmp = e->left.expr; + *e = *(e->left.expr); + free(tmp); + return e; + } + } + break; + case E_OR: + e->left.expr = expr_eliminate_yn(e->left.expr); + e->right.expr = expr_eliminate_yn(e->right.expr); + if (e->left.expr->type == E_SYMBOL) { + if (e->left.expr->left.sym == &symbol_no) { + free(e->left.expr); + tmp = e->right.expr; + *e = *(e->right.expr); + free(tmp); + return e; + } else if (e->left.expr->left.sym == &symbol_yes) { + expr_free(e->left.expr); + expr_free(e->right.expr); + e->type = E_SYMBOL; + e->left.sym = &symbol_yes; + e->right.expr = NULL; + return e; + } + } + if (e->right.expr->type == E_SYMBOL) { + if (e->right.expr->left.sym == &symbol_no) { + free(e->right.expr); + tmp = e->left.expr; + *e = *(e->left.expr); + free(tmp); + return e; + } else if (e->right.expr->left.sym == &symbol_yes) { + expr_free(e->left.expr); + expr_free(e->right.expr); + e->type = E_SYMBOL; + e->left.sym = &symbol_yes; + e->right.expr = NULL; + return e; + } + } + break; + default: + ; + } + return e; +} + +/* + * bool FOO!=n => FOO + */ +struct expr *expr_trans_bool(struct expr *e) +{ + if (!e) + return NULL; + switch (e->type) { + case E_AND: + case E_OR: + case E_NOT: + e->left.expr = expr_trans_bool(e->left.expr); + e->right.expr = expr_trans_bool(e->right.expr); + break; + case E_UNEQUAL: + // FOO!=n -> FOO + if (e->left.sym->type == S_TRISTATE) { + if (e->right.sym == &symbol_no) { + e->type = E_SYMBOL; + e->right.sym = NULL; + } + } + break; + default: + ; + } + return e; +} + +/* + * e1 || e2 -> ? + */ +static struct expr *expr_join_or(struct expr *e1, struct expr *e2) +{ + struct expr *tmp; + struct symbol *sym1, *sym2; + + if (expr_eq(e1, e2)) + return expr_copy(e1); + if (e1->type != E_EQUAL && e1->type != E_UNEQUAL && e1->type != E_SYMBOL && e1->type != E_NOT) + return NULL; + if (e2->type != E_EQUAL && e2->type != E_UNEQUAL && e2->type != E_SYMBOL && e2->type != E_NOT) + return NULL; + if (e1->type == E_NOT) { + tmp = e1->left.expr; + if (tmp->type != E_EQUAL && tmp->type != E_UNEQUAL && tmp->type != E_SYMBOL) + return NULL; + sym1 = tmp->left.sym; + } else + sym1 = e1->left.sym; + if (e2->type == E_NOT) { + if (e2->left.expr->type != E_SYMBOL) + return NULL; + sym2 = e2->left.expr->left.sym; + } else + sym2 = e2->left.sym; + if (sym1 != sym2) + return NULL; + if (sym1->type != S_BOOLEAN && sym1->type != S_TRISTATE) + return NULL; + if (sym1->type == S_TRISTATE) { + if (e1->type == E_EQUAL && e2->type == E_EQUAL && + ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) || + (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) { + // (a='y') || (a='m') -> (a!='n') + return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_no); + } + if (e1->type == E_EQUAL && e2->type == E_EQUAL && + ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) || + (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) { + // (a='y') || (a='n') -> (a!='m') + return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_mod); + } + if (e1->type == E_EQUAL && e2->type == E_EQUAL && + ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) || + (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) { + // (a='m') || (a='n') -> (a!='y') + return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes); + } + } + if (sym1->type == S_BOOLEAN && sym1 == sym2) { + if ((e1->type == E_NOT && e1->left.expr->type == E_SYMBOL && e2->type == E_SYMBOL) || + (e2->type == E_NOT && e2->left.expr->type == E_SYMBOL && e1->type == E_SYMBOL)) + return expr_alloc_symbol(&symbol_yes); + } + + if (DEBUG_EXPR) { + printf("optimize ("); + expr_fprint(e1, stdout); + printf(") || ("); + expr_fprint(e2, stdout); + printf(")?\n"); + } + return NULL; +} + +static struct expr *expr_join_and(struct expr *e1, struct expr *e2) +{ + struct expr *tmp; + struct symbol *sym1, *sym2; + + if (expr_eq(e1, e2)) + return expr_copy(e1); + if (e1->type != E_EQUAL && e1->type != E_UNEQUAL && e1->type != E_SYMBOL && e1->type != E_NOT) + return NULL; + if (e2->type != E_EQUAL && e2->type != E_UNEQUAL && e2->type != E_SYMBOL && e2->type != E_NOT) + return NULL; + if (e1->type == E_NOT) { + tmp = e1->left.expr; + if (tmp->type != E_EQUAL && tmp->type != E_UNEQUAL && tmp->type != E_SYMBOL) + return NULL; + sym1 = tmp->left.sym; + } else + sym1 = e1->left.sym; + if (e2->type == E_NOT) { + if (e2->left.expr->type != E_SYMBOL) + return NULL; + sym2 = e2->left.expr->left.sym; + } else + sym2 = e2->left.sym; + if (sym1 != sym2) + return NULL; + if (sym1->type != S_BOOLEAN && sym1->type != S_TRISTATE) + return NULL; + + if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) || + (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes)) + // (a) && (a='y') -> (a='y') + return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes); + + if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_no) || + (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_no)) + // (a) && (a!='n') -> (a) + return expr_alloc_symbol(sym1); + + if ((e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_mod) || + (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_mod)) + // (a) && (a!='m') -> (a='y') + return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes); + + if (sym1->type == S_TRISTATE) { + if (e1->type == E_EQUAL && e2->type == E_UNEQUAL) { + // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' + sym2 = e1->right.sym; + if ((e2->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST)) + return sym2 != e2->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2) + : expr_alloc_symbol(&symbol_no); + } + if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) { + // (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b' + sym2 = e2->right.sym; + if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST)) + return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2) + : expr_alloc_symbol(&symbol_no); + } + if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL && + ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) || + (e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes))) + // (a!='y') && (a!='n') -> (a='m') + return expr_alloc_comp(E_EQUAL, sym1, &symbol_mod); + + if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL && + ((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) || + (e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) + // (a!='y') && (a!='m') -> (a='n') + return expr_alloc_comp(E_EQUAL, sym1, &symbol_no); + + if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL && + ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) || + (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod))) + // (a!='m') && (a!='n') -> (a='m') + return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes); + + if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) || + (e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_mod) || + (e1->type == E_SYMBOL && e2->type == E_UNEQUAL && e2->right.sym == &symbol_yes) || + (e2->type == E_SYMBOL && e1->type == E_UNEQUAL && e1->right.sym == &symbol_yes)) + return NULL; + } + + if (DEBUG_EXPR) { + printf("optimize ("); + expr_fprint(e1, stdout); + printf(") && ("); + expr_fprint(e2, stdout); + printf(")?\n"); + } + return NULL; +} + +static void expr_eliminate_dups1(enum expr_type type, struct expr **ep1, struct expr **ep2) +{ +#define e1 (*ep1) +#define e2 (*ep2) + struct expr *tmp; + + if (e1->type == type) { + expr_eliminate_dups1(type, &e1->left.expr, &e2); + expr_eliminate_dups1(type, &e1->right.expr, &e2); + return; + } + if (e2->type == type) { + expr_eliminate_dups1(type, &e1, &e2->left.expr); + expr_eliminate_dups1(type, &e1, &e2->right.expr); + return; + } + if (e1 == e2) + return; + + switch (e1->type) { + case E_OR: case E_AND: + expr_eliminate_dups1(e1->type, &e1, &e1); + default: + ; + } + + switch (type) { + case E_OR: + tmp = expr_join_or(e1, e2); + if (tmp) { + expr_free(e1); expr_free(e2); + e1 = expr_alloc_symbol(&symbol_no); + e2 = tmp; + trans_count++; + } + break; + case E_AND: + tmp = expr_join_and(e1, e2); + if (tmp) { + expr_free(e1); expr_free(e2); + e1 = expr_alloc_symbol(&symbol_yes); + e2 = tmp; + trans_count++; + } + break; + default: + ; + } +#undef e1 +#undef e2 +} + +static void expr_eliminate_dups2(enum expr_type type, struct expr **ep1, struct expr **ep2) +{ +#define e1 (*ep1) +#define e2 (*ep2) + struct expr *tmp, *tmp1, *tmp2; + + if (e1->type == type) { + expr_eliminate_dups2(type, &e1->left.expr, &e2); + expr_eliminate_dups2(type, &e1->right.expr, &e2); + return; + } + if (e2->type == type) { + expr_eliminate_dups2(type, &e1, &e2->left.expr); + expr_eliminate_dups2(type, &e1, &e2->right.expr); + } + if (e1 == e2) + return; + + switch (e1->type) { + case E_OR: + expr_eliminate_dups2(e1->type, &e1, &e1); + // (FOO || BAR) && (!FOO && !BAR) -> n + tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1))); + tmp2 = expr_copy(e2); + tmp = expr_extract_eq_and(&tmp1, &tmp2); + if (expr_is_yes(tmp1)) { + expr_free(e1); + e1 = expr_alloc_symbol(&symbol_no); + trans_count++; + } + expr_free(tmp2); + expr_free(tmp1); + expr_free(tmp); + break; + case E_AND: + expr_eliminate_dups2(e1->type, &e1, &e1); + // (FOO && BAR) || (!FOO || !BAR) -> y + tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1))); + tmp2 = expr_copy(e2); + tmp = expr_extract_eq_or(&tmp1, &tmp2); + if (expr_is_no(tmp1)) { + expr_free(e1); + e1 = expr_alloc_symbol(&symbol_yes); + trans_count++; + } + expr_free(tmp2); + expr_free(tmp1); + expr_free(tmp); + break; + default: + ; + } +#undef e1 +#undef e2 +} + +struct expr *expr_eliminate_dups(struct expr *e) +{ + int oldcount; + if (!e) + return e; + + oldcount = trans_count; + while (1) { + trans_count = 0; + switch (e->type) { + case E_OR: case E_AND: + expr_eliminate_dups1(e->type, &e, &e); + expr_eliminate_dups2(e->type, &e, &e); + default: + ; + } + if (!trans_count) + break; + e = expr_eliminate_yn(e); + } + trans_count = oldcount; + return e; +} + +struct expr *expr_transform(struct expr *e) +{ + struct expr *tmp; + + if (!e) + return NULL; + switch (e->type) { + case E_EQUAL: + case E_UNEQUAL: + case E_SYMBOL: + case E_LIST: + break; + default: + e->left.expr = expr_transform(e->left.expr); + e->right.expr = expr_transform(e->right.expr); + } + + switch (e->type) { + case E_EQUAL: + if (e->left.sym->type != S_BOOLEAN) + break; + if (e->right.sym == &symbol_no) { + e->type = E_NOT; + e->left.expr = expr_alloc_symbol(e->left.sym); + e->right.sym = NULL; + break; + } + if (e->right.sym == &symbol_mod) { + printf("boolean symbol %s tested for 'm'? test forced to 'n'\n", e->left.sym->name); + e->type = E_SYMBOL; + e->left.sym = &symbol_no; + e->right.sym = NULL; + break; + } + if (e->right.sym == &symbol_yes) { + e->type = E_SYMBOL; + e->right.sym = NULL; + break; + } + break; + case E_UNEQUAL: + if (e->left.sym->type != S_BOOLEAN) + break; + if (e->right.sym == &symbol_no) { + e->type = E_SYMBOL; + e->right.sym = NULL; + break; + } + if (e->right.sym == &symbol_mod) { + printf("boolean symbol %s tested for 'm'? test forced to 'y'\n", e->left.sym->name); + e->type = E_SYMBOL; + e->left.sym = &symbol_yes; + e->right.sym = NULL; + break; + } + if (e->right.sym == &symbol_yes) { + e->type = E_NOT; + e->left.expr = expr_alloc_symbol(e->left.sym); + e->right.sym = NULL; + break; + } + break; + case E_NOT: + switch (e->left.expr->type) { + case E_NOT: + // !!a -> a + tmp = e->left.expr->left.expr; + free(e->left.expr); + free(e); + e = tmp; + e = expr_transform(e); + break; + case E_EQUAL: + case E_UNEQUAL: + // !a='x' -> a!='x' + tmp = e->left.expr; + free(e); + e = tmp; + e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL; + break; + case E_OR: + // !(a || b) -> !a && !b + tmp = e->left.expr; + e->type = E_AND; + e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr); + tmp->type = E_NOT; + tmp->right.expr = NULL; + e = expr_transform(e); + break; + case E_AND: + // !(a && b) -> !a || !b + tmp = e->left.expr; + e->type = E_OR; + e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr); + tmp->type = E_NOT; + tmp->right.expr = NULL; + e = expr_transform(e); + break; + case E_SYMBOL: + if (e->left.expr->left.sym == &symbol_yes) { + // !'y' -> 'n' + tmp = e->left.expr; + free(e); + e = tmp; + e->type = E_SYMBOL; + e->left.sym = &symbol_no; + break; + } + if (e->left.expr->left.sym == &symbol_mod) { + // !'m' -> 'm' + tmp = e->left.expr; + free(e); + e = tmp; + e->type = E_SYMBOL; + e->left.sym = &symbol_mod; + break; + } + if (e->left.expr->left.sym == &symbol_no) { + // !'n' -> 'y' + tmp = e->left.expr; + free(e); + e = tmp; + e->type = E_SYMBOL; + e->left.sym = &symbol_yes; + break; + } + break; + default: + ; + } + break; + default: + ; + } + return e; +} + +int expr_contains_symbol(struct expr *dep, struct symbol *sym) +{ + if (!dep) + return 0; + + switch (dep->type) { + case E_AND: + case E_OR: + return expr_contains_symbol(dep->left.expr, sym) || + expr_contains_symbol(dep->right.expr, sym); + case E_SYMBOL: + return dep->left.sym == sym; + case E_EQUAL: + case E_UNEQUAL: + return dep->left.sym == sym || + dep->right.sym == sym; + case E_NOT: + return expr_contains_symbol(dep->left.expr, sym); + default: + ; + } + return 0; +} + +bool expr_depends_symbol(struct expr *dep, struct symbol *sym) +{ + if (!dep) + return false; + + switch (dep->type) { + case E_AND: + return expr_depends_symbol(dep->left.expr, sym) || + expr_depends_symbol(dep->right.expr, sym); + case E_SYMBOL: + return dep->left.sym == sym; + case E_EQUAL: + if (dep->left.sym == sym) { + if (dep->right.sym == &symbol_yes || dep->right.sym == &symbol_mod) + return true; + } + break; + case E_UNEQUAL: + if (dep->left.sym == sym) { + if (dep->right.sym == &symbol_no) + return true; + } + break; + default: + ; + } + return false; +} + +struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2) +{ + struct expr *tmp = NULL; + expr_extract_eq(E_AND, &tmp, ep1, ep2); + if (tmp) { + *ep1 = expr_eliminate_yn(*ep1); + *ep2 = expr_eliminate_yn(*ep2); + } + return tmp; +} + +struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2) +{ + struct expr *tmp = NULL; + expr_extract_eq(E_OR, &tmp, ep1, ep2); + if (tmp) { + *ep1 = expr_eliminate_yn(*ep1); + *ep2 = expr_eliminate_yn(*ep2); + } + return tmp; +} + +void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2) +{ +#define e1 (*ep1) +#define e2 (*ep2) + if (e1->type == type) { + expr_extract_eq(type, ep, &e1->left.expr, &e2); + expr_extract_eq(type, ep, &e1->right.expr, &e2); + return; + } + if (e2->type == type) { + expr_extract_eq(type, ep, ep1, &e2->left.expr); + expr_extract_eq(type, ep, ep1, &e2->right.expr); + return; + } + if (expr_eq(e1, e2)) { + *ep = *ep ? expr_alloc_two(type, *ep, e1) : e1; + expr_free(e2); + if (type == E_AND) { + e1 = expr_alloc_symbol(&symbol_yes); + e2 = expr_alloc_symbol(&symbol_yes); + } else if (type == E_OR) { + e1 = expr_alloc_symbol(&symbol_no); + e2 = expr_alloc_symbol(&symbol_no); + } + } +#undef e1 +#undef e2 +} + +struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym) +{ + struct expr *e1, *e2; + + if (!e) { + e = expr_alloc_symbol(sym); + if (type == E_UNEQUAL) + e = expr_alloc_one(E_NOT, e); + return e; + } + switch (e->type) { + case E_AND: + e1 = expr_trans_compare(e->left.expr, E_EQUAL, sym); + e2 = expr_trans_compare(e->right.expr, E_EQUAL, sym); + if (sym == &symbol_yes) + e = expr_alloc_two(E_AND, e1, e2); + if (sym == &symbol_no) + e = expr_alloc_two(E_OR, e1, e2); + if (type == E_UNEQUAL) + e = expr_alloc_one(E_NOT, e); + return e; + case E_OR: + e1 = expr_trans_compare(e->left.expr, E_EQUAL, sym); + e2 = expr_trans_compare(e->right.expr, E_EQUAL, sym); + if (sym == &symbol_yes) + e = expr_alloc_two(E_OR, e1, e2); + if (sym == &symbol_no) + e = expr_alloc_two(E_AND, e1, e2); + if (type == E_UNEQUAL) + e = expr_alloc_one(E_NOT, e); + return e; + case E_NOT: + return expr_trans_compare(e->left.expr, type == E_EQUAL ? E_UNEQUAL : E_EQUAL, sym); + case E_UNEQUAL: + case E_EQUAL: + if (type == E_EQUAL) { + if (sym == &symbol_yes) + return expr_copy(e); + if (sym == &symbol_mod) + return expr_alloc_symbol(&symbol_no); + if (sym == &symbol_no) + return expr_alloc_one(E_NOT, expr_copy(e)); + } else { + if (sym == &symbol_yes) + return expr_alloc_one(E_NOT, expr_copy(e)); + if (sym == &symbol_mod) + return expr_alloc_symbol(&symbol_yes); + if (sym == &symbol_no) + return expr_copy(e); + } + break; + case E_SYMBOL: + return expr_alloc_comp(type, e->left.sym, sym); + case E_LIST: + case E_RANGE: + case E_NONE: + /* panic */; + } + return NULL; +} + +tristate expr_calc_value(struct expr *e) +{ + tristate val1, val2; + const char *str1, *str2; + + if (!e) + return yes; + + switch (e->type) { + case E_SYMBOL: + sym_calc_value(e->left.sym); + return e->left.sym->curr.tri; + case E_AND: + val1 = expr_calc_value(e->left.expr); + val2 = expr_calc_value(e->right.expr); + return EXPR_AND(val1, val2); + case E_OR: + val1 = expr_calc_value(e->left.expr); + val2 = expr_calc_value(e->right.expr); + return EXPR_OR(val1, val2); + case E_NOT: + val1 = expr_calc_value(e->left.expr); + return EXPR_NOT(val1); + case E_EQUAL: + sym_calc_value(e->left.sym); + sym_calc_value(e->right.sym); + str1 = sym_get_string_value(e->left.sym); + str2 = sym_get_string_value(e->right.sym); + return !strcmp(str1, str2) ? yes : no; + case E_UNEQUAL: + sym_calc_value(e->left.sym); + sym_calc_value(e->right.sym); + str1 = sym_get_string_value(e->left.sym); + str2 = sym_get_string_value(e->right.sym); + return !strcmp(str1, str2) ? no : yes; + default: + printf("expr_calc_value: %d?\n", e->type); + return no; + } +} + +int expr_compare_type(enum expr_type t1, enum expr_type t2) +{ +#if 0 + return 1; +#else + if (t1 == t2) + return 0; + switch (t1) { + case E_EQUAL: + case E_UNEQUAL: + if (t2 == E_NOT) + return 1; + case E_NOT: + if (t2 == E_AND) + return 1; + case E_AND: + if (t2 == E_OR) + return 1; + case E_OR: + if (t2 == E_LIST) + return 1; + case E_LIST: + if (t2 == 0) + return 1; + default: + return -1; + } + printf("[%dgt%d?]", t1, t2); + return 0; +#endif +} + +static inline struct expr * +expr_get_leftmost_symbol(const struct expr *e) +{ + + if (e == NULL) + return NULL; + + while (e->type != E_SYMBOL) + e = e->left.expr; + + return expr_copy(e); +} + +/* + * Given expression `e1' and `e2', returns the leaf of the longest + * sub-expression of `e1' not containing 'e2. + */ +struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2) +{ + struct expr *ret; + + switch (e1->type) { + case E_OR: + return expr_alloc_and( + expr_simplify_unmet_dep(e1->left.expr, e2), + expr_simplify_unmet_dep(e1->right.expr, e2)); + case E_AND: { + struct expr *e; + e = expr_alloc_and(expr_copy(e1), expr_copy(e2)); + e = expr_eliminate_dups(e); + ret = (!expr_eq(e, e1)) ? e1 : NULL; + expr_free(e); + break; + } + default: + ret = e1; + break; + } + + return expr_get_leftmost_symbol(ret); +} + +void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken) +{ + if (!e) { + fn(data, NULL, "y"); + return; + } + + if (expr_compare_type(prevtoken, e->type) > 0) + fn(data, NULL, "("); + switch (e->type) { + case E_SYMBOL: + if (e->left.sym->name) + fn(data, e->left.sym, e->left.sym->name); + else + fn(data, NULL, "<choice>"); + break; + case E_NOT: + fn(data, NULL, "!"); + expr_print(e->left.expr, fn, data, E_NOT); + break; + case E_EQUAL: + if (e->left.sym->name) + fn(data, e->left.sym, e->left.sym->name); + else + fn(data, NULL, "<choice>"); + fn(data, NULL, "="); + fn(data, e->right.sym, e->right.sym->name); + break; + case E_UNEQUAL: + if (e->left.sym->name) + fn(data, e->left.sym, e->left.sym->name); + else + fn(data, NULL, "<choice>"); + fn(data, NULL, "!="); + fn(data, e->right.sym, e->right.sym->name); + break; + case E_OR: + expr_print(e->left.expr, fn, data, E_OR); + fn(data, NULL, " || "); + expr_print(e->right.expr, fn, data, E_OR); + break; + case E_AND: + expr_print(e->left.expr, fn, data, E_AND); + fn(data, NULL, " && "); + expr_print(e->right.expr, fn, data, E_AND); + break; + case E_LIST: + fn(data, e->right.sym, e->right.sym->name); + if (e->left.expr) { + fn(data, NULL, " ^ "); + expr_print(e->left.expr, fn, data, E_LIST); + } + break; + case E_RANGE: + fn(data, NULL, "["); + fn(data, e->left.sym, e->left.sym->name); + fn(data, NULL, " "); + fn(data, e->right.sym, e->right.sym->name); + fn(data, NULL, "]"); + break; + default: + { + char buf[32]; + sprintf(buf, "<unknown type %d>", e->type); + fn(data, NULL, buf); + break; + } + } + if (expr_compare_type(prevtoken, e->type) > 0) + fn(data, NULL, ")"); +} + +static void expr_print_file_helper(void *data, struct symbol *sym, const char *str) +{ + xfwrite(str, strlen(str), 1, data); +} + +void expr_fprint(struct expr *e, FILE *out) +{ + expr_print(e, expr_print_file_helper, out, E_NONE); +} + +static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str) +{ + struct gstr *gs = (struct gstr*)data; + const char *sym_str = NULL; + + if (sym) + sym_str = sym_get_string_value(sym); + + if (gs->max_width) { + unsigned extra_length = strlen(str); + const char *last_cr = strrchr(gs->s, '\n'); + unsigned last_line_length; + + if (sym_str) + extra_length += 4 + strlen(sym_str); + + if (!last_cr) + last_cr = gs->s; + + last_line_length = strlen(gs->s) - (last_cr - gs->s); + + if ((last_line_length + extra_length) > gs->max_width) + str_append(gs, "\\\n"); + } + + str_append(gs, str); + if (sym && sym->type != S_UNKNOWN) + str_printf(gs, " [=%s]", sym_str); +} + +void expr_gstr_print(struct expr *e, struct gstr *gs) +{ + expr_print(e, expr_print_gstr_helper, gs, E_NONE); +} diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h new file mode 100644 index 00000000..cdd48600 --- /dev/null +++ b/scripts/kconfig/expr.h @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#ifndef EXPR_H +#define EXPR_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <assert.h> +#include <stdio.h> +#include "list.h" +#ifndef __cplusplus +#include <stdbool.h> +#endif + +struct file { + struct file *next; + struct file *parent; + const char *name; + int lineno; +}; + +typedef enum tristate { + no, mod, yes +} tristate; + +enum expr_type { + E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_LIST, E_SYMBOL, E_RANGE +}; + +union expr_data { + struct expr *expr; + struct symbol *sym; +}; + +struct expr { + enum expr_type type; + union expr_data left, right; +}; + +#define EXPR_OR(dep1, dep2) (((dep1)>(dep2))?(dep1):(dep2)) +#define EXPR_AND(dep1, dep2) (((dep1)<(dep2))?(dep1):(dep2)) +#define EXPR_NOT(dep) (2-(dep)) + +#define expr_list_for_each_sym(l, e, s) \ + for (e = (l); e && (s = e->right.sym); e = e->left.expr) + +struct expr_value { + struct expr *expr; + tristate tri; +}; + +struct symbol_value { + void *val; + tristate tri; +}; + +enum symbol_type { + S_UNKNOWN, S_BOOLEAN, S_TRISTATE, S_INT, S_HEX, S_STRING, S_OTHER +}; + +/* enum values are used as index to symbol.def[] */ +enum { + S_DEF_USER, /* main user value */ + S_DEF_AUTO, /* values read from auto.conf */ + S_DEF_DEF3, /* Reserved for UI usage */ + S_DEF_DEF4, /* Reserved for UI usage */ + S_DEF_COUNT +}; + +struct symbol { + struct symbol *next; + char *name; + enum symbol_type type; + struct symbol_value curr; + struct symbol_value def[S_DEF_COUNT]; + tristate visible; + int flags; + struct property *prop; + struct expr_value dir_dep; + struct expr_value rev_dep; +}; + +#define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER) + +#define SYMBOL_CONST 0x0001 /* symbol is const */ +#define SYMBOL_CHECK 0x0008 /* used during dependency checking */ +#define SYMBOL_CHOICE 0x0010 /* start of a choice block (null name) */ +#define SYMBOL_CHOICEVAL 0x0020 /* used as a value in a choice block */ +#define SYMBOL_VALID 0x0080 /* set when symbol.curr is calculated */ +#define SYMBOL_OPTIONAL 0x0100 /* choice is optional - values can be 'n' */ +#define SYMBOL_WRITE 0x0200 /* ? */ +#define SYMBOL_CHANGED 0x0400 /* ? */ +#define SYMBOL_AUTO 0x1000 /* value from environment variable */ +#define SYMBOL_CHECKED 0x2000 /* used during dependency checking */ +#define SYMBOL_WARNED 0x8000 /* warning has been issued */ + +/* Set when symbol.def[] is used */ +#define SYMBOL_DEF 0x10000 /* First bit of SYMBOL_DEF */ +#define SYMBOL_DEF_USER 0x10000 /* symbol.def[S_DEF_USER] is valid */ +#define SYMBOL_DEF_AUTO 0x20000 /* symbol.def[S_DEF_AUTO] is valid */ +#define SYMBOL_DEF3 0x40000 /* symbol.def[S_DEF_3] is valid */ +#define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */ + +#define SYMBOL_MAXLENGTH 256 +#define SYMBOL_HASHSIZE 9973 + +/* A property represent the config options that can be associated + * with a config "symbol". + * Sample: + * config FOO + * default y + * prompt "foo prompt" + * select BAR + * config BAZ + * int "BAZ Value" + * range 1..255 + */ +enum prop_type { + P_UNKNOWN, + P_PROMPT, /* prompt "foo prompt" or "BAZ Value" */ + P_COMMENT, /* text associated with a comment */ + P_MENU, /* prompt associated with a menuconfig option */ + P_DEFAULT, /* default y */ + P_CHOICE, /* choice value */ + P_SELECT, /* select BAR */ + P_RANGE, /* range 7..100 (for a symbol) */ + P_ENV, /* value from environment variable */ + P_SYMBOL, /* where a symbol is defined */ +}; + +struct property { + struct property *next; /* next property - null if last */ + struct symbol *sym; /* the symbol for which the property is associated */ + enum prop_type type; /* type of property */ + const char *text; /* the prompt value - P_PROMPT, P_MENU, P_COMMENT */ + struct expr_value visible; + struct expr *expr; /* the optional conditional part of the property */ + struct menu *menu; /* the menu the property are associated with + * valid for: P_SELECT, P_RANGE, P_CHOICE, + * P_PROMPT, P_DEFAULT, P_MENU, P_COMMENT */ + struct file *file; /* what file was this property defined */ + int lineno; /* what lineno was this property defined */ +}; + +#define for_all_properties(sym, st, tok) \ + for (st = sym->prop; st; st = st->next) \ + if (st->type == (tok)) +#define for_all_defaults(sym, st) for_all_properties(sym, st, P_DEFAULT) +#define for_all_choices(sym, st) for_all_properties(sym, st, P_CHOICE) +#define for_all_prompts(sym, st) \ + for (st = sym->prop; st; st = st->next) \ + if (st->text) + +struct menu { + struct menu *next; + struct menu *parent; + struct menu *list; + struct symbol *sym; + struct property *prompt; + struct expr *visibility; + struct expr *dep; + unsigned int flags; + char *help; + struct file *file; + int lineno; + void *data; +}; + +#define MENU_CHANGED 0x0001 +#define MENU_ROOT 0x0002 + +struct jump_key { + struct list_head entries; + size_t offset; + struct menu *target; + int index; +}; + +#define JUMP_NB 9 + +extern struct file *file_list; +extern struct file *current_file; +struct file *lookup_file(const char *name); + +extern struct symbol symbol_yes, symbol_no, symbol_mod; +extern struct symbol *modules_sym; +extern struct symbol *sym_defconfig_list; +extern int cdebug; +struct expr *expr_alloc_symbol(struct symbol *sym); +struct expr *expr_alloc_one(enum expr_type type, struct expr *ce); +struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2); +struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2); +struct expr *expr_alloc_and(struct expr *e1, struct expr *e2); +struct expr *expr_alloc_or(struct expr *e1, struct expr *e2); +struct expr *expr_copy(const struct expr *org); +void expr_free(struct expr *e); +int expr_eq(struct expr *e1, struct expr *e2); +void expr_eliminate_eq(struct expr **ep1, struct expr **ep2); +tristate expr_calc_value(struct expr *e); +struct expr *expr_eliminate_yn(struct expr *e); +struct expr *expr_trans_bool(struct expr *e); +struct expr *expr_eliminate_dups(struct expr *e); +struct expr *expr_transform(struct expr *e); +int expr_contains_symbol(struct expr *dep, struct symbol *sym); +bool expr_depends_symbol(struct expr *dep, struct symbol *sym); +struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2); +struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2); +void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2); +struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym); +struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2); + +void expr_fprint(struct expr *e, FILE *out); +struct gstr; /* forward */ +void expr_gstr_print(struct expr *e, struct gstr *gs); + +static inline int expr_is_yes(struct expr *e) +{ + return !e || (e->type == E_SYMBOL && e->left.sym == &symbol_yes); +} + +static inline int expr_is_no(struct expr *e) +{ + return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no); +} + +#ifdef __cplusplus +} +#endif + +#endif /* EXPR_H */ diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h new file mode 100644 index 00000000..0ae730be --- /dev/null +++ b/scripts/kconfig/list.h @@ -0,0 +1,91 @@ +#ifndef LIST_H +#define LIST_H + +/* + * Copied from include/linux/... + */ + +#undef offsetof +#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) + +/** + * container_of - cast a member of a structure out to the containing structure + * @ptr: the pointer to the member. + * @type: the type of the container struct this is embedded in. + * @member: the name of the member within the struct. + * + */ +#define container_of(ptr, type, member) ({ \ + const typeof( ((type *)0)->member ) *__mptr = (ptr); \ + (type *)( (char *)__mptr - offsetof(type,member) );}) + + +struct list_head { + struct list_head *next, *prev; +}; + + +#define LIST_HEAD_INIT(name) { &(name), &(name) } + +#define LIST_HEAD(name) \ + struct list_head name = LIST_HEAD_INIT(name) + +/** + * list_entry - get the struct for this entry + * @ptr: the &struct list_head pointer. + * @type: the type of the struct this is embedded in. + * @member: the name of the list_struct within the struct. + */ +#define list_entry(ptr, type, member) \ + container_of(ptr, type, member) + +/** + * list_for_each_entry - iterate over list of given type + * @pos: the type * to use as a loop cursor. + * @head: the head for your list. + * @member: the name of the list_struct within the struct. + */ +#define list_for_each_entry(pos, head, member) \ + for (pos = list_entry((head)->next, typeof(*pos), member); \ + &pos->member != (head); \ + pos = list_entry(pos->member.next, typeof(*pos), member)) + +/** + * list_empty - tests whether a list is empty + * @head: the list to test. + */ +static inline int list_empty(const struct list_head *head) +{ + return head->next == head; +} + +/* + * Insert a new entry between two known consecutive entries. + * + * This is only for internal list manipulation where we know + * the prev/next entries already! + */ +static inline void __list_add(struct list_head *_new, + struct list_head *prev, + struct list_head *next) +{ + next->prev = _new; + _new->next = next; + _new->prev = prev; + prev->next = _new; +} + +/** + * list_add_tail - add a new entry + * @new: new entry to be added + * @head: list head to add it before + * + * Insert a new entry before the specified head. + * This is useful for implementing queues. + */ +static inline void list_add_tail(struct list_head *_new, struct list_head *head) +{ + __list_add(_new, head->prev, head); +} + +#endif diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h new file mode 100644 index 00000000..f8aee5fc --- /dev/null +++ b/scripts/kconfig/lkc.h @@ -0,0 +1,198 @@ +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#ifndef LKC_H +#define LKC_H + +#include "expr.h" + +#ifndef KBUILD_NO_NLS +# include <libintl.h> +#else +static inline const char *gettext(const char *txt) { return txt; } +static inline void textdomain(const char *domainname) {} +static inline void bindtextdomain(const char *name, const char *dir) {} +static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; } +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define P(name,type,arg) extern type name arg +#include "lkc_proto.h" +#undef P + +#define SRCTREE "srctree" + +#ifndef PACKAGE +#define PACKAGE "linux" +#endif + +#define LOCALEDIR "/usr/share/locale" + +#define _(text) gettext(text) +#define N_(text) (text) + +#ifndef CONFIG_ +#define CONFIG_ "CONFIG_" +#endif +static inline const char *CONFIG_prefix(void) +{ + return getenv( "CONFIG_" ) ?: CONFIG_; +} +#undef CONFIG_ +#define CONFIG_ CONFIG_prefix() + +#define TF_COMMAND 0x0001 +#define TF_PARAM 0x0002 +#define TF_OPTION 0x0004 + +enum conf_def_mode { + def_default, + def_yes, + def_mod, + def_no, + def_random +}; + +#define T_OPT_MODULES 1 +#define T_OPT_DEFCONFIG_LIST 2 +#define T_OPT_ENV 3 + +struct kconf_id { + int name; + int token; + unsigned int flags; + enum symbol_type stype; +}; + +extern int zconfdebug; + +int zconfparse(void); +void zconfdump(FILE *out); +void zconf_starthelp(void); +FILE *zconf_fopen(const char *name); +void zconf_initscan(const char *name); +void zconf_nextfile(const char *name); +int zconf_lineno(void); +const char *zconf_curname(void); + +/* confdata.c */ +const char *conf_get_configname(void); +const char *conf_get_autoconfig_name(void); +char *conf_get_default_confname(void); +void sym_set_change_count(int count); +void sym_add_change_count(int count); +void conf_set_all_new_symbols(enum conf_def_mode mode); + +struct conf_printer { + void (*print_symbol)(FILE *, struct symbol *, const char *, void *); + void (*print_comment)(FILE *, const char *, void *); +}; + +/* confdata.c and expr.c */ +static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out) +{ + assert(len != 0); + + if (fwrite(str, len, count, out) != count) + fprintf(stderr, "Error in writing or end of file.\n"); +} + +/* menu.c */ +void _menu_init(void); +void menu_warn(struct menu *menu, const char *fmt, ...); +struct menu *menu_add_menu(void); +void menu_end_menu(void); +void menu_add_entry(struct symbol *sym); +void menu_end_entry(void); +void menu_add_dep(struct expr *dep); +void menu_add_visibility(struct expr *dep); +struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep); +struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); +void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); +void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); +void menu_add_option(int token, char *arg); +void menu_finalize(struct menu *parent); +void menu_set_type(int type); + +/* util.c */ +struct file *file_lookup(const char *name); +int file_write_dep(const char *name); +void *xmalloc(size_t size); +void *xcalloc(size_t nmemb, size_t size); + +struct gstr { + size_t len; + char *s; + /* + * when max_width is not zero long lines in string s (if any) get + * wrapped not to exceed the max_width value + */ + int max_width; +}; +struct gstr str_new(void); +struct gstr str_assign(const char *s); +void str_free(struct gstr *gs); +void str_append(struct gstr *gs, const char *s); +void str_printf(struct gstr *gs, const char *fmt, ...); +const char *str_get(struct gstr *gs); + +/* symbol.c */ +extern struct expr *sym_env_list; + +void sym_init(void); +void sym_clear_all_valid(void); +void sym_set_all_changed(void); +void sym_set_changed(struct symbol *sym); +struct symbol *sym_choice_default(struct symbol *sym); +const char *sym_get_string_default(struct symbol *sym); +struct symbol *sym_check_deps(struct symbol *sym); +struct property *prop_alloc(enum prop_type type, struct symbol *sym); +struct symbol *prop_get_symbol(struct property *prop); +struct property *sym_get_env_prop(struct symbol *sym); + +static inline tristate sym_get_tristate_value(struct symbol *sym) +{ + return sym->curr.tri; +} + + +static inline struct symbol *sym_get_choice_value(struct symbol *sym) +{ + return (struct symbol *)sym->curr.val; +} + +static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval) +{ + return sym_set_tristate_value(chval, yes); +} + +static inline bool sym_is_choice(struct symbol *sym) +{ + return sym->flags & SYMBOL_CHOICE ? true : false; +} + +static inline bool sym_is_choice_value(struct symbol *sym) +{ + return sym->flags & SYMBOL_CHOICEVAL ? true : false; +} + +static inline bool sym_is_optional(struct symbol *sym) +{ + return sym->flags & SYMBOL_OPTIONAL ? true : false; +} + +static inline bool sym_has_value(struct symbol *sym) +{ + return sym->flags & SYMBOL_DEF_USER ? true : false; +} + +#ifdef __cplusplus +} +#endif + +#endif /* LKC_H */ diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h new file mode 100644 index 00000000..ef1a7381 --- /dev/null +++ b/scripts/kconfig/lkc_proto.h @@ -0,0 +1,56 @@ +#include <stdarg.h> + +/* confdata.c */ +P(conf_parse,void,(const char *name)); +P(conf_read,int,(const char *name)); +P(conf_read_simple,int,(const char *name, int)); +P(conf_write_defconfig,int,(const char *name)); +P(conf_write,int,(const char *name)); +P(conf_write_autoconf,int,(void)); +P(conf_get_changed,bool,(void)); +P(conf_set_changed_callback, void,(void (*fn)(void))); +P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap))); + +/* menu.c */ +P(rootmenu,struct menu,); + +P(menu_is_visible, bool, (struct menu *menu)); +P(menu_has_prompt, bool, (struct menu *menu)); +P(menu_get_prompt,const char *,(struct menu *menu)); +P(menu_get_root_menu,struct menu *,(struct menu *menu)); +P(menu_get_parent_menu,struct menu *,(struct menu *menu)); +P(menu_has_help,bool,(struct menu *menu)); +P(menu_get_help,const char *,(struct menu *menu)); +P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head + *head)); +P(get_relations_str, struct gstr, (struct symbol **sym_arr, struct list_head + *head)); +P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help)); + +/* symbol.c */ +P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]); + +P(sym_lookup,struct symbol *,(const char *name, int flags)); +P(sym_find,struct symbol *,(const char *name)); +P(sym_expand_string_value,const char *,(const char *in)); +P(sym_escape_string_value, const char *,(const char *in)); +P(sym_re_search,struct symbol **,(const char *pattern)); +P(sym_type_name,const char *,(enum symbol_type type)); +P(sym_calc_value,void,(struct symbol *sym)); +P(sym_get_type,enum symbol_type,(struct symbol *sym)); +P(sym_tristate_within_range,bool,(struct symbol *sym,tristate tri)); +P(sym_set_tristate_value,bool,(struct symbol *sym,tristate tri)); +P(sym_toggle_tristate_value,tristate,(struct symbol *sym)); +P(sym_string_valid,bool,(struct symbol *sym, const char *newval)); +P(sym_string_within_range,bool,(struct symbol *sym, const char *str)); +P(sym_set_string_value,bool,(struct symbol *sym, const char *newval)); +P(sym_is_changable,bool,(struct symbol *sym)); +P(sym_get_choice_prop,struct property *,(struct symbol *sym)); +P(sym_get_default_prop,struct property *,(struct symbol *sym)); +P(sym_get_string_value,const char *,(struct symbol *sym)); + +P(prop_get_type_name,const char *,(enum prop_type type)); + +/* expr.c */ +P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2)); +P(expr_print,void,(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken)); diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh new file mode 100644 index 00000000..80788137 --- /dev/null +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh @@ -0,0 +1,85 @@ +#!/bin/sh +# Check ncurses compatibility + +# What library to link +ldflags() +{ + for ext in so a dll.a dylib ; do + for lib in ncursesw ncurses curses ; do + $cc -print-file-name=lib${lib}.${ext} | grep -q / + if [ $? -eq 0 ]; then + echo "-l${lib}" + exit + fi + done + done + exit 1 +} + +# Where is ncurses.h? +ccflags() +{ + if [ -f /usr/include/ncursesw/curses.h ]; then + echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"' + echo ' -DNCURSES_WIDECHAR=1' + elif [ -f /usr/include/ncurses/ncurses.h ]; then + echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' + elif [ -f /usr/include/ncurses/curses.h ]; then + echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"' + elif [ -f /usr/include/ncurses.h ]; then + echo '-DCURSES_LOC="<ncurses.h>"' + else + echo '-DCURSES_LOC="<curses.h>"' + fi +} + +# Temp file, try to clean up after us +tmp=.lxdialog.tmp +trap "rm -f $tmp" 0 1 2 3 15 + +# Check if we can link to ncurses +check() { + $cc -x c - -o $tmp 2>/dev/null <<'EOF' +#include CURSES_LOC +main() {} +EOF + if [ $? != 0 ]; then + echo " *** Unable to find the ncurses libraries or the" 1>&2 + echo " *** required header files." 1>&2 + echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2 + echo " *** " 1>&2 + echo " *** Install ncurses (ncurses-devel) and try again." 1>&2 + echo " *** " 1>&2 + exit 1 + fi +} + +usage() { + printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n" +} + +if [ $# -eq 0 ]; then + usage + exit 1 +fi + +cc="" +case "$1" in + "-check") + shift + cc="$@" + check + ;; + "-ccflags") + ccflags + ;; + "-ldflags") + shift + cc="$@" + ldflags + ;; + "*") + usage + exit 1 + ;; +esac diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c new file mode 100644 index 00000000..a2eb80fb --- /dev/null +++ b/scripts/kconfig/lxdialog/checklist.c @@ -0,0 +1,332 @@ +/* + * checklist.c -- implements the checklist box + * + * ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk) + * Stuart Herbert - S.Herbert@sheffield.ac.uk: radiolist extension + * Alessandro Rubini - rubini@ipvvis.unipv.it: merged the two + * MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com) + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "dialog.h" + +static int list_width, check_x, item_x; + +/* + * Print list item + */ +static void print_item(WINDOW * win, int choice, int selected) +{ + int i; + char *list_item = malloc(list_width + 1); + + strncpy(list_item, item_str(), list_width - item_x); + list_item[list_width - item_x] = '\0'; + + /* Clear 'residue' of last item */ + wattrset(win, dlg.menubox.atr); + wmove(win, choice, 0); + for (i = 0; i < list_width; i++) + waddch(win, ' '); + + wmove(win, choice, check_x); + wattrset(win, selected ? dlg.check_selected.atr + : dlg.check.atr); + if (!item_is_tag(':')) + wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' '); + + wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr); + mvwaddch(win, choice, item_x, list_item[0]); + wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr); + waddstr(win, list_item + 1); + if (selected) { + wmove(win, choice, check_x + 1); + wrefresh(win); + } + free(list_item); +} + +/* + * Print the scroll indicators. + */ +static void print_arrows(WINDOW * win, int choice, int item_no, int scroll, + int y, int x, int height) +{ + wmove(win, y, x); + + if (scroll > 0) { + wattrset(win, dlg.uarrow.atr); + waddch(win, ACS_UARROW); + waddstr(win, "(-)"); + } else { + wattrset(win, dlg.menubox.atr); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + } + + y = y + height + 1; + wmove(win, y, x); + + if ((height < item_no) && (scroll + choice < item_no - 1)) { + wattrset(win, dlg.darrow.atr); + waddch(win, ACS_DARROW); + waddstr(win, "(+)"); + } else { + wattrset(win, dlg.menubox_border.atr); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + } +} + +/* + * Display the termination buttons + */ +static void print_buttons(WINDOW * dialog, int height, int width, int selected) +{ + int x = width / 2 - 11; + int y = height - 2; + + print_button(dialog, gettext("Select"), y, x, selected == 0); + print_button(dialog, gettext(" Help "), y, x + 14, selected == 1); + + wmove(dialog, y, x + 1 + 14 * selected); + wrefresh(dialog); +} + +/* + * Display a dialog box with a list of options that can be turned on or off + * in the style of radiolist (only one option turned on at a time). + */ +int dialog_checklist(const char *title, const char *prompt, int height, + int width, int list_height) +{ + int i, x, y, box_x, box_y; + int key = 0, button = 0, choice = 0, scroll = 0, max_choice; + WINDOW *dialog, *list; + + /* which item to highlight */ + item_foreach() { + if (item_is_tag('X')) + choice = item_n(); + if (item_is_selected()) { + choice = item_n(); + break; + } + } + +do_resize: + if (getmaxy(stdscr) < (height + 6)) + return -ERRDISPLAYTOOSMALL; + if (getmaxx(stdscr) < (width + 6)) + return -ERRDISPLAYTOOSMALL; + + max_choice = MIN(list_height, item_count()); + + /* center dialog box on screen */ + x = (COLS - width) / 2; + y = (LINES - height) / 2; + + draw_shadow(stdscr, y, x, height, width); + + dialog = newwin(height, width, y, x); + keypad(dialog, TRUE); + + draw_box(dialog, 0, 0, height, width, + dlg.dialog.atr, dlg.border.atr); + wattrset(dialog, dlg.border.atr); + mvwaddch(dialog, height - 3, 0, ACS_LTEE); + for (i = 0; i < width - 2; i++) + waddch(dialog, ACS_HLINE); + wattrset(dialog, dlg.dialog.atr); + waddch(dialog, ACS_RTEE); + + print_title(dialog, title, width); + + wattrset(dialog, dlg.dialog.atr); + print_autowrap(dialog, prompt, width - 2, 1, 3); + + list_width = width - 6; + box_y = height - list_height - 5; + box_x = (width - list_width) / 2 - 1; + + /* create new window for the list */ + list = subwin(dialog, list_height, list_width, y + box_y + 1, + x + box_x + 1); + + keypad(list, TRUE); + + /* draw a box around the list items */ + draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2, + dlg.menubox_border.atr, dlg.menubox.atr); + + /* Find length of longest item in order to center checklist */ + check_x = 0; + item_foreach() + check_x = MAX(check_x, strlen(item_str()) + 4); + check_x = MIN(check_x, list_width); + + check_x = (list_width - check_x) / 2; + item_x = check_x + 4; + + if (choice >= list_height) { + scroll = choice - list_height + 1; + choice -= scroll; + } + + /* Print the list */ + for (i = 0; i < max_choice; i++) { + item_set(scroll + i); + print_item(list, i, i == choice); + } + + print_arrows(dialog, choice, item_count(), scroll, + box_y, box_x + check_x + 5, list_height); + + print_buttons(dialog, height, width, 0); + + wnoutrefresh(dialog); + wnoutrefresh(list); + doupdate(); + + while (key != KEY_ESC) { + key = wgetch(dialog); + + for (i = 0; i < max_choice; i++) { + item_set(i + scroll); + if (toupper(key) == toupper(item_str()[0])) + break; + } + + if (i < max_choice || key == KEY_UP || key == KEY_DOWN || + key == '+' || key == '-') { + if (key == KEY_UP || key == '-') { + if (!choice) { + if (!scroll) + continue; + /* Scroll list down */ + if (list_height > 1) { + /* De-highlight current first item */ + item_set(scroll); + print_item(list, 0, FALSE); + scrollok(list, TRUE); + wscrl(list, -1); + scrollok(list, FALSE); + } + scroll--; + item_set(scroll); + print_item(list, 0, TRUE); + print_arrows(dialog, choice, item_count(), + scroll, box_y, box_x + check_x + 5, list_height); + + wnoutrefresh(dialog); + wrefresh(list); + + continue; /* wait for another key press */ + } else + i = choice - 1; + } else if (key == KEY_DOWN || key == '+') { + if (choice == max_choice - 1) { + if (scroll + choice >= item_count() - 1) + continue; + /* Scroll list up */ + if (list_height > 1) { + /* De-highlight current last item before scrolling up */ + item_set(scroll + max_choice - 1); + print_item(list, + max_choice - 1, + FALSE); + scrollok(list, TRUE); + wscrl(list, 1); + scrollok(list, FALSE); + } + scroll++; + item_set(scroll + max_choice - 1); + print_item(list, max_choice - 1, TRUE); + + print_arrows(dialog, choice, item_count(), + scroll, box_y, box_x + check_x + 5, list_height); + + wnoutrefresh(dialog); + wrefresh(list); + + continue; /* wait for another key press */ + } else + i = choice + 1; + } + if (i != choice) { + /* De-highlight current item */ + item_set(scroll + choice); + print_item(list, choice, FALSE); + /* Highlight new item */ + choice = i; + item_set(scroll + choice); + print_item(list, choice, TRUE); + wnoutrefresh(dialog); + wrefresh(list); + } + continue; /* wait for another key press */ + } + switch (key) { + case 'H': + case 'h': + case '?': + button = 1; + /* fall-through */ + case 'S': + case 's': + case ' ': + case '\n': + item_foreach() + item_set_selected(0); + item_set(scroll + choice); + item_set_selected(1); + delwin(list); + delwin(dialog); + return button; + case TAB: + case KEY_LEFT: + case KEY_RIGHT: + button = ((key == KEY_LEFT ? --button : ++button) < 0) + ? 1 : (button > 1 ? 0 : button); + + print_buttons(dialog, height, width, button); + wrefresh(dialog); + break; + case 'X': + case 'x': + key = KEY_ESC; + break; + case KEY_ESC: + key = on_key_esc(dialog); + break; + case KEY_RESIZE: + delwin(list); + delwin(dialog); + on_key_resize(); + goto do_resize; + } + + /* Now, update everything... */ + doupdate(); + } + delwin(list); + delwin(dialog); + return key; /* ESC pressed */ +} diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h new file mode 100644 index 00000000..aa3d6d9a --- /dev/null +++ b/scripts/kconfig/lxdialog/dialog.h @@ -0,0 +1,236 @@ +/* + * dialog.h -- common declarations for all dialog modules + * + * AUTHOR: Savio Lam (lam836@cs.cuhk.hk) + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <sys/types.h> +#include <fcntl.h> +#include <unistd.h> +#include <ctype.h> +#include <stdlib.h> +#include <string.h> +#include <stdbool.h> + +#ifndef KBUILD_NO_NLS +# include <libintl.h> +#else +# define gettext(Msgid) ((const char *) (Msgid)) +#endif + +#ifdef __sun__ +#define CURS_MACROS +#endif +#include <ncurses.h> + +/* + * Colors in ncurses 1.9.9e do not work properly since foreground and + * background colors are OR'd rather than separately masked. This version + * of dialog was hacked to work with ncurses 1.9.9e, making it incompatible + * with standard curses. The simplest fix (to make this work with standard + * curses) uses the wbkgdset() function, not used in the original hack. + * Turn it off if we're building with 1.9.9e, since it just confuses things. + */ +#if defined(NCURSES_VERSION) && defined(_NEED_WRAP) && !defined(GCC_PRINTFLIKE) +#define OLD_NCURSES 1 +#undef wbkgdset +#define wbkgdset(w,p) /*nothing */ +#else +#define OLD_NCURSES 0 +#endif + +#define TR(params) _tracef params + +#define KEY_ESC 27 +#define TAB 9 +#define MAX_LEN 2048 +#define BUF_SIZE (10*1024) +#define MIN(x,y) (x < y ? x : y) +#define MAX(x,y) (x > y ? x : y) + +#ifndef ACS_ULCORNER +#define ACS_ULCORNER '+' +#endif +#ifndef ACS_LLCORNER +#define ACS_LLCORNER '+' +#endif +#ifndef ACS_URCORNER +#define ACS_URCORNER '+' +#endif +#ifndef ACS_LRCORNER +#define ACS_LRCORNER '+' +#endif +#ifndef ACS_HLINE +#define ACS_HLINE '-' +#endif +#ifndef ACS_VLINE +#define ACS_VLINE '|' +#endif +#ifndef ACS_LTEE +#define ACS_LTEE '+' +#endif +#ifndef ACS_RTEE +#define ACS_RTEE '+' +#endif +#ifndef ACS_UARROW +#define ACS_UARROW '^' +#endif +#ifndef ACS_DARROW +#define ACS_DARROW 'v' +#endif + +/* error return codes */ +#define ERRDISPLAYTOOSMALL (KEY_MAX + 1) + +/* + * Color definitions + */ +struct dialog_color { + chtype atr; /* Color attribute */ + int fg; /* foreground */ + int bg; /* background */ + int hl; /* highlight this item */ +}; + +struct dialog_info { + const char *backtitle; + struct dialog_color screen; + struct dialog_color shadow; + struct dialog_color dialog; + struct dialog_color title; + struct dialog_color border; + struct dialog_color button_active; + struct dialog_color button_inactive; + struct dialog_color button_key_active; + struct dialog_color button_key_inactive; + struct dialog_color button_label_active; + struct dialog_color button_label_inactive; + struct dialog_color inputbox; + struct dialog_color inputbox_border; + struct dialog_color searchbox; + struct dialog_color searchbox_title; + struct dialog_color searchbox_border; + struct dialog_color position_indicator; + struct dialog_color menubox; + struct dialog_color menubox_border; + struct dialog_color item; + struct dialog_color item_selected; + struct dialog_color tag; + struct dialog_color tag_selected; + struct dialog_color tag_key; + struct dialog_color tag_key_selected; + struct dialog_color check; + struct dialog_color check_selected; + struct dialog_color uarrow; + struct dialog_color darrow; +}; + +/* + * Global variables + */ +extern struct dialog_info dlg; +extern char dialog_input_result[]; +extern int saved_x, saved_y; /* Needed in signal handler in mconf.c */ + +/* + * Function prototypes + */ + +/* item list as used by checklist and menubox */ +void item_reset(void); +void item_make(const char *fmt, ...); +void item_add_str(const char *fmt, ...); +void item_set_tag(char tag); +void item_set_data(void *p); +void item_set_selected(int val); +int item_activate_selected(void); +void *item_data(void); +char item_tag(void); + +/* item list manipulation for lxdialog use */ +#define MAXITEMSTR 200 +struct dialog_item { + char str[MAXITEMSTR]; /* promtp displayed */ + char tag; + void *data; /* pointer to menu item - used by menubox+checklist */ + int selected; /* Set to 1 by dialog_*() function if selected. */ +}; + +/* list of lialog_items */ +struct dialog_list { + struct dialog_item node; + struct dialog_list *next; +}; + +extern struct dialog_list *item_cur; +extern struct dialog_list item_nil; +extern struct dialog_list *item_head; + +int item_count(void); +void item_set(int n); +int item_n(void); +const char *item_str(void); +int item_is_selected(void); +int item_is_tag(char tag); +#define item_foreach() \ + for (item_cur = item_head ? item_head: item_cur; \ + item_cur && (item_cur != &item_nil); item_cur = item_cur->next) + +/* generic key handlers */ +int on_key_esc(WINDOW *win); +int on_key_resize(void); + +int init_dialog(const char *backtitle); +void set_dialog_backtitle(const char *backtitle); +void end_dialog(int x, int y); +void attr_clear(WINDOW * win, int height, int width, chtype attr); +void dialog_clear(void); +void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x); +void print_button(WINDOW * win, const char *label, int y, int x, int selected); +void print_title(WINDOW *dialog, const char *title, int width); +void draw_box(WINDOW * win, int y, int x, int height, int width, chtype box, + chtype border); +void draw_shadow(WINDOW * win, int y, int x, int height, int width); + +int first_alpha(const char *string, const char *exempt); +int dialog_yesno(const char *title, const char *prompt, int height, int width); +int dialog_msgbox(const char *title, const char *prompt, int height, + int width, int pause); + + +typedef void (*update_text_fn)(char *buf, size_t start, size_t end, void + *_data); +int dialog_textbox(const char *title, char *tbuf, int initial_height, + int initial_width, int *keys, int *_vscroll, int *_hscroll, + update_text_fn update_text, void *data); +int dialog_menu(const char *title, const char *prompt, + const void *selected, int *s_scroll); +int dialog_checklist(const char *title, const char *prompt, int height, + int width, int list_height); +int dialog_inputbox(const char *title, const char *prompt, int height, + int width, const char *init); + +/* + * This is the base for fictitious keys, which activate + * the buttons. + * + * Mouse-generated keys are the following: + * -- the first 32 are used as numbers, in addition to '0'-'9' + * -- the lowercase are used to signal mouse-enter events (M_EVENT + 'o') + * -- uppercase chars are used to invoke the button (M_EVENT + 'O') + */ +#define M_EVENT (KEY_MAX+1) diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c new file mode 100644 index 00000000..21404a04 --- /dev/null +++ b/scripts/kconfig/lxdialog/inputbox.c @@ -0,0 +1,301 @@ +/* + * inputbox.c -- implements the input box + * + * ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk) + * MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com) + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "dialog.h" + +char dialog_input_result[MAX_LEN + 1]; + +/* + * Print the termination buttons + */ +static void print_buttons(WINDOW * dialog, int height, int width, int selected) +{ + int x = width / 2 - 11; + int y = height - 2; + + print_button(dialog, gettext(" Ok "), y, x, selected == 0); + print_button(dialog, gettext(" Help "), y, x + 14, selected == 1); + + wmove(dialog, y, x + 1 + 14 * selected); + wrefresh(dialog); +} + +/* + * Display a dialog box for inputing a string + */ +int dialog_inputbox(const char *title, const char *prompt, int height, int width, + const char *init) +{ + int i, x, y, box_y, box_x, box_width; + int input_x = 0, key = 0, button = -1; + int show_x, len, pos; + char *instr = dialog_input_result; + WINDOW *dialog; + + if (!init) + instr[0] = '\0'; + else + strcpy(instr, init); + +do_resize: + if (getmaxy(stdscr) <= (height - 2)) + return -ERRDISPLAYTOOSMALL; + if (getmaxx(stdscr) <= (width - 2)) + return -ERRDISPLAYTOOSMALL; + + /* center dialog box on screen */ + x = (COLS - width) / 2; + y = (LINES - height) / 2; + + draw_shadow(stdscr, y, x, height, width); + + dialog = newwin(height, width, y, x); + keypad(dialog, TRUE); + + draw_box(dialog, 0, 0, height, width, + dlg.dialog.atr, dlg.border.atr); + wattrset(dialog, dlg.border.atr); + mvwaddch(dialog, height - 3, 0, ACS_LTEE); + for (i = 0; i < width - 2; i++) + waddch(dialog, ACS_HLINE); + wattrset(dialog, dlg.dialog.atr); + waddch(dialog, ACS_RTEE); + + print_title(dialog, title, width); + + wattrset(dialog, dlg.dialog.atr); + print_autowrap(dialog, prompt, width - 2, 1, 3); + + /* Draw the input field box */ + box_width = width - 6; + getyx(dialog, y, x); + box_y = y + 2; + box_x = (width - box_width) / 2; + draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2, + dlg.dialog.atr, dlg.border.atr); + + print_buttons(dialog, height, width, 0); + + /* Set up the initial value */ + wmove(dialog, box_y, box_x); + wattrset(dialog, dlg.inputbox.atr); + + len = strlen(instr); + pos = len; + + if (len >= box_width) { + show_x = len - box_width + 1; + input_x = box_width - 1; + for (i = 0; i < box_width - 1; i++) + waddch(dialog, instr[show_x + i]); + } else { + show_x = 0; + input_x = len; + waddstr(dialog, instr); + } + + wmove(dialog, box_y, box_x + input_x); + + wrefresh(dialog); + + while (key != KEY_ESC) { + key = wgetch(dialog); + + if (button == -1) { /* Input box selected */ + switch (key) { + case TAB: + case KEY_UP: + case KEY_DOWN: + break; + case KEY_BACKSPACE: + case 127: + if (pos) { + wattrset(dialog, dlg.inputbox.atr); + if (input_x == 0) { + show_x--; + } else + input_x--; + + if (pos < len) { + for (i = pos - 1; i < len; i++) { + instr[i] = instr[i+1]; + } + } + + pos--; + len--; + instr[len] = '\0'; + wmove(dialog, box_y, box_x); + for (i = 0; i < box_width; i++) { + if (!instr[show_x + i]) { + waddch(dialog, ' '); + break; + } + waddch(dialog, instr[show_x + i]); + } + wmove(dialog, box_y, input_x + box_x); + wrefresh(dialog); + } + continue; + case KEY_LEFT: + if (pos > 0) { + if (input_x > 0) { + wmove(dialog, box_y, --input_x + box_x); + } else if (input_x == 0) { + show_x--; + wmove(dialog, box_y, box_x); + for (i = 0; i < box_width; i++) { + if (!instr[show_x + i]) { + waddch(dialog, ' '); + break; + } + waddch(dialog, instr[show_x + i]); + } + wmove(dialog, box_y, box_x); + } + pos--; + } + continue; + case KEY_RIGHT: + if (pos < len) { + if (input_x < box_width - 1) { + wmove(dialog, box_y, ++input_x + box_x); + } else if (input_x == box_width - 1) { + show_x++; + wmove(dialog, box_y, box_x); + for (i = 0; i < box_width; i++) { + if (!instr[show_x + i]) { + waddch(dialog, ' '); + break; + } + waddch(dialog, instr[show_x + i]); + } + wmove(dialog, box_y, input_x + box_x); + } + pos++; + } + continue; + default: + if (key < 0x100 && isprint(key)) { + if (len < MAX_LEN) { + wattrset(dialog, dlg.inputbox.atr); + if (pos < len) { + for (i = len; i > pos; i--) + instr[i] = instr[i-1]; + instr[pos] = key; + } else { + instr[len] = key; + } + pos++; + len++; + instr[len] = '\0'; + + if (input_x == box_width - 1) { + show_x++; + } else { + input_x++; + } + + wmove(dialog, box_y, box_x); + for (i = 0; i < box_width; i++) { + if (!instr[show_x + i]) { + waddch(dialog, ' '); + break; + } + waddch(dialog, instr[show_x + i]); + } + wmove(dialog, box_y, input_x + box_x); + wrefresh(dialog); + } else + flash(); /* Alarm user about overflow */ + continue; + } + } + } + switch (key) { + case 'O': + case 'o': + delwin(dialog); + return 0; + case 'H': + case 'h': + delwin(dialog); + return 1; + case KEY_UP: + case KEY_LEFT: + switch (button) { + case -1: + button = 1; /* Indicates "Help" button is selected */ + print_buttons(dialog, height, width, 1); + break; + case 0: + button = -1; /* Indicates input box is selected */ + print_buttons(dialog, height, width, 0); + wmove(dialog, box_y, box_x + input_x); + wrefresh(dialog); + break; + case 1: + button = 0; /* Indicates "OK" button is selected */ + print_buttons(dialog, height, width, 0); + break; + } + break; + case TAB: + case KEY_DOWN: + case KEY_RIGHT: + switch (button) { + case -1: + button = 0; /* Indicates "OK" button is selected */ + print_buttons(dialog, height, width, 0); + break; + case 0: + button = 1; /* Indicates "Help" button is selected */ + print_buttons(dialog, height, width, 1); + break; + case 1: + button = -1; /* Indicates input box is selected */ + print_buttons(dialog, height, width, 0); + wmove(dialog, box_y, box_x + input_x); + wrefresh(dialog); + break; + } + break; + case ' ': + case '\n': + delwin(dialog); + return (button == -1 ? 0 : button); + case 'X': + case 'x': + key = KEY_ESC; + break; + case KEY_ESC: + key = on_key_esc(dialog); + break; + case KEY_RESIZE: + delwin(dialog); + on_key_resize(); + goto do_resize; + } + } + + delwin(dialog); + return KEY_ESC; /* ESC pressed */ +} diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c new file mode 100644 index 00000000..48d382e7 --- /dev/null +++ b/scripts/kconfig/lxdialog/menubox.c @@ -0,0 +1,436 @@ +/* + * menubox.c -- implements the menu box + * + * ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk) + * MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com) + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + * Changes by Clifford Wolf (god@clifford.at) + * + * [ 1998-06-13 ] + * + * *) A bugfix for the Page-Down problem + * + * *) Formerly when I used Page Down and Page Up, the cursor would be set + * to the first position in the menu box. Now lxdialog is a bit + * smarter and works more like other menu systems (just have a look at + * it). + * + * *) Formerly if I selected something my scrolling would be broken because + * lxdialog is re-invoked by the Menuconfig shell script, can't + * remember the last scrolling position, and just sets it so that the + * cursor is at the bottom of the box. Now it writes the temporary file + * lxdialog.scrltmp which contains this information. The file is + * deleted by lxdialog if the user leaves a submenu or enters a new + * one, but it would be nice if Menuconfig could make another "rm -f" + * just to be sure. Just try it out - you will recognise a difference! + * + * [ 1998-06-14 ] + * + * *) Now lxdialog is crash-safe against broken "lxdialog.scrltmp" files + * and menus change their size on the fly. + * + * *) If for some reason the last scrolling position is not saved by + * lxdialog, it sets the scrolling so that the selected item is in the + * middle of the menu box, not at the bottom. + * + * 02 January 1999, Michael Elizabeth Chastain (mec@shout.net) + * Reset 'scroll' to 0 if the value from lxdialog.scrltmp is bogus. + * This fixes a bug in Menuconfig where using ' ' to descend into menus + * would leave mis-synchronized lxdialog.scrltmp files lying around, + * fscanf would read in 'scroll', and eventually that value would get used. + */ + +#include "dialog.h" + +static int menu_width, item_x; + +/* + * Print menu item + */ +static void do_print_item(WINDOW * win, const char *item, int line_y, + int selected, int hotkey) +{ + int j; + char *menu_item = malloc(menu_width + 1); + + strncpy(menu_item, item, menu_width - item_x); + menu_item[menu_width - item_x] = '\0'; + j = first_alpha(menu_item, "YyNnMmHh"); + + /* Clear 'residue' of last item */ + wattrset(win, dlg.menubox.atr); + wmove(win, line_y, 0); +#if OLD_NCURSES + { + int i; + for (i = 0; i < menu_width; i++) + waddch(win, ' '); + } +#else + wclrtoeol(win); +#endif + wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr); + mvwaddstr(win, line_y, item_x, menu_item); + if (hotkey) { + wattrset(win, selected ? dlg.tag_key_selected.atr + : dlg.tag_key.atr); + mvwaddch(win, line_y, item_x + j, menu_item[j]); + } + if (selected) { + wmove(win, line_y, item_x + 1); + } + free(menu_item); + wrefresh(win); +} + +#define print_item(index, choice, selected) \ +do { \ + item_set(index); \ + do_print_item(menu, item_str(), choice, selected, !item_is_tag(':')); \ +} while (0) + +/* + * Print the scroll indicators. + */ +static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x, + int height) +{ + int cur_y, cur_x; + + getyx(win, cur_y, cur_x); + + wmove(win, y, x); + + if (scroll > 0) { + wattrset(win, dlg.uarrow.atr); + waddch(win, ACS_UARROW); + waddstr(win, "(-)"); + } else { + wattrset(win, dlg.menubox.atr); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + } + + y = y + height + 1; + wmove(win, y, x); + wrefresh(win); + + if ((height < item_no) && (scroll + height < item_no)) { + wattrset(win, dlg.darrow.atr); + waddch(win, ACS_DARROW); + waddstr(win, "(+)"); + } else { + wattrset(win, dlg.menubox_border.atr); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + waddch(win, ACS_HLINE); + } + + wmove(win, cur_y, cur_x); + wrefresh(win); +} + +/* + * Display the termination buttons. + */ +static void print_buttons(WINDOW * win, int height, int width, int selected) +{ + int x = width / 2 - 28; + int y = height - 2; + + print_button(win, gettext("Select"), y, x, selected == 0); + print_button(win, gettext(" Exit "), y, x + 12, selected == 1); + print_button(win, gettext(" Help "), y, x + 24, selected == 2); + print_button(win, gettext(" Save "), y, x + 36, selected == 3); + print_button(win, gettext(" Load "), y, x + 48, selected == 4); + + wmove(win, y, x + 1 + 12 * selected); + wrefresh(win); +} + +/* scroll up n lines (n may be negative) */ +static void do_scroll(WINDOW *win, int *scroll, int n) +{ + /* Scroll menu up */ + scrollok(win, TRUE); + wscrl(win, n); + scrollok(win, FALSE); + *scroll = *scroll + n; + wrefresh(win); +} + +/* + * Display a menu for choosing among a number of options + */ +int dialog_menu(const char *title, const char *prompt, + const void *selected, int *s_scroll) +{ + int i, j, x, y, box_x, box_y; + int height, width, menu_height; + int key = 0, button = 0, scroll = 0, choice = 0; + int first_item = 0, max_choice; + WINDOW *dialog, *menu; + +do_resize: + height = getmaxy(stdscr); + width = getmaxx(stdscr); + if (height < 15 || width < 65) + return -ERRDISPLAYTOOSMALL; + + height -= 4; + width -= 5; + menu_height = height - 10; + + max_choice = MIN(menu_height, item_count()); + + /* center dialog box on screen */ + x = (COLS - width) / 2; + y = (LINES - height) / 2; + + draw_shadow(stdscr, y, x, height, width); + + dialog = newwin(height, width, y, x); + keypad(dialog, TRUE); + + draw_box(dialog, 0, 0, height, width, + dlg.dialog.atr, dlg.border.atr); + wattrset(dialog, dlg.border.atr); + mvwaddch(dialog, height - 3, 0, ACS_LTEE); + for (i = 0; i < width - 2; i++) + waddch(dialog, ACS_HLINE); + wattrset(dialog, dlg.dialog.atr); + wbkgdset(dialog, dlg.dialog.atr & A_COLOR); + waddch(dialog, ACS_RTEE); + + print_title(dialog, title, width); + + wattrset(dialog, dlg.dialog.atr); + print_autowrap(dialog, prompt, width - 2, 1, 3); + + menu_width = width - 6; + box_y = height - menu_height - 5; + box_x = (width - menu_width) / 2 - 1; + + /* create new window for the menu */ + menu = subwin(dialog, menu_height, menu_width, + y + box_y + 1, x + box_x + 1); + keypad(menu, TRUE); + + /* draw a box around the menu items */ + draw_box(dialog, box_y, box_x, menu_height + 2, menu_width + 2, + dlg.menubox_border.atr, dlg.menubox.atr); + + if (menu_width >= 80) + item_x = (menu_width - 70) / 2; + else + item_x = 4; + + /* Set choice to default item */ + item_foreach() + if (selected && (selected == item_data())) + choice = item_n(); + /* get the saved scroll info */ + scroll = *s_scroll; + if ((scroll <= choice) && (scroll + max_choice > choice) && + (scroll >= 0) && (scroll + max_choice <= item_count())) { + first_item = scroll; + choice = choice - scroll; + } else { + scroll = 0; + } + if ((choice >= max_choice)) { + if (choice >= item_count() - max_choice / 2) + scroll = first_item = item_count() - max_choice; + else + scroll = first_item = choice - max_choice / 2; + choice = choice - scroll; + } + + /* Print the menu */ + for (i = 0; i < max_choice; i++) { + print_item(first_item + i, i, i == choice); + } + + wnoutrefresh(menu); + + print_arrows(dialog, item_count(), scroll, + box_y, box_x + item_x + 1, menu_height); + + print_buttons(dialog, height, width, 0); + wmove(menu, choice, item_x + 1); + wrefresh(menu); + + while (key != KEY_ESC) { + key = wgetch(menu); + + if (key < 256 && isalpha(key)) + key = tolower(key); + + if (strchr("ynmh", key)) + i = max_choice; + else { + for (i = choice + 1; i < max_choice; i++) { + item_set(scroll + i); + j = first_alpha(item_str(), "YyNnMmHh"); + if (key == tolower(item_str()[j])) + break; + } + if (i == max_choice) + for (i = 0; i < max_choice; i++) { + item_set(scroll + i); + j = first_alpha(item_str(), "YyNnMmHh"); + if (key == tolower(item_str()[j])) + break; + } + } + + if (i < max_choice || + key == KEY_UP || key == KEY_DOWN || + key == '-' || key == '+' || + key == KEY_PPAGE || key == KEY_NPAGE) { + /* Remove highligt of current item */ + print_item(scroll + choice, choice, FALSE); + + if (key == KEY_UP || key == '-') { + if (choice < 2 && scroll) { + /* Scroll menu down */ + do_scroll(menu, &scroll, -1); + + print_item(scroll, 0, FALSE); + } else + choice = MAX(choice - 1, 0); + + } else if (key == KEY_DOWN || key == '+') { + print_item(scroll+choice, choice, FALSE); + + if ((choice > max_choice - 3) && + (scroll + max_choice < item_count())) { + /* Scroll menu up */ + do_scroll(menu, &scroll, 1); + + print_item(scroll+max_choice - 1, + max_choice - 1, FALSE); + } else + choice = MIN(choice + 1, max_choice - 1); + + } else if (key == KEY_PPAGE) { + scrollok(menu, TRUE); + for (i = 0; (i < max_choice); i++) { + if (scroll > 0) { + do_scroll(menu, &scroll, -1); + print_item(scroll, 0, FALSE); + } else { + if (choice > 0) + choice--; + } + } + + } else if (key == KEY_NPAGE) { + for (i = 0; (i < max_choice); i++) { + if (scroll + max_choice < item_count()) { + do_scroll(menu, &scroll, 1); + print_item(scroll+max_choice-1, + max_choice - 1, FALSE); + } else { + if (choice + 1 < max_choice) + choice++; + } + } + } else + choice = i; + + print_item(scroll + choice, choice, TRUE); + + print_arrows(dialog, item_count(), scroll, + box_y, box_x + item_x + 1, menu_height); + + wnoutrefresh(dialog); + wrefresh(menu); + + continue; /* wait for another key press */ + } + + switch (key) { + case KEY_LEFT: + case TAB: + case KEY_RIGHT: + button = ((key == KEY_LEFT ? --button : ++button) < 0) + ? 4 : (button > 4 ? 0 : button); + + print_buttons(dialog, height, width, button); + wrefresh(menu); + break; + case ' ': + case 's': + case 'y': + case 'n': + case 'm': + case '/': + case 'h': + case '?': + case 'z': + case '\n': + /* save scroll info */ + *s_scroll = scroll; + delwin(menu); + delwin(dialog); + item_set(scroll + choice); + item_set_selected(1); + switch (key) { + case 'h': + case '?': + return 2; + case 's': + case 'y': + return 5; + case 'n': + return 6; + case 'm': + return 7; + case ' ': + return 8; + case '/': + return 9; + case 'z': + return 10; + case '\n': + return button; + } + return 0; + case 'e': + case 'x': + key = KEY_ESC; + break; + case KEY_ESC: + key = on_key_esc(menu); + break; + case KEY_RESIZE: + on_key_resize(); + delwin(menu); + delwin(dialog); + goto do_resize; + } + } + delwin(menu); + delwin(dialog); + return key; /* ESC pressed */ +} diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c new file mode 100644 index 00000000..a48bb93e --- /dev/null +++ b/scripts/kconfig/lxdialog/textbox.c @@ -0,0 +1,408 @@ +/* + * textbox.c -- implements the text box + * + * ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk) + * MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com) + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "dialog.h" + +static void back_lines(int n); +static void print_page(WINDOW *win, int height, int width, update_text_fn + update_text, void *data); +static void print_line(WINDOW *win, int row, int width); +static char *get_line(void); +static void print_position(WINDOW * win); + +static int hscroll; +static int begin_reached, end_reached, page_length; +static char *buf; +static char *page; + +/* + * refresh window content + */ +static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw, + int cur_y, int cur_x, update_text_fn update_text, + void *data) +{ + print_page(box, boxh, boxw, update_text, data); + print_position(dialog); + wmove(dialog, cur_y, cur_x); /* Restore cursor position */ + wrefresh(dialog); +} + + +/* + * Display text from a file in a dialog box. + * + * keys is a null-terminated array + * update_text() may not add or remove any '\n' or '\0' in tbuf + */ +int dialog_textbox(const char *title, char *tbuf, int initial_height, + int initial_width, int *keys, int *_vscroll, int *_hscroll, + update_text_fn update_text, void *data) +{ + int i, x, y, cur_x, cur_y, key = 0; + int height, width, boxh, boxw; + WINDOW *dialog, *box; + bool done = false; + + begin_reached = 1; + end_reached = 0; + page_length = 0; + hscroll = 0; + buf = tbuf; + page = buf; /* page is pointer to start of page to be displayed */ + + if (_vscroll && *_vscroll) { + begin_reached = 0; + + for (i = 0; i < *_vscroll; i++) + get_line(); + } + if (_hscroll) + hscroll = *_hscroll; + +do_resize: + getmaxyx(stdscr, height, width); + if (height < 8 || width < 8) + return -ERRDISPLAYTOOSMALL; + if (initial_height != 0) + height = initial_height; + else + if (height > 4) + height -= 4; + else + height = 0; + if (initial_width != 0) + width = initial_width; + else + if (width > 5) + width -= 5; + else + width = 0; + + /* center dialog box on screen */ + x = (COLS - width) / 2; + y = (LINES - height) / 2; + + draw_shadow(stdscr, y, x, height, width); + + dialog = newwin(height, width, y, x); + keypad(dialog, TRUE); + + /* Create window for box region, used for scrolling text */ + boxh = height - 4; + boxw = width - 2; + box = subwin(dialog, boxh, boxw, y + 1, x + 1); + wattrset(box, dlg.dialog.atr); + wbkgdset(box, dlg.dialog.atr & A_COLOR); + + keypad(box, TRUE); + + /* register the new window, along with its borders */ + draw_box(dialog, 0, 0, height, width, + dlg.dialog.atr, dlg.border.atr); + + wattrset(dialog, dlg.border.atr); + mvwaddch(dialog, height - 3, 0, ACS_LTEE); + for (i = 0; i < width - 2; i++) + waddch(dialog, ACS_HLINE); + wattrset(dialog, dlg.dialog.atr); + wbkgdset(dialog, dlg.dialog.atr & A_COLOR); + waddch(dialog, ACS_RTEE); + + print_title(dialog, title, width); + + print_button(dialog, gettext(" Exit "), height - 2, width / 2 - 4, TRUE); + wnoutrefresh(dialog); + getyx(dialog, cur_y, cur_x); /* Save cursor position */ + + /* Print first page of text */ + attr_clear(box, boxh, boxw, dlg.dialog.atr); + refresh_text_box(dialog, box, boxh, boxw, cur_y, cur_x, update_text, + data); + + while (!done) { + key = wgetch(dialog); + switch (key) { + case 'E': /* Exit */ + case 'e': + case 'X': + case 'x': + case 'q': + case '\n': + done = true; + break; + case 'g': /* First page */ + case KEY_HOME: + if (!begin_reached) { + begin_reached = 1; + page = buf; + refresh_text_box(dialog, box, boxh, boxw, + cur_y, cur_x, update_text, + data); + } + break; + case 'G': /* Last page */ + case KEY_END: + + end_reached = 1; + /* point to last char in buf */ + page = buf + strlen(buf); + back_lines(boxh); + refresh_text_box(dialog, box, boxh, boxw, cur_y, + cur_x, update_text, data); + break; + case 'K': /* Previous line */ + case 'k': + case KEY_UP: + if (begin_reached) + break; + + back_lines(page_length + 1); + refresh_text_box(dialog, box, boxh, boxw, cur_y, + cur_x, update_text, data); + break; + case 'B': /* Previous page */ + case 'b': + case 'u': + case KEY_PPAGE: + if (begin_reached) + break; + back_lines(page_length + boxh); + refresh_text_box(dialog, box, boxh, boxw, cur_y, + cur_x, update_text, data); + break; + case 'J': /* Next line */ + case 'j': + case KEY_DOWN: + if (end_reached) + break; + + back_lines(page_length - 1); + refresh_text_box(dialog, box, boxh, boxw, cur_y, + cur_x, update_text, data); + break; + case KEY_NPAGE: /* Next page */ + case ' ': + case 'd': + if (end_reached) + break; + + begin_reached = 0; + refresh_text_box(dialog, box, boxh, boxw, cur_y, + cur_x, update_text, data); + break; + case '0': /* Beginning of line */ + case 'H': /* Scroll left */ + case 'h': + case KEY_LEFT: + if (hscroll <= 0) + break; + + if (key == '0') + hscroll = 0; + else + hscroll--; + /* Reprint current page to scroll horizontally */ + back_lines(page_length); + refresh_text_box(dialog, box, boxh, boxw, cur_y, + cur_x, update_text, data); + break; + case 'L': /* Scroll right */ + case 'l': + case KEY_RIGHT: + if (hscroll >= MAX_LEN) + break; + hscroll++; + /* Reprint current page to scroll horizontally */ + back_lines(page_length); + refresh_text_box(dialog, box, boxh, boxw, cur_y, + cur_x, update_text, data); + break; + case KEY_ESC: + if (on_key_esc(dialog) == KEY_ESC) + done = true; + break; + case KEY_RESIZE: + back_lines(height); + delwin(box); + delwin(dialog); + on_key_resize(); + goto do_resize; + default: + for (i = 0; keys[i]; i++) { + if (key == keys[i]) { + done = true; + break; + } + } + } + } + delwin(box); + delwin(dialog); + if (_vscroll) { + const char *s; + + s = buf; + *_vscroll = 0; + back_lines(page_length); + while (s < page && (s = strchr(s, '\n'))) { + (*_vscroll)++; + s++; + } + } + if (_hscroll) + *_hscroll = hscroll; + return key; +} + +/* + * Go back 'n' lines in text. Called by dialog_textbox(). + * 'page' will be updated to point to the desired line in 'buf'. + */ +static void back_lines(int n) +{ + int i; + + begin_reached = 0; + /* Go back 'n' lines */ + for (i = 0; i < n; i++) { + if (*page == '\0') { + if (end_reached) { + end_reached = 0; + continue; + } + } + if (page == buf) { + begin_reached = 1; + return; + } + page--; + do { + if (page == buf) { + begin_reached = 1; + return; + } + page--; + } while (*page != '\n'); + page++; + } +} + +/* + * Print a new page of text. + */ +static void print_page(WINDOW *win, int height, int width, update_text_fn + update_text, void *data) +{ + int i, passed_end = 0; + + if (update_text) { + char *end; + + for (i = 0; i < height; i++) + get_line(); + end = page; + back_lines(height); + update_text(buf, page - buf, end - buf, data); + } + + page_length = 0; + for (i = 0; i < height; i++) { + print_line(win, i, width); + if (!passed_end) + page_length++; + if (end_reached && !passed_end) + passed_end = 1; + } + wnoutrefresh(win); +} + +/* + * Print a new line of text. + */ +static void print_line(WINDOW * win, int row, int width) +{ + char *line; + + line = get_line(); + line += MIN(strlen(line), hscroll); /* Scroll horizontally */ + wmove(win, row, 0); /* move cursor to correct line */ + waddch(win, ' '); + waddnstr(win, line, MIN(strlen(line), width - 2)); + + /* Clear 'residue' of previous line */ +#if OLD_NCURSES + { + int x = getcurx(win); + int i; + for (i = 0; i < width - x; i++) + waddch(win, ' '); + } +#else + wclrtoeol(win); +#endif +} + +/* + * Return current line of text. Called by dialog_textbox() and print_line(). + * 'page' should point to start of current line before calling, and will be + * updated to point to start of next line. + */ +static char *get_line(void) +{ + int i = 0; + static char line[MAX_LEN + 1]; + + end_reached = 0; + while (*page != '\n') { + if (*page == '\0') { + end_reached = 1; + break; + } else if (i < MAX_LEN) + line[i++] = *(page++); + else { + /* Truncate lines longer than MAX_LEN characters */ + if (i == MAX_LEN) + line[i++] = '\0'; + page++; + } + } + if (i <= MAX_LEN) + line[i] = '\0'; + if (!end_reached) + page++; /* move past '\n' */ + + return line; +} + +/* + * Print current position + */ +static void print_position(WINDOW * win) +{ + int percent; + + wattrset(win, dlg.position_indicator.atr); + wbkgdset(win, dlg.position_indicator.atr & A_COLOR); + percent = (page - buf) * 100 / strlen(buf); + wmove(win, getmaxy(win) - 3, getmaxx(win) - 9); + wprintw(win, "(%3d%%)", percent); +} diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c new file mode 100644 index 00000000..109d5311 --- /dev/null +++ b/scripts/kconfig/lxdialog/util.c @@ -0,0 +1,664 @@ +/* + * util.c + * + * ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk) + * MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com) + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <stdarg.h> + +#include "dialog.h" + +/* Needed in signal handler in mconf.c */ +int saved_x, saved_y; + +struct dialog_info dlg; + +static void set_mono_theme(void) +{ + dlg.screen.atr = A_NORMAL; + dlg.shadow.atr = A_NORMAL; + dlg.dialog.atr = A_NORMAL; + dlg.title.atr = A_BOLD; + dlg.border.atr = A_NORMAL; + dlg.button_active.atr = A_REVERSE; + dlg.button_inactive.atr = A_DIM; + dlg.button_key_active.atr = A_REVERSE; + dlg.button_key_inactive.atr = A_BOLD; + dlg.button_label_active.atr = A_REVERSE; + dlg.button_label_inactive.atr = A_NORMAL; + dlg.inputbox.atr = A_NORMAL; + dlg.inputbox_border.atr = A_NORMAL; + dlg.searchbox.atr = A_NORMAL; + dlg.searchbox_title.atr = A_BOLD; + dlg.searchbox_border.atr = A_NORMAL; + dlg.position_indicator.atr = A_BOLD; + dlg.menubox.atr = A_NORMAL; + dlg.menubox_border.atr = A_NORMAL; + dlg.item.atr = A_NORMAL; + dlg.item_selected.atr = A_REVERSE; + dlg.tag.atr = A_BOLD; + dlg.tag_selected.atr = A_REVERSE; + dlg.tag_key.atr = A_BOLD; + dlg.tag_key_selected.atr = A_REVERSE; + dlg.check.atr = A_BOLD; + dlg.check_selected.atr = A_REVERSE; + dlg.uarrow.atr = A_BOLD; + dlg.darrow.atr = A_BOLD; +} + +#define DLG_COLOR(dialog, f, b, h) \ +do { \ + dlg.dialog.fg = (f); \ + dlg.dialog.bg = (b); \ + dlg.dialog.hl = (h); \ +} while (0) + +static void set_classic_theme(void) +{ + DLG_COLOR(screen, COLOR_CYAN, COLOR_BLUE, true); + DLG_COLOR(shadow, COLOR_BLACK, COLOR_BLACK, true); + DLG_COLOR(dialog, COLOR_BLACK, COLOR_WHITE, false); + DLG_COLOR(title, COLOR_YELLOW, COLOR_WHITE, true); + DLG_COLOR(border, COLOR_WHITE, COLOR_WHITE, true); + DLG_COLOR(button_active, COLOR_WHITE, COLOR_BLUE, true); + DLG_COLOR(button_inactive, COLOR_BLACK, COLOR_WHITE, false); + DLG_COLOR(button_key_active, COLOR_WHITE, COLOR_BLUE, true); + DLG_COLOR(button_key_inactive, COLOR_RED, COLOR_WHITE, false); + DLG_COLOR(button_label_active, COLOR_YELLOW, COLOR_BLUE, true); + DLG_COLOR(button_label_inactive, COLOR_BLACK, COLOR_WHITE, true); + DLG_COLOR(inputbox, COLOR_BLACK, COLOR_WHITE, false); + DLG_COLOR(inputbox_border, COLOR_BLACK, COLOR_WHITE, false); + DLG_COLOR(searchbox, COLOR_BLACK, COLOR_WHITE, false); + DLG_COLOR(searchbox_title, COLOR_YELLOW, COLOR_WHITE, true); + DLG_COLOR(searchbox_border, COLOR_WHITE, COLOR_WHITE, true); + DLG_COLOR(position_indicator, COLOR_YELLOW, COLOR_WHITE, true); + DLG_COLOR(menubox, COLOR_BLACK, COLOR_WHITE, false); + DLG_COLOR(menubox_border, COLOR_WHITE, COLOR_WHITE, true); + DLG_COLOR(item, COLOR_BLACK, COLOR_WHITE, false); + DLG_COLOR(item_selected, COLOR_WHITE, COLOR_BLUE, true); + DLG_COLOR(tag, COLOR_YELLOW, COLOR_WHITE, true); + DLG_COLOR(tag_selected, COLOR_YELLOW, COLOR_BLUE, true); + DLG_COLOR(tag_key, COLOR_YELLOW, COLOR_WHITE, true); + DLG_COLOR(tag_key_selected, COLOR_YELLOW, COLOR_BLUE, true); + DLG_COLOR(check, COLOR_BLACK, COLOR_WHITE, false); + DLG_COLOR(check_selected, COLOR_WHITE, COLOR_BLUE, true); + DLG_COLOR(uarrow, COLOR_GREEN, COLOR_WHITE, true); + DLG_COLOR(darrow, COLOR_GREEN, COLOR_WHITE, true); +} + +static void set_blackbg_theme(void) +{ + DLG_COLOR(screen, COLOR_RED, COLOR_BLACK, true); + DLG_COLOR(shadow, COLOR_BLACK, COLOR_BLACK, false); + DLG_COLOR(dialog, COLOR_WHITE, COLOR_BLACK, false); + DLG_COLOR(title, COLOR_RED, COLOR_BLACK, false); + DLG_COLOR(border, COLOR_BLACK, COLOR_BLACK, true); + + DLG_COLOR(button_active, COLOR_YELLOW, COLOR_RED, false); + DLG_COLOR(button_inactive, COLOR_YELLOW, COLOR_BLACK, false); + DLG_COLOR(button_key_active, COLOR_YELLOW, COLOR_RED, true); + DLG_COLOR(button_key_inactive, COLOR_RED, COLOR_BLACK, false); + DLG_COLOR(button_label_active, COLOR_WHITE, COLOR_RED, false); + DLG_COLOR(button_label_inactive, COLOR_BLACK, COLOR_BLACK, true); + + DLG_COLOR(inputbox, COLOR_YELLOW, COLOR_BLACK, false); + DLG_COLOR(inputbox_border, COLOR_YELLOW, COLOR_BLACK, false); + + DLG_COLOR(searchbox, COLOR_YELLOW, COLOR_BLACK, false); + DLG_COLOR(searchbox_title, COLOR_YELLOW, COLOR_BLACK, true); + DLG_COLOR(searchbox_border, COLOR_BLACK, COLOR_BLACK, true); + + DLG_COLOR(position_indicator, COLOR_RED, COLOR_BLACK, false); + + DLG_COLOR(menubox, COLOR_YELLOW, COLOR_BLACK, false); + DLG_COLOR(menubox_border, COLOR_BLACK, COLOR_BLACK, true); + + DLG_COLOR(item, COLOR_WHITE, COLOR_BLACK, false); + DLG_COLOR(item_selected, COLOR_WHITE, COLOR_RED, false); + + DLG_COLOR(tag, COLOR_RED, COLOR_BLACK, false); + DLG_COLOR(tag_selected, COLOR_YELLOW, COLOR_RED, true); + DLG_COLOR(tag_key, COLOR_RED, COLOR_BLACK, false); + DLG_COLOR(tag_key_selected, COLOR_YELLOW, COLOR_RED, true); + + DLG_COLOR(check, COLOR_YELLOW, COLOR_BLACK, false); + DLG_COLOR(check_selected, COLOR_YELLOW, COLOR_RED, true); + + DLG_COLOR(uarrow, COLOR_RED, COLOR_BLACK, false); + DLG_COLOR(darrow, COLOR_RED, COLOR_BLACK, false); +} + +static void set_bluetitle_theme(void) +{ + set_classic_theme(); + DLG_COLOR(title, COLOR_BLUE, COLOR_WHITE, true); + DLG_COLOR(button_key_active, COLOR_YELLOW, COLOR_BLUE, true); + DLG_COLOR(button_label_active, COLOR_WHITE, COLOR_BLUE, true); + DLG_COLOR(searchbox_title, COLOR_BLUE, COLOR_WHITE, true); + DLG_COLOR(position_indicator, COLOR_BLUE, COLOR_WHITE, true); + DLG_COLOR(tag, COLOR_BLUE, COLOR_WHITE, true); + DLG_COLOR(tag_key, COLOR_BLUE, COLOR_WHITE, true); + +} + +/* + * Select color theme + */ +static int set_theme(const char *theme) +{ + int use_color = 1; + if (!theme) + set_bluetitle_theme(); + else if (strcmp(theme, "classic") == 0) + set_classic_theme(); + else if (strcmp(theme, "bluetitle") == 0) + set_bluetitle_theme(); + else if (strcmp(theme, "blackbg") == 0) + set_blackbg_theme(); + else if (strcmp(theme, "mono") == 0) + use_color = 0; + + return use_color; +} + +static void init_one_color(struct dialog_color *color) +{ + static int pair = 0; + + pair++; + init_pair(pair, color->fg, color->bg); + if (color->hl) + color->atr = A_BOLD | COLOR_PAIR(pair); + else + color->atr = COLOR_PAIR(pair); +} + +static void init_dialog_colors(void) +{ + init_one_color(&dlg.screen); + init_one_color(&dlg.shadow); + init_one_color(&dlg.dialog); + init_one_color(&dlg.title); + init_one_color(&dlg.border); + init_one_color(&dlg.button_active); + init_one_color(&dlg.button_inactive); + init_one_color(&dlg.button_key_active); + init_one_color(&dlg.button_key_inactive); + init_one_color(&dlg.button_label_active); + init_one_color(&dlg.button_label_inactive); + init_one_color(&dlg.inputbox); + init_one_color(&dlg.inputbox_border); + init_one_color(&dlg.searchbox); + init_one_color(&dlg.searchbox_title); + init_one_color(&dlg.searchbox_border); + init_one_color(&dlg.position_indicator); + init_one_color(&dlg.menubox); + init_one_color(&dlg.menubox_border); + init_one_color(&dlg.item); + init_one_color(&dlg.item_selected); + init_one_color(&dlg.tag); + init_one_color(&dlg.tag_selected); + init_one_color(&dlg.tag_key); + init_one_color(&dlg.tag_key_selected); + init_one_color(&dlg.check); + init_one_color(&dlg.check_selected); + init_one_color(&dlg.uarrow); + init_one_color(&dlg.darrow); +} + +/* + * Setup for color display + */ +static void color_setup(const char *theme) +{ + int use_color; + + use_color = set_theme(theme); + if (use_color && has_colors()) { + start_color(); + init_dialog_colors(); + } else + set_mono_theme(); +} + +/* + * Set window to attribute 'attr' + */ +void attr_clear(WINDOW * win, int height, int width, chtype attr) +{ + int i, j; + + wattrset(win, attr); + for (i = 0; i < height; i++) { + wmove(win, i, 0); + for (j = 0; j < width; j++) + waddch(win, ' '); + } + touchwin(win); +} + +void dialog_clear(void) +{ + attr_clear(stdscr, LINES, COLS, dlg.screen.atr); + /* Display background title if it exists ... - SLH */ + if (dlg.backtitle != NULL) { + int i; + + wattrset(stdscr, dlg.screen.atr); + mvwaddstr(stdscr, 0, 1, (char *)dlg.backtitle); + wmove(stdscr, 1, 1); + for (i = 1; i < COLS - 1; i++) + waddch(stdscr, ACS_HLINE); + } + wnoutrefresh(stdscr); +} + +/* + * Do some initialization for dialog + */ +int init_dialog(const char *backtitle) +{ + int height, width; + + initscr(); /* Init curses */ + + /* Get current cursor position for signal handler in mconf.c */ + getyx(stdscr, saved_y, saved_x); + + getmaxyx(stdscr, height, width); + if (height < 19 || width < 80) { + endwin(); + return -ERRDISPLAYTOOSMALL; + } + + dlg.backtitle = backtitle; + color_setup(getenv("MENUCONFIG_COLOR")); + + keypad(stdscr, TRUE); + cbreak(); + noecho(); + dialog_clear(); + + return 0; +} + +void set_dialog_backtitle(const char *backtitle) +{ + dlg.backtitle = backtitle; +} + +/* + * End using dialog functions. + */ +void end_dialog(int x, int y) +{ + /* move cursor back to original position */ + move(y, x); + refresh(); + endwin(); +} + +/* Print the title of the dialog. Center the title and truncate + * tile if wider than dialog (- 2 chars). + **/ +void print_title(WINDOW *dialog, const char *title, int width) +{ + if (title) { + int tlen = MIN(width - 2, strlen(title)); + wattrset(dialog, dlg.title.atr); + mvwaddch(dialog, 0, (width - tlen) / 2 - 1, ' '); + mvwaddnstr(dialog, 0, (width - tlen)/2, title, tlen); + waddch(dialog, ' '); + } +} + +/* + * Print a string of text in a window, automatically wrap around to the + * next line if the string is too long to fit on one line. Newline + * characters '\n' are replaced by spaces. We start on a new line + * if there is no room for at least 4 nonblanks following a double-space. + */ +void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x) +{ + int newl, cur_x, cur_y; + int i, prompt_len, room, wlen; + char tempstr[MAX_LEN + 1], *word, *sp, *sp2; + + strcpy(tempstr, prompt); + + prompt_len = strlen(tempstr); + + /* + * Remove newlines + */ + for (i = 0; i < prompt_len; i++) { + if (tempstr[i] == '\n') + tempstr[i] = ' '; + } + + if (prompt_len <= width - x * 2) { /* If prompt is short */ + wmove(win, y, (width - prompt_len) / 2); + waddstr(win, tempstr); + } else { + cur_x = x; + cur_y = y; + newl = 1; + word = tempstr; + while (word && *word) { + sp = strchr(word, ' '); + if (sp) + *sp++ = 0; + + /* Wrap to next line if either the word does not fit, + or it is the first word of a new sentence, and it is + short, and the next word does not fit. */ + room = width - cur_x; + wlen = strlen(word); + if (wlen > room || + (newl && wlen < 4 && sp + && wlen + 1 + strlen(sp) > room + && (!(sp2 = strchr(sp, ' ')) + || wlen + 1 + (sp2 - sp) > room))) { + cur_y++; + cur_x = x; + } + wmove(win, cur_y, cur_x); + waddstr(win, word); + getyx(win, cur_y, cur_x); + cur_x++; + if (sp && *sp == ' ') { + cur_x++; /* double space */ + while (*++sp == ' ') ; + newl = 1; + } else + newl = 0; + word = sp; + } + } +} + +/* + * Print a button + */ +void print_button(WINDOW * win, const char *label, int y, int x, int selected) +{ + int i, temp; + + wmove(win, y, x); + wattrset(win, selected ? dlg.button_active.atr + : dlg.button_inactive.atr); + waddstr(win, "<"); + temp = strspn(label, " "); + label += temp; + wattrset(win, selected ? dlg.button_label_active.atr + : dlg.button_label_inactive.atr); + for (i = 0; i < temp; i++) + waddch(win, ' '); + wattrset(win, selected ? dlg.button_key_active.atr + : dlg.button_key_inactive.atr); + waddch(win, label[0]); + wattrset(win, selected ? dlg.button_label_active.atr + : dlg.button_label_inactive.atr); + waddstr(win, (char *)label + 1); + wattrset(win, selected ? dlg.button_active.atr + : dlg.button_inactive.atr); + waddstr(win, ">"); + wmove(win, y, x + temp + 1); +} + +/* + * Draw a rectangular box with line drawing characters + */ +void +draw_box(WINDOW * win, int y, int x, int height, int width, + chtype box, chtype border) +{ + int i, j; + + wattrset(win, 0); + for (i = 0; i < height; i++) { + wmove(win, y + i, x); + for (j = 0; j < width; j++) + if (!i && !j) + waddch(win, border | ACS_ULCORNER); + else if (i == height - 1 && !j) + waddch(win, border | ACS_LLCORNER); + else if (!i && j == width - 1) + waddch(win, box | ACS_URCORNER); + else if (i == height - 1 && j == width - 1) + waddch(win, box | ACS_LRCORNER); + else if (!i) + waddch(win, border | ACS_HLINE); + else if (i == height - 1) + waddch(win, box | ACS_HLINE); + else if (!j) + waddch(win, border | ACS_VLINE); + else if (j == width - 1) + waddch(win, box | ACS_VLINE); + else + waddch(win, box | ' '); + } +} + +/* + * Draw shadows along the right and bottom edge to give a more 3D look + * to the boxes + */ +void draw_shadow(WINDOW * win, int y, int x, int height, int width) +{ + int i; + + if (has_colors()) { /* Whether terminal supports color? */ + wattrset(win, dlg.shadow.atr); + wmove(win, y + height, x + 2); + for (i = 0; i < width; i++) + waddch(win, winch(win) & A_CHARTEXT); + for (i = y + 1; i < y + height + 1; i++) { + wmove(win, i, x + width); + waddch(win, winch(win) & A_CHARTEXT); + waddch(win, winch(win) & A_CHARTEXT); + } + wnoutrefresh(win); + } +} + +/* + * Return the position of the first alphabetic character in a string. + */ +int first_alpha(const char *string, const char *exempt) +{ + int i, in_paren = 0, c; + + for (i = 0; i < strlen(string); i++) { + c = tolower(string[i]); + + if (strchr("<[(", c)) + ++in_paren; + if (strchr(">])", c) && in_paren > 0) + --in_paren; + + if ((!in_paren) && isalpha(c) && strchr(exempt, c) == 0) + return i; + } + + return 0; +} + +/* + * ncurses uses ESC to detect escaped char sequences. This resutl in + * a small timeout before ESC is actually delivered to the application. + * lxdialog suggest <ESC> <ESC> which is correctly translated to two + * times esc. But then we need to ignore the second esc to avoid stepping + * out one menu too much. Filter away all escaped key sequences since + * keypad(FALSE) turn off ncurses support for escape sequences - and thats + * needed to make notimeout() do as expected. + */ +int on_key_esc(WINDOW *win) +{ + int key; + int key2; + int key3; + + nodelay(win, TRUE); + keypad(win, FALSE); + key = wgetch(win); + key2 = wgetch(win); + do { + key3 = wgetch(win); + } while (key3 != ERR); + nodelay(win, FALSE); + keypad(win, TRUE); + if (key == KEY_ESC && key2 == ERR) + return KEY_ESC; + else if (key != ERR && key != KEY_ESC && key2 == ERR) + ungetch(key); + + return -1; +} + +/* redraw screen in new size */ +int on_key_resize(void) +{ + dialog_clear(); + return KEY_RESIZE; +} + +struct dialog_list *item_cur; +struct dialog_list item_nil; +struct dialog_list *item_head; + +void item_reset(void) +{ + struct dialog_list *p, *next; + + for (p = item_head; p; p = next) { + next = p->next; + free(p); + } + item_head = NULL; + item_cur = &item_nil; +} + +void item_make(const char *fmt, ...) +{ + va_list ap; + struct dialog_list *p = malloc(sizeof(*p)); + + if (item_head) + item_cur->next = p; + else + item_head = p; + item_cur = p; + memset(p, 0, sizeof(*p)); + + va_start(ap, fmt); + vsnprintf(item_cur->node.str, sizeof(item_cur->node.str), fmt, ap); + va_end(ap); +} + +void item_add_str(const char *fmt, ...) +{ + va_list ap; + size_t avail; + + avail = sizeof(item_cur->node.str) - strlen(item_cur->node.str); + + va_start(ap, fmt); + vsnprintf(item_cur->node.str + strlen(item_cur->node.str), + avail, fmt, ap); + item_cur->node.str[sizeof(item_cur->node.str) - 1] = '\0'; + va_end(ap); +} + +void item_set_tag(char tag) +{ + item_cur->node.tag = tag; +} +void item_set_data(void *ptr) +{ + item_cur->node.data = ptr; +} + +void item_set_selected(int val) +{ + item_cur->node.selected = val; +} + +int item_activate_selected(void) +{ + item_foreach() + if (item_is_selected()) + return 1; + return 0; +} + +void *item_data(void) +{ + return item_cur->node.data; +} + +char item_tag(void) +{ + return item_cur->node.tag; +} + +int item_count(void) +{ + int n = 0; + struct dialog_list *p; + + for (p = item_head; p; p = p->next) + n++; + return n; +} + +void item_set(int n) +{ + int i = 0; + item_foreach() + if (i++ == n) + return; +} + +int item_n(void) +{ + int n = 0; + struct dialog_list *p; + + for (p = item_head; p; p = p->next) { + if (p == item_cur) + return n; + n++; + } + return 0; +} + +const char *item_str(void) +{ + return item_cur->node.str; +} + +int item_is_selected(void) +{ + return (item_cur->node.selected != 0); +} + +int item_is_tag(char tag) +{ + return (item_cur->node.tag == tag); +} diff --git a/scripts/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c new file mode 100644 index 00000000..4e6e8090 --- /dev/null +++ b/scripts/kconfig/lxdialog/yesno.c @@ -0,0 +1,114 @@ +/* + * yesno.c -- implements the yes/no box + * + * ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk) + * MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com) + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "dialog.h" + +/* + * Display termination buttons + */ +static void print_buttons(WINDOW * dialog, int height, int width, int selected) +{ + int x = width / 2 - 10; + int y = height - 2; + + print_button(dialog, gettext(" Yes "), y, x, selected == 0); + print_button(dialog, gettext(" No "), y, x + 13, selected == 1); + + wmove(dialog, y, x + 1 + 13 * selected); + wrefresh(dialog); +} + +/* + * Display a dialog box with two buttons - Yes and No + */ +int dialog_yesno(const char *title, const char *prompt, int height, int width) +{ + int i, x, y, key = 0, button = 0; + WINDOW *dialog; + +do_resize: + if (getmaxy(stdscr) < (height + 4)) + return -ERRDISPLAYTOOSMALL; + if (getmaxx(stdscr) < (width + 4)) + return -ERRDISPLAYTOOSMALL; + + /* center dialog box on screen */ + x = (COLS - width) / 2; + y = (LINES - height) / 2; + + draw_shadow(stdscr, y, x, height, width); + + dialog = newwin(height, width, y, x); + keypad(dialog, TRUE); + + draw_box(dialog, 0, 0, height, width, + dlg.dialog.atr, dlg.border.atr); + wattrset(dialog, dlg.border.atr); + mvwaddch(dialog, height - 3, 0, ACS_LTEE); + for (i = 0; i < width - 2; i++) + waddch(dialog, ACS_HLINE); + wattrset(dialog, dlg.dialog.atr); + waddch(dialog, ACS_RTEE); + + print_title(dialog, title, width); + + wattrset(dialog, dlg.dialog.atr); + print_autowrap(dialog, prompt, width - 2, 1, 3); + + print_buttons(dialog, height, width, 0); + + while (key != KEY_ESC) { + key = wgetch(dialog); + switch (key) { + case 'Y': + case 'y': + delwin(dialog); + return 0; + case 'N': + case 'n': + delwin(dialog); + return 1; + + case TAB: + case KEY_LEFT: + case KEY_RIGHT: + button = ((key == KEY_LEFT ? --button : ++button) < 0) ? 1 : (button > 1 ? 0 : button); + + print_buttons(dialog, height, width, button); + wrefresh(dialog); + break; + case ' ': + case '\n': + delwin(dialog); + return button; + case KEY_ESC: + key = on_key_esc(dialog); + break; + case KEY_RESIZE: + delwin(dialog); + on_key_resize(); + goto do_resize; + } + } + + delwin(dialog); + return key; /* ESC pressed */ +} diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c new file mode 100644 index 00000000..566288a7 --- /dev/null +++ b/scripts/kconfig/mconf.c @@ -0,0 +1,963 @@ +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + * + * Introduced single menu mode (show all sub-menus in one large tree). + * 2002-11-06 Petr Baudis <pasky@ucw.cz> + * + * i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br> + */ + +#include <ctype.h> +#include <errno.h> +#include <fcntl.h> +#include <limits.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <signal.h> +#include <unistd.h> +#include <locale.h> + +#include "lkc.h" +#include "lxdialog/dialog.h" + +static const char mconf_readme[] = N_( +"Overview\n" +"--------\n" +"This interface let you select features and parameters for the build.\n" +"Features can either be built-in, modularized, or ignored. Parameters\n" +"must be entered in as decimal or hexadecimal numbers or text.\n" +"\n" +"Menu items beginning with following braces represent features that\n" +" [ ] can be built in or removed\n" +" < > can be built in, modularized or removed\n" +" { } can be built in or modularized (selected by other feature)\n" +" - - are selected by other feature,\n" +"while *, M or whitespace inside braces means to build in, build as\n" +"a module or to exclude the feature respectively.\n" +"\n" +"To change any of these features, highlight it with the cursor\n" +"keys and press <Y> to build it in, <M> to make it a module or\n" +"<N> to removed it. You may also press the <Space Bar> to cycle\n" +"through the available options (ie. Y->N->M->Y).\n" +"\n" +"Some additional keyboard hints:\n" +"\n" +"Menus\n" +"----------\n" +"o Use the Up/Down arrow keys (cursor keys) to highlight the item\n" +" you wish to change or submenu wish to select and press <Enter>.\n" +" Submenus are designated by \"--->\".\n" +"\n" +" Shortcut: Press the option's highlighted letter (hotkey).\n" +" Pressing a hotkey more than once will sequence\n" +" through all visible items which use that hotkey.\n" +"\n" +" You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n" +" unseen options into view.\n" +"\n" +"o To exit a menu use the cursor keys to highlight the <Exit> button\n" +" and press <ENTER>.\n" +"\n" +" Shortcut: Press <ESC><ESC> or <E> or <X> if there is no hotkey\n" +" using those letters. You may press a single <ESC>, but\n" +" there is a delayed response which you may find annoying.\n" +"\n" +" Also, the <TAB> and cursor keys will cycle between <Select>,\n" +" <Exit> and <Help>.\n" +"\n" +"o To get help with an item, use the cursor keys to highlight <Help>\n" +" and press <ENTER>.\n" +"\n" +" Shortcut: Press <H> or <?>.\n" +"\n" +"o To toggle the display of hidden options, press <Z>.\n" +"\n" +"\n" +"Radiolists (Choice lists)\n" +"-----------\n" +"o Use the cursor keys to select the option you wish to set and press\n" +" <S> or the <SPACE BAR>.\n" +"\n" +" Shortcut: Press the first letter of the option you wish to set then\n" +" press <S> or <SPACE BAR>.\n" +"\n" +"o To see available help for the item, use the cursor keys to highlight\n" +" <Help> and Press <ENTER>.\n" +"\n" +" Shortcut: Press <H> or <?>.\n" +"\n" +" Also, the <TAB> and cursor keys will cycle between <Select> and\n" +" <Help>\n" +"\n" +"\n" +"Data Entry\n" +"-----------\n" +"o Enter the requested information and press <ENTER>\n" +" If you are entering hexadecimal values, it is not necessary to\n" +" add the '0x' prefix to the entry.\n" +"\n" +"o For help, use the <TAB> or cursor keys to highlight the help option\n" +" and press <ENTER>. You can try <TAB><H> as well.\n" +"\n" +"\n" +"Text Box (Help Window)\n" +"--------\n" +"o Use the cursor keys to scroll up/down/left/right. The VI editor\n" +" keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for \n" +" those who are familiar with less and lynx.\n" +"\n" +"o Press <E>, <X>, <q>, <Enter> or <Esc><Esc> to exit.\n" +"\n" +"\n" +"Alternate Configuration Files\n" +"-----------------------------\n" +"Menuconfig supports the use of alternate configuration files for\n" +"those who, for various reasons, find it necessary to switch\n" +"between different configurations.\n" +"\n" +"At the end of the main menu you will find two options. One is\n" +"for saving the current configuration to a file of your choosing.\n" +"The other option is for loading a previously saved alternate\n" +"configuration.\n" +"\n" +"Even if you don't use alternate configuration files, but you\n" +"find during a Menuconfig session that you have completely messed\n" +"up your settings, you may use the \"Load Alternate...\" option to\n" +"restore your previously saved settings from \".config\" without\n" +"restarting Menuconfig.\n" +"\n" +"Other information\n" +"-----------------\n" +"If you use Menuconfig in an XTERM window make sure you have your\n" +"$TERM variable set to point to a xterm definition which supports color.\n" +"Otherwise, Menuconfig will look rather bad. Menuconfig will not\n" +"display correctly in a RXVT window because rxvt displays only one\n" +"intensity of color, bright.\n" +"\n" +"Menuconfig will display larger menus on screens or xterms which are\n" +"set to display more than the standard 25 row by 80 column geometry.\n" +"In order for this to work, the \"stty size\" command must be able to\n" +"display the screen's current row and column geometry. I STRONGLY\n" +"RECOMMEND that you make sure you do NOT have the shell variables\n" +"LINES and COLUMNS exported into your environment. Some distributions\n" +"export those variables via /etc/profile. Some ncurses programs can\n" +"become confused when those variables (LINES & COLUMNS) don't reflect\n" +"the true screen size.\n" +"\n" +"Optional personality available\n" +"------------------------------\n" +"If you prefer to have all of the options listed in a single menu, rather\n" +"than the default multimenu hierarchy, run the menuconfig with\n" +"MENUCONFIG_MODE environment variable set to single_menu. Example:\n" +"\n" +"make MENUCONFIG_MODE=single_menu menuconfig\n" +"\n" +"<Enter> will then unroll the appropriate category, or enfold it if it\n" +"is already unrolled.\n" +"\n" +"Note that this mode can eventually be a little more CPU expensive\n" +"(especially with a larger number of unrolled categories) than the\n" +"default mode.\n" +"\n" +"Different color themes available\n" +"--------------------------------\n" +"It is possible to select different color themes using the variable\n" +"MENUCONFIG_COLOR. To select a theme use:\n" +"\n" +"make MENUCONFIG_COLOR=<theme> menuconfig\n" +"\n" +"Available themes are\n" +" mono => selects colors suitable for monochrome displays\n" +" blackbg => selects a color scheme with black background\n" +" classic => theme with blue background. The classic look\n" +" bluetitle => a LCD friendly version of classic. (default)\n" +"\n"), +menu_instructions[] = N_( + "Arrow keys navigate the menu. " + "<Enter> selects submenus --->. " + "Highlighted letters are hotkeys. " + "Pressing <Y> includes, <N> excludes, <M> modularizes features. " + "Press <Esc><Esc> to exit, <?> for Help, </> for Search. " + "Legend: [*] built-in [ ] excluded <M> module < > module capable"), +radiolist_instructions[] = N_( + "Use the arrow keys to navigate this window or " + "press the hotkey of the item you wish to select " + "followed by the <SPACE BAR>. " + "Press <?> for additional information about this option."), +inputbox_instructions_int[] = N_( + "Please enter a decimal value. " + "Fractions will not be accepted. " + "Use the <TAB> key to move from the input field to the buttons below it."), +inputbox_instructions_hex[] = N_( + "Please enter a hexadecimal value. " + "Use the <TAB> key to move from the input field to the buttons below it."), +inputbox_instructions_string[] = N_( + "Please enter a string value. " + "Use the <TAB> key to move from the input field to the buttons below it."), +setmod_text[] = N_( + "This feature depends on another which has been configured as a module.\n" + "As a result, this feature will be built as a module."), +load_config_text[] = N_( + "Enter the name of the configuration file you wish to load. " + "Accept the name shown to restore the configuration you " + "last retrieved. Leave blank to abort."), +load_config_help[] = N_( + "\n" + "For various reasons, one may wish to keep several different\n" + "configurations available on a single machine.\n" + "\n" + "If you have saved a previous configuration in a file other than the\n" + "default one, entering its name here will allow you to modify that\n" + "configuration.\n" + "\n" + "If you are uncertain, then you have probably never used alternate\n" + "configuration files. You should therefore leave this blank to abort.\n"), +save_config_text[] = N_( + "Enter a filename to which this configuration should be saved " + "as an alternate. Leave blank to abort."), +save_config_help[] = N_( + "\n" + "For various reasons, one may wish to keep different configurations\n" + "available on a single machine.\n" + "\n" + "Entering a file name here will allow you to later retrieve, modify\n" + "and use the current configuration as an alternate to whatever\n" + "configuration options you have selected at that time.\n" + "\n" + "If you are uncertain what all this means then you should probably\n" + "leave this blank.\n"), +search_help[] = N_( + "\n" + "Search for symbols and display their relations.\n" + "Regular expressions are allowed.\n" + "Example: search for \"^FOO\"\n" + "Result:\n" + "-----------------------------------------------------------------\n" + "Symbol: FOO [=m]\n" + "Type : tristate\n" + "Prompt: Foo bus is used to drive the bar HW\n" + " Defined at drivers/pci/Kconfig:47\n" + " Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n" + " Location:\n" + " -> Bus options (PCI, PCMCIA, EISA, ISA)\n" + " -> PCI support (PCI [=y])\n" + "(1) -> PCI access mode (<choice> [=y])\n" + " Selects: LIBCRC32\n" + " Selected by: BAR\n" + "-----------------------------------------------------------------\n" + "o The line 'Type:' shows the type of the configuration option for\n" + " this symbol (boolean, tristate, string, ...)\n" + "o The line 'Prompt:' shows the text used in the menu structure for\n" + " this symbol\n" + "o The 'Defined at' line tell at what file / line number the symbol\n" + " is defined\n" + "o The 'Depends on:' line tell what symbols needs to be defined for\n" + " this symbol to be visible in the menu (selectable)\n" + "o The 'Location:' lines tell where in the menu structure this symbol\n" + " is located\n" + " A location followed by a [=y] indicates that this is a\n" + " selectable menu item - and the current value is displayed inside\n" + " brackets.\n" + " Press the key in the (#) prefix to jump directly to that\n" + " location. You will be returned to the current search results\n" + " after exiting this new menu.\n" + "o The 'Selects:' line tell what symbol will be automatically\n" + " selected if this symbol is selected (y or m)\n" + "o The 'Selected by' line tell what symbol has selected this symbol\n" + "\n" + "Only relevant lines are shown.\n" + "\n\n" + "Search examples:\n" + "Examples: USB => find all symbols containing USB\n" + " ^USB => find all symbols starting with USB\n" + " USB$ => find all symbols ending with USB\n" + "\n"); + +static int indent; +static struct menu *current_menu; +static int child_count; +static int single_menu_mode; +static int show_all_options; +static int save_and_exit; + +static void conf(struct menu *menu, struct menu *active_menu); +static void conf_choice(struct menu *menu); +static void conf_string(struct menu *menu); +static void conf_load(void); +static void conf_save(void); +static int show_textbox_ext(const char *title, char *text, int r, int c, + int *keys, int *vscroll, int *hscroll, + update_text_fn update_text, void *data); +static void show_textbox(const char *title, const char *text, int r, int c); +static void show_helptext(const char *title, const char *text); +static void show_help(struct menu *menu); + +static char filename[PATH_MAX+1]; +static void set_config_filename(const char *config_filename) +{ + static char menu_backtitle[PATH_MAX+128]; + int size; + + size = snprintf(menu_backtitle, sizeof(menu_backtitle), + "%s - %s", config_filename, rootmenu.prompt->text); + if (size >= sizeof(menu_backtitle)) + menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; + set_dialog_backtitle(menu_backtitle); + + size = snprintf(filename, sizeof(filename), "%s", config_filename); + if (size >= sizeof(filename)) + filename[sizeof(filename)-1] = '\0'; +} + + +struct search_data { + struct list_head *head; + struct menu **targets; + int *keys; +}; + +static void update_text(char *buf, size_t start, size_t end, void *_data) +{ + struct search_data *data = _data; + struct jump_key *pos; + int k = 0; + + list_for_each_entry(pos, data->head, entries) { + if (pos->offset >= start && pos->offset < end) { + char header[4]; + + if (k < JUMP_NB) { + int key = '0' + (pos->index % JUMP_NB) + 1; + + sprintf(header, "(%c)", key); + data->keys[k] = key; + data->targets[k] = pos->target; + k++; + } else { + sprintf(header, " "); + } + + memcpy(buf + pos->offset, header, sizeof(header) - 1); + } + } + data->keys[k] = 0; +} + +static void search_conf(void) +{ + struct symbol **sym_arr; + struct gstr res; + struct gstr title; + char *dialog_input; + int dres, vscroll = 0, hscroll = 0; + bool again; + + title = str_new(); + str_printf( &title, _("Enter %s (sub)string to search for " + "(with or without \"%s\")"), CONFIG_, CONFIG_); + +again: + dialog_clear(); + dres = dialog_inputbox(_("Search Configuration Parameter"), + str_get(&title), + 10, 75, ""); + switch (dres) { + case 0: + break; + case 1: + show_helptext(_("Search Configuration"), search_help); + goto again; + default: + str_free(&title); + return; + } + + /* strip the prefix if necessary */ + dialog_input = dialog_input_result; + if (strncasecmp(dialog_input_result, CONFIG_, strlen(CONFIG_)) == 0) + dialog_input += strlen(CONFIG_); + + sym_arr = sym_re_search(dialog_input); + do { + LIST_HEAD(head); + struct menu *targets[JUMP_NB]; + int keys[JUMP_NB + 1], i; + struct search_data data = { + .head = &head, + .targets = targets, + .keys = keys, + }; + + res = get_relations_str(sym_arr, &head); + dres = show_textbox_ext(_("Search Results"), (char *) + str_get(&res), 0, 0, keys, &vscroll, + &hscroll, &update_text, (void *) + &data); + again = false; + for (i = 0; i < JUMP_NB && keys[i]; i++) + if (dres == keys[i]) { + conf(targets[i]->parent, targets[i]); + again = true; + } + str_free(&res); + } while (again); + free(sym_arr); + str_free(&title); +} + +static void build_conf(struct menu *menu) +{ + struct symbol *sym; + struct property *prop; + struct menu *child; + int type, tmp, doint = 2; + tristate val; + char ch; + bool visible; + + /* + * note: menu_is_visible() has side effect that it will + * recalc the value of the symbol. + */ + visible = menu_is_visible(menu); + if (show_all_options && !menu_has_prompt(menu)) + return; + else if (!show_all_options && !visible) + return; + + sym = menu->sym; + prop = menu->prompt; + if (!sym) { + if (prop && menu != current_menu) { + const char *prompt = menu_get_prompt(menu); + switch (prop->type) { + case P_MENU: + child_count++; + prompt = _(prompt); + if (single_menu_mode) { + item_make("%s%*c%s", + menu->data ? "-->" : "++>", + indent + 1, ' ', prompt); + } else + item_make(" %*c%s --->", indent + 1, ' ', prompt); + + item_set_tag('m'); + item_set_data(menu); + if (single_menu_mode && menu->data) + goto conf_childs; + return; + case P_COMMENT: + if (prompt) { + child_count++; + item_make(" %*c*** %s ***", indent + 1, ' ', _(prompt)); + item_set_tag(':'); + item_set_data(menu); + } + break; + default: + if (prompt) { + child_count++; + item_make("---%*c%s", indent + 1, ' ', _(prompt)); + item_set_tag(':'); + item_set_data(menu); + } + } + } else + doint = 0; + goto conf_childs; + } + + type = sym_get_type(sym); + if (sym_is_choice(sym)) { + struct symbol *def_sym = sym_get_choice_value(sym); + struct menu *def_menu = NULL; + + child_count++; + for (child = menu->list; child; child = child->next) { + if (menu_is_visible(child) && child->sym == def_sym) + def_menu = child; + } + + val = sym_get_tristate_value(sym); + if (sym_is_changable(sym)) { + switch (type) { + case S_BOOLEAN: + item_make("[%c]", val == no ? ' ' : '*'); + break; + case S_TRISTATE: + switch (val) { + case yes: ch = '*'; break; + case mod: ch = 'M'; break; + default: ch = ' '; break; + } + item_make("<%c>", ch); + break; + } + item_set_tag('t'); + item_set_data(menu); + } else { + item_make(" "); + item_set_tag(def_menu ? 't' : ':'); + item_set_data(menu); + } + + item_add_str("%*c%s", indent + 1, ' ', _(menu_get_prompt(menu))); + if (val == yes) { + if (def_menu) { + item_add_str(" (%s)", _(menu_get_prompt(def_menu))); + item_add_str(" --->"); + if (def_menu->list) { + indent += 2; + build_conf(def_menu); + indent -= 2; + } + } + return; + } + } else { + if (menu == current_menu) { + item_make("---%*c%s", indent + 1, ' ', _(menu_get_prompt(menu))); + item_set_tag(':'); + item_set_data(menu); + goto conf_childs; + } + child_count++; + val = sym_get_tristate_value(sym); + if (sym_is_choice_value(sym) && val == yes) { + item_make(" "); + item_set_tag(':'); + item_set_data(menu); + } else { + switch (type) { + case S_BOOLEAN: + if (sym_is_changable(sym)) + item_make("[%c]", val == no ? ' ' : '*'); + else + item_make("-%c-", val == no ? ' ' : '*'); + item_set_tag('t'); + item_set_data(menu); + break; + case S_TRISTATE: + switch (val) { + case yes: ch = '*'; break; + case mod: ch = 'M'; break; + default: ch = ' '; break; + } + if (sym_is_changable(sym)) { + if (sym->rev_dep.tri == mod) + item_make("{%c}", ch); + else + item_make("<%c>", ch); + } else + item_make("-%c-", ch); + item_set_tag('t'); + item_set_data(menu); + break; + default: + tmp = 2 + strlen(sym_get_string_value(sym)); /* () = 2 */ + item_make("(%s)", sym_get_string_value(sym)); + tmp = indent - tmp + 4; + if (tmp < 0) + tmp = 0; + item_add_str("%*c%s%s", tmp, ' ', _(menu_get_prompt(menu)), + (sym_has_value(sym) || !sym_is_changable(sym)) ? + "" : _(" (NEW)")); + item_set_tag('s'); + item_set_data(menu); + goto conf_childs; + } + } + item_add_str("%*c%s%s", indent + 1, ' ', _(menu_get_prompt(menu)), + (sym_has_value(sym) || !sym_is_changable(sym)) ? + "" : _(" (NEW)")); + if (menu->prompt->type == P_MENU) { + item_add_str(" --->"); + return; + } + } + +conf_childs: + indent += doint; + for (child = menu->list; child; child = child->next) + build_conf(child); + indent -= doint; +} + +static void conf(struct menu *menu, struct menu *active_menu) +{ + struct menu *submenu; + const char *prompt = menu_get_prompt(menu); + struct symbol *sym; + int res; + int s_scroll = 0; + + while (1) { + item_reset(); + current_menu = menu; + build_conf(menu); + if (!child_count) + break; + dialog_clear(); + res = dialog_menu(prompt ? _(prompt) : _("Main Menu"), + _(menu_instructions), + active_menu, &s_scroll); + if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL) + break; + if (!item_activate_selected()) + continue; + if (!item_tag()) + continue; + + submenu = item_data(); + active_menu = item_data(); + if (submenu) + sym = submenu->sym; + else + sym = NULL; + + switch (res) { + case 0: + switch (item_tag()) { + case 'm': + if (single_menu_mode) + submenu->data = (void *) (long) !submenu->data; + else + conf(submenu, NULL); + break; + case 't': + if (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes) + conf_choice(submenu); + else if (submenu->prompt->type == P_MENU) + conf(submenu, NULL); + break; + case 's': + conf_string(submenu); + break; + } + break; + case 2: + if (sym) + show_help(submenu); + else + show_helptext(_("README"), _(mconf_readme)); + break; + case 3: + conf_save(); + break; + case 4: + conf_load(); + break; + case 5: + if (item_is_tag('t')) { + if (sym_set_tristate_value(sym, yes)) + break; + if (sym_set_tristate_value(sym, mod)) + show_textbox(NULL, setmod_text, 6, 74); + } + break; + case 6: + if (item_is_tag('t')) + sym_set_tristate_value(sym, no); + break; + case 7: + if (item_is_tag('t')) + sym_set_tristate_value(sym, mod); + break; + case 8: + if (item_is_tag('t')) + sym_toggle_tristate_value(sym); + else if (item_is_tag('m')) + conf(submenu, NULL); + break; + case 9: + search_conf(); + break; + case 10: + show_all_options = !show_all_options; + break; + } + } +} + +static int show_textbox_ext(const char *title, char *text, int r, int c, int + *keys, int *vscroll, int *hscroll, update_text_fn + update_text, void *data) +{ + dialog_clear(); + return dialog_textbox(title, text, r, c, keys, vscroll, hscroll, + update_text, data); +} + +static void show_textbox(const char *title, const char *text, int r, int c) +{ + show_textbox_ext(title, (char *) text, r, c, (int []) {0}, NULL, NULL, + NULL, NULL); +} + +static void show_helptext(const char *title, const char *text) +{ + show_textbox(title, text, 0, 0); +} + +static void conf_message_callback(const char *fmt, va_list ap) +{ + char buf[PATH_MAX+1]; + + vsnprintf(buf, sizeof(buf), fmt, ap); + if (save_and_exit) + printf("%s", buf); + else + show_textbox(NULL, buf, 6, 60); +} + +static void show_help(struct menu *menu) +{ + struct gstr help = str_new(); + + help.max_width = getmaxx(stdscr) - 10; + menu_get_ext_help(menu, &help); + + show_helptext(_(menu_get_prompt(menu)), str_get(&help)); + str_free(&help); +} + +static void conf_choice(struct menu *menu) +{ + const char *prompt = _(menu_get_prompt(menu)); + struct menu *child; + struct symbol *active; + + active = sym_get_choice_value(menu->sym); + while (1) { + int res; + int selected; + item_reset(); + + current_menu = menu; + for (child = menu->list; child; child = child->next) { + if (!menu_is_visible(child)) + continue; + if (child->sym) + item_make("%s", _(menu_get_prompt(child))); + else { + item_make("*** %s ***", _(menu_get_prompt(child))); + item_set_tag(':'); + } + item_set_data(child); + if (child->sym == active) + item_set_selected(1); + if (child->sym == sym_get_choice_value(menu->sym)) + item_set_tag('X'); + } + dialog_clear(); + res = dialog_checklist(prompt ? _(prompt) : _("Main Menu"), + _(radiolist_instructions), + 15, 70, 6); + selected = item_activate_selected(); + switch (res) { + case 0: + if (selected) { + child = item_data(); + if (!child->sym) + break; + + sym_set_tristate_value(child->sym, yes); + } + return; + case 1: + if (selected) { + child = item_data(); + show_help(child); + active = child->sym; + } else + show_help(menu); + break; + case KEY_ESC: + return; + case -ERRDISPLAYTOOSMALL: + return; + } + } +} + +static void conf_string(struct menu *menu) +{ + const char *prompt = menu_get_prompt(menu); + + while (1) { + int res; + const char *heading; + + switch (sym_get_type(menu->sym)) { + case S_INT: + heading = _(inputbox_instructions_int); + break; + case S_HEX: + heading = _(inputbox_instructions_hex); + break; + case S_STRING: + heading = _(inputbox_instructions_string); + break; + default: + heading = _("Internal mconf error!"); + } + dialog_clear(); + res = dialog_inputbox(prompt ? _(prompt) : _("Main Menu"), + heading, 10, 75, + sym_get_string_value(menu->sym)); + switch (res) { + case 0: + if (sym_set_string_value(menu->sym, dialog_input_result)) + return; + show_textbox(NULL, _("You have made an invalid entry."), 5, 43); + break; + case 1: + show_help(menu); + break; + case KEY_ESC: + return; + } + } +} + +static void conf_load(void) +{ + + while (1) { + int res; + dialog_clear(); + res = dialog_inputbox(NULL, load_config_text, + 11, 55, filename); + switch(res) { + case 0: + if (!dialog_input_result[0]) + return; + if (!conf_read(dialog_input_result)) { + set_config_filename(dialog_input_result); + sym_set_change_count(1); + return; + } + show_textbox(NULL, _("File does not exist!"), 5, 38); + break; + case 1: + show_helptext(_("Load Alternate Configuration"), load_config_help); + break; + case KEY_ESC: + return; + } + } +} + +static void conf_save(void) +{ + while (1) { + int res; + dialog_clear(); + res = dialog_inputbox(NULL, save_config_text, + 11, 55, filename); + switch(res) { + case 0: + if (!dialog_input_result[0]) + return; + if (!conf_write(dialog_input_result)) { + set_config_filename(dialog_input_result); + return; + } + show_textbox(NULL, _("Can't create file! Probably a nonexistent directory."), 5, 60); + break; + case 1: + show_helptext(_("Save Alternate Configuration"), save_config_help); + break; + case KEY_ESC: + return; + } + } +} + +static int handle_exit(void) +{ + int res; + + save_and_exit = 1; + dialog_clear(); + if (conf_get_changed()) + res = dialog_yesno(NULL, + _("Do you wish to save your new configuration ?\n" + "<ESC><ESC> to continue."), + 6, 60); + else + res = -1; + + end_dialog(saved_x, saved_y); + + switch (res) { + case 0: + if (conf_write(filename)) { + fprintf(stderr, _("\n\n" + "Error while writing of the configuration.\n" + "Your configuration changes were NOT saved." + "\n\n")); + return 1; + } + /* fall through */ + case -1: + printf(_("\n\n" + "*** End of the configuration.\n" + "*** Execute 'make' to start the build or try 'make help'." + "\n\n")); + res = 0; + break; + default: + fprintf(stderr, _("\n\n" + "Your configuration changes were NOT saved." + "\n\n")); + if (res != KEY_ESC) + res = 0; + } + + return res; +} + +static void sig_handler(int signo) +{ + exit(handle_exit()); +} + +int main(int ac, char **av) +{ + char *mode; + int res; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + + signal(SIGINT, sig_handler); + + conf_parse(av[1]); + conf_read(NULL); + + mode = getenv("MENUCONFIG_MODE"); + if (mode) { + if (!strcasecmp(mode, "single_menu")) + single_menu_mode = 1; + } + + if (init_dialog(NULL)) { + fprintf(stderr, N_("Your display is too small to run Menuconfig!\n")); + fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n")); + return 1; + } + + set_config_filename(conf_get_configname()); + conf_set_message_callback(conf_message_callback); + do { + conf(&rootmenu, NULL); + res = handle_exit(); + } while (res == KEY_ESC); + + return res; +} + diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c new file mode 100644 index 00000000..f3bffa30 --- /dev/null +++ b/scripts/kconfig/menu.c @@ -0,0 +1,644 @@ +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#include <ctype.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> + +#include "lkc.h" + +static const char nohelp_text[] = "There is no help available for this option."; + +struct menu rootmenu; +static struct menu **last_entry_ptr; + +struct file *file_list; +struct file *current_file; + +void menu_warn(struct menu *menu, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, "%s:%d:warning: ", menu->file->name, menu->lineno); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); +} + +static void prop_warn(struct property *prop, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, "%s:%d:warning: ", prop->file->name, prop->lineno); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); +} + +void _menu_init(void) +{ + current_entry = current_menu = &rootmenu; + last_entry_ptr = &rootmenu.list; +} + +void menu_add_entry(struct symbol *sym) +{ + struct menu *menu; + + menu = xmalloc(sizeof(*menu)); + memset(menu, 0, sizeof(*menu)); + menu->sym = sym; + menu->parent = current_menu; + menu->file = current_file; + menu->lineno = zconf_lineno(); + + *last_entry_ptr = menu; + last_entry_ptr = &menu->next; + current_entry = menu; + if (sym) + menu_add_symbol(P_SYMBOL, sym, NULL); +} + +void menu_end_entry(void) +{ +} + +struct menu *menu_add_menu(void) +{ + menu_end_entry(); + last_entry_ptr = ¤t_entry->list; + return current_menu = current_entry; +} + +void menu_end_menu(void) +{ + last_entry_ptr = ¤t_menu->next; + current_menu = current_menu->parent; +} + +static struct expr *menu_check_dep(struct expr *e) +{ + if (!e) + return e; + + switch (e->type) { + case E_NOT: + e->left.expr = menu_check_dep(e->left.expr); + break; + case E_OR: + case E_AND: + e->left.expr = menu_check_dep(e->left.expr); + e->right.expr = menu_check_dep(e->right.expr); + break; + case E_SYMBOL: + /* change 'm' into 'm' && MODULES */ + if (e->left.sym == &symbol_mod) + return expr_alloc_and(e, expr_alloc_symbol(modules_sym)); + break; + default: + break; + } + return e; +} + +void menu_add_dep(struct expr *dep) +{ + current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep)); +} + +void menu_set_type(int type) +{ + struct symbol *sym = current_entry->sym; + + if (sym->type == type) + return; + if (sym->type == S_UNKNOWN) { + sym->type = type; + return; + } + menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'", + sym->name ? sym->name : "<choice>", + sym_type_name(sym->type), sym_type_name(type)); +} + +struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep) +{ + struct property *prop = prop_alloc(type, current_entry->sym); + + prop->menu = current_entry; + prop->expr = expr; + prop->visible.expr = menu_check_dep(dep); + + if (prompt) { + if (isspace(*prompt)) { + prop_warn(prop, "leading whitespace ignored"); + while (isspace(*prompt)) + prompt++; + } + if (current_entry->prompt && current_entry != &rootmenu) + prop_warn(prop, "prompt redefined"); + + /* Apply all upper menus' visibilities to actual prompts. */ + if(type == P_PROMPT) { + struct menu *menu = current_entry; + + while ((menu = menu->parent) != NULL) { + if (!menu->visibility) + continue; + prop->visible.expr + = expr_alloc_and(prop->visible.expr, + menu->visibility); + } + } + + current_entry->prompt = prop; + } + prop->text = prompt; + + return prop; +} + +struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep) +{ + return menu_add_prop(type, prompt, NULL, dep); +} + +void menu_add_visibility(struct expr *expr) +{ + current_entry->visibility = expr_alloc_and(current_entry->visibility, + expr); +} + +void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep) +{ + menu_add_prop(type, NULL, expr, dep); +} + +void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep) +{ + menu_add_prop(type, NULL, expr_alloc_symbol(sym), dep); +} + +void menu_add_option(int token, char *arg) +{ + struct property *prop; + + switch (token) { + case T_OPT_MODULES: + prop = prop_alloc(P_DEFAULT, modules_sym); + prop->expr = expr_alloc_symbol(current_entry->sym); + break; + case T_OPT_DEFCONFIG_LIST: + if (!sym_defconfig_list) + sym_defconfig_list = current_entry->sym; + else if (sym_defconfig_list != current_entry->sym) + zconf_error("trying to redefine defconfig symbol"); + break; + case T_OPT_ENV: + prop_add_env(arg); + break; + } +} + +static int menu_validate_number(struct symbol *sym, struct symbol *sym2) +{ + return sym2->type == S_INT || sym2->type == S_HEX || + (sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name)); +} + +static void sym_check_prop(struct symbol *sym) +{ + struct property *prop; + struct symbol *sym2; + for (prop = sym->prop; prop; prop = prop->next) { + switch (prop->type) { + case P_DEFAULT: + if ((sym->type == S_STRING || sym->type == S_INT || sym->type == S_HEX) && + prop->expr->type != E_SYMBOL) + prop_warn(prop, + "default for config symbol '%s'" + " must be a single symbol", sym->name); + if (prop->expr->type != E_SYMBOL) + break; + sym2 = prop_get_symbol(prop); + if (sym->type == S_HEX || sym->type == S_INT) { + if (!menu_validate_number(sym, sym2)) + prop_warn(prop, + "'%s': number is invalid", + sym->name); + } + break; + case P_SELECT: + sym2 = prop_get_symbol(prop); + if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE) + prop_warn(prop, + "config symbol '%s' uses select, but is " + "not boolean or tristate", sym->name); + else if (sym2->type != S_UNKNOWN && + sym2->type != S_BOOLEAN && + sym2->type != S_TRISTATE) + prop_warn(prop, + "'%s' has wrong type. 'select' only " + "accept arguments of boolean and " + "tristate type", sym2->name); + break; + case P_RANGE: + if (sym->type != S_INT && sym->type != S_HEX) + prop_warn(prop, "range is only allowed " + "for int or hex symbols"); + if (!menu_validate_number(sym, prop->expr->left.sym) || + !menu_validate_number(sym, prop->expr->right.sym)) + prop_warn(prop, "range is invalid"); + break; + default: + ; + } + } +} + +void menu_finalize(struct menu *parent) +{ + struct menu *menu, *last_menu; + struct symbol *sym; + struct property *prop; + struct expr *parentdep, *basedep, *dep, *dep2, **ep; + + sym = parent->sym; + if (parent->list) { + if (sym && sym_is_choice(sym)) { + if (sym->type == S_UNKNOWN) { + /* find the first choice value to find out choice type */ + current_entry = parent; + for (menu = parent->list; menu; menu = menu->next) { + if (menu->sym && menu->sym->type != S_UNKNOWN) { + menu_set_type(menu->sym->type); + break; + } + } + } + /* set the type of the remaining choice values */ + for (menu = parent->list; menu; menu = menu->next) { + current_entry = menu; + if (menu->sym && menu->sym->type == S_UNKNOWN) + menu_set_type(sym->type); + } + parentdep = expr_alloc_symbol(sym); + } else if (parent->prompt) + parentdep = parent->prompt->visible.expr; + else + parentdep = parent->dep; + + for (menu = parent->list; menu; menu = menu->next) { + basedep = expr_transform(menu->dep); + basedep = expr_alloc_and(expr_copy(parentdep), basedep); + basedep = expr_eliminate_dups(basedep); + menu->dep = basedep; + if (menu->sym) + prop = menu->sym->prop; + else + prop = menu->prompt; + for (; prop; prop = prop->next) { + if (prop->menu != menu) + continue; + dep = expr_transform(prop->visible.expr); + dep = expr_alloc_and(expr_copy(basedep), dep); + dep = expr_eliminate_dups(dep); + if (menu->sym && menu->sym->type != S_TRISTATE) + dep = expr_trans_bool(dep); + prop->visible.expr = dep; + if (prop->type == P_SELECT) { + struct symbol *es = prop_get_symbol(prop); + es->rev_dep.expr = expr_alloc_or(es->rev_dep.expr, + expr_alloc_and(expr_alloc_symbol(menu->sym), expr_copy(dep))); + } + } + } + for (menu = parent->list; menu; menu = menu->next) + menu_finalize(menu); + } else if (sym) { + basedep = parent->prompt ? parent->prompt->visible.expr : NULL; + basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no); + basedep = expr_eliminate_dups(expr_transform(basedep)); + last_menu = NULL; + for (menu = parent->next; menu; menu = menu->next) { + dep = menu->prompt ? menu->prompt->visible.expr : menu->dep; + if (!expr_contains_symbol(dep, sym)) + break; + if (expr_depends_symbol(dep, sym)) + goto next; + dep = expr_trans_compare(dep, E_UNEQUAL, &symbol_no); + dep = expr_eliminate_dups(expr_transform(dep)); + dep2 = expr_copy(basedep); + expr_eliminate_eq(&dep, &dep2); + expr_free(dep); + if (!expr_is_yes(dep2)) { + expr_free(dep2); + break; + } + expr_free(dep2); + next: + menu_finalize(menu); + menu->parent = parent; + last_menu = menu; + } + if (last_menu) { + parent->list = parent->next; + parent->next = last_menu->next; + last_menu->next = NULL; + } + + sym->dir_dep.expr = expr_alloc_or(sym->dir_dep.expr, parent->dep); + } + for (menu = parent->list; menu; menu = menu->next) { + if (sym && sym_is_choice(sym) && + menu->sym && !sym_is_choice_value(menu->sym)) { + current_entry = menu; + menu->sym->flags |= SYMBOL_CHOICEVAL; + if (!menu->prompt) + menu_warn(menu, "choice value must have a prompt"); + for (prop = menu->sym->prop; prop; prop = prop->next) { + if (prop->type == P_DEFAULT) + prop_warn(prop, "defaults for choice " + "values not supported"); + if (prop->menu == menu) + continue; + if (prop->type == P_PROMPT && + prop->menu->parent->sym != sym) + prop_warn(prop, "choice value used outside its choice group"); + } + /* Non-tristate choice values of tristate choices must + * depend on the choice being set to Y. The choice + * values' dependencies were propagated to their + * properties above, so the change here must be re- + * propagated. + */ + if (sym->type == S_TRISTATE && menu->sym->type != S_TRISTATE) { + basedep = expr_alloc_comp(E_EQUAL, sym, &symbol_yes); + menu->dep = expr_alloc_and(basedep, menu->dep); + for (prop = menu->sym->prop; prop; prop = prop->next) { + if (prop->menu != menu) + continue; + prop->visible.expr = expr_alloc_and(expr_copy(basedep), + prop->visible.expr); + } + } + menu_add_symbol(P_CHOICE, sym, NULL); + prop = sym_get_choice_prop(sym); + for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr) + ; + *ep = expr_alloc_one(E_LIST, NULL); + (*ep)->right.sym = menu->sym; + } + if (menu->list && (!menu->prompt || !menu->prompt->text)) { + for (last_menu = menu->list; ; last_menu = last_menu->next) { + last_menu->parent = parent; + if (!last_menu->next) + break; + } + last_menu->next = menu->next; + menu->next = menu->list; + menu->list = NULL; + } + } + + if (sym && !(sym->flags & SYMBOL_WARNED)) { + if (sym->type == S_UNKNOWN) + menu_warn(parent, "config symbol defined without type"); + + if (sym_is_choice(sym) && !parent->prompt) + menu_warn(parent, "choice must have a prompt"); + + /* Check properties connected to this symbol */ + sym_check_prop(sym); + sym->flags |= SYMBOL_WARNED; + } + + if (sym && !sym_is_optional(sym) && parent->prompt) { + sym->rev_dep.expr = expr_alloc_or(sym->rev_dep.expr, + expr_alloc_and(parent->prompt->visible.expr, + expr_alloc_symbol(&symbol_mod))); + } +} + +bool menu_has_prompt(struct menu *menu) +{ + if (!menu->prompt) + return false; + return true; +} + +bool menu_is_visible(struct menu *menu) +{ + struct menu *child; + struct symbol *sym; + tristate visible; + + if (!menu->prompt) + return false; + + if (menu->visibility) { + if (expr_calc_value(menu->visibility) == no) + return no; + } + + sym = menu->sym; + if (sym) { + sym_calc_value(sym); + visible = menu->prompt->visible.tri; + } else + visible = menu->prompt->visible.tri = expr_calc_value(menu->prompt->visible.expr); + + if (visible != no) + return true; + + if (!sym || sym_get_tristate_value(menu->sym) == no) + return false; + + for (child = menu->list; child; child = child->next) { + if (menu_is_visible(child)) { + if (sym) + sym->flags |= SYMBOL_DEF_USER; + return true; + } + } + + return false; +} + +const char *menu_get_prompt(struct menu *menu) +{ + if (menu->prompt) + return menu->prompt->text; + else if (menu->sym) + return menu->sym->name; + return NULL; +} + +struct menu *menu_get_root_menu(struct menu *menu) +{ + return &rootmenu; +} + +struct menu *menu_get_parent_menu(struct menu *menu) +{ + enum prop_type type; + + for (; menu != &rootmenu; menu = menu->parent) { + type = menu->prompt ? menu->prompt->type : 0; + if (type == P_MENU) + break; + } + return menu; +} + +bool menu_has_help(struct menu *menu) +{ + return menu->help != NULL; +} + +const char *menu_get_help(struct menu *menu) +{ + if (menu->help) + return menu->help; + else + return ""; +} + +static void get_prompt_str(struct gstr *r, struct property *prop, + struct list_head *head) +{ + int i, j; + struct menu *submenu[8], *menu, *location = NULL; + struct jump_key *jump; + + str_printf(r, _("Prompt: %s\n"), _(prop->text)); + str_printf(r, _(" Defined at %s:%d\n"), prop->menu->file->name, + prop->menu->lineno); + if (!expr_is_yes(prop->visible.expr)) { + str_append(r, _(" Depends on: ")); + expr_gstr_print(prop->visible.expr, r); + str_append(r, "\n"); + } + menu = prop->menu->parent; + for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) { + bool accessible = menu_is_visible(menu); + + submenu[i++] = menu; + if (location == NULL && accessible) + location = menu; + } + if (head && location) { + jump = xmalloc(sizeof(struct jump_key)); + + if (menu_is_visible(prop->menu)) { + /* + * There is not enough room to put the hint at the + * beginning of the "Prompt" line. Put the hint on the + * last "Location" line even when it would belong on + * the former. + */ + jump->target = prop->menu; + } else + jump->target = location; + + if (list_empty(head)) + jump->index = 0; + else + jump->index = list_entry(head->prev, struct jump_key, + entries)->index + 1; + + list_add_tail(&jump->entries, head); + } + + if (i > 0) { + str_printf(r, _(" Location:\n")); + for (j = 4; --i >= 0; j += 2) { + menu = submenu[i]; + if (head && location && menu == location) + jump->offset = r->len - 1; + str_printf(r, "%*c-> %s", j, ' ', + _(menu_get_prompt(menu))); + if (menu->sym) { + str_printf(r, " (%s [=%s])", menu->sym->name ? + menu->sym->name : _("<choice>"), + sym_get_string_value(menu->sym)); + } + str_append(r, "\n"); + } + } +} + +/* + * head is optional and may be NULL + */ +void get_symbol_str(struct gstr *r, struct symbol *sym, + struct list_head *head) +{ + bool hit; + struct property *prop; + + if (sym && sym->name) { + str_printf(r, "Symbol: %s [=%s]\n", sym->name, + sym_get_string_value(sym)); + str_printf(r, "Type : %s\n", sym_type_name(sym->type)); + if (sym->type == S_INT || sym->type == S_HEX) { + prop = sym_get_range_prop(sym); + if (prop) { + str_printf(r, "Range : "); + expr_gstr_print(prop->expr, r); + str_append(r, "\n"); + } + } + } + for_all_prompts(sym, prop) + get_prompt_str(r, prop, head); + hit = false; + for_all_properties(sym, prop, P_SELECT) { + if (!hit) { + str_append(r, " Selects: "); + hit = true; + } else + str_printf(r, " && "); + expr_gstr_print(prop->expr, r); + } + if (hit) + str_append(r, "\n"); + if (sym->rev_dep.expr) { + str_append(r, _(" Selected by: ")); + expr_gstr_print(sym->rev_dep.expr, r); + str_append(r, "\n"); + } + str_append(r, "\n\n"); +} + +struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head) +{ + struct symbol *sym; + struct gstr res = str_new(); + int i; + + for (i = 0; sym_arr && (sym = sym_arr[i]); i++) + get_symbol_str(&res, sym, head); + if (!i) + str_append(&res, _("No matches found.\n")); + return res; +} + + +void menu_get_ext_help(struct menu *menu, struct gstr *help) +{ + struct symbol *sym = menu->sym; + const char *help_text = nohelp_text; + + if (menu_has_help(menu)) { + if (sym->name) + str_printf(help, "%s%s:\n\n", CONFIG_, sym->name); + help_text = menu_get_help(menu); + } + str_printf(help, "%s\n", _(help_text)); + if (sym) + get_symbol_str(help, sym, NULL); +} diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c new file mode 100644 index 00000000..ecc5aa5f --- /dev/null +++ b/scripts/kconfig/symbol.c @@ -0,0 +1,1310 @@ +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#include <ctype.h> +#include <stdlib.h> +#include <string.h> +#include <regex.h> +#include <sys/utsname.h> + +#include "lkc.h" + +struct symbol symbol_yes = { + .name = "y", + .curr = { "y", yes }, + .flags = SYMBOL_CONST|SYMBOL_VALID, +}, symbol_mod = { + .name = "m", + .curr = { "m", mod }, + .flags = SYMBOL_CONST|SYMBOL_VALID, +}, symbol_no = { + .name = "n", + .curr = { "n", no }, + .flags = SYMBOL_CONST|SYMBOL_VALID, +}, symbol_empty = { + .name = "", + .curr = { "", no }, + .flags = SYMBOL_VALID, +}; + +struct symbol *sym_defconfig_list; +struct symbol *modules_sym; +tristate modules_val; + +struct expr *sym_env_list; + +static void sym_add_default(struct symbol *sym, const char *def) +{ + struct property *prop = prop_alloc(P_DEFAULT, sym); + + prop->expr = expr_alloc_symbol(sym_lookup(def, SYMBOL_CONST)); +} + +void sym_init(void) +{ + struct symbol *sym; + struct utsname uts; + static bool inited = false; + + if (inited) + return; + inited = true; + + uname(&uts); + + sym = sym_lookup("UNAME_RELEASE", 0); + sym->type = S_STRING; + sym->flags |= SYMBOL_AUTO; + sym_add_default(sym, uts.release); +} + +enum symbol_type sym_get_type(struct symbol *sym) +{ + enum symbol_type type = sym->type; + + if (type == S_TRISTATE) { + if (sym_is_choice_value(sym) && sym->visible == yes) + type = S_BOOLEAN; + else if (modules_val == no) + type = S_BOOLEAN; + } + return type; +} + +const char *sym_type_name(enum symbol_type type) +{ + switch (type) { + case S_BOOLEAN: + return "boolean"; + case S_TRISTATE: + return "tristate"; + case S_INT: + return "integer"; + case S_HEX: + return "hex"; + case S_STRING: + return "string"; + case S_UNKNOWN: + return "unknown"; + case S_OTHER: + break; + } + return "???"; +} + +struct property *sym_get_choice_prop(struct symbol *sym) +{ + struct property *prop; + + for_all_choices(sym, prop) + return prop; + return NULL; +} + +struct property *sym_get_env_prop(struct symbol *sym) +{ + struct property *prop; + + for_all_properties(sym, prop, P_ENV) + return prop; + return NULL; +} + +struct property *sym_get_default_prop(struct symbol *sym) +{ + struct property *prop; + + for_all_defaults(sym, prop) { + prop->visible.tri = expr_calc_value(prop->visible.expr); + if (prop->visible.tri != no) + return prop; + } + return NULL; +} + +static struct property *sym_get_range_prop(struct symbol *sym) +{ + struct property *prop; + + for_all_properties(sym, prop, P_RANGE) { + prop->visible.tri = expr_calc_value(prop->visible.expr); + if (prop->visible.tri != no) + return prop; + } + return NULL; +} + +static int sym_get_range_val(struct symbol *sym, int base) +{ + sym_calc_value(sym); + switch (sym->type) { + case S_INT: + base = 10; + break; + case S_HEX: + base = 16; + break; + default: + break; + } + return strtol(sym->curr.val, NULL, base); +} + +static void sym_validate_range(struct symbol *sym) +{ + struct property *prop; + int base, val, val2; + char str[64]; + + switch (sym->type) { + case S_INT: + base = 10; + break; + case S_HEX: + base = 16; + break; + default: + return; + } + prop = sym_get_range_prop(sym); + if (!prop) + return; + val = strtol(sym->curr.val, NULL, base); + val2 = sym_get_range_val(prop->expr->left.sym, base); + if (val >= val2) { + val2 = sym_get_range_val(prop->expr->right.sym, base); + if (val <= val2) + return; + } + if (sym->type == S_INT) + sprintf(str, "%d", val2); + else + sprintf(str, "0x%x", val2); + sym->curr.val = strdup(str); +} + +static void sym_calc_visibility(struct symbol *sym) +{ + struct property *prop; + tristate tri; + + /* any prompt visible? */ + tri = no; + for_all_prompts(sym, prop) { + prop->visible.tri = expr_calc_value(prop->visible.expr); + tri = EXPR_OR(tri, prop->visible.tri); + } + if (tri == mod && (sym->type != S_TRISTATE || modules_val == no)) + tri = yes; + if (sym->visible != tri) { + sym->visible = tri; + sym_set_changed(sym); + } + if (sym_is_choice_value(sym)) + return; + /* defaulting to "yes" if no explicit "depends on" are given */ + tri = yes; + if (sym->dir_dep.expr) + tri = expr_calc_value(sym->dir_dep.expr); + if (tri == mod) + tri = yes; + if (sym->dir_dep.tri != tri) { + sym->dir_dep.tri = tri; + sym_set_changed(sym); + } + tri = no; + if (sym->rev_dep.expr) + tri = expr_calc_value(sym->rev_dep.expr); + if (tri == mod && sym_get_type(sym) == S_BOOLEAN) + tri = yes; + if (sym->rev_dep.tri != tri) { + sym->rev_dep.tri = tri; + sym_set_changed(sym); + } +} + +/* + * Find the default symbol for a choice. + * First try the default values for the choice symbol + * Next locate the first visible choice value + * Return NULL if none was found + */ +struct symbol *sym_choice_default(struct symbol *sym) +{ + struct symbol *def_sym; + struct property *prop; + struct expr *e; + + /* any of the defaults visible? */ + for_all_defaults(sym, prop) { + prop->visible.tri = expr_calc_value(prop->visible.expr); + if (prop->visible.tri == no) + continue; + def_sym = prop_get_symbol(prop); + if (def_sym->visible != no) + return def_sym; + } + + /* just get the first visible value */ + prop = sym_get_choice_prop(sym); + expr_list_for_each_sym(prop->expr, e, def_sym) + if (def_sym->visible != no) + return def_sym; + + /* failed to locate any defaults */ + return NULL; +} + +static struct symbol *sym_calc_choice(struct symbol *sym) +{ + struct symbol *def_sym; + struct property *prop; + struct expr *e; + int flags; + + /* first calculate all choice values' visibilities */ + flags = sym->flags; + prop = sym_get_choice_prop(sym); + expr_list_for_each_sym(prop->expr, e, def_sym) { + sym_calc_visibility(def_sym); + if (def_sym->visible != no) + flags &= def_sym->flags; + } + + sym->flags &= flags | ~SYMBOL_DEF_USER; + + /* is the user choice visible? */ + def_sym = sym->def[S_DEF_USER].val; + if (def_sym && def_sym->visible != no) + return def_sym; + + def_sym = sym_choice_default(sym); + + if (def_sym == NULL) + /* no choice? reset tristate value */ + sym->curr.tri = no; + + return def_sym; +} + +void sym_calc_value(struct symbol *sym) +{ + struct symbol_value newval, oldval; + struct property *prop; + struct expr *e; + + if (!sym) + return; + + if (sym->flags & SYMBOL_VALID) + return; + sym->flags |= SYMBOL_VALID; + + oldval = sym->curr; + + switch (sym->type) { + case S_INT: + case S_HEX: + case S_STRING: + newval = symbol_empty.curr; + break; + case S_BOOLEAN: + case S_TRISTATE: + newval = symbol_no.curr; + break; + default: + sym->curr.val = sym->name; + sym->curr.tri = no; + return; + } + if (!sym_is_choice_value(sym)) + sym->flags &= ~SYMBOL_WRITE; + + sym_calc_visibility(sym); + + /* set default if recursively called */ + sym->curr = newval; + + switch (sym_get_type(sym)) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym_is_choice_value(sym) && sym->visible == yes) { + prop = sym_get_choice_prop(sym); + newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no; + } else { + if (sym->visible != no) { + /* if the symbol is visible use the user value + * if available, otherwise try the default value + */ + sym->flags |= SYMBOL_WRITE; + if (sym_has_value(sym)) { + newval.tri = EXPR_AND(sym->def[S_DEF_USER].tri, + sym->visible); + goto calc_newval; + } + } + if (sym->rev_dep.tri != no) + sym->flags |= SYMBOL_WRITE; + if (!sym_is_choice(sym)) { + prop = sym_get_default_prop(sym); + if (prop) { + sym->flags |= SYMBOL_WRITE; + newval.tri = EXPR_AND(expr_calc_value(prop->expr), + prop->visible.tri); + } + } + calc_newval: + if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) { + struct expr *e; + e = expr_simplify_unmet_dep(sym->rev_dep.expr, + sym->dir_dep.expr); + fprintf(stderr, "warning: ("); + expr_fprint(e, stderr); + fprintf(stderr, ") selects %s which has unmet direct dependencies (", + sym->name); + expr_fprint(sym->dir_dep.expr, stderr); + fprintf(stderr, ")\n"); + expr_free(e); + } + newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri); + } + if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN) + newval.tri = yes; + break; + case S_STRING: + case S_HEX: + case S_INT: + if (sym->visible != no) { + sym->flags |= SYMBOL_WRITE; + if (sym_has_value(sym)) { + newval.val = sym->def[S_DEF_USER].val; + break; + } + } + prop = sym_get_default_prop(sym); + if (prop) { + struct symbol *ds = prop_get_symbol(prop); + if (ds) { + sym->flags |= SYMBOL_WRITE; + sym_calc_value(ds); + newval.val = ds->curr.val; + } + } + break; + default: + ; + } + + sym->curr = newval; + if (sym_is_choice(sym) && newval.tri == yes) + sym->curr.val = sym_calc_choice(sym); + sym_validate_range(sym); + + if (memcmp(&oldval, &sym->curr, sizeof(oldval))) { + sym_set_changed(sym); + if (modules_sym == sym) { + sym_set_all_changed(); + modules_val = modules_sym->curr.tri; + } + } + + if (sym_is_choice(sym)) { + struct symbol *choice_sym; + + prop = sym_get_choice_prop(sym); + expr_list_for_each_sym(prop->expr, e, choice_sym) { + if ((sym->flags & SYMBOL_WRITE) && + choice_sym->visible != no) + choice_sym->flags |= SYMBOL_WRITE; + if (sym->flags & SYMBOL_CHANGED) + sym_set_changed(choice_sym); + } + } + + if (sym->flags & SYMBOL_AUTO) + sym->flags &= ~SYMBOL_WRITE; +} + +void sym_clear_all_valid(void) +{ + struct symbol *sym; + int i; + + for_all_symbols(i, sym) + sym->flags &= ~SYMBOL_VALID; + sym_add_change_count(1); + if (modules_sym) + sym_calc_value(modules_sym); +} + +void sym_set_changed(struct symbol *sym) +{ + struct property *prop; + + sym->flags |= SYMBOL_CHANGED; + for (prop = sym->prop; prop; prop = prop->next) { + if (prop->menu) + prop->menu->flags |= MENU_CHANGED; + } +} + +void sym_set_all_changed(void) +{ + struct symbol *sym; + int i; + + for_all_symbols(i, sym) + sym_set_changed(sym); +} + +bool sym_tristate_within_range(struct symbol *sym, tristate val) +{ + int type = sym_get_type(sym); + + if (sym->visible == no) + return false; + + if (type != S_BOOLEAN && type != S_TRISTATE) + return false; + + if (type == S_BOOLEAN && val == mod) + return false; + if (sym->visible <= sym->rev_dep.tri) + return false; + if (sym_is_choice_value(sym) && sym->visible == yes) + return val == yes; + return val >= sym->rev_dep.tri && val <= sym->visible; +} + +bool sym_set_tristate_value(struct symbol *sym, tristate val) +{ + tristate oldval = sym_get_tristate_value(sym); + + if (oldval != val && !sym_tristate_within_range(sym, val)) + return false; + + if (!(sym->flags & SYMBOL_DEF_USER)) { + sym->flags |= SYMBOL_DEF_USER; + sym_set_changed(sym); + } + /* + * setting a choice value also resets the new flag of the choice + * symbol and all other choice values. + */ + if (sym_is_choice_value(sym) && val == yes) { + struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); + struct property *prop; + struct expr *e; + + cs->def[S_DEF_USER].val = sym; + cs->flags |= SYMBOL_DEF_USER; + prop = sym_get_choice_prop(cs); + for (e = prop->expr; e; e = e->left.expr) { + if (e->right.sym->visible != no) + e->right.sym->flags |= SYMBOL_DEF_USER; + } + } + + sym->def[S_DEF_USER].tri = val; + if (oldval != val) + sym_clear_all_valid(); + + return true; +} + +tristate sym_toggle_tristate_value(struct symbol *sym) +{ + tristate oldval, newval; + + oldval = newval = sym_get_tristate_value(sym); + do { + switch (newval) { + case no: + newval = mod; + break; + case mod: + newval = yes; + break; + case yes: + newval = no; + break; + } + if (sym_set_tristate_value(sym, newval)) + break; + } while (oldval != newval); + return newval; +} + +bool sym_string_valid(struct symbol *sym, const char *str) +{ + signed char ch; + + switch (sym->type) { + case S_STRING: + return true; + case S_INT: + ch = *str++; + if (ch == '-') + ch = *str++; + if (!isdigit(ch)) + return false; + if (ch == '0' && *str != 0) + return false; + while ((ch = *str++)) { + if (!isdigit(ch)) + return false; + } + return true; + case S_HEX: + if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) + str += 2; + ch = *str++; + do { + if (!isxdigit(ch)) + return false; + } while ((ch = *str++)); + return true; + case S_BOOLEAN: + case S_TRISTATE: + switch (str[0]) { + case 'y': case 'Y': + case 'm': case 'M': + case 'n': case 'N': + return true; + } + return false; + default: + return false; + } +} + +bool sym_string_within_range(struct symbol *sym, const char *str) +{ + struct property *prop; + int val; + + switch (sym->type) { + case S_STRING: + return sym_string_valid(sym, str); + case S_INT: + if (!sym_string_valid(sym, str)) + return false; + prop = sym_get_range_prop(sym); + if (!prop) + return true; + val = strtol(str, NULL, 10); + return val >= sym_get_range_val(prop->expr->left.sym, 10) && + val <= sym_get_range_val(prop->expr->right.sym, 10); + case S_HEX: + if (!sym_string_valid(sym, str)) + return false; + prop = sym_get_range_prop(sym); + if (!prop) + return true; + val = strtol(str, NULL, 16); + return val >= sym_get_range_val(prop->expr->left.sym, 16) && + val <= sym_get_range_val(prop->expr->right.sym, 16); + case S_BOOLEAN: + case S_TRISTATE: + switch (str[0]) { + case 'y': case 'Y': + return sym_tristate_within_range(sym, yes); + case 'm': case 'M': + return sym_tristate_within_range(sym, mod); + case 'n': case 'N': + return sym_tristate_within_range(sym, no); + } + return false; + default: + return false; + } +} + +bool sym_set_string_value(struct symbol *sym, const char *newval) +{ + const char *oldval; + char *val; + int size; + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + switch (newval[0]) { + case 'y': case 'Y': + return sym_set_tristate_value(sym, yes); + case 'm': case 'M': + return sym_set_tristate_value(sym, mod); + case 'n': case 'N': + return sym_set_tristate_value(sym, no); + } + return false; + default: + ; + } + + if (!sym_string_within_range(sym, newval)) + return false; + + if (!(sym->flags & SYMBOL_DEF_USER)) { + sym->flags |= SYMBOL_DEF_USER; + sym_set_changed(sym); + } + + oldval = sym->def[S_DEF_USER].val; + size = strlen(newval) + 1; + if (sym->type == S_HEX && (newval[0] != '0' || (newval[1] != 'x' && newval[1] != 'X'))) { + size += 2; + sym->def[S_DEF_USER].val = val = xmalloc(size); + *val++ = '0'; + *val++ = 'x'; + } else if (!oldval || strcmp(oldval, newval)) + sym->def[S_DEF_USER].val = val = xmalloc(size); + else + return true; + + strcpy(val, newval); + free((void *)oldval); + sym_clear_all_valid(); + + return true; +} + +/* + * Find the default value associated to a symbol. + * For tristate symbol handle the modules=n case + * in which case "m" becomes "y". + * If the symbol does not have any default then fallback + * to the fixed default values. + */ +const char *sym_get_string_default(struct symbol *sym) +{ + struct property *prop; + struct symbol *ds; + const char *str; + tristate val; + + sym_calc_visibility(sym); + sym_calc_value(modules_sym); + val = symbol_no.curr.tri; + str = symbol_empty.curr.val; + + /* If symbol has a default value look it up */ + prop = sym_get_default_prop(sym); + if (prop != NULL) { + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + /* The visibility may limit the value from yes => mod */ + val = EXPR_AND(expr_calc_value(prop->expr), prop->visible.tri); + break; + default: + /* + * The following fails to handle the situation + * where a default value is further limited by + * the valid range. + */ + ds = prop_get_symbol(prop); + if (ds != NULL) { + sym_calc_value(ds); + str = (const char *)ds->curr.val; + } + } + } + + /* Handle select statements */ + val = EXPR_OR(val, sym->rev_dep.tri); + + /* transpose mod to yes if modules are not enabled */ + if (val == mod) + if (!sym_is_choice_value(sym) && modules_sym->curr.tri == no) + val = yes; + + /* transpose mod to yes if type is bool */ + if (sym->type == S_BOOLEAN && val == mod) + val = yes; + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + switch (val) { + case no: return "n"; + case mod: return "m"; + case yes: return "y"; + } + case S_INT: + case S_HEX: + return str; + case S_STRING: + return str; + case S_OTHER: + case S_UNKNOWN: + break; + } + return ""; +} + +const char *sym_get_string_value(struct symbol *sym) +{ + tristate val; + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + val = sym_get_tristate_value(sym); + switch (val) { + case no: + return "n"; + case mod: + sym_calc_value(modules_sym); + return (modules_sym->curr.tri == no) ? "n" : "m"; + case yes: + return "y"; + } + break; + default: + ; + } + return (const char *)sym->curr.val; +} + +bool sym_is_changable(struct symbol *sym) +{ + return sym->visible > sym->rev_dep.tri; +} + +static unsigned strhash(const char *s) +{ + /* fnv32 hash */ + unsigned hash = 2166136261U; + for (; *s; s++) + hash = (hash ^ *s) * 0x01000193; + return hash; +} + +struct symbol *sym_lookup(const char *name, int flags) +{ + struct symbol *symbol; + char *new_name; + int hash; + + if (name) { + if (name[0] && !name[1]) { + switch (name[0]) { + case 'y': return &symbol_yes; + case 'm': return &symbol_mod; + case 'n': return &symbol_no; + } + } + hash = strhash(name) % SYMBOL_HASHSIZE; + + for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) { + if (symbol->name && + !strcmp(symbol->name, name) && + (flags ? symbol->flags & flags + : !(symbol->flags & (SYMBOL_CONST|SYMBOL_CHOICE)))) + return symbol; + } + new_name = strdup(name); + } else { + new_name = NULL; + hash = 0; + } + + symbol = xmalloc(sizeof(*symbol)); + memset(symbol, 0, sizeof(*symbol)); + symbol->name = new_name; + symbol->type = S_UNKNOWN; + symbol->flags |= flags; + + symbol->next = symbol_hash[hash]; + symbol_hash[hash] = symbol; + + return symbol; +} + +struct symbol *sym_find(const char *name) +{ + struct symbol *symbol = NULL; + int hash = 0; + + if (!name) + return NULL; + + if (name[0] && !name[1]) { + switch (name[0]) { + case 'y': return &symbol_yes; + case 'm': return &symbol_mod; + case 'n': return &symbol_no; + } + } + hash = strhash(name) % SYMBOL_HASHSIZE; + + for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) { + if (symbol->name && + !strcmp(symbol->name, name) && + !(symbol->flags & SYMBOL_CONST)) + break; + } + + return symbol; +} + +/* + * Expand symbol's names embedded in the string given in argument. Symbols' + * name to be expanded shall be prefixed by a '$'. Unknown symbol expands to + * the empty string. + */ +const char *sym_expand_string_value(const char *in) +{ + const char *src; + char *res; + size_t reslen; + + reslen = strlen(in) + 1; + res = xmalloc(reslen); + res[0] = '\0'; + + while ((src = strchr(in, '$'))) { + char *p, name[SYMBOL_MAXLENGTH]; + const char *symval = ""; + struct symbol *sym; + size_t newlen; + + strncat(res, in, src - in); + src++; + + p = name; + while (isalnum(*src) || *src == '_') + *p++ = *src++; + *p = '\0'; + + sym = sym_find(name); + if (sym != NULL) { + sym_calc_value(sym); + symval = sym_get_string_value(sym); + } + + newlen = strlen(res) + strlen(symval) + strlen(src) + 1; + if (newlen > reslen) { + reslen = newlen; + res = realloc(res, reslen); + } + + strcat(res, symval); + in = src; + } + strcat(res, in); + + return res; +} + +const char *sym_escape_string_value(const char *in) +{ + const char *p; + size_t reslen; + char *res; + size_t l; + + reslen = strlen(in) + strlen("\"\"") + 1; + + p = in; + for (;;) { + l = strcspn(p, "\"\\"); + p += l; + + if (p[0] == '\0') + break; + + reslen++; + p++; + } + + res = xmalloc(reslen); + res[0] = '\0'; + + strcat(res, "\""); + + p = in; + for (;;) { + l = strcspn(p, "\"\\"); + strncat(res, p, l); + p += l; + + if (p[0] == '\0') + break; + + strcat(res, "\\"); + strncat(res, p++, 1); + } + + strcat(res, "\""); + return res; +} + +struct symbol **sym_re_search(const char *pattern) +{ + struct symbol *sym, **sym_arr = NULL; + int i, cnt, size; + regex_t re; + + cnt = size = 0; + /* Skip if empty */ + if (strlen(pattern) == 0) + return NULL; + if (regcomp(&re, pattern, REG_EXTENDED|REG_NOSUB|REG_ICASE)) + return NULL; + + for_all_symbols(i, sym) { + if (sym->flags & SYMBOL_CONST || !sym->name) + continue; + if (regexec(&re, sym->name, 0, NULL, 0)) + continue; + if (cnt + 1 >= size) { + void *tmp = sym_arr; + size += 16; + sym_arr = realloc(sym_arr, size * sizeof(struct symbol *)); + if (!sym_arr) { + free(tmp); + return NULL; + } + } + sym_calc_value(sym); + sym_arr[cnt++] = sym; + } + if (sym_arr) + sym_arr[cnt] = NULL; + regfree(&re); + + return sym_arr; +} + +/* + * When we check for recursive dependencies we use a stack to save + * current state so we can print out relevant info to user. + * The entries are located on the call stack so no need to free memory. + * Note inser() remove() must always match to properly clear the stack. + */ +static struct dep_stack { + struct dep_stack *prev, *next; + struct symbol *sym; + struct property *prop; + struct expr *expr; +} *check_top; + +static void dep_stack_insert(struct dep_stack *stack, struct symbol *sym) +{ + memset(stack, 0, sizeof(*stack)); + if (check_top) + check_top->next = stack; + stack->prev = check_top; + stack->sym = sym; + check_top = stack; +} + +static void dep_stack_remove(void) +{ + check_top = check_top->prev; + if (check_top) + check_top->next = NULL; +} + +/* + * Called when we have detected a recursive dependency. + * check_top point to the top of the stact so we use + * the ->prev pointer to locate the bottom of the stack. + */ +static void sym_check_print_recursive(struct symbol *last_sym) +{ + struct dep_stack *stack; + struct symbol *sym, *next_sym; + struct menu *menu = NULL; + struct property *prop; + struct dep_stack cv_stack; + + if (sym_is_choice_value(last_sym)) { + dep_stack_insert(&cv_stack, last_sym); + last_sym = prop_get_symbol(sym_get_choice_prop(last_sym)); + } + + for (stack = check_top; stack != NULL; stack = stack->prev) + if (stack->sym == last_sym) + break; + if (!stack) { + fprintf(stderr, "unexpected recursive dependency error\n"); + return; + } + + for (; stack; stack = stack->next) { + sym = stack->sym; + next_sym = stack->next ? stack->next->sym : last_sym; + prop = stack->prop; + if (prop == NULL) + prop = stack->sym->prop; + + /* for choice values find the menu entry (used below) */ + if (sym_is_choice(sym) || sym_is_choice_value(sym)) { + for (prop = sym->prop; prop; prop = prop->next) { + menu = prop->menu; + if (prop->menu) + break; + } + } + if (stack->sym == last_sym) + fprintf(stderr, "%s:%d:error: recursive dependency detected!\n", + prop->file->name, prop->lineno); + if (stack->expr) { + fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n", + prop->file->name, prop->lineno, + sym->name ? sym->name : "<choice>", + prop_get_type_name(prop->type), + next_sym->name ? next_sym->name : "<choice>"); + } else if (stack->prop) { + fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n", + prop->file->name, prop->lineno, + sym->name ? sym->name : "<choice>", + next_sym->name ? next_sym->name : "<choice>"); + } else if (sym_is_choice(sym)) { + fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n", + menu->file->name, menu->lineno, + sym->name ? sym->name : "<choice>", + next_sym->name ? next_sym->name : "<choice>"); + } else if (sym_is_choice_value(sym)) { + fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n", + menu->file->name, menu->lineno, + sym->name ? sym->name : "<choice>", + next_sym->name ? next_sym->name : "<choice>"); + } else { + fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n", + prop->file->name, prop->lineno, + sym->name ? sym->name : "<choice>", + next_sym->name ? next_sym->name : "<choice>"); + } + } + + if (check_top == &cv_stack) + dep_stack_remove(); +} + +static struct symbol *sym_check_expr_deps(struct expr *e) +{ + struct symbol *sym; + + if (!e) + return NULL; + switch (e->type) { + case E_OR: + case E_AND: + sym = sym_check_expr_deps(e->left.expr); + if (sym) + return sym; + return sym_check_expr_deps(e->right.expr); + case E_NOT: + return sym_check_expr_deps(e->left.expr); + case E_EQUAL: + case E_UNEQUAL: + sym = sym_check_deps(e->left.sym); + if (sym) + return sym; + return sym_check_deps(e->right.sym); + case E_SYMBOL: + return sym_check_deps(e->left.sym); + default: + break; + } + printf("Oops! How to check %d?\n", e->type); + return NULL; +} + +/* return NULL when dependencies are OK */ +static struct symbol *sym_check_sym_deps(struct symbol *sym) +{ + struct symbol *sym2; + struct property *prop; + struct dep_stack stack; + + dep_stack_insert(&stack, sym); + + sym2 = sym_check_expr_deps(sym->rev_dep.expr); + if (sym2) + goto out; + + for (prop = sym->prop; prop; prop = prop->next) { + if (prop->type == P_CHOICE || prop->type == P_SELECT) + continue; + stack.prop = prop; + sym2 = sym_check_expr_deps(prop->visible.expr); + if (sym2) + break; + if (prop->type != P_DEFAULT || sym_is_choice(sym)) + continue; + stack.expr = prop->expr; + sym2 = sym_check_expr_deps(prop->expr); + if (sym2) + break; + stack.expr = NULL; + } + +out: + dep_stack_remove(); + + return sym2; +} + +static struct symbol *sym_check_choice_deps(struct symbol *choice) +{ + struct symbol *sym, *sym2; + struct property *prop; + struct expr *e; + struct dep_stack stack; + + dep_stack_insert(&stack, choice); + + prop = sym_get_choice_prop(choice); + expr_list_for_each_sym(prop->expr, e, sym) + sym->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED); + + choice->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED); + sym2 = sym_check_sym_deps(choice); + choice->flags &= ~SYMBOL_CHECK; + if (sym2) + goto out; + + expr_list_for_each_sym(prop->expr, e, sym) { + sym2 = sym_check_sym_deps(sym); + if (sym2) + break; + } +out: + expr_list_for_each_sym(prop->expr, e, sym) + sym->flags &= ~SYMBOL_CHECK; + + if (sym2 && sym_is_choice_value(sym2) && + prop_get_symbol(sym_get_choice_prop(sym2)) == choice) + sym2 = choice; + + dep_stack_remove(); + + return sym2; +} + +struct symbol *sym_check_deps(struct symbol *sym) +{ + struct symbol *sym2; + struct property *prop; + + if (sym->flags & SYMBOL_CHECK) { + sym_check_print_recursive(sym); + return sym; + } + if (sym->flags & SYMBOL_CHECKED) + return NULL; + + if (sym_is_choice_value(sym)) { + struct dep_stack stack; + + /* for choice groups start the check with main choice symbol */ + dep_stack_insert(&stack, sym); + prop = sym_get_choice_prop(sym); + sym2 = sym_check_deps(prop_get_symbol(prop)); + dep_stack_remove(); + } else if (sym_is_choice(sym)) { + sym2 = sym_check_choice_deps(sym); + } else { + sym->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED); + sym2 = sym_check_sym_deps(sym); + sym->flags &= ~SYMBOL_CHECK; + } + + if (sym2 && sym2 == sym) + sym2 = NULL; + + return sym2; +} + +struct property *prop_alloc(enum prop_type type, struct symbol *sym) +{ + struct property *prop; + struct property **propp; + + prop = xmalloc(sizeof(*prop)); + memset(prop, 0, sizeof(*prop)); + prop->type = type; + prop->sym = sym; + prop->file = current_file; + prop->lineno = zconf_lineno(); + + /* append property to the prop list of symbol */ + if (sym) { + for (propp = &sym->prop; *propp; propp = &(*propp)->next) + ; + *propp = prop; + } + + return prop; +} + +struct symbol *prop_get_symbol(struct property *prop) +{ + if (prop->expr && (prop->expr->type == E_SYMBOL || + prop->expr->type == E_LIST)) + return prop->expr->left.sym; + return NULL; +} + +const char *prop_get_type_name(enum prop_type type) +{ + switch (type) { + case P_PROMPT: + return "prompt"; + case P_ENV: + return "env"; + case P_COMMENT: + return "comment"; + case P_MENU: + return "menu"; + case P_DEFAULT: + return "default"; + case P_CHOICE: + return "choice"; + case P_SELECT: + return "select"; + case P_RANGE: + return "range"; + case P_SYMBOL: + return "symbol"; + case P_UNKNOWN: + break; + } + return "unknown"; +} + +static void prop_add_env(const char *env) +{ + struct symbol *sym, *sym2; + struct property *prop; + char *p; + + sym = current_entry->sym; + sym->flags |= SYMBOL_AUTO; + for_all_properties(sym, prop, P_ENV) { + sym2 = prop_get_symbol(prop); + if (strcmp(sym2->name, env)) + menu_warn(current_entry, "redefining environment symbol from %s", + sym2->name); + return; + } + + prop = prop_alloc(P_ENV, sym); + prop->expr = expr_alloc_symbol(sym_lookup(env, SYMBOL_CONST)); + + sym_env_list = expr_alloc_one(E_LIST, sym_env_list); + sym_env_list->right.sym = sym; + + p = getenv(env); + if (p) + sym_add_default(sym, p); + else + menu_warn(current_entry, "environment variable %s undefined", env); +} diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c new file mode 100644 index 00000000..6e7fbf19 --- /dev/null +++ b/scripts/kconfig/util.c @@ -0,0 +1,159 @@ +/* + * Copyright (C) 2002-2005 Roman Zippel <zippel@linux-m68k.org> + * Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org> + * + * Released under the terms of the GNU GPL v2.0. + */ + +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include "lkc.h" + +/* file already present in list? If not add it */ +struct file *file_lookup(const char *name) +{ + struct file *file; + const char *file_name = sym_expand_string_value(name); + + for (file = file_list; file; file = file->next) { + if (!strcmp(name, file->name)) { + free((void *)file_name); + return file; + } + } + + file = xmalloc(sizeof(*file)); + memset(file, 0, sizeof(*file)); + file->name = file_name; + file->next = file_list; + file_list = file; + return file; +} + +/* write a dependency file as used by kbuild to track dependencies */ +int file_write_dep(const char *name) +{ + struct symbol *sym, *env_sym; + struct expr *e; + struct file *file; + FILE *out; + + if (!name) + name = ".kconfig.d"; + out = fopen("..config.tmp", "w"); + if (!out) + return 1; + fprintf(out, "deps_config := \\\n"); + for (file = file_list; file; file = file->next) { + if (file->next) + fprintf(out, "\t%s \\\n", file->name); + else + fprintf(out, "\t%s\n", file->name); + } + fprintf(out, "\n%s: \\\n" + "\t$(deps_config)\n\n", conf_get_autoconfig_name()); + + expr_list_for_each_sym(sym_env_list, e, sym) { + struct property *prop; + const char *value; + + prop = sym_get_env_prop(sym); + env_sym = prop_get_symbol(prop); + if (!env_sym) + continue; + value = getenv(env_sym->name); + if (!value) + value = ""; + fprintf(out, "ifneq \"$(%s)\" \"%s\"\n", env_sym->name, value); + fprintf(out, "%s: FORCE\n", conf_get_autoconfig_name()); + fprintf(out, "endif\n"); + } + + fprintf(out, "\n$(deps_config): ;\n"); + fclose(out); + rename("..config.tmp", name); + return 0; +} + + +/* Allocate initial growable string */ +struct gstr str_new(void) +{ + struct gstr gs; + gs.s = xmalloc(sizeof(char) * 64); + gs.len = 64; + gs.max_width = 0; + strcpy(gs.s, "\0"); + return gs; +} + +/* Allocate and assign growable string */ +struct gstr str_assign(const char *s) +{ + struct gstr gs; + gs.s = strdup(s); + gs.len = strlen(s) + 1; + gs.max_width = 0; + return gs; +} + +/* Free storage for growable string */ +void str_free(struct gstr *gs) +{ + if (gs->s) + free(gs->s); + gs->s = NULL; + gs->len = 0; +} + +/* Append to growable string */ +void str_append(struct gstr *gs, const char *s) +{ + size_t l; + if (s) { + l = strlen(gs->s) + strlen(s) + 1; + if (l > gs->len) { + gs->s = realloc(gs->s, l); + gs->len = l; + } + strcat(gs->s, s); + } +} + +/* Append printf formatted string to growable string */ +void str_printf(struct gstr *gs, const char *fmt, ...) +{ + va_list ap; + char s[10000]; /* big enough... */ + va_start(ap, fmt); + vsnprintf(s, sizeof(s), fmt, ap); + str_append(gs, s); + va_end(ap); +} + +/* Retrieve value of growable string */ +const char *str_get(struct gstr *gs) +{ + return gs->s; +} + +void *xmalloc(size_t size) +{ + void *p = malloc(size); + if (p) + return p; + fprintf(stderr, "Out of memory.\n"); + exit(1); +} + +void *xcalloc(size_t nmemb, size_t size) +{ + void *p = calloc(nmemb, size); + if (p) + return p; + fprintf(stderr, "Out of memory.\n"); + exit(1); +} + + diff --git a/scripts/kconfig/zconf.hash.c b/scripts/kconfig/zconf.hash.c new file mode 100644 index 00000000..40df0005 --- /dev/null +++ b/scripts/kconfig/zconf.hash.c @@ -0,0 +1,286 @@ +/* ANSI-C code produced by gperf version 3.0.4 */ +/* Command-line: gperf -t --output-file scripts/kconfig/zconf.hash.c_shipped -a -C -E -g -k '1,3,$' -p -t scripts/kconfig/zconf.gperf */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ + && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ + && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ + && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ + && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ + && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ + && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ + && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ + && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ + && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ + && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ + && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ + && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ + && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ + && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ + && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ + && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ + && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ + && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ + && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." +#endif + +#line 10 "scripts/kconfig/zconf.gperf" +struct kconf_id; + +static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len); +/* maximum key range = 71, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +#ifdef __cplusplus +inline +#endif +#endif +static unsigned int +kconf_id_hash (register const char *str, register unsigned int len) +{ + static const unsigned char asso_values[] = + { + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 25, 25, + 0, 0, 0, 5, 0, 0, 73, 73, 5, 0, + 10, 5, 45, 73, 20, 20, 0, 15, 15, 73, + 20, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 73, 73, 73 + }; + register int hval = len; + + switch (hval) + { + default: + hval += asso_values[(unsigned char)str[2]]; + /*FALLTHROUGH*/ + case 2: + case 1: + hval += asso_values[(unsigned char)str[0]]; + break; + } + return hval + asso_values[(unsigned char)str[len - 1]]; +} + +struct kconf_id_strings_t + { + char kconf_id_strings_str2[sizeof("if")]; + char kconf_id_strings_str3[sizeof("int")]; + char kconf_id_strings_str5[sizeof("endif")]; + char kconf_id_strings_str7[sizeof("default")]; + char kconf_id_strings_str8[sizeof("tristate")]; + char kconf_id_strings_str9[sizeof("endchoice")]; + char kconf_id_strings_str12[sizeof("def_tristate")]; + char kconf_id_strings_str13[sizeof("def_bool")]; + char kconf_id_strings_str14[sizeof("defconfig_list")]; + char kconf_id_strings_str17[sizeof("on")]; + char kconf_id_strings_str18[sizeof("optional")]; + char kconf_id_strings_str21[sizeof("option")]; + char kconf_id_strings_str22[sizeof("endmenu")]; + char kconf_id_strings_str23[sizeof("mainmenu")]; + char kconf_id_strings_str25[sizeof("menuconfig")]; + char kconf_id_strings_str27[sizeof("modules")]; + char kconf_id_strings_str29[sizeof("menu")]; + char kconf_id_strings_str31[sizeof("select")]; + char kconf_id_strings_str32[sizeof("comment")]; + char kconf_id_strings_str33[sizeof("env")]; + char kconf_id_strings_str35[sizeof("range")]; + char kconf_id_strings_str36[sizeof("choice")]; + char kconf_id_strings_str39[sizeof("bool")]; + char kconf_id_strings_str41[sizeof("source")]; + char kconf_id_strings_str42[sizeof("visible")]; + char kconf_id_strings_str43[sizeof("hex")]; + char kconf_id_strings_str46[sizeof("config")]; + char kconf_id_strings_str47[sizeof("boolean")]; + char kconf_id_strings_str51[sizeof("string")]; + char kconf_id_strings_str54[sizeof("help")]; + char kconf_id_strings_str56[sizeof("prompt")]; + char kconf_id_strings_str72[sizeof("depends")]; + }; +static const struct kconf_id_strings_t kconf_id_strings_contents = + { + "if", + "int", + "endif", + "default", + "tristate", + "endchoice", + "def_tristate", + "def_bool", + "defconfig_list", + "on", + "optional", + "option", + "endmenu", + "mainmenu", + "menuconfig", + "modules", + "menu", + "select", + "comment", + "env", + "range", + "choice", + "bool", + "source", + "visible", + "hex", + "config", + "boolean", + "string", + "help", + "prompt", + "depends" + }; +#define kconf_id_strings ((const char *) &kconf_id_strings_contents) +#ifdef __GNUC__ +__inline +#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ +__attribute__ ((__gnu_inline__)) +#endif +#endif +const struct kconf_id * +kconf_id_lookup (register const char *str, register unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 32, + MIN_WORD_LENGTH = 2, + MAX_WORD_LENGTH = 14, + MIN_HASH_VALUE = 2, + MAX_HASH_VALUE = 72 + }; + + static const struct kconf_id wordlist[] = + { + {-1}, {-1}, +#line 25 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2, T_IF, TF_COMMAND|TF_PARAM}, +#line 36 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3, T_TYPE, TF_COMMAND, S_INT}, + {-1}, +#line 26 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5, T_ENDIF, TF_COMMAND}, + {-1}, +#line 29 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7, T_DEFAULT, TF_COMMAND, S_UNKNOWN}, +#line 31 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8, T_TYPE, TF_COMMAND, S_TRISTATE}, +#line 20 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9, T_ENDCHOICE, TF_COMMAND}, + {-1}, {-1}, +#line 32 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_TRISTATE}, +#line 35 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN}, +#line 45 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_OPT_DEFCONFIG_LIST,TF_OPTION}, + {-1}, {-1}, +#line 43 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_ON, TF_PARAM}, +#line 28 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_OPTIONAL, TF_COMMAND}, + {-1}, {-1}, +#line 42 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_OPTION, TF_COMMAND}, +#line 17 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_ENDMENU, TF_COMMAND}, +#line 15 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_MAINMENU, TF_COMMAND}, + {-1}, +#line 23 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str25, T_MENUCONFIG, TF_COMMAND}, + {-1}, +#line 44 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_OPT_MODULES, TF_OPTION}, + {-1}, +#line 16 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29, T_MENU, TF_COMMAND}, + {-1}, +#line 39 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SELECT, TF_COMMAND}, +#line 21 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND}, +#line 46 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_OPT_ENV, TF_OPTION}, + {-1}, +#line 40 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_RANGE, TF_COMMAND}, +#line 19 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_CHOICE, TF_COMMAND}, + {-1}, {-1}, +#line 33 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39, T_TYPE, TF_COMMAND, S_BOOLEAN}, + {-1}, +#line 18 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_SOURCE, TF_COMMAND}, +#line 41 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_VISIBLE, TF_COMMAND}, +#line 37 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43, T_TYPE, TF_COMMAND, S_HEX}, + {-1}, {-1}, +#line 22 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_CONFIG, TF_COMMAND}, +#line 34 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47, T_TYPE, TF_COMMAND, S_BOOLEAN}, + {-1}, {-1}, {-1}, +#line 38 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51, T_TYPE, TF_COMMAND, S_STRING}, + {-1}, {-1}, +#line 24 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str54, T_HELP, TF_COMMAND}, + {-1}, +#line 30 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str56, T_PROMPT, TF_COMMAND}, + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, +#line 27 "scripts/kconfig/zconf.gperf" + {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str72, T_DEPENDS, TF_COMMAND} + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + register int key = kconf_id_hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= 0) + { + register int o = wordlist[key].name; + if (o >= 0) + { + register const char *s = o + kconf_id_strings; + + if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0') + return &wordlist[key]; + } + } + } + return 0; +} +#line 47 "scripts/kconfig/zconf.gperf" + diff --git a/scripts/kconfig/zconf.lex.c b/scripts/kconfig/zconf.lex.c new file mode 100644 index 00000000..a0521aa5 --- /dev/null +++ b/scripts/kconfig/zconf.lex.c @@ -0,0 +1,2420 @@ + +#line 3 "scripts/kconfig/zconf.lex.c_shipped" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define yy_create_buffer zconf_create_buffer +#define yy_delete_buffer zconf_delete_buffer +#define yy_flex_debug zconf_flex_debug +#define yy_init_buffer zconf_init_buffer +#define yy_flush_buffer zconf_flush_buffer +#define yy_load_buffer_state zconf_load_buffer_state +#define yy_switch_to_buffer zconf_switch_to_buffer +#define yyin zconfin +#define yyleng zconfleng +#define yylex zconflex +#define yylineno zconflineno +#define yyout zconfout +#define yyrestart zconfrestart +#define yytext zconftext +#define yywrap zconfwrap +#define yyalloc zconfalloc +#define yyrealloc zconfrealloc +#define yyfree zconffree + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <stdlib.h> + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include <inttypes.h> +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN (yy_start) = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START (((yy_start) - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE zconfrestart(zconfin ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +extern int zconfleng; + +extern FILE *zconfin, *zconfout; + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up zconftext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ + YY_RESTORE_YY_MORE_OFFSET \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up zconftext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, (yytext_ptr) ) + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via zconfrestart()), so that the user can continue scanning by + * just pointing zconfin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + * + * Returns the top of the stack, or NULL. + */ +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) + +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] + +/* yy_hold_char holds the character lost when zconftext is formed. */ +static char yy_hold_char; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int zconfleng; + +/* Points to current character in buffer. */ +static char *yy_c_buf_p = (char *) 0; +static int yy_init = 0; /* whether we need to initialize */ +static int yy_start = 0; /* start state number */ + +/* Flag which is used to allow zconfwrap()'s to do buffer switches + * instead of setting up a fresh zconfin. A bit of a hack ... + */ +static int yy_did_buffer_switch_on_eof; + +void zconfrestart (FILE *input_file ); +void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE zconf_create_buffer (FILE *file,int size ); +void zconf_delete_buffer (YY_BUFFER_STATE b ); +void zconf_flush_buffer (YY_BUFFER_STATE b ); +void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer ); +void zconfpop_buffer_state (void ); + +static void zconfensure_buffer_stack (void ); +static void zconf_load_buffer_state (void ); +static void zconf_init_buffer (YY_BUFFER_STATE b,FILE *file ); + +#define YY_FLUSH_BUFFER zconf_flush_buffer(YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE zconf_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE zconf_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,int len ); + +void *zconfalloc (yy_size_t ); +void *zconfrealloc (void *,yy_size_t ); +void zconffree (void * ); + +#define yy_new_buffer zconf_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + zconfensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + zconf_create_buffer(zconfin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! YY_CURRENT_BUFFER ){\ + zconfensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + zconf_create_buffer(zconfin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +/* Begin user sect3 */ + +#define zconfwrap(n) 1 +#define YY_SKIP_YYWRAP + +typedef unsigned char YY_CHAR; + +FILE *zconfin = (FILE *) 0, *zconfout = (FILE *) 0; + +typedef int yy_state_type; + +extern int zconflineno; + +int zconflineno = 1; + +extern char *zconftext; +#define yytext_ptr zconftext +static yyconst flex_int16_t yy_nxt[][17] = + { + { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0 + }, + + { + 11, 12, 13, 14, 12, 12, 15, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12 + }, + + { + 11, 12, 13, 14, 12, 12, 15, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12 + }, + + { + 11, 16, 16, 17, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 18, 16, 16, 16 + }, + + { + 11, 16, 16, 17, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 18, 16, 16, 16 + + }, + + { + 11, 19, 20, 21, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19 + }, + + { + 11, 19, 20, 21, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19 + }, + + { + 11, 22, 22, 23, 22, 24, 22, 22, 24, 22, + 22, 22, 22, 22, 22, 25, 22 + }, + + { + 11, 22, 22, 23, 22, 24, 22, 22, 24, 22, + 22, 22, 22, 22, 22, 25, 22 + }, + + { + 11, 26, 26, 27, 28, 29, 30, 31, 29, 32, + 33, 34, 35, 35, 36, 37, 38 + + }, + + { + 11, 26, 26, 27, 28, 29, 30, 31, 29, 32, + 33, 34, 35, 35, 36, 37, 38 + }, + + { + -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, + -11, -11, -11, -11, -11, -11, -11 + }, + + { + 11, -12, -12, -12, -12, -12, -12, -12, -12, -12, + -12, -12, -12, -12, -12, -12, -12 + }, + + { + 11, -13, 39, 40, -13, -13, 41, -13, -13, -13, + -13, -13, -13, -13, -13, -13, -13 + }, + + { + 11, -14, -14, -14, -14, -14, -14, -14, -14, -14, + -14, -14, -14, -14, -14, -14, -14 + + }, + + { + 11, 42, 42, 43, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42 + }, + + { + 11, -16, -16, -16, -16, -16, -16, -16, -16, -16, + -16, -16, -16, -16, -16, -16, -16 + }, + + { + 11, -17, -17, -17, -17, -17, -17, -17, -17, -17, + -17, -17, -17, -17, -17, -17, -17 + }, + + { + 11, -18, -18, -18, -18, -18, -18, -18, -18, -18, + -18, -18, -18, 44, -18, -18, -18 + }, + + { + 11, 45, 45, -19, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45 + + }, + + { + 11, -20, 46, 47, -20, -20, -20, -20, -20, -20, + -20, -20, -20, -20, -20, -20, -20 + }, + + { + 11, 48, -21, -21, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48 + }, + + { + 11, 49, 49, 50, 49, -22, 49, 49, -22, 49, + 49, 49, 49, 49, 49, -22, 49 + }, + + { + 11, -23, -23, -23, -23, -23, -23, -23, -23, -23, + -23, -23, -23, -23, -23, -23, -23 + }, + + { + 11, -24, -24, -24, -24, -24, -24, -24, -24, -24, + -24, -24, -24, -24, -24, -24, -24 + + }, + + { + 11, 51, 51, 52, 51, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51 + }, + + { + 11, -26, -26, -26, -26, -26, -26, -26, -26, -26, + -26, -26, -26, -26, -26, -26, -26 + }, + + { + 11, -27, -27, -27, -27, -27, -27, -27, -27, -27, + -27, -27, -27, -27, -27, -27, -27 + }, + + { + 11, -28, -28, -28, -28, -28, -28, -28, -28, -28, + -28, -28, -28, -28, 53, -28, -28 + }, + + { + 11, -29, -29, -29, -29, -29, -29, -29, -29, -29, + -29, -29, -29, -29, -29, -29, -29 + + }, + + { + 11, 54, 54, -30, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 54, 54, 54, 54 + }, + + { + 11, -31, -31, -31, -31, -31, -31, 55, -31, -31, + -31, -31, -31, -31, -31, -31, -31 + }, + + { + 11, -32, -32, -32, -32, -32, -32, -32, -32, -32, + -32, -32, -32, -32, -32, -32, -32 + }, + + { + 11, -33, -33, -33, -33, -33, -33, -33, -33, -33, + -33, -33, -33, -33, -33, -33, -33 + }, + + { + 11, -34, -34, -34, -34, -34, -34, -34, -34, -34, + -34, 56, 57, 57, -34, -34, -34 + + }, + + { + 11, -35, -35, -35, -35, -35, -35, -35, -35, -35, + -35, 57, 57, 57, -35, -35, -35 + }, + + { + 11, -36, -36, -36, -36, -36, -36, -36, -36, -36, + -36, -36, -36, -36, -36, -36, -36 + }, + + { + 11, -37, -37, 58, -37, -37, -37, -37, -37, -37, + -37, -37, -37, -37, -37, -37, -37 + }, + + { + 11, -38, -38, -38, -38, -38, -38, -38, -38, -38, + -38, -38, -38, -38, -38, -38, 59 + }, + + { + 11, -39, 39, 40, -39, -39, 41, -39, -39, -39, + -39, -39, -39, -39, -39, -39, -39 + + }, + + { + 11, -40, -40, -40, -40, -40, -40, -40, -40, -40, + -40, -40, -40, -40, -40, -40, -40 + }, + + { + 11, 42, 42, 43, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42 + }, + + { + 11, 42, 42, 43, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42 + }, + + { + 11, -43, -43, -43, -43, -43, -43, -43, -43, -43, + -43, -43, -43, -43, -43, -43, -43 + }, + + { + 11, -44, -44, -44, -44, -44, -44, -44, -44, -44, + -44, -44, -44, 44, -44, -44, -44 + + }, + + { + 11, 45, 45, -45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45 + }, + + { + 11, -46, 46, 47, -46, -46, -46, -46, -46, -46, + -46, -46, -46, -46, -46, -46, -46 + }, + + { + 11, 48, -47, -47, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48 + }, + + { + 11, -48, -48, -48, -48, -48, -48, -48, -48, -48, + -48, -48, -48, -48, -48, -48, -48 + }, + + { + 11, 49, 49, 50, 49, -49, 49, 49, -49, 49, + 49, 49, 49, 49, 49, -49, 49 + + }, + + { + 11, -50, -50, -50, -50, -50, -50, -50, -50, -50, + -50, -50, -50, -50, -50, -50, -50 + }, + + { + 11, -51, -51, 52, -51, -51, -51, -51, -51, -51, + -51, -51, -51, -51, -51, -51, -51 + }, + + { + 11, -52, -52, -52, -52, -52, -52, -52, -52, -52, + -52, -52, -52, -52, -52, -52, -52 + }, + + { + 11, -53, -53, -53, -53, -53, -53, -53, -53, -53, + -53, -53, -53, -53, -53, -53, -53 + }, + + { + 11, 54, 54, -54, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 54, 54, 54, 54 + + }, + + { + 11, -55, -55, -55, -55, -55, -55, -55, -55, -55, + -55, -55, -55, -55, -55, -55, -55 + }, + + { + 11, -56, -56, -56, -56, -56, -56, -56, -56, -56, + -56, 60, 57, 57, -56, -56, -56 + }, + + { + 11, -57, -57, -57, -57, -57, -57, -57, -57, -57, + -57, 57, 57, 57, -57, -57, -57 + }, + + { + 11, -58, -58, -58, -58, -58, -58, -58, -58, -58, + -58, -58, -58, -58, -58, -58, -58 + }, + + { + 11, -59, -59, -59, -59, -59, -59, -59, -59, -59, + -59, -59, -59, -59, -59, -59, -59 + + }, + + { + 11, -60, -60, -60, -60, -60, -60, -60, -60, -60, + -60, 57, 57, 57, -60, -60, -60 + }, + + } ; + +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ); + +/* Done after the current pattern has been matched and before the + * corresponding action - sets up zconftext. + */ +#define YY_DO_BEFORE_ACTION \ + (yytext_ptr) = yy_bp; \ + zconfleng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ + *yy_cp = '\0'; \ + (yy_c_buf_p) = yy_cp; + +#define YY_NUM_RULES 33 +#define YY_END_OF_BUFFER 34 +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[61] = + { 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 34, 5, 4, 2, 3, 7, 8, 6, 32, 29, + 31, 24, 28, 27, 26, 22, 17, 13, 16, 20, + 22, 11, 12, 19, 19, 14, 22, 22, 4, 2, + 3, 3, 1, 6, 32, 29, 31, 30, 24, 23, + 26, 25, 15, 20, 9, 19, 19, 21, 10, 18 + } ; + +static yyconst flex_int32_t yy_ec[256] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 4, 5, 6, 1, 1, 7, 8, 9, + 10, 1, 1, 1, 11, 12, 12, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 1, 1, 1, + 14, 1, 1, 1, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 1, 15, 1, 1, 13, 1, 13, 13, 13, 13, + + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 1, 16, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; + +extern int zconf_flex_debug; +int zconf_flex_debug = 0; + +/* The intent behind this definition is that it'll catch + * any uses of REJECT which flex missed. + */ +#define REJECT reject_used_but_not_detected +#define yymore() yymore_used_but_not_detected +#define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET +char *zconftext; +#define YY_NO_INPUT 1 + +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "lkc.h" + +#define START_STRSIZE 16 + +static struct { + struct file *file; + int lineno; +} current_pos; + +static char *text; +static int text_size, text_asize; + +struct buffer { + struct buffer *parent; + YY_BUFFER_STATE state; +}; + +struct buffer *current_buf; + +static int last_ts, first_ts; + +static void zconf_endhelp(void); +static void zconf_endfile(void); + +static void new_string(void) +{ + text = xmalloc(START_STRSIZE); + text_asize = START_STRSIZE; + text_size = 0; + *text = 0; +} + +static void append_string(const char *str, int size) +{ + int new_size = text_size + size + 1; + if (new_size > text_asize) { + new_size += START_STRSIZE - 1; + new_size &= -START_STRSIZE; + text = realloc(text, new_size); + text_asize = new_size; + } + memcpy(text + text_size, str, size); + text_size += size; + text[text_size] = 0; +} + +static void alloc_string(const char *str, int size) +{ + text = xmalloc(size + 1); + memcpy(text, str, size); + text[size] = 0; +} + +#define INITIAL 0 +#define COMMAND 1 +#define HELP 2 +#define STRING 3 +#define PARAM 4 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include <unistd.h> +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +static int yy_init_globals (void ); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int zconflex_destroy (void ); + +int zconfget_debug (void ); + +void zconfset_debug (int debug_flag ); + +YY_EXTRA_TYPE zconfget_extra (void ); + +void zconfset_extra (YY_EXTRA_TYPE user_defined ); + +FILE *zconfget_in (void ); + +void zconfset_in (FILE * in_str ); + +FILE *zconfget_out (void ); + +void zconfset_out (FILE * out_str ); + +int zconfget_leng (void ); + +char *zconfget_text (void ); + +int zconfget_lineno (void ); + +void zconfset_lineno (int line_number ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int zconfwrap (void ); +#else +extern int zconfwrap (void ); +#endif +#endif + + static void yyunput (int c,char *buf_ptr ); + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ); +#endif + +#ifndef YY_NO_INPUT + +#ifdef __cplusplus +static int yyinput (void ); +#else +static int input (void ); +#endif + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Copy whatever the last rule matched to the standard output. */ +#ifndef ECHO +/* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +#define ECHO do { if (fwrite( zconftext, zconfleng, 1, zconfout )) {} } while (0) +#endif + +/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, + * is returned in "result". + */ +#ifndef YY_INPUT +#define YY_INPUT(buf,result,max_size) \ + errno=0; \ + while ( (result = read( fileno(zconfin), (char *) buf, max_size )) < 0 ) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(zconfin); \ + }\ +\ + +#endif + +/* No semi-colon after return; correct usage is to write "yyterminate();" - + * we don't want an extra ';' after the "return" because that will cause + * some compilers to complain about unreachable statements. + */ +#ifndef yyterminate +#define yyterminate() return YY_NULL +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Report a fatal error. */ +#ifndef YY_FATAL_ERROR +#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) +#endif + +/* end tables serialization structures and prototypes */ + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int zconflex (void); + +#define YY_DECL int zconflex (void) +#endif /* !YY_DECL */ + +/* Code executed at the beginning of each rule, after zconftext and zconfleng + * have been set up. + */ +#ifndef YY_USER_ACTION +#define YY_USER_ACTION +#endif + +/* Code executed at the end of each rule. */ +#ifndef YY_BREAK +#define YY_BREAK break; +#endif + +#define YY_RULE_SETUP \ + YY_USER_ACTION + +/** The main scanner function which does all the work. + */ +YY_DECL +{ + register yy_state_type yy_current_state; + register char *yy_cp, *yy_bp; + register int yy_act; + + int str = 0; + int ts, i; + + if ( !(yy_init) ) + { + (yy_init) = 1; + +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif + + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ + + if ( ! zconfin ) + zconfin = stdin; + + if ( ! zconfout ) + zconfout = stdout; + + if ( ! YY_CURRENT_BUFFER ) { + zconfensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + zconf_create_buffer(zconfin,YY_BUF_SIZE ); + } + + zconf_load_buffer_state( ); + } + + while ( 1 ) /* loops until end-of-file is reached */ + { + yy_cp = (yy_c_buf_p); + + /* Support of zconftext. */ + *yy_cp = (yy_hold_char); + + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; + + yy_current_state = (yy_start); +yy_match: + while ( (yy_current_state = yy_nxt[yy_current_state][ yy_ec[YY_SC_TO_UI(*yy_cp)] ]) > 0 ) + ++yy_cp; + + yy_current_state = -yy_current_state; + +yy_find_action: + yy_act = yy_accept[yy_current_state]; + + YY_DO_BEFORE_ACTION; + +do_action: /* This label is used only to access EOF actions. */ + + switch ( yy_act ) + { /* beginning of action switch */ +case 1: +/* rule 1 can match eol */ +case 2: +/* rule 2 can match eol */ +YY_RULE_SETUP +{ + current_file->lineno++; + return T_EOL; +} + YY_BREAK +case 3: +YY_RULE_SETUP + + YY_BREAK +case 4: +YY_RULE_SETUP +{ + BEGIN(COMMAND); +} + YY_BREAK +case 5: +YY_RULE_SETUP +{ + unput(zconftext[0]); + BEGIN(COMMAND); +} + YY_BREAK + +case 6: +YY_RULE_SETUP +{ + const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng); + BEGIN(PARAM); + current_pos.file = current_file; + current_pos.lineno = current_file->lineno; + if (id && id->flags & TF_COMMAND) { + zconflval.id = id; + return id->token; + } + alloc_string(zconftext, zconfleng); + zconflval.string = text; + return T_WORD; + } + YY_BREAK +case 7: +YY_RULE_SETUP + + YY_BREAK +case 8: +/* rule 8 can match eol */ +YY_RULE_SETUP +{ + BEGIN(INITIAL); + current_file->lineno++; + return T_EOL; + } + YY_BREAK + +case 9: +YY_RULE_SETUP +return T_AND; + YY_BREAK +case 10: +YY_RULE_SETUP +return T_OR; + YY_BREAK +case 11: +YY_RULE_SETUP +return T_OPEN_PAREN; + YY_BREAK +case 12: +YY_RULE_SETUP +return T_CLOSE_PAREN; + YY_BREAK +case 13: +YY_RULE_SETUP +return T_NOT; + YY_BREAK +case 14: +YY_RULE_SETUP +return T_EQUAL; + YY_BREAK +case 15: +YY_RULE_SETUP +return T_UNEQUAL; + YY_BREAK +case 16: +YY_RULE_SETUP +{ + str = zconftext[0]; + new_string(); + BEGIN(STRING); + } + YY_BREAK +case 17: +/* rule 17 can match eol */ +YY_RULE_SETUP +BEGIN(INITIAL); current_file->lineno++; return T_EOL; + YY_BREAK +case 18: +YY_RULE_SETUP +/* ignore */ + YY_BREAK +case 19: +YY_RULE_SETUP +{ + const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng); + if (id && id->flags & TF_PARAM) { + zconflval.id = id; + return id->token; + } + alloc_string(zconftext, zconfleng); + zconflval.string = text; + return T_WORD; + } + YY_BREAK +case 20: +YY_RULE_SETUP +/* comment */ + YY_BREAK +case 21: +/* rule 21 can match eol */ +YY_RULE_SETUP +current_file->lineno++; + YY_BREAK +case 22: +YY_RULE_SETUP + + YY_BREAK +case YY_STATE_EOF(PARAM): +{ + BEGIN(INITIAL); + } + YY_BREAK + +case 23: +/* rule 23 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up zconftext again */ +YY_RULE_SETUP +{ + append_string(zconftext, zconfleng); + zconflval.string = text; + return T_WORD_QUOTE; + } + YY_BREAK +case 24: +YY_RULE_SETUP +{ + append_string(zconftext, zconfleng); + } + YY_BREAK +case 25: +/* rule 25 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up zconftext again */ +YY_RULE_SETUP +{ + append_string(zconftext + 1, zconfleng - 1); + zconflval.string = text; + return T_WORD_QUOTE; + } + YY_BREAK +case 26: +YY_RULE_SETUP +{ + append_string(zconftext + 1, zconfleng - 1); + } + YY_BREAK +case 27: +YY_RULE_SETUP +{ + if (str == zconftext[0]) { + BEGIN(PARAM); + zconflval.string = text; + return T_WORD_QUOTE; + } else + append_string(zconftext, 1); + } + YY_BREAK +case 28: +/* rule 28 can match eol */ +YY_RULE_SETUP +{ + printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno()); + current_file->lineno++; + BEGIN(INITIAL); + return T_EOL; + } + YY_BREAK +case YY_STATE_EOF(STRING): +{ + BEGIN(INITIAL); + } + YY_BREAK + +case 29: +YY_RULE_SETUP +{ + ts = 0; + for (i = 0; i < zconfleng; i++) { + if (zconftext[i] == '\t') + ts = (ts & ~7) + 8; + else + ts++; + } + last_ts = ts; + if (first_ts) { + if (ts < first_ts) { + zconf_endhelp(); + return T_HELPTEXT; + } + ts -= first_ts; + while (ts > 8) { + append_string(" ", 8); + ts -= 8; + } + append_string(" ", ts); + } + } + YY_BREAK +case 30: +/* rule 30 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up zconftext again */ +YY_RULE_SETUP +{ + current_file->lineno++; + zconf_endhelp(); + return T_HELPTEXT; + } + YY_BREAK +case 31: +/* rule 31 can match eol */ +YY_RULE_SETUP +{ + current_file->lineno++; + append_string("\n", 1); + } + YY_BREAK +case 32: +YY_RULE_SETUP +{ + while (zconfleng) { + if ((zconftext[zconfleng-1] != ' ') && (zconftext[zconfleng-1] != '\t')) + break; + zconfleng--; + } + append_string(zconftext, zconfleng); + if (!first_ts) + first_ts = last_ts; + } + YY_BREAK +case YY_STATE_EOF(HELP): +{ + zconf_endhelp(); + return T_HELPTEXT; + } + YY_BREAK + +case YY_STATE_EOF(INITIAL): +case YY_STATE_EOF(COMMAND): +{ + if (current_file) { + zconf_endfile(); + return T_EOL; + } + fclose(zconfin); + yyterminate(); +} + YY_BREAK +case 33: +YY_RULE_SETUP +YY_FATAL_ERROR( "flex scanner jammed" ); + YY_BREAK + + case YY_END_OF_BUFFER: + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; + + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = (yy_hold_char); + YY_RESTORE_YY_MORE_OFFSET + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed zconfin at a new source and called + * zconflex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. + */ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = zconfin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + } + + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + { /* This was really a NUL. */ + yy_state_type yy_next_state; + + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( ); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans( yy_current_state ); + + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + + if ( yy_next_state ) + { + /* Consume the NUL. */ + yy_cp = ++(yy_c_buf_p); + yy_current_state = yy_next_state; + goto yy_match; + } + + else + { + yy_cp = (yy_c_buf_p); + goto yy_find_action; + } + } + + else switch ( yy_get_next_buffer( ) ) + { + case EOB_ACT_END_OF_FILE: + { + (yy_did_buffer_switch_on_eof) = 0; + + if ( zconfwrap( ) ) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * zconftext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. + */ + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; + + yy_act = YY_STATE_EOF(YY_START); + goto do_action; + } + + else + { + if ( ! (yy_did_buffer_switch_on_eof) ) + YY_NEW_FILE; + } + break; + } + + case EOB_ACT_CONTINUE_SCAN: + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( ); + + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + goto yy_match; + + case EOB_ACT_LAST_MATCH: + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; + + yy_current_state = yy_get_previous_state( ); + + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; + goto yy_find_action; + } + break; + } + + default: + YY_FATAL_ERROR( + "fatal flex scanner internal error--no action found" ); + } /* end of action switch */ + } /* end of scanning one token */ +} /* end of zconflex */ + +/* yy_get_next_buffer - try to read in a new buffer + * + * Returns a code representing an action: + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file + */ +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); + register int number_to_move, i; + int ret_val; + + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) + YY_FATAL_ERROR( + "fatal flex scanner internal error--end of buffer missed" ); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } + + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } + + /* Try to read more data. */ + + /* First move last chars to start of buffer. */ + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + + for ( i = 0; i < number_to_move; ++i ) + *(dest++) = *(source++); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; + + else + { + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + + while ( num_to_read <= 0 ) + { /* Not enough room in the buffer - grow it. */ + + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + + int yy_c_buf_p_offset = + (int) ((yy_c_buf_p) - b->yy_ch_buf); + + if ( b->yy_is_our_buffer ) + { + int new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; + + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + zconfrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; + + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( + "fatal error - scanner input buffer overflow" ); + + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; + + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + number_to_move - 1; + + } + + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; + + /* Read in more data. */ + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), (size_t) num_to_read ); + + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + if ( (yy_n_chars) == 0 ) + { + if ( number_to_move == YY_MORE_ADJ ) + { + ret_val = EOB_ACT_END_OF_FILE; + zconfrestart(zconfin ); + } + + else + { + ret_val = EOB_ACT_LAST_MATCH; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_BUFFER_EOF_PENDING; + } + } + + else + ret_val = EOB_ACT_CONTINUE_SCAN; + + if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; + + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + + return ret_val; +} + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + + static yy_state_type yy_get_previous_state (void) +{ + register yy_state_type yy_current_state; + register char *yy_cp; + + yy_current_state = (yy_start); + + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) + { + yy_current_state = yy_nxt[yy_current_state][(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1)]; + } + + return yy_current_state; +} + +/* yy_try_NUL_trans - try to make a transition on the NUL character + * + * synopsis + * next_state = yy_try_NUL_trans( current_state ); + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ + register int yy_is_jam; + + yy_current_state = yy_nxt[yy_current_state][1]; + yy_is_jam = (yy_current_state <= 0); + + return yy_is_jam ? 0 : yy_current_state; +} + + static void yyunput (int c, register char * yy_bp ) +{ + register char *yy_cp; + + yy_cp = (yy_c_buf_p); + + /* undo effects of setting up zconftext */ + *yy_cp = (yy_hold_char); + + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ + register int number_to_move = (yy_n_chars) + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; + register char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + *--dest = *--source; + + yy_cp += (int) (dest - source); + yy_bp += (int) (dest - source); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + YY_FATAL_ERROR( "flex scanner push-back overflow" ); + } + + *--yy_cp = (char) c; + + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} + +#ifndef YY_NO_INPUT +#ifdef __cplusplus + static int yyinput (void) +#else + static int input (void) +#endif + +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); + + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) + /* This was really a NUL. */ + *(yy_c_buf_p) = '\0'; + + else + { /* need more input */ + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); + + switch ( yy_get_next_buffer( ) ) + { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + zconfrestart(zconfin ); + + /*FALLTHROUGH*/ + + case EOB_ACT_END_OF_FILE: + { + if ( zconfwrap( ) ) + return EOF; + + if ( ! (yy_did_buffer_switch_on_eof) ) + YY_NEW_FILE; +#ifdef __cplusplus + return yyinput(); +#else + return input(); +#endif + } + + case EOB_ACT_CONTINUE_SCAN: + (yy_c_buf_p) = (yytext_ptr) + offset; + break; + } + } + } + + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve zconftext */ + (yy_hold_char) = *++(yy_c_buf_p); + + return c; +} +#endif /* ifndef YY_NO_INPUT */ + +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void zconfrestart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + zconfensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + zconf_create_buffer(zconfin,YY_BUF_SIZE ); + } + + zconf_init_buffer(YY_CURRENT_BUFFER,input_file ); + zconf_load_buffer_state( ); +} + +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * zconfpop_buffer_state(); + * zconfpush_buffer_state(new_buffer); + */ + zconfensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) + return; + + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + YY_CURRENT_BUFFER_LVALUE = new_buffer; + zconf_load_buffer_state( ); + + /* We don't actually know whether we did this switch during + * EOF (zconfwrap()) processing, but the only time this flag + * is looked at is after zconfwrap() is called, so it's safe + * to go ahead and always set it. + */ + (yy_did_buffer_switch_on_eof) = 1; +} + +static void zconf_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + zconfin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} + +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE zconf_create_buffer (FILE * file, int size ) +{ + YY_BUFFER_STATE b; + + b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" ); + + b->yy_buf_size = size; + + /* yy_ch_buf has to be 2 characters longer than the size given because + * we need to put in 2 end-of-buffer characters. + */ + b->yy_ch_buf = (char *) zconfalloc(b->yy_buf_size + 2 ); + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" ); + + b->yy_is_our_buffer = 1; + + zconf_init_buffer(b,file ); + + return b; +} + +/** Destroy the buffer. + * @param b a buffer created with zconf_create_buffer() + * + */ + void zconf_delete_buffer (YY_BUFFER_STATE b ) +{ + + if ( ! b ) + return; + + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + + if ( b->yy_is_our_buffer ) + zconffree((void *) b->yy_ch_buf ); + + zconffree((void *) b ); +} + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a zconfrestart() or at EOF. + */ + static void zconf_init_buffer (YY_BUFFER_STATE b, FILE * file ) + +{ + int oerrno = errno; + + zconf_flush_buffer(b ); + + b->yy_input_file = file; + b->yy_fill_buffer = 1; + + /* If b is the current buffer, then zconf_init_buffer was _probably_ + * called from zconfrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } + + b->yy_is_interactive = 0; + + errno = oerrno; +} + +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void zconf_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) + return; + + b->yy_n_chars = 0; + + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + + b->yy_buf_pos = &b->yy_ch_buf[0]; + + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; + + if ( b == YY_CURRENT_BUFFER ) + zconf_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + zconfensure_buffer_stack(); + + /* This block is copied from zconf_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from zconf_switch_to_buffer. */ + zconf_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void zconfpop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + zconf_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + zconf_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void zconfensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; + } + + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)zconfrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; + b->yy_buffer_status = YY_BUFFER_NEW; + + zconf_switch_to_buffer(b ); + + return b; +} + +/** Setup the input buffer state to scan a string. The next call to zconflex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * zconf_scan_bytes() instead. + */ +YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr ) +{ + + return zconf_scan_bytes(yystr,strlen(yystr) ); +} + +/** Setup the input buffer state to scan the given bytes. The next call to zconflex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE zconf_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +{ + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = _yybytes_len + 2; + buf = (char *) zconfalloc(n ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_bytes()" ); + + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; + + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + + b = zconf_scan_buffer(buf,n ); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in zconf_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif + +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} + +/* Redefine yyless() so it works in section 3 code. */ + +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up zconftext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + zconftext[zconfleng] = (yy_hold_char); \ + (yy_c_buf_p) = zconftext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + zconfleng = yyless_macro_arg; \ + } \ + while ( 0 ) + +/* Accessor methods (get/set functions) to struct members. */ + +/** Get the current line number. + * + */ +int zconfget_lineno (void) +{ + + return zconflineno; +} + +/** Get the input stream. + * + */ +FILE *zconfget_in (void) +{ + return zconfin; +} + +/** Get the output stream. + * + */ +FILE *zconfget_out (void) +{ + return zconfout; +} + +/** Get the length of the current token. + * + */ +int zconfget_leng (void) +{ + return zconfleng; +} + +/** Get the current token. + * + */ + +char *zconfget_text (void) +{ + return zconftext; +} + +/** Set the current line number. + * @param line_number + * + */ +void zconfset_lineno (int line_number ) +{ + + zconflineno = line_number; +} + +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see zconf_switch_to_buffer + */ +void zconfset_in (FILE * in_str ) +{ + zconfin = in_str ; +} + +void zconfset_out (FILE * out_str ) +{ + zconfout = out_str ; +} + +int zconfget_debug (void) +{ + return zconf_flex_debug; +} + +void zconfset_debug (int bdebug ) +{ + zconf_flex_debug = bdebug ; +} + +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from zconflex_destroy(), so don't allocate here. + */ + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = (char *) 0; + (yy_init) = 0; + (yy_start) = 0; + +/* Defined in main.c */ +#ifdef YY_STDINIT + zconfin = stdin; + zconfout = stdout; +#else + zconfin = (FILE *) 0; + zconfout = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * zconflex_init() + */ + return 0; +} + +/* zconflex_destroy is for both reentrant and non-reentrant scanners. */ +int zconflex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + zconf_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + zconfpop_buffer_state(); + } + + /* Destroy the stack itself. */ + zconffree((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * zconflex() is called, initialization will occur. */ + yy_init_globals( ); + + return 0; +} + +/* + * Internal utility routines. + */ + +#ifndef yytext_ptr +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ + register int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; +} +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * s ) +{ + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; +} +#endif + +void *zconfalloc (yy_size_t size ) +{ + return (void *) malloc( size ); +} + +void *zconfrealloc (void * ptr, yy_size_t size ) +{ + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); +} + +void zconffree (void * ptr ) +{ + free( (char *) ptr ); /* see zconfrealloc() for (char *) cast */ +} + +#define YYTABLES_NAME "yytables" + +void zconf_starthelp(void) +{ + new_string(); + last_ts = first_ts = 0; + BEGIN(HELP); +} + +static void zconf_endhelp(void) +{ + zconflval.string = text; + BEGIN(INITIAL); +} + +/* + * Try to open specified file with following names: + * ./name + * $(srctree)/name + * The latter is used when srctree is separate from objtree + * when compiling the kernel. + * Return NULL if file is not found. + */ +FILE *zconf_fopen(const char *name) +{ + char *env, fullname[PATH_MAX+1]; + FILE *f; + + f = fopen(name, "r"); + if (!f && name != NULL && name[0] != '/') { + env = getenv(SRCTREE); + if (env) { + sprintf(fullname, "%s/%s", env, name); + f = fopen(fullname, "r"); + } + } + return f; +} + +void zconf_initscan(const char *name) +{ + zconfin = zconf_fopen(name); + if (!zconfin) { + printf("can't find file %s\n", name); + exit(1); + } + + current_buf = xmalloc(sizeof(*current_buf)); + memset(current_buf, 0, sizeof(*current_buf)); + + current_file = file_lookup(name); + current_file->lineno = 1; +} + +void zconf_nextfile(const char *name) +{ + struct file *iter; + struct file *file = file_lookup(name); + struct buffer *buf = xmalloc(sizeof(*buf)); + memset(buf, 0, sizeof(*buf)); + + current_buf->state = YY_CURRENT_BUFFER; + zconfin = zconf_fopen(file->name); + if (!zconfin) { + printf("%s:%d: can't open file \"%s\"\n", + zconf_curname(), zconf_lineno(), file->name); + exit(1); + } + zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE)); + buf->parent = current_buf; + current_buf = buf; + + for (iter = current_file->parent; iter; iter = iter->parent ) { + if (!strcmp(current_file->name,iter->name) ) { + printf("%s:%d: recursive inclusion detected. " + "Inclusion path:\n current file : '%s'\n", + zconf_curname(), zconf_lineno(), + zconf_curname()); + iter = current_file->parent; + while (iter && \ + strcmp(iter->name,current_file->name)) { + printf(" included from: '%s:%d'\n", + iter->name, iter->lineno-1); + iter = iter->parent; + } + if (iter) + printf(" included from: '%s:%d'\n", + iter->name, iter->lineno+1); + exit(1); + } + } + file->lineno = 1; + file->parent = current_file; + current_file = file; +} + +static void zconf_endfile(void) +{ + struct buffer *parent; + + current_file = current_file->parent; + + parent = current_buf->parent; + if (parent) { + fclose(zconfin); + zconf_delete_buffer(YY_CURRENT_BUFFER); + zconf_switch_to_buffer(parent->state); + } + free(current_buf); + current_buf = parent; +} + +int zconf_lineno(void) +{ + return current_pos.lineno; +} + +const char *zconf_curname(void) +{ + return current_pos.file ? current_pos.file->name : "<none>"; +} + diff --git a/scripts/kconfig/zconf.tab.c b/scripts/kconfig/zconf.tab.c new file mode 100644 index 00000000..f636141e --- /dev/null +++ b/scripts/kconfig/zconf.tab.c @@ -0,0 +1,2504 @@ +/* A Bison parser, made by GNU Bison 2.4.3. */ + +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. + + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.4.3" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 0 + +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + +/* Using locations. */ +#define YYLSP_NEEDED 0 + +/* Substitute the variable and function names. */ +#define yyparse zconfparse +#define yylex zconflex +#define yyerror zconferror +#define yylval zconflval +#define yychar zconfchar +#define yydebug zconfdebug +#define yynerrs zconfnerrs + + +/* Copy the first part of user declarations. */ + + +/* + * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> + * Released under the terms of the GNU GPL v2.0. + */ + +#include <ctype.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdbool.h> + +#include "lkc.h" + +#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt) + +#define PRINTD 0x0001 +#define DEBUG_PARSE 0x0002 + +int cdebug = PRINTD; + +extern int zconflex(void); +static void zconfprint(const char *err, ...); +static void zconf_error(const char *err, ...); +static void zconferror(const char *err); +static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken); + +struct symbol *symbol_hash[SYMBOL_HASHSIZE]; + +static struct menu *current_menu, *current_entry; + + + + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 0 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + T_MAINMENU = 258, + T_MENU = 259, + T_ENDMENU = 260, + T_SOURCE = 261, + T_CHOICE = 262, + T_ENDCHOICE = 263, + T_COMMENT = 264, + T_CONFIG = 265, + T_MENUCONFIG = 266, + T_HELP = 267, + T_HELPTEXT = 268, + T_IF = 269, + T_ENDIF = 270, + T_DEPENDS = 271, + T_OPTIONAL = 272, + T_PROMPT = 273, + T_TYPE = 274, + T_DEFAULT = 275, + T_SELECT = 276, + T_RANGE = 277, + T_VISIBLE = 278, + T_OPTION = 279, + T_ON = 280, + T_WORD = 281, + T_WORD_QUOTE = 282, + T_UNEQUAL = 283, + T_CLOSE_PAREN = 284, + T_OPEN_PAREN = 285, + T_EOL = 286, + T_OR = 287, + T_AND = 288, + T_EQUAL = 289, + T_NOT = 290 + }; +#endif + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +{ + + + char *string; + struct file *file; + struct symbol *symbol; + struct expr *expr; + struct menu *menu; + const struct kconf_id *id; + + + +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +#endif + + +/* Copy the second part of user declarations. */ + + +/* Include zconf.hash.c here so it can see the token constants. */ +#include "zconf.hash.c" + + + +#ifdef short +# undef short +#endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if defined YYENABLE_NLS && YYENABLE_NLS +# if ENABLE_NLS +# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int yyi) +#else +static int +YYID (yyi) + int yyi; +#endif +{ + return yyi; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss_alloc; + YYSTYPE yyvs_alloc; +}; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + + YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 11 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 290 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 36 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 50 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 118 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 191 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 290 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint16 yyprhs[] = +{ + 0, 0, 3, 6, 8, 11, 13, 14, 17, 20, + 23, 26, 31, 36, 40, 42, 44, 46, 48, 50, + 52, 54, 56, 58, 60, 62, 64, 66, 68, 72, + 75, 79, 82, 86, 89, 90, 93, 96, 99, 102, + 105, 108, 112, 117, 122, 127, 133, 137, 138, 142, + 143, 146, 150, 153, 155, 159, 160, 163, 166, 169, + 172, 175, 180, 184, 187, 192, 193, 196, 200, 202, + 206, 207, 210, 213, 216, 220, 224, 228, 230, 234, + 235, 238, 241, 244, 248, 252, 255, 258, 261, 262, + 265, 268, 271, 276, 277, 280, 283, 286, 287, 290, + 292, 294, 297, 300, 303, 305, 308, 309, 312, 314, + 318, 322, 326, 329, 333, 337, 339, 341, 342 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = +{ + 37, 0, -1, 81, 38, -1, 38, -1, 63, 39, + -1, 39, -1, -1, 39, 41, -1, 39, 55, -1, + 39, 67, -1, 39, 80, -1, 39, 26, 1, 31, + -1, 39, 40, 1, 31, -1, 39, 1, 31, -1, + 16, -1, 18, -1, 19, -1, 21, -1, 17, -1, + 22, -1, 20, -1, 23, -1, 31, -1, 61, -1, + 71, -1, 44, -1, 46, -1, 69, -1, 26, 1, + 31, -1, 1, 31, -1, 10, 26, 31, -1, 43, + 47, -1, 11, 26, 31, -1, 45, 47, -1, -1, + 47, 48, -1, 47, 49, -1, 47, 75, -1, 47, + 73, -1, 47, 42, -1, 47, 31, -1, 19, 78, + 31, -1, 18, 79, 82, 31, -1, 20, 83, 82, + 31, -1, 21, 26, 82, 31, -1, 22, 84, 84, + 82, 31, -1, 24, 50, 31, -1, -1, 50, 26, + 51, -1, -1, 34, 79, -1, 7, 85, 31, -1, + 52, 56, -1, 80, -1, 53, 58, 54, -1, -1, + 56, 57, -1, 56, 75, -1, 56, 73, -1, 56, + 31, -1, 56, 42, -1, 18, 79, 82, 31, -1, + 19, 78, 31, -1, 17, 31, -1, 20, 26, 82, + 31, -1, -1, 58, 41, -1, 14, 83, 81, -1, + 80, -1, 59, 62, 60, -1, -1, 62, 41, -1, + 62, 67, -1, 62, 55, -1, 3, 79, 81, -1, + 4, 79, 31, -1, 64, 76, 74, -1, 80, -1, + 65, 68, 66, -1, -1, 68, 41, -1, 68, 67, + -1, 68, 55, -1, 6, 79, 31, -1, 9, 79, + 31, -1, 70, 74, -1, 12, 31, -1, 72, 13, + -1, -1, 74, 75, -1, 74, 31, -1, 74, 42, + -1, 16, 25, 83, 31, -1, -1, 76, 77, -1, + 76, 31, -1, 23, 82, -1, -1, 79, 82, -1, + 26, -1, 27, -1, 5, 31, -1, 8, 31, -1, + 15, 31, -1, 31, -1, 81, 31, -1, -1, 14, + 83, -1, 84, -1, 84, 34, 84, -1, 84, 28, + 84, -1, 30, 83, 29, -1, 35, 83, -1, 83, + 32, 83, -1, 83, 33, 83, -1, 26, -1, 27, + -1, -1, 26, -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint16 yyrline[] = +{ + 0, 104, 104, 104, 106, 106, 108, 110, 111, 112, + 113, 114, 115, 119, 123, 123, 123, 123, 123, 123, + 123, 123, 127, 128, 129, 130, 131, 132, 136, 137, + 143, 151, 157, 165, 175, 177, 178, 179, 180, 181, + 182, 185, 193, 199, 209, 215, 221, 224, 226, 237, + 238, 243, 252, 257, 265, 268, 270, 271, 272, 273, + 274, 277, 283, 294, 300, 310, 312, 317, 325, 333, + 336, 338, 339, 340, 345, 352, 359, 364, 372, 375, + 377, 378, 379, 382, 390, 397, 404, 410, 417, 419, + 420, 421, 424, 432, 434, 435, 438, 445, 447, 452, + 453, 456, 457, 458, 462, 463, 466, 467, 470, 471, + 472, 473, 474, 475, 476, 479, 480, 483, 484 +}; +#endif + +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU", + "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG", + "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS", + "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE", + "T_VISIBLE", "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL", + "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL", + "T_NOT", "$accept", "input", "start", "stmt_list", "option_name", + "common_stmt", "option_error", "config_entry_start", "config_stmt", + "menuconfig_entry_start", "menuconfig_stmt", "config_option_list", + "config_option", "symbol_option", "symbol_option_list", + "symbol_option_arg", "choice", "choice_entry", "choice_end", + "choice_stmt", "choice_option_list", "choice_option", "choice_block", + "if_entry", "if_end", "if_stmt", "if_block", "mainmenu_stmt", "menu", + "menu_entry", "menu_end", "menu_stmt", "menu_block", "source_stmt", + "comment", "comment_stmt", "help_start", "help", "depends_list", + "depends", "visibility_list", "visible", "prompt_stmt_opt", "prompt", + "end", "nl", "if_expr", "expr", "symbol", "word_opt", 0 +}; +#endif + +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285, 286, 287, 288, 289, 290 +}; +# endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 36, 37, 37, 38, 38, 39, 39, 39, 39, + 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, + 40, 40, 41, 41, 41, 41, 41, 41, 42, 42, + 43, 44, 45, 46, 47, 47, 47, 47, 47, 47, + 47, 48, 48, 48, 48, 48, 49, 50, 50, 51, + 51, 52, 53, 54, 55, 56, 56, 56, 56, 56, + 56, 57, 57, 57, 57, 58, 58, 59, 60, 61, + 62, 62, 62, 62, 63, 64, 65, 66, 67, 68, + 68, 68, 68, 69, 70, 71, 72, 73, 74, 74, + 74, 74, 75, 76, 76, 76, 77, 78, 78, 79, + 79, 80, 80, 80, 81, 81, 82, 82, 83, 83, + 83, 83, 83, 83, 83, 84, 84, 85, 85 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 2, 1, 2, 1, 0, 2, 2, 2, + 2, 4, 4, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, + 3, 2, 3, 2, 0, 2, 2, 2, 2, 2, + 2, 3, 4, 4, 4, 5, 3, 0, 3, 0, + 2, 3, 2, 1, 3, 0, 2, 2, 2, 2, + 2, 4, 3, 2, 4, 0, 2, 3, 1, 3, + 0, 2, 2, 2, 3, 3, 3, 1, 3, 0, + 2, 2, 2, 3, 3, 2, 2, 2, 0, 2, + 2, 2, 4, 0, 2, 2, 2, 0, 2, 1, + 1, 2, 2, 2, 1, 2, 0, 2, 1, 3, + 3, 3, 2, 3, 3, 1, 1, 0, 1 +}; + +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 6, 0, 104, 0, 3, 0, 6, 6, 99, 100, + 0, 1, 0, 0, 0, 0, 117, 0, 0, 0, + 0, 0, 0, 14, 18, 15, 16, 20, 17, 19, + 21, 0, 22, 0, 7, 34, 25, 34, 26, 55, + 65, 8, 70, 23, 93, 79, 9, 27, 88, 24, + 10, 0, 105, 2, 74, 13, 0, 101, 0, 118, + 0, 102, 0, 0, 0, 115, 116, 0, 0, 0, + 108, 103, 0, 0, 0, 0, 0, 0, 0, 88, + 0, 0, 75, 83, 51, 84, 30, 32, 0, 112, + 0, 0, 67, 0, 0, 11, 12, 0, 0, 0, + 0, 97, 0, 0, 0, 47, 0, 40, 39, 35, + 36, 0, 38, 37, 0, 0, 97, 0, 59, 60, + 56, 58, 57, 66, 54, 53, 71, 73, 69, 72, + 68, 106, 95, 0, 94, 80, 82, 78, 81, 77, + 90, 91, 89, 111, 113, 114, 110, 109, 29, 86, + 0, 106, 0, 106, 106, 106, 0, 0, 0, 87, + 63, 106, 0, 106, 0, 96, 0, 0, 41, 98, + 0, 0, 106, 49, 46, 28, 0, 62, 0, 107, + 92, 42, 43, 44, 0, 0, 48, 61, 64, 45, + 50 +}; + +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = +{ + -1, 3, 4, 5, 33, 34, 108, 35, 36, 37, + 38, 74, 109, 110, 157, 186, 39, 40, 124, 41, + 76, 120, 77, 42, 128, 43, 78, 6, 44, 45, + 137, 46, 80, 47, 48, 49, 111, 112, 81, 113, + 79, 134, 152, 153, 50, 7, 165, 69, 70, 60 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -90 +static const yytype_int16 yypact[] = +{ + 4, 42, -90, 96, -90, 111, -90, 15, -90, -90, + 75, -90, 82, 42, 104, 42, 110, 107, 42, 115, + 125, -4, 121, -90, -90, -90, -90, -90, -90, -90, + -90, 162, -90, 163, -90, -90, -90, -90, -90, -90, + -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, + -90, 139, -90, -90, 138, -90, 142, -90, 143, -90, + 152, -90, 164, 167, 168, -90, -90, -4, -4, 77, + -18, -90, 177, 185, 33, 71, 195, 247, 236, -2, + 236, 171, -90, -90, -90, -90, -90, -90, 41, -90, + -4, -4, 138, 97, 97, -90, -90, 186, 187, 194, + 42, 42, -4, 196, 97, -90, 219, -90, -90, -90, + -90, 210, -90, -90, 204, 42, 42, 199, -90, -90, + -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, + -90, 222, -90, 223, -90, -90, -90, -90, -90, -90, + -90, -90, -90, -90, 215, -90, -90, -90, -90, -90, + -4, 222, 228, 222, -5, 222, 97, 35, 229, -90, + -90, 222, 232, 222, -4, -90, 135, 233, -90, -90, + 234, 235, 222, 240, -90, -90, 237, -90, 239, -13, + -90, -90, -90, -90, 244, 42, -90, -90, -90, -90, + -90 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int16 yypgoto[] = +{ + -90, -90, 269, 271, -90, 23, -70, -90, -90, -90, + -90, 243, -90, -90, -90, -90, -90, -90, -90, -48, + -90, -90, -90, -90, -90, -90, -90, -90, -90, -90, + -90, -20, -90, -90, -90, -90, -90, 206, 205, -68, + -90, -90, 169, -1, 27, -7, 118, -66, -89, -90 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -86 +static const yytype_int16 yytable[] = +{ + 10, 88, 89, 54, 146, 147, 119, 1, 122, 164, + 93, 141, 56, 142, 58, 156, 94, 62, 1, 90, + 91, 131, 65, 66, 144, 145, 67, 90, 91, 132, + 127, 68, 136, -31, 97, 2, 154, -31, -31, -31, + -31, -31, -31, -31, -31, 98, 52, -31, -31, 99, + -31, 100, 101, 102, 103, 104, -31, 105, 129, 106, + 138, 173, 92, 141, 107, 142, 174, 172, 8, 9, + 143, -33, 97, 90, 91, -33, -33, -33, -33, -33, + -33, -33, -33, 98, 166, -33, -33, 99, -33, 100, + 101, 102, 103, 104, -33, 105, 11, 106, 179, 151, + 123, 126, 107, 135, 125, 130, 2, 139, 2, 90, + 91, -5, 12, 55, 161, 13, 14, 15, 16, 17, + 18, 19, 20, 65, 66, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 57, 59, 31, 61, -4, + 12, 63, 32, 13, 14, 15, 16, 17, 18, 19, + 20, 64, 71, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 72, 73, 31, 180, 90, 91, 52, + 32, -85, 97, 82, 83, -85, -85, -85, -85, -85, + -85, -85, -85, 84, 190, -85, -85, 99, -85, -85, + -85, -85, -85, -85, -85, 85, 97, 106, 86, 87, + -52, -52, 140, -52, -52, -52, -52, 98, 95, -52, + -52, 99, 114, 115, 116, 117, 96, 148, 149, 150, + 158, 106, 155, 159, 97, 163, 118, -76, -76, -76, + -76, -76, -76, -76, -76, 160, 164, -76, -76, 99, + 13, 14, 15, 16, 17, 18, 19, 20, 91, 106, + 21, 22, 14, 15, 140, 17, 18, 19, 20, 168, + 175, 21, 22, 177, 181, 182, 183, 32, 187, 167, + 188, 169, 170, 171, 185, 189, 53, 51, 32, 176, + 75, 178, 121, 0, 133, 162, 0, 0, 0, 0, + 184 +}; + +static const yytype_int16 yycheck[] = +{ + 1, 67, 68, 10, 93, 94, 76, 3, 76, 14, + 28, 81, 13, 81, 15, 104, 34, 18, 3, 32, + 33, 23, 26, 27, 90, 91, 30, 32, 33, 31, + 78, 35, 80, 0, 1, 31, 102, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 31, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 78, 26, + 80, 26, 69, 133, 31, 133, 31, 156, 26, 27, + 29, 0, 1, 32, 33, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 150, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 0, 26, 164, 100, + 77, 78, 31, 80, 77, 78, 31, 80, 31, 32, + 33, 0, 1, 31, 115, 4, 5, 6, 7, 8, + 9, 10, 11, 26, 27, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 31, 26, 26, 31, 0, + 1, 26, 31, 4, 5, 6, 7, 8, 9, 10, + 11, 26, 31, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 1, 1, 26, 31, 32, 33, 31, + 31, 0, 1, 31, 31, 4, 5, 6, 7, 8, + 9, 10, 11, 31, 185, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 31, 1, 26, 31, 31, + 5, 6, 31, 8, 9, 10, 11, 12, 31, 14, + 15, 16, 17, 18, 19, 20, 31, 31, 31, 25, + 1, 26, 26, 13, 1, 26, 31, 4, 5, 6, + 7, 8, 9, 10, 11, 31, 14, 14, 15, 16, + 4, 5, 6, 7, 8, 9, 10, 11, 33, 26, + 14, 15, 5, 6, 31, 8, 9, 10, 11, 31, + 31, 14, 15, 31, 31, 31, 31, 31, 31, 151, + 31, 153, 154, 155, 34, 31, 7, 6, 31, 161, + 37, 163, 76, -1, 79, 116, -1, -1, -1, -1, + 172 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 3, 31, 37, 38, 39, 63, 81, 26, 27, + 79, 0, 1, 4, 5, 6, 7, 8, 9, 10, + 11, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 26, 31, 40, 41, 43, 44, 45, 46, 52, + 53, 55, 59, 61, 64, 65, 67, 69, 70, 71, + 80, 39, 31, 38, 81, 31, 79, 31, 79, 26, + 85, 31, 79, 26, 26, 26, 27, 30, 35, 83, + 84, 31, 1, 1, 47, 47, 56, 58, 62, 76, + 68, 74, 31, 31, 31, 31, 31, 31, 83, 83, + 32, 33, 81, 28, 34, 31, 31, 1, 12, 16, + 18, 19, 20, 21, 22, 24, 26, 31, 42, 48, + 49, 72, 73, 75, 17, 18, 19, 20, 31, 42, + 57, 73, 75, 41, 54, 80, 41, 55, 60, 67, + 80, 23, 31, 74, 77, 41, 55, 66, 67, 80, + 31, 42, 75, 29, 83, 83, 84, 84, 31, 31, + 25, 79, 78, 79, 83, 26, 84, 50, 1, 13, + 31, 79, 78, 26, 14, 82, 83, 82, 31, 82, + 82, 82, 84, 26, 31, 31, 82, 31, 82, 83, + 31, 31, 31, 31, 82, 34, 51, 31, 31, 31, + 79 +}; + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ + +#define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) + + +#define YYTERROR 1 +#define YYERRCODE 256 + + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) +#endif + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + +/* YYLEX -- calling `yylex' with the right arguments. */ + +#ifdef YYLEX_PARAM +# define YYLEX yylex (YYLEX_PARAM) +#else +# define YYLEX yylex () +#endif + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +#else +static void +yy_stack_print (yybottom, yytop) + yytype_int16 *yybottom; + yytype_int16 *yytop; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +#else +static void +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; + int yyrule; +#endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + YYFPRINTF (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + + +/* YYINITDEPTH -- initial size of the parser's stacks. */ +#ifndef YYINITDEPTH +# define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ + +#ifndef YYMAXDEPTH +# define YYMAXDEPTH 10000 +#endif + + + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static YYSIZE_T +yystrlen (const char *yystr) +#else +static YYSIZE_T +yystrlen (yystr) + const char *yystr; +#endif +{ + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static char * +yystpcpy (char *yydest, const char *yysrc) +#else +static char * +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +#endif +{ + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; + + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } +} +#endif /* YYERROR_VERBOSE */ + + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +#else +static void +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; +#endif +{ + YYUSE (yyvaluep); + + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + switch (yytype) + { + case 53: /* "choice_entry" */ + + { + fprintf(stderr, "%s:%d: missing end statement for this entry\n", + (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno); + if (current_menu == (yyvaluep->menu)) + menu_end_menu(); +}; + + break; + case 59: /* "if_entry" */ + + { + fprintf(stderr, "%s:%d: missing end statement for this entry\n", + (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno); + if (current_menu == (yyvaluep->menu)) + menu_end_menu(); +}; + + break; + case 65: /* "menu_entry" */ + + { + fprintf(stderr, "%s:%d: missing end statement for this entry\n", + (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno); + if (current_menu == (yyvaluep->menu)) + menu_end_menu(); +}; + + break; + + default: + break; + } +} + +/* Prevent warnings from -Wmissing-prototypes. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ + + +/* The lookahead symbol. */ +int yychar; + +/* The semantic value of the lookahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; + + + +/*-------------------------. +| yyparse or yypush_parse. | +`-------------------------*/ + +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void) +#else +int +yyparse () + +#endif +#endif +{ + + + int yystate; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + + /* The stacks and their tools: + `yyss': related to states. + `yyvs': related to semantic values. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs; + YYSTYPE *yyvsp; + + YYSIZE_T yystacksize; + + int yyn; + int yyresult; + /* Lookahead token as an internal (translated) token number. */ + int yytoken; + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; + + yytoken = 0; + yyss = yyssa; + yyvs = yyvsa; + yystacksize = YYINITDEPTH; + + YYDPRINTF ((stderr, "Starting parse\n")); + + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; + yychar = YYEMPTY; /* Cause a token to be read. */ + + /* Initialize stack pointers. + Waste one element of value and location stack + so that they stay on the same level as the state stack. + The wasted elements are never initialized. */ + yyssp = yyss; + yyvsp = yyvs; + + goto yysetstate; + +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. So pushing a state here evens the stacks. */ + yyssp++; + + yysetstate: + *yyssp = yystate; + + if (yyss + yystacksize - 1 <= yyssp) + { + /* Get the current used size of the three stacks, in elements. */ + YYSIZE_T yysize = yyssp - yyss + 1; + +#ifdef yyoverflow + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; + } +#else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyexhaustedlab; +# else + /* Extend the stack our own way. */ + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; + yystacksize *= 2; + if (YYMAXDEPTH < yystacksize) + yystacksize = YYMAXDEPTH; + + { + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif +#endif /* no yyoverflow */ + + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; + + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); + + if (yyss + yystacksize - 1 <= yyssp) + YYABORT; + } + + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + if (yystate == YYFINAL) + YYACCEPT; + + goto yybackup; + +/*-----------. +| yybackup. | +`-----------*/ +yybackup: + + /* Do appropriate processing given the current state. Read a + lookahead token if we need one and don't already have one. */ + + /* First try to decide what to do without reference to lookahead token. */ + yyn = yypact[yystate]; + if (yyn == YYPACT_NINF) + goto yydefault; + + /* Not known => get a lookahead token if don't already have one. */ + + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + if (yychar == YYEMPTY) + { + YYDPRINTF ((stderr, "Reading a token: ")); + yychar = YYLEX; + } + + if (yychar <= YYEOF) + { + yychar = yytoken = YYEOF; + YYDPRINTF ((stderr, "Now at end of input.\n")); + } + else + { + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + } + + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) + goto yydefault; + yyn = yytable[yyn]; + if (yyn <= 0) + { + if (yyn == 0 || yyn == YYTABLE_NINF) + goto yyerrlab; + yyn = -yyn; + goto yyreduce; + } + + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + + /* Shift the lookahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token. */ + yychar = YYEMPTY; + + yystate = yyn; + *++yyvsp = yylval; + + goto yynewstate; + + +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: + yyn = yydefact[yystate]; + if (yyn == 0) + goto yyerrlab; + goto yyreduce; + + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ +yyreduce: + /* yyn is the number of a rule to reduce with. */ + yylen = yyr2[yyn]; + + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + + + YY_REDUCE_PRINT (yyn); + switch (yyn) + { + case 10: + + { zconf_error("unexpected end statement"); ;} + break; + + case 11: + + { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;} + break; + + case 12: + + { + zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name); +;} + break; + + case 13: + + { zconf_error("invalid statement"); ;} + break; + + case 28: + + { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;} + break; + + case 29: + + { zconf_error("invalid option"); ;} + break; + + case 30: + + { + struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0); + sym->flags |= SYMBOL_OPTIONAL; + menu_add_entry(sym); + printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); +;} + break; + + case 31: + + { + menu_end_entry(); + printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 32: + + { + struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0); + sym->flags |= SYMBOL_OPTIONAL; + menu_add_entry(sym); + printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); +;} + break; + + case 33: + + { + if (current_entry->prompt) + current_entry->prompt->type = P_MENU; + else + zconfprint("warning: menuconfig statement without prompt"); + menu_end_entry(); + printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 41: + + { + menu_set_type((yyvsp[(1) - (3)].id)->stype); + printd(DEBUG_PARSE, "%s:%d:type(%u)\n", + zconf_curname(), zconf_lineno(), + (yyvsp[(1) - (3)].id)->stype); +;} + break; + + case 42: + + { + menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr)); + printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 43: + + { + menu_add_expr(P_DEFAULT, (yyvsp[(2) - (4)].expr), (yyvsp[(3) - (4)].expr)); + if ((yyvsp[(1) - (4)].id)->stype != S_UNKNOWN) + menu_set_type((yyvsp[(1) - (4)].id)->stype); + printd(DEBUG_PARSE, "%s:%d:default(%u)\n", + zconf_curname(), zconf_lineno(), + (yyvsp[(1) - (4)].id)->stype); +;} + break; + + case 44: + + { + menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr)); + printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 45: + + { + menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr)); + printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 48: + + { + const struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string))); + if (id && id->flags & TF_OPTION) + menu_add_option(id->token, (yyvsp[(3) - (3)].string)); + else + zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) - (3)].string)); + free((yyvsp[(2) - (3)].string)); +;} + break; + + case 49: + + { (yyval.string) = NULL; ;} + break; + + case 50: + + { (yyval.string) = (yyvsp[(2) - (2)].string); ;} + break; + + case 51: + + { + struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), SYMBOL_CHOICE); + sym->flags |= SYMBOL_AUTO; + menu_add_entry(sym); + menu_add_expr(P_CHOICE, NULL, NULL); + printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 52: + + { + (yyval.menu) = menu_add_menu(); +;} + break; + + case 53: + + { + if (zconf_endtoken((yyvsp[(1) - (1)].id), T_CHOICE, T_ENDCHOICE)) { + menu_end_menu(); + printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno()); + } +;} + break; + + case 61: + + { + menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr)); + printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 62: + + { + if ((yyvsp[(1) - (3)].id)->stype == S_BOOLEAN || (yyvsp[(1) - (3)].id)->stype == S_TRISTATE) { + menu_set_type((yyvsp[(1) - (3)].id)->stype); + printd(DEBUG_PARSE, "%s:%d:type(%u)\n", + zconf_curname(), zconf_lineno(), + (yyvsp[(1) - (3)].id)->stype); + } else + YYERROR; +;} + break; + + case 63: + + { + current_entry->sym->flags |= SYMBOL_OPTIONAL; + printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 64: + + { + if ((yyvsp[(1) - (4)].id)->stype == S_UNKNOWN) { + menu_add_symbol(P_DEFAULT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr)); + printd(DEBUG_PARSE, "%s:%d:default\n", + zconf_curname(), zconf_lineno()); + } else + YYERROR; +;} + break; + + case 67: + + { + printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno()); + menu_add_entry(NULL); + menu_add_dep((yyvsp[(2) - (3)].expr)); + (yyval.menu) = menu_add_menu(); +;} + break; + + case 68: + + { + if (zconf_endtoken((yyvsp[(1) - (1)].id), T_IF, T_ENDIF)) { + menu_end_menu(); + printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno()); + } +;} + break; + + case 74: + + { + menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL); +;} + break; + + case 75: + + { + menu_add_entry(NULL); + menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL); + printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 76: + + { + (yyval.menu) = menu_add_menu(); +;} + break; + + case 77: + + { + if (zconf_endtoken((yyvsp[(1) - (1)].id), T_MENU, T_ENDMENU)) { + menu_end_menu(); + printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno()); + } +;} + break; + + case 83: + + { + printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string)); + zconf_nextfile((yyvsp[(2) - (3)].string)); +;} + break; + + case 84: + + { + menu_add_entry(NULL); + menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL); + printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 85: + + { + menu_end_entry(); +;} + break; + + case 86: + + { + printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno()); + zconf_starthelp(); +;} + break; + + case 87: + + { + current_entry->help = (yyvsp[(2) - (2)].string); +;} + break; + + case 92: + + { + menu_add_dep((yyvsp[(3) - (4)].expr)); + printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); +;} + break; + + case 96: + + { + menu_add_visibility((yyvsp[(2) - (2)].expr)); +;} + break; + + case 98: + + { + menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr)); +;} + break; + + case 101: + + { (yyval.id) = (yyvsp[(1) - (2)].id); ;} + break; + + case 102: + + { (yyval.id) = (yyvsp[(1) - (2)].id); ;} + break; + + case 103: + + { (yyval.id) = (yyvsp[(1) - (2)].id); ;} + break; + + case 106: + + { (yyval.expr) = NULL; ;} + break; + + case 107: + + { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;} + break; + + case 108: + + { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;} + break; + + case 109: + + { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} + break; + + case 110: + + { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;} + break; + + case 111: + + { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;} + break; + + case 112: + + { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;} + break; + + case 113: + + { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} + break; + + case 114: + + { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;} + break; + + case 115: + + { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;} + break; + + case 116: + + { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;} + break; + + case 117: + + { (yyval.string) = NULL; ;} + break; + + + + default: break; + } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + + *++yyvsp = yyval; + + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ + + yyn = yyr1[yyn]; + + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yytable[yystate]; + else + yystate = yydefgoto[yyn - YYNTOKENS]; + + goto yynewstate; + + +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) + { + ++yynerrs; +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif + } + + + + if (yyerrstatus == 3) + { + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ + + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } + } + + /* Else will try to reuse lookahead token after shifting the error + token. */ + goto yyerrlab1; + + +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; + + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; + + +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ + + for (;;) + { + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } + + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; + + + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); + } + + *++yyvsp = yylval; + + + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + + yystate = yyn; + goto yynewstate; + + +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +#if !defined(yyoverflow) || YYERROR_VERBOSE +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); + yyresult = 2; + /* Fall through. */ +#endif + +yyreturn: + if (yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK (1); + } +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); +} + + + + + +void conf_parse(const char *name) +{ + struct symbol *sym; + int i; + + zconf_initscan(name); + + sym_init(); + _menu_init(); + modules_sym = sym_lookup(NULL, 0); + modules_sym->type = S_BOOLEAN; + modules_sym->flags |= SYMBOL_AUTO; + rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + + if (getenv("ZCONF_DEBUG")) + zconfdebug = 1; + zconfparse(); + if (zconfnerrs) + exit(1); + if (!modules_sym->prop) { + struct property *prop; + + prop = prop_alloc(P_DEFAULT, modules_sym); + prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0)); + } + + rootmenu.prompt->text = _(rootmenu.prompt->text); + rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text); + + menu_finalize(&rootmenu); + for_all_symbols(i, sym) { + if (sym_check_deps(sym)) + zconfnerrs++; + } + if (zconfnerrs) + exit(1); + sym_set_change_count(1); +} + +static const char *zconf_tokenname(int token) +{ + switch (token) { + case T_MENU: return "menu"; + case T_ENDMENU: return "endmenu"; + case T_CHOICE: return "choice"; + case T_ENDCHOICE: return "endchoice"; + case T_IF: return "if"; + case T_ENDIF: return "endif"; + case T_DEPENDS: return "depends"; + case T_VISIBLE: return "visible"; + } + return "<token>"; +} + +static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken) +{ + if (id->token != endtoken) { + zconf_error("unexpected '%s' within %s block", + kconf_id_strings + id->name, zconf_tokenname(starttoken)); + zconfnerrs++; + return false; + } + if (current_menu->file != current_file) { + zconf_error("'%s' in different file than '%s'", + kconf_id_strings + id->name, zconf_tokenname(starttoken)); + fprintf(stderr, "%s:%d: location of the '%s'\n", + current_menu->file->name, current_menu->lineno, + zconf_tokenname(starttoken)); + zconfnerrs++; + return false; + } + return true; +} + +static void zconfprint(const char *err, ...) +{ + va_list ap; + + fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno()); + va_start(ap, err); + vfprintf(stderr, err, ap); + va_end(ap); + fprintf(stderr, "\n"); +} + +static void zconf_error(const char *err, ...) +{ + va_list ap; + + zconfnerrs++; + fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno()); + va_start(ap, err); + vfprintf(stderr, err, ap); + va_end(ap); + fprintf(stderr, "\n"); +} + +static void zconferror(const char *err) +{ + fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err); +} + +static void print_quoted_string(FILE *out, const char *str) +{ + const char *p; + int len; + + putc('"', out); + while ((p = strchr(str, '"'))) { + len = p - str; + if (len) + fprintf(out, "%.*s", len, str); + fputs("\\\"", out); + str = p + 1; + } + fputs(str, out); + putc('"', out); +} + +static void print_symbol(FILE *out, struct menu *menu) +{ + struct symbol *sym = menu->sym; + struct property *prop; + + if (sym_is_choice(sym)) + fprintf(out, "\nchoice\n"); + else + fprintf(out, "\nconfig %s\n", sym->name); + switch (sym->type) { + case S_BOOLEAN: + fputs(" boolean\n", out); + break; + case S_TRISTATE: + fputs(" tristate\n", out); + break; + case S_STRING: + fputs(" string\n", out); + break; + case S_INT: + fputs(" integer\n", out); + break; + case S_HEX: + fputs(" hex\n", out); + break; + default: + fputs(" ???\n", out); + break; + } + for (prop = sym->prop; prop; prop = prop->next) { + if (prop->menu != menu) + continue; + switch (prop->type) { + case P_PROMPT: + fputs(" prompt ", out); + print_quoted_string(out, prop->text); + if (!expr_is_yes(prop->visible.expr)) { + fputs(" if ", out); + expr_fprint(prop->visible.expr, out); + } + fputc('\n', out); + break; + case P_DEFAULT: + fputs( " default ", out); + expr_fprint(prop->expr, out); + if (!expr_is_yes(prop->visible.expr)) { + fputs(" if ", out); + expr_fprint(prop->visible.expr, out); + } + fputc('\n', out); + break; + case P_CHOICE: + fputs(" #choice value\n", out); + break; + case P_SELECT: + fputs( " select ", out); + expr_fprint(prop->expr, out); + fputc('\n', out); + break; + case P_RANGE: + fputs( " range ", out); + expr_fprint(prop->expr, out); + fputc('\n', out); + break; + case P_MENU: + fputs( " menu ", out); + print_quoted_string(out, prop->text); + fputc('\n', out); + break; + default: + fprintf(out, " unknown prop %d!\n", prop->type); + break; + } + } + if (menu->help) { + int len = strlen(menu->help); + while (menu->help[--len] == '\n') + menu->help[len] = 0; + fprintf(out, " help\n%s\n", menu->help); + } +} + +void zconfdump(FILE *out) +{ + struct property *prop; + struct symbol *sym; + struct menu *menu; + + menu = rootmenu.list; + while (menu) { + if ((sym = menu->sym)) + print_symbol(out, menu); + else if ((prop = menu->prompt)) { + switch (prop->type) { + case P_COMMENT: + fputs("\ncomment ", out); + print_quoted_string(out, prop->text); + fputs("\n", out); + break; + case P_MENU: + fputs("\nmenu ", out); + print_quoted_string(out, prop->text); + fputs("\n", out); + break; + default: + ; + } + if (!expr_is_yes(prop->visible.expr)) { + fputs(" depends ", out); + expr_fprint(prop->visible.expr, out); + fputc('\n', out); + } + } + + if (menu->list) + menu = menu->list; + else if (menu->next) + menu = menu->next; + else while ((menu = menu->parent)) { + if (menu->prompt && menu->prompt->type == P_MENU) + fputs("\nendmenu\n", out); + if (menu->next) { + menu = menu->next; + break; + } + } + } +} + +#include "zconf.lex.c" +#include "util.c" +#include "confdata.c" +#include "expr.c" +#include "symbol.c" +#include "menu.c" + diff --git a/scripts/madwifi-unload b/scripts/madwifi-unload new file mode 100755 index 00000000..0cde2865 --- /dev/null +++ b/scripts/madwifi-unload @@ -0,0 +1,58 @@ +#!/bin/sh +# Copyright 2006 Kel Modderman <kelrin@tpg.com.au> +# +# Taken from madwifi scripts. This unloads madwifi + +: ${PATTERN='\(ath_.*\|wlan_.*\|wlan\)$'} +: ${MAX_TRIES=10} + +test "`id -u`" = 0 || { + echo "ERROR: You must be root to run this script" >&2 + exit 1 +} + +test -r /proc/modules || { + echo "ERROR: Cannot read /proc/modules" >&2 + exit 1 +} + +tries="$MAX_TRIES" +while test "$tries" != "0"; do + skipped=0 + IFS=' +' + for line in `cat /proc/modules`; do + IFS=' ' + set x $line + name="$2" + size="$3" + use_count="$4" + use_name="$5" + state="$6" + expr "$name" : "$PATTERN" >/dev/null || continue + + # Compatibility for Linux 2.4.x + test -z "$state" && { use_name="-"; state="Live"; } + + if test "$state" != "Live" || test "$use_count" != "0" || \ + test "$use_name" != "-"; then + # Don't skip unload in the last run + if test "$tries" != "1"; then + skipped=1 + continue + fi + fi + + echo "Unloading \"$name\"" + sync # to be safe + /sbin/rmmod "$name" || { + echo "ERROR: cannot unload module \"$name\"" >&2 + exit 1 + } + sync # to be even safer + done + test "$skipped" = "0" && break + tries=$(($tries - 1)) +done + +exit 0 diff --git a/scripts/modlib.sh b/scripts/modlib.sh new file mode 100755 index 00000000..d839a37e --- /dev/null +++ b/scripts/modlib.sh @@ -0,0 +1,87 @@ +#!/bin/bash +# +# Copyright 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> +# +# You can use these to enable/disable modules without blacklisting them + +# Make sure our imporant paths are included +PATH=$PATH:/usr/sbin:/sbin + +# Appended to module file at the end when we want to ignore one +IGNORE_SUFFIX=".ignore" +VER=`uname -r` + +# If 'module' is found, its renamed to 'module.ignore' +function module_disable { + # Basic check to see if this is a module available for loading + MODULE_CHECK=`modprobe -l $1` + if [ -z $MODULE_CHECK ]; then + echo "Module $1 not detected -- this is fine" + return + fi + MODULE=$1 + MODULE_KO=${MODULE}.ko + # In case there are more than one of these modules. This can + # happen, for example if your distribution provides one and you have + # compiled one in yourself later. + MODULE_COUNT=`find /lib/modules/$VER/ -name $MODULE_KO | wc -l` + ALL_MODULES=`find /lib/modules/$VER/ -name $MODULE_KO` + COUNT=1 + CHECK=`modprobe -l $MODULE` + for i in $ALL_MODULES; do + if [[ $MODULE_COUNT -gt 1 ]]; then + if [[ $COUNT -eq 1 ]]; then + echo -en "$MODULE_COUNT $MODULE modules found " + echo -e "we'll disable all of them" + fi + echo -en "Disabling $MODULE ($COUNT) ..." + else + echo -en "Disabling $MODULE ..." + fi + mv -f $i ${i}${IGNORE_SUFFIX} + depmod -a + CHECK_AGAIN=`modprobe -l $MODULE` + if [ "$CHECK" != "$CHECK_AGAIN" ]; then + echo -e "\t[OK]\tModule disabled:" + echo "$CHECK" + else + echo -e "[ERROR]\tModule is still being detected:" + echo "$CHECK" + fi + let COUNT=$COUNT+1 + done +} + +# If 'module.ignore' is found, rename it back to 'module' +function module_enable { + MODULE=$1 + MODULE_KO=${MODULE}.ko + IGNORED_MODULE=${MODULE_KO}${IGNORE_SUFFIX} + # In case there are more than one of these modules. This can + # happen, for example if your distribution provides one and you have + # compiled one in yourself later. + ALL_MODULES=`find /lib/modules/$VER/ -name $IGNORED_MODULE` + for i in $ALL_MODULES; do + echo -en "Enabling $MODULE ..." + DIR=`dirname $i` + mv $i $DIR/$MODULE_KO + depmod -a + CHECK=`modprobe -l $MODULE` + if [ "$DIR/$MODULE_KO" != $CHECK ]; then + if [ -z $CHECK ]; then + echo -e "\t[ERROR]\tModule could not be enabled" + else + echo -en "\t[OK]\tModule renamed but another " + echo "module file is being preferred" + echo -e "Renamed module:\t\t$DIR/$MODULE_KO" + echo -e "Preferred module:\t$CHECK" + fi + else + echo -e "\t[OK]\tModule enabled: " + echo "$DIR/$MODULE_KO" + fi + # Lets only do this for the first module found + break + done +} + diff --git a/scripts/refresh-compat b/scripts/refresh-compat new file mode 100755 index 00000000..6846d3e9 --- /dev/null +++ b/scripts/refresh-compat @@ -0,0 +1,118 @@ +#!/bin/bash +# +# Copyright 2012 Luis R. Rodriguez <mcgrof@frijolero.org> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +# The purpose of this script is to enable developers use compat-drivers +# backport work without having to carry code on their tree. This lets +# developers synch to newer compat-drivers releases to gain more backport +# work. If you use this throw the files into your .gitignore: +# +# compat/ +# udev/ +# include/ +# scripts/ +# .compat_base_tree +# .compat_base_tree_version +# .compat_version +# config.mk +# +# An example git tree for standalone development will be provided later. +# Once run you can then just run on your standalone development tree: +# +# ./refresh-compat +# +# This is a copy of refresh-compat-local that we maintain here +# You can keep that in your git tree as otherwise its hard for users to +# know what to run. + +# Pretty colors +GREEN="\033[01;32m" +YELLOW="\033[01;33m" +NORMAL="\033[00m" +BLUE="\033[34m" +RED="\033[31m" +PURPLE="\033[35m" +CYAN="\033[36m" +UNDERLINE="\033[02m" + +COMPAT_SRC="$HOME/devel/compat-drivers/" +EXTRA_COPY="" + +if [[ -f .compat_copy ]]; then + source .compat_copy +fi + +COPY="" +COPY="$COPY compat/" +COPY="$COPY include/" +COPY="$COPY udev/" +COPY="$COPY scripts/check_config.sh" +COPY="$COPY scripts/check_depmod" +COPY="$COPY scripts/compress_modules" +COPY="$COPY scripts/gen-compat-autoconf.sh" +COPY="$COPY scripts/modlib.sh" +COPY="$COPY scripts/update-initramfs" +COPY="$COPY scripts/skip-colors" +COPY="$COPY .compat_base" +COPY="$COPY .compat_base_tree" +COPY="$COPY .compat_base_tree_version" +COPY="$COPY .compat_version" +COPY="$COPY config.mk" +COPY="$COPY $EXTRA_COPY" + +REFRESH_LOCAL="scripts/refresh-compat-local" +REFRESH_TARGET="refresh-compat" + +WORK_DIR="$(pwd)" +cd ${COMPAT_SRC} +# Only copy the base files +./scripts/admin-update.sh -b +cd ${WORK_DIR} + +for i in $COPY ; do + if [[ -d ${COMPAT_SRC}${i} ]]; then + echo -e "Copying ${BLUE}${i}${NORMAL} ..." + cp -a ${COMPAT_SRC}/$i . + continue + fi + if [[ -f ${COMPAT_SRC}${i} ]]; then + DIR=$(dirname $i) + if [[ ! -d $DIR ]]; then + mkdir -p $DIR + fi + + if [[ -x ${COMPAT_SRC}${i} ]]; then + echo -e "Copying ${GREEN}${i}${NORMAL} ..." + else + echo -e "Copying ${i}${NORMAL} ..." + fi + + cp -f ${COMPAT_SRC}/${i} $i + continue + fi +done + +rm -f include/linux/compat_autoconfig.h +rm -f .config + +cp -f ${COMPAT_SRC}/${REFRESH_LOCAL} ${REFRESH_TARGET} + +if [[ ! -f .compat_base_tree_version ]]; then + echo -e "Failed at copying files over..." + exit 1 +fi + +echo +echo -e "Synched with ${CYAN}$(cat .compat_version)${NORMAL}" diff --git a/scripts/refresh-compat-local b/scripts/refresh-compat-local new file mode 100755 index 00000000..53963df3 --- /dev/null +++ b/scripts/refresh-compat-local @@ -0,0 +1,34 @@ +#!/bin/bash +# +# Copyright 2012 Luis R. Rodriguez <mcgrof@do-not-panic.com> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +# You can keep this in synch with your git tree after running +# This script just update your local copy. + +source .compat_copy +UPDATE_SCRIPT="$COMPAT_SRC/scripts/refresh-compat" + +if [[ ! -d $COMPAT_SRC ]]; then + echo -e "You should have compat-drivers.git cloned and checked out under $COMPAT_SRC" + echo -e "The git tree: git://github.com/mcgrof/compat-drivers" + exit 1 +fi + +if [[ ! -f $UPDATE_SCRIPT ]]; then + echo -e "$UPDATE_SCRIPT must exist" + exit 1 +fi + +exec $UPDATE_SCRIPT diff --git a/scripts/skip-colors b/scripts/skip-colors index 121626fb..71238082 100755 --- a/scripts/skip-colors +++ b/scripts/skip-colors @@ -1,2 +1,2 @@ -#!/bin/bash +#!/usr/bin/env bash perl -pe 's|(\e)\[(\d+)(;*)(\d*)(\w)||g' diff --git a/scripts/unload.sh b/scripts/unload.sh new file mode 100755 index 00000000..1f3c5c38 --- /dev/null +++ b/scripts/unload.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +# The old stack drivers and the mac80211 rc80211_simple modules +# which is no longer on recent kernels (its internal) +OLD_MODULES="iwlwifi_mac80211 rc80211_simple zd1211rw-mac80211" +OLD_MODULES="$OLD_MODULES ieee80211_crypt_tkip ieee80211_crypt_ccmp" +OLD_MODULES="$OLD_MODULES ieee80211softmac ieee80211_crypt ieee80211" +OLD_MODULES="$OLD_MODULES bcm43xx rndis_wext iwl4965" +MODULES="$OLD_MODULES" +MODULES="$MODULES ipw2100 ipw2200 libipw" +MODULES="$MODULES wl1251 wl12xx" +MODULES="$MODULES libertas_cs usb8xxx libertas libertas_sdio libertas_spi" +MODULES="$MODULES libertas_tf libertas_tf_usb" +MODULES="$MODULES adm8211 zd1211rw" +MODULES="$MODULES orinoco_cs orinoco_nortel orinoco_pci orinoco_plx" +MODULES="$MODULES orinoco_tld orinoco_usb spectrum_cs orinoco" +MODULES="$MODULES b43 b44 b43legacy brcm80211 ssb" +MODULES="$MODULES iwl3945 iwlwifi iwlagn iwlcore" +MODULES="$MODULES ath9k ath9k_htc ath9k_common ath9k_hw " +MODULES="$MODULES ath5k ath ath6kl ar9170usb carl9170" +MODULES="$MODULES p54pci p54usb p54spi p54common" +MODULES="$MODULES rt2400pci rt2500pci rt61pci" +MODULES="$MODULES rt2500usb rt73usb" +MODULES="$MODULES rt2800usb rt2800pci rt2800lib" +MODULES="$MODULES rt2x00usb rt2x00pci rt2x00lib" +MODULES="$MODULES rtl8180 rtl8187 rtl8192ce rtlwifi" +MODULES="$MODULES mwl8k mac80211_hwsim" +MODULES="$MODULES at76c50x_usb at76_usb" +MODULES="$MODULES rndis_wlan rndis_host cdc_ether usbnet" +# eeprom_93cx6 is used by rt2x00 (rt61pci, rt2500pci, rt2400pci) +# and Realtek drivers ( rtl8187, rtl8180) +MODULES="$MODULES eeprom_93cx6" +MODULES="$MODULES lib80211_crypt_ccmp lib80211_crypt_tkip lib80211_crypt_wep" +MODULES="$MODULES mac80211 cfg80211 lib80211" +MODULES="$MODULES compat" +# Bluetooth modules +MODULES="$MODULES ath3k bcm203x bluecard_cs bnep bpa10x bt3c_cs btmrvl btmrvl_sdio btsdio" +MODULES="$MODULES btusb btuart_cs cmtp dtl1_cs hidp hci_vhci hci_uart rfcomm sco bluetooth l2cap" +MODULES="$MODULES atl1 atl2 atl1e atl1c alx" +echo Stoping bluetooth service.. +/etc/init.d/bluetooth stop +/etc/init.d/bluetooth status +MADWIFI_MODULES="ath_pci ath_rate_sample wlan_scan_sta wlan ath_hal" +IPW3945D="/sbin/ipw3945d-`uname -r`" + +if [ -f $IPW3945D ]; then + $IPW3945D --isrunning + if [ ! $? ]; then + echo -n "Detected ipw3945 daemon loaded we're going to " + echo "shut the daemon down now and remove the module." + modprobe -r --ignore-remove ipw3945 + fi +fi + +grep ath_pci /proc/modules 2>&1 > /dev/null +if [ $? -eq 0 ]; then + echo "MadWifi driver is loaded, going to try to unload it..." + ./scripts/madwifi-unload +fi + +for i in $MODULES; do + grep ^$i /proc/modules 2>&1 > /dev/null + if [ $? -eq 0 ]; then + echo Unloading $i... + modprobe -r --ignore-remove $i + fi +done diff --git a/scripts/update-initramfs b/scripts/update-initramfs new file mode 100755 index 00000000..9e311a49 --- /dev/null +++ b/scripts/update-initramfs @@ -0,0 +1,62 @@ +#!/bin/bash +# Copyright 2009 Luis R. Rodriguez <mcgrof@gmail.com> +# +# Since we provide ssb, ethernet modules and most importantly +# DRM drivers, people may want to update the initramfs image +# of their distribution. This can also help people who may +# want to wireless-boot their systems. + +KLIB=/lib/modules/$(uname -r)/build +ver=$(echo $KLIB | awk -F "/lib/modules/" '{print $2}' | awk -F"/" '{print $1}') +dir=/boot/ + +LSB_RED_ID=$(/usr/bin/lsb_release -i -s &> /dev/null) + +if [[ -z $LSB_RED_ID && -f "/etc/os-release" ]]; then + # Let's try with os-release. Fedora doesn't have + # lsb_release anymore. + LSB_RED_ID=$(sed -n '/^NAME/ s/^NAME=\(.*\)$/\1/p' /etc/os-release) +fi + +case $LSB_RED_ID in +"Ubuntu") + echo "Updating ${LSB_RED_ID}'s initramfs for $ver under $dir ..." + mkinitramfs -o $dir/initrd.img-$ver $ver + echo "Will now run update-grub to ensure grub will find the new initramfs ..." + update-grub + ;; +"Debian") + echo "Updating ${LSB_RED_ID}'s initramfs for $ver under $dir ..." + mkinitramfs -o $dir/initrd.img-$ver $ver + echo "Will now run update-grub to ensure grub will find the new initramfs ..." + update-grub + ;; +"Fedora") + # This adds a -compat-drivers suffixed initramfs with a new grub2 + # entry to not override distribution's default stuff. + INITRAMFS=${dir}initramfs-$ver-compat-drivers.img + KERNEL=${dir}vmlinuz-$ver + GRUB_TITLE="Fedora ($ver) with compat-drivers" + + echo "Updating ${LSB_RED_ID}'s initramfs for $ver under $dir ..." + mkinitrd --force $INITRAMFS $ver + + # If a previous compat-drivers entry for the same kernel exists + # do not add it again. + grep -q "${GRUB_TITLE}" /etc/grub2.cfg &> /dev/null + if [[ "$?" == "1" ]]; then + echo "Will now run grubby to add a new kernel entry ..." + # Add a new kernel entry + grubby --grub2 --copy-default --add-kernel="$KERNEL" --initrd="$INITRAMFS" --title="$GRUB_TITLE" + fi + ;; +*) + echo "Warning:" + echo "You may or may not need to update your initramfs, you should if" + echo "any of the modules installed are part of your initramfs. To add" + echo "support for your distribution to do this automatically send a" + echo "patch against $0. If your distribution does not require this" + echo "send a patch against the '/usr/bin/lsb_release -i -s': $LSB_RED_ID" + echo "tag for your distribution to avoid this warning." + ;; +esac diff --git a/scripts/wlunload.sh b/scripts/wlunload.sh new file mode 100755 index 00000000..88c20cf6 --- /dev/null +++ b/scripts/wlunload.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +# The old stack drivers and the mac80211 rc80211_simple modules +# which is no longer on recent kernels (its internal) +OLD_MODULES="iwlwifi_mac80211 rc80211_simple zd1211rw-mac80211" +OLD_MODULES="$OLD_MODULES ieee80211_crypt_tkip ieee80211_crypt_ccmp" +OLD_MODULES="$OLD_MODULES ieee80211softmac ieee80211_crypt ieee80211" +OLD_MODULES="$OLD_MODULES bcm43xx rndis_wext iwl4965" +MODULES="$OLD_MODULES" +MODULES="$MODULES ipw2100 ipw2200 libipw" +MODULES="$MODULES wl1251 wl12xx" +MODULES="$MODULES libertas_cs usb8xxx libertas libertas_sdio libertas_spi" +MODULES="$MODULES libertas_tf libertas_tf_usb" +MODULES="$MODULES adm8211 zd1211rw" +MODULES="$MODULES orinoco_cs orinoco_nortel orinoco_pci orinoco_plx" +MODULES="$MODULES orinoco_tld orinoco_usb spectrum_cs orinoco" +MODULES="$MODULES b43 b44 b43legacy brcm80211 ssb" +MODULES="$MODULES iwl3945 iwlwifi iwlagn iwlcore" +MODULES="$MODULES ath9k ath9k_htc ath9k_common ath9k_hw " +MODULES="$MODULES ath5k ath ath6kl ar9170usb carl9170" +MODULES="$MODULES p54pci p54usb p54spi p54common" +MODULES="$MODULES rt2400pci rt2500pci rt61pci" +MODULES="$MODULES rt2500usb rt73usb" +MODULES="$MODULES rt2800usb rt2800lib" +MODULES="$MODULES rt2x00usb rt2x00lib" +MODULES="$MODULES rtl8180 rtl8187 rtl8192ce rtlwifi" +MODULES="$MODULES mwl8k mac80211_hwsim" +MODULES="$MODULES at76c50x_usb at76_usb" +MODULES="$MODULES rndis_wlan rndis_host cdc_ether usbnet" +# eeprom_93cx6 is used by rt2x00 (rt61pci, rt2500pci, rt2400pci) +# and Realtek drivers ( rtl8187, rtl8180) +MODULES="$MODULES eeprom_93cx6" +MODULES="$MODULES lib80211_crypt_ccmp lib80211_crypt_tkip lib80211_crypt_wep" +MODULES="$MODULES mac80211 cfg80211 lib80211" +MADWIFI_MODULES="ath_pci ath_rate_sample wlan_scan_sta wlan ath_hal" +IPW3945D="/sbin/ipw3945d-`uname -r`" + +if [ -f $IPW3945D ]; then + $IPW3945D --isrunning + if [ ! $? ]; then + echo -n "Detected ipw3945 daemon loaded we're going to " + echo "shut the daemon down now and remove the module." + modprobe -r --ignore-remove ipw3945 + fi +fi + +grep ath_pci /proc/modules 2>&1 > /dev/null +if [ $? -eq 0 ]; then + echo "MadWifi driver is loaded, going to try to unload it..." + ./scripts/madwifi-unload +fi + +for i in $MODULES; do + grep ^$i /proc/modules 2>&1 > /dev/null + if [ $? -eq 0 ]; then + echo Unloading $i... + modprobe -r --ignore-remove $i + fi +done |