Fix array indices for kernel 4.7+ support #12
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…aders
During the 4.7 development cycle, commit 9a9b6aa6a8 (Input: add
SW_PEN_INSERTED define) got added, which has the same numerical value as
SW_MAX:
+#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
+#define SW_MAX 0x0f
This breaks the build as the SW_NAME array is sized using the SW_MAX macro:
In file included from eventtable.h:21:0,
from eventnames.c:11:
evtable_SW.inc:17:1: error: array index in initializer exceeds array bounds
EV_MAP(SW_PEN_INSERTED),
^
evtable_SW.inc:17:1: error: (near initialization for ‘SW_NAME’)
The arrays should be sized using the <foo>_CNT (which is MAX+1) macros
instead of <foo>_MAX. These got added during the 2.6.24 development cycle,
so it should be safe to do so unconditially:
commit 7b19ada2ed3c1eccb9fe94d74b05e1428224663d
Author: Jiri Slaby <jirislaby@gmail.com>
Date: Thu Oct 18 23:40:32 2007 -0700
get rid of input BIT* duplicate defines
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Events are in the 0..MAX range (inclusive), so adjust the range, otherwise events equal to max (E.G. SW_PEN_INSERTED) do not get printed. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
buildroot-auto-update
pushed a commit
to buildroot/buildroot
that referenced
this pull request
Jul 31, 2016
Fixes: http://autobuild.buildroot.org/results/3d0/3d07de291ec64a16d03e10f0cf1faeb19d546412/ http://autobuild.buildroot.org/results/b03/b03500e7d85786c6eee8f0adc38801340129aa14/ http://autobuild.buildroot.org/results/dd0/dd05caf0db318a9287d239cc6fa5470ccdc2ce7c/ http://autobuild.buildroot.org/results/76b/76bb000d041bd0828d15aa04138e222a4773ce94/ Triggerhappy used the wrong constants for array sizes, causing a compilation error about out of array bounds initializers with the SW_PEN_INSERTED switch event added in 4.7. Fix it by using the correct constants (<foo>_CNT) instead. Patch submitted upstream: wertarbyte/triggerhappy#12 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.