Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream PRs #10

Closed
wants to merge 13 commits into from
Closed

Merge upstream PRs #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7fa31d2
Clear interrupt status in mask/unmask callback
ben9923 Aug 13, 2019
3f42a0b
Fixes cursor movement lagging or jumping since 2.1.4+
Erictoby Sep 2, 2019
cf8387f
Fixes deadlock or delays in interrupt loop.
Erictoby Sep 8, 2019
eb42516
Enable GPIO interrupt after initing all parameters
Erictoby Sep 14, 2019
bd3b177
Minor change - PMInit location.
Erictoby Sep 23, 2019
ec0b2d9
Reduce CPU load caused by too many GPIO interrupts
Erictoby Sep 28, 2019
d6d06a5
Simplify offset validation in intel_get_padcfg()
ben9923 Oct 10, 2019
a9d1dd9
Allow to request locked pads
ben9923 Oct 10, 2019
268d60a
Merge pull request #1 from coolstar/master
Erictoby Oct 11, 2019
390bd8c
Fix a possibility to access array out of bounds
Erictoby Oct 11, 2019
0455b5c
Merge branch 'master' into clear-status-unmask
ben9923 Oct 25, 2019
8507d8d
Fix kernel panic during stop after failed initialization
ben9923 Nov 1, 2019
9270b0e
Fixed merge conflicts
kprinssu Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions VoodooGPIO.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@
INFOPLIST_FILE = VoodooGPIO/Info.plist;
MODULE_NAME = org.coolstar.VoodooGPIO;
MODULE_VERSION = 1.0.0d1;
"OTHER_CPLUSPLUSFLAGS[arch=*]" = "-Wno-inconsistent-missing-override";
PRODUCT_BUNDLE_IDENTIFIER = org.coolstar.VoodooGPIO;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = kext;
Expand All @@ -336,7 +335,6 @@
INFOPLIST_FILE = VoodooGPIO/Info.plist;
MODULE_NAME = org.coolstar.VoodooGPIO;
MODULE_VERSION = 1.0.0d1;
"OTHER_CPLUSPLUSFLAGS[arch=*]" = "-Wno-inconsistent-missing-override";
PRODUCT_BUNDLE_IDENTIFIER = org.coolstar.VoodooGPIO;
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = kext;
Expand Down
10 changes: 5 additions & 5 deletions VoodooGPIO/CannonLake-H/VoodooGPIOCannonLakeH.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ static unsigned int cnlh_i2c1_pins[] = { 69, 70 };
static unsigned int cnlh_i2c2_pins[] = { 88, 89 };
static unsigned int cnlh_i2c3_pins[] = { 79, 98 };

static const struct intel_pingroup cnlh_groups[] = {
static struct intel_pingroup cnlh_groups[] = {
PIN_GROUP((char *)"spi0_grp", cnlh_spi0_pins, 1),
PIN_GROUP((char *)"spi1_grp", cnlh_spi1_pins, 1),
PIN_GROUP((char *)"spi2_grp", cnlh_spi2_pins, 3),
Expand Down Expand Up @@ -411,12 +411,12 @@ static struct intel_function cnlh_functions[] = {
FUNCTION((char *)"i2c3", cnlh_i2c3_groups),
};

static const struct intel_padgroup cnlh_community0_gpps[] = {
static struct intel_padgroup cnlh_community0_gpps[] = {
CNL_GPP(0, 0, 24, 0), /* GPP_A */
CNL_GPP(1, 25, 50, 32), /* GPP_B */
};

static const struct intel_padgroup cnlh_community1_gpps[] = {
static struct intel_padgroup cnlh_community1_gpps[] = {
CNL_GPP(0, 51, 74, 64), /* GPP_C */
CNL_GPP(1, 75, 98, 96), /* GPP_D */
CNL_GPP(2, 99, 106, 128), /* GPP_G */
Expand All @@ -425,15 +425,15 @@ static const struct intel_padgroup cnlh_community1_gpps[] = {
CNL_GPP(5, 147, 154, CNL_NO_GPIO), /* vGPIO_1 */
};

static const struct intel_padgroup cnlh_community3_gpps[] = {
static struct intel_padgroup cnlh_community3_gpps[] = {
CNL_GPP(0, 155, 178, 192), /* GPP_K */
CNL_GPP(1, 179, 202, 224), /* GPP_H */
CNL_GPP(2, 203, 215, 256), /* GPP_E */
CNL_GPP(3, 216, 239, 288), /* GPP_F */
CNL_GPP(4, 240, 248, CNL_NO_GPIO), /* SPI */
};

static const struct intel_padgroup cnlh_community4_gpps[] = {
static struct intel_padgroup cnlh_community4_gpps[] = {
CNL_GPP(0, 249, 259, CNL_NO_GPIO), /* CPU */
CNL_GPP(1, 260, 268, CNL_NO_GPIO), /* JTAG */
CNL_GPP(2, 269, 286, 320), /* GPP_I */
Expand Down
6 changes: 3 additions & 3 deletions VoodooGPIO/CannonLake-LP/VoodooGPIOCannonLakeLP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,22 +363,22 @@ static struct intel_function cnllp_functions[] = {
FUNCTION((char *)"uart2", cnllp_uart2_groups),
};

static const struct intel_padgroup cnllp_community0_gpps[] = {
static struct intel_padgroup cnllp_community0_gpps[] = {
CNL_GPP(0, 0, 24, 0), /* GPP_A */
CNL_GPP(1, 25, 50, 32), /* GPP_B */
CNL_GPP(2, 51, 58, 64), /* GPP_G */
CNL_GPP(3, 59, 67, CNL_NO_GPIO), /* SPI */
};

static const struct intel_padgroup cnllp_community1_gpps[] = {
static struct intel_padgroup cnllp_community1_gpps[] = {
CNL_GPP(0, 68, 92, 96), /* GPP_D */
CNL_GPP(1, 93, 116, 128), /* GPP_F */
CNL_GPP(2, 117, 140, 160), /* GPP_H */
CNL_GPP(3, 141, 172, 192), /* vGPIO */
CNL_GPP(4, 173, 180, 224), /* vGPIO */
};

static const struct intel_padgroup cnllp_community4_gpps[] = {
static struct intel_padgroup cnllp_community4_gpps[] = {
CNL_GPP(0, 181, 204, 256), /* GPP_C */
CNL_GPP(1, 205, 228, 288), /* GPP_E */
CNL_GPP(2, 229, 237, CNL_NO_GPIO), /* JTAG */
Expand Down
Loading