summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Gysin2017-04-26 08:59:06 +0300
committerChristoph Gysin2017-04-26 16:36:25 +0300
commit158aac3c23ae85cfe2ea2c4fcf5b24491948b31d (patch)
tree8e4c3227cd1f32b3216cf736af7109bf430ba0fc
parentce5c258add9159ffb1b40e1ff4cb9bf0fda5e542 (diff)
downloadaur-158aac3c23ae85cfe2ea2c4fcf5b24491948b31d.tar.gz
remove makefile patch
-rw-r--r--.SRCINFO12
-rw-r--r--0001-add-option-iso_layout.patch125
-rw-r--r--PKGBUILD15
-rw-r--r--iso-layout.patch18
-rw-r--r--makefile.patch27
5 files changed, 135 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 26d69ca8d8a4..0f58b8244251 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Apr 24 19:51:50 UTC 2017
+# Wed Apr 26 13:36:20 UTC 2017
pkgbase = macbook12-spi-driver-dkms
pkgdesc = WIP input driver for the SPI touchpad / keyboard found in the 12" MacBook
- pkgver = 0+git.25
- pkgrel = 2
+ pkgver = 0+git.35
+ pkgrel = 1
url = https://github.com/cb22/macbook12-spi-driver
arch = i686
arch = x86_64
@@ -11,12 +11,10 @@ pkgbase = macbook12-spi-driver-dkms
makedepends = git
depends = dkms
source = git+https://github.com/cb22/macbook12-spi-driver.git
- source = makefile.patch
- source = iso-layout.patch
+ source = 0001-add-option-iso_layout.patch
source = dkms.conf
sha256sums = SKIP
- sha256sums = cef4a5b2ca51488986a476b3fde100cfaca9acbe0a93e3ce009168b48cd01f0b
- sha256sums = 986550b8a316f01be1f7dc6b5e28952a89ce76a0f3d5d35636970960c32adea1
+ sha256sums = 0688c4b79408bd10cbcdefbb70d1ecce4b4a3bee725f74bcd066d332983e354a
sha256sums = 72d908df93de0022dbd5e3cc458a3434105fe61125454a2738587727a42e21b7
pkgname = macbook12-spi-driver-dkms
diff --git a/0001-add-option-iso_layout.patch b/0001-add-option-iso_layout.patch
new file mode 100644
index 000000000000..89c7b282939d
--- /dev/null
+++ b/0001-add-option-iso_layout.patch
@@ -0,0 +1,125 @@
+From ece075810b575c144aff8996c5d703164ead7cd8 Mon Sep 17 00:00:00 2001
+From: Christoph Gysin <christoph.gysin@gmail.com>
+Date: Wed, 19 Apr 2017 17:29:57 +0300
+Subject: [PATCH] add option iso_layout
+
+fixes #12
+---
+ applespi.c | 64 +++++++++++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 42 insertions(+), 22 deletions(-)
+
+diff --git a/applespi.c b/applespi.c
+index b8fa4cf..d11f825 100644
+--- a/applespi.c
++++ b/applespi.c
+@@ -45,6 +45,10 @@
+ #define MAX_FINGERS 6
+ #define MAX_FINGER_ORIENTATION 16384
+
++static unsigned int iso_layout = 1;
++module_param(iso_layout, uint, 0644);
++MODULE_PARM_DESC(iso_layout, "Enable/Disable hardcoded ISO-layout of the keyboard. "
++ "(0 = disabled, [1] = enabled)");
+
+ struct keyboard_protocol {
+ u16 packet_type;
+@@ -172,11 +176,12 @@ static const unsigned char applespi_scancodes[] = {
+ KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0,
+ KEY_ENTER, KEY_ESC, KEY_BACKSPACE, KEY_TAB, KEY_SPACE, KEY_MINUS,
+ KEY_EQUAL, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_BACKSLASH, 0,
+- KEY_SEMICOLON, KEY_APOSTROPHE, KEY_GRAVE, KEY_COMMA, KEY_DOT, KEY_SLASH,
++ KEY_SEMICOLON, KEY_APOSTROPHE, KEY_102ND, KEY_COMMA, KEY_DOT, KEY_SLASH,
+ KEY_CAPSLOCK,
+ KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9,
+ KEY_F10, KEY_F11, KEY_F12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ KEY_RIGHT, KEY_LEFT, KEY_DOWN, KEY_UP,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_GRAVE,
+ };
+
+ static const unsigned char applespi_controlcodes[] = {
+@@ -191,29 +196,35 @@ static const unsigned char applespi_controlcodes[] = {
+ };
+
+ struct applespi_key_translation {
+- u8 from;
++ u16 from;
+ u16 to;
+ };
+
+ static const struct applespi_key_translation applespi_fn_codes[] = {
+- { 42, KEY_DELETE },
+- { 40, KEY_INSERT },
+- { 58, KEY_BRIGHTNESSDOWN },
+- { 59, KEY_BRIGHTNESSUP },
+- { 60, KEY_SCALE },
+- { 61, KEY_DASHBOARD },
+- { 62, KEY_KBDILLUMDOWN },
+- { 63, KEY_KBDILLUMUP },
+- { 64, KEY_PREVIOUSSONG },
+- { 65, KEY_PLAYPAUSE },
+- { 66, KEY_NEXTSONG },
+- { 67, KEY_MUTE },
+- { 68, KEY_VOLUMEDOWN },
+- { 69, KEY_VOLUMEUP },
+- { 82, KEY_PAGEUP },
+- { 81, KEY_PAGEDOWN },
+- { 80, KEY_HOME },
+- { 79, KEY_END },
++ { KEY_BACKSPACE, KEY_DELETE },
++ { KEY_ENTER, KEY_INSERT },
++ { KEY_F1, KEY_BRIGHTNESSDOWN },
++ { KEY_F2, KEY_BRIGHTNESSUP },
++ { KEY_F3, KEY_SCALE },
++ { KEY_F4, KEY_DASHBOARD },
++ { KEY_F5, KEY_KBDILLUMDOWN },
++ { KEY_F6, KEY_KBDILLUMUP },
++ { KEY_F7, KEY_PREVIOUSSONG },
++ { KEY_F8, KEY_PLAYPAUSE },
++ { KEY_F9, KEY_NEXTSONG },
++ { KEY_F10, KEY_MUTE },
++ { KEY_F11, KEY_VOLUMEDOWN },
++ { KEY_F12, KEY_VOLUMEUP },
++ { KEY_RIGHT, KEY_END },
++ { KEY_LEFT, KEY_HOME },
++ { KEY_DOWN, KEY_PAGEDOWN },
++ { KEY_UP, KEY_PAGEUP },
++};
++
++static const struct applespi_key_translation apple_iso_keyboard[] = {
++ { KEY_GRAVE, KEY_102ND },
++ { KEY_102ND, KEY_GRAVE },
++ { }
+ };
+
+ static u8 *acpi_dsm_uuid = "a0b5b7c6-1318-441c-b0c9-fe695eaf949b";
+@@ -684,16 +695,25 @@ static unsigned int
+ applespi_code_to_key(u8 code, int fn_pressed)
+ {
+ int i;
++ unsigned int key = applespi_scancodes[code];
+
+ if (fn_pressed) {
+ for (i=0; i<ARRAY_SIZE(applespi_fn_codes); i++) {
+- if (applespi_fn_codes[i].from == code) {
++ if (applespi_fn_codes[i].from == key) {
+ return applespi_fn_codes[i].to;
+ }
+ }
+ }
+
+- return applespi_scancodes[code];
++ if (iso_layout) {
++ for (i=0; i<ARRAY_SIZE(apple_iso_keyboard); i++) {
++ if (apple_iso_keyboard[i].from == key) {
++ return apple_iso_keyboard[i].to;
++ }
++ }
++ }
++
++ return key;
+ }
+
+ static void
+--
+2.12.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 38bb6d49eb81..65eadd094d5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Christoph Gysin <christoph.gysin@gmail.com>
_pkgbase=macbook12-spi-driver
pkgname=(${_pkgbase}-dkms)
-pkgver=0+git.25
-pkgrel=2
+pkgver=0+git.35
+pkgrel=1
pkgdesc="WIP input driver for the SPI touchpad / keyboard found in the 12\" MacBook"
arch=('i686' 'x86_64')
url="https://github.com/cb22/macbook12-spi-driver"
@@ -12,12 +12,10 @@ depends=('dkms')
makedepends=('git')
optdepends=()
source=(git+https://github.com/cb22/macbook12-spi-driver.git
- makefile.patch
- iso-layout.patch
+ 0001-add-option-iso_layout.patch
dkms.conf)
sha256sums=('SKIP'
- 'cef4a5b2ca51488986a476b3fde100cfaca9acbe0a93e3ce009168b48cd01f0b'
- '986550b8a316f01be1f7dc6b5e28952a89ce76a0f3d5d35636970960c32adea1'
+ '0688c4b79408bd10cbcdefbb70d1ecce4b4a3bee725f74bcd066d332983e354a'
'72d908df93de0022dbd5e3cc458a3434105fe61125454a2738587727a42e21b7')
pkgver() {
@@ -27,10 +25,7 @@ pkgver() {
build() {
cd "${srcdir}"/${_pkgbase}
- patch -Nsf -p1 -i "${srcdir}"/makefile.patch
-
- # uncomment for ISO layout
- #patch -Nsf -p1 -i "${srcdir}"/iso-layout.patch
+ patch -p1 -i "${srcdir}"/0001-add-option-iso_layout.patch
}
package() {
diff --git a/iso-layout.patch b/iso-layout.patch
deleted file mode 100644
index 668f8bb7022d..000000000000
--- a/iso-layout.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/applespi.c b/applespi.c
-index 4356f84..3bf40ea 100644
---- a/applespi.c
-+++ b/applespi.c
-@@ -129,11 +129,12 @@ static const unsigned char applespi_scancodes[] = {
- KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0,
- KEY_ENTER, KEY_ESC, KEY_BACKSPACE, KEY_TAB, KEY_SPACE, KEY_MINUS,
- KEY_EQUAL, KEY_LEFTBRACE, KEY_RIGHTBRACE, KEY_BACKSLASH, 0,
-- KEY_SEMICOLON, KEY_APOSTROPHE, KEY_GRAVE, KEY_COMMA, KEY_DOT, KEY_SLASH,
-+ KEY_SEMICOLON, KEY_APOSTROPHE, KEY_102ND, KEY_COMMA, KEY_DOT, KEY_SLASH,
- KEY_CAPSLOCK,
- KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9,
- KEY_F10, KEY_F11, KEY_F12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- KEY_RIGHT, KEY_LEFT, KEY_DOWN, KEY_UP,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_GRAVE,
- };
-
- static const unsigned char applespi_controlcodes[] = {
diff --git a/makefile.patch b/makefile.patch
deleted file mode 100644
index 80cb8702758d..000000000000
--- a/makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 62caa34..5a7c139 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,10 +1,20 @@
- obj-m += applespi.o
-
-+KVERSION := $(KERNELRELEASE)
-+ifeq ($(origin KERNELRELEASE), undefined)
-+KVERSION := $(shell uname -r)
-+endif
-+KDIR := /lib/modules/$(KVERSION)/build
-+PWD := $(shell pwd)
-+
- all:
-- make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
-+ $(MAKE) -C $(KDIR) M=$(PWD) modules
-
- clean:
-- make -C /lib/modules/$(shell uname -r)/build M=$(PWD) clean
-+ $(MAKE) -C $(KDIR) M=$(PWD) clean
-+
-+install:
-+ $(MAKE) -C $(KDIR) M=$(PWD) modules_install
-
- test: all
- sync