Adds patch to compile on systems with kernel-3.10.1 and up

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA8C8FBCF

4 files changed, 235 insertions, 6 deletions

diff --git a/app-laptop/easy-slow-down-manager/ChangeLog b/app-laptop/easy-slow-down-manager/ChangeLog
index a8dd1fc256f8..b6bfaa410371 100644
--- a/app-laptop/easy-slow-down-manager/ChangeLog
+++ b/app-laptop/easy-slow-down-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-laptop/easy-slow-down-manager
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/easy-slow-down-manager/ChangeLog,v 1.4 2013/09/25 18:01:24 angelos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/easy-slow-down-manager/ChangeLog,v 1.5 2014/04/19 03:23:58 twitch153 Exp $
+
+  19 Apr 2014; Devan Franchini <twitch153@gentoo.org>
+  +files/easy-slow-down-manager-0.3-kernel-3.10-1.patch,
+  easy-slow-down-manager-0.3.ebuild:
+  Adds patch to compile on systems with kernel-3.10.1 and up
 
   25 Sep 2013;  <christoph@gentoo.org> metadata.xml:
   Remove myself from metadata since I do not own a Samsung laptop anymore
diff --git a/app-laptop/easy-slow-down-manager/Manifest b/app-laptop/easy-slow-down-manager/Manifest
index 84fbd2f8c2e0..5d6f51de309d 100644
--- a/app-laptop/easy-slow-down-manager/Manifest
+++ b/app-laptop/easy-slow-down-manager/Manifest
@@ -1,5 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX easy-slow-down-manager-0.3-kernel-3.10-1.patch 6682 SHA256 319d06407fa43bab23b161b3c3c996c34841ef7f559142d8db3ed575cde875ec SHA512 d6e68e444abd956e96fc1542546d38ab62f7f54d81822d468b7695df761c0e3810d12a1d98ca0a71228c80e63bce7d1b198bf7d8c87d49c4f19305aae78ab0e9 WHIRLPOOL 5947a6060950972692224935e11e3b9bf180e730c592fe2d95246d2904ca204e262f569137355e0196735ba234e71b1b44f0b84fffd500c6c6b214e111030703
 AUX easy-slow-down-manager-0.3-kv_dir.patch 441 SHA256 05fa50fe4182e4d5b5886994b0be0d5b70d984f9b60614216040620540120ff3 SHA512 bd6b204b597ea0c109d51e016061b5db56a500ea5189ad7bf3f666b18e10989f799e54dfa4318caa618666d9055b325257abb0e39cb89f4862314d4686c45dd5 WHIRLPOOL 62dbf2c7c3fb826f6db6db5570a79357412b9a8d1d8c889dbe5dd71149cc95ba744940230834430391a80ebac2d0cddf5631c946bac34d12edc6d22149683b73
 DIST easy-slow-down-manager-0.3.tar.gz 5636 SHA256 c9296226d4e0d41955988d0dbd7f143ff2e06a40744705c78f89f9a51c1c0253 SHA512 9974fb3af48a529f050aa5730988614a91b615e3fd2e5b6edc5b70ac6a1faffb4f4a1423cb634aff671dc7228bb70be8ef150c274bf57895048fae5566aac77a WHIRLPOOL 8820c937e308b940f58fe7c0132394a17b0d6e78844b0b72757f8f8f76c000a548fb291a508b8e803460ba75c745ce045f54541480f25756c976129d64236ff0
-EBUILD easy-slow-down-manager-0.3.ebuild 781 SHA256 bdd9cf1f690aedab8411536a88407c9c81b940104a24264cf274c339ca85b47b SHA512 150c580b236c1a2c8c5ebf720b467518c3b4d823c49668f87d0fb78126333d75b800b2870bb32ad28fbe6c06f00e0e0ac850d307a67881ef5d50d218f62ec0f7 WHIRLPOOL b07eedb111afa1732f381062aab9758c3458829c253444b32ae9e07bd10e1c52083c52a7e8c8621424c297683d00cc7e70985f2bec03bdb67f8c55ffff100328
-MISC ChangeLog 853 SHA256 476292ff61f9a4432430790205bba5b11eb45a1e00d3c3d66d4696113739ef75 SHA512 292602e4d292419a726e1a6d60eac541b7608ec24ea760599418f5edd41ac755ee38b09e8a896bb7593c3a069050cd7edcbf4e1c88906e8a298927ca838ca6f6 WHIRLPOOL aff75d4dc6e64988f749356e69f4154d0a71287bc4ad6cbcb79b35ce33551440cbd109b0040c2a0f050298f0b6be55c71a2ba30ac13e7c755d58b64c86fb26d5
+EBUILD easy-slow-down-manager-0.3.ebuild 877 SHA256 90a0dbb3f9c5b934e5cebdcd0d06ab5c6052663ceaa9bd5a6e1110eb956def35 SHA512 9d18a25b11c5996400b4e8e96fdcbd2d152bdb5fa10bb7ecd219a5f328a7470b1f0b90b504bd1ef90e7e020580961bbee4743b8f8b855cc31c45f545ef915dcb WHIRLPOOL 8b7a57048ef282e36c5bd756142cc526866df68fa54ec2da39e54d1a8d334fe56e163aa3d8a98322c7445105dd085c6dd1d67189f4de6afc4d3ed367b656c2d5
+MISC ChangeLog 1065 SHA256 68a0ece4401b47c1846f2df5e79670b9d2d58a199a3b918dfac4d93f98557afd SHA512 662950ac29599587c098bd8cd2411bc53409945b1483ace61c0e4439b6d1efa4e31f0ba511d2a898862feb0f84408ed9453f48bf2f569884a93fbeb1534f999c WHIRLPOOL 5001fac65ac4280552a7c70f6e17f1cec0f1f2576570a944f2a4b9d12409d6a7d0121d625c0aaf702835c4299b10f6e1639569366bb52bdabf486ee05245eb51
 MISC metadata.xml 306 SHA256 441074c311e18864e1b86cb36ce57cfb6c5bf929afa9f509e83fd351a24bd5dd SHA512 cde86252f9d1ef4d8490d41f439a2b0d40efe7e38e92b5942cce335a4ef0ced57130ec1f2efb2f77625ba03407cc0fffdb4c807d3da1e32d49e64e71196d4946 WHIRLPOOL 765335da94129ba429fd934a925ff0ed2ca77ef34fb58dee88b1d9b3b38ded1f87bf92f97bce54bcaf52cff09663ba433ccbf9f082d04b12fc62a5ff71eb2dd7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTUexnAAoJEOf5eU+oyPvPUCIH/19LuetZqWv0ZgHFj/OUyOrF
+429mv8eqjH22TI08CvwYO7UH3ntu5C5xec2euWPBIOglWL4ci9IM8L89/3EscPjR
+TsJd+cJbhFbtIFj7eYAUkvnVs/fHitTA/h5lUSGe81cGVFBQ3sGNpdkiTF2mCMaF
+q3bBxWn91Z73mDVmZybPHEthkS0eTdJ63gkEIHTJyODPqviXwHz3620bIY9kfUhY
+bwFvIuZjHn7qxe3AruH1Apbah2MWIXe4hZTerEujwZa/mKqZTu2oM1prtYHV7wto
+UkGMTA8TXrLEl0naP6xwzuE5m9dIQSvz4guFqmBKLomHkw9QPCsMCf+gg1H8mUk=
+=tqXN
+-----END PGP SIGNATURE-----
diff --git a/app-laptop/easy-slow-down-manager/easy-slow-down-manager-0.3.ebuild b/app-laptop/easy-slow-down-manager/easy-slow-down-manager-0.3.ebuild
index 19768307a898..1597d87874ed 100644
--- a/app-laptop/easy-slow-down-manager/easy-slow-down-manager-0.3.ebuild
+++ b/app-laptop/easy-slow-down-manager/easy-slow-down-manager-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/easy-slow-down-manager/easy-slow-down-manager-0.3.ebuild,v 1.3 2013/07/02 21:59:39 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/easy-slow-down-manager/easy-slow-down-manager-0.3.ebuild,v 1.4 2014/04/19 03:23:58 twitch153 Exp $
 
 EAPI=4
 inherit eutils linux-mod
@@ -20,6 +20,10 @@ BUILD_TARGETS="all"
 MODULE_NAMES="samsung-backlight() easy_slow_down_manager()"
 
 src_prepare() {
+	get_version
+	if kernel_is -ge 3 10; then
+		epatch "${FILESDIR}"/${P}-kernel-3.10-1.patch
+	fi
 	epatch "${FILESDIR}"/${P}-kv_dir.patch
 }
 
diff --git a/app-laptop/easy-slow-down-manager/files/easy-slow-down-manager-0.3-kernel-3.10-1.patch b/app-laptop/easy-slow-down-manager/files/easy-slow-down-manager-0.3-kernel-3.10-1.patch
new file mode 100644
index 000000000000..272143eeea3b
--- /dev/null
+++ b/app-laptop/easy-slow-down-manager/files/easy-slow-down-manager-0.3-kernel-3.10-1.patch
@@ -0,0 +1,205 @@
+diff --git a/easy_slow_down_manager.c b/easy_slow_down_manager.c
+index 7b2d1e9..1336557 100644
+--- a/easy_slow_down_manager.c
++++ b/easy_slow_down_manager.c
+@@ -4,6 +4,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
++#include <linux/version.h>
+ #include <asm/uaccess.h>
+ #include <linux/dmi.h>
+ 
+@@ -101,7 +102,7 @@ MODULE_PARM_DESC(debug, "Verbose output");
+ int sabi_exec_command(u8 command, u8 data, struct sabi_retval *sretval)
+ {
+     int retval = 0;
+-    
++
+     mutex_lock(&sabi_mutex);
+ 
+     /* enable memory to be able to write to it */
+@@ -141,22 +142,25 @@ int sabi_exec_command(u8 command, u8 data, struct sabi_retval *sretval)
+     return retval;
+ }
+ 
+-int easy_slow_down_read(char *page, char **start, off_t off,
+-			  int count, int *eof, void *data) {
++ssize_t easy_slow_down_read(struct file *filp, char __user *buffer,
++                size_t length, loff_t *off) {
+     struct sabi_retval sretval;
+-    
+-    if (off > 0) {
+-        *eof = 1;
+-    }
+-    else if (!sabi_exec_command(SABI_GET_ETIQUETTE_MODE, 0, &sretval)) {
+-        page[0] = sretval.retval[0] + '0';
++
++    if (*off > 0)
++        return 0;
++
++    if (!sabi_exec_command(SABI_GET_ETIQUETTE_MODE, 0, &sretval)) {
++        char mode = sretval.retval[0] + '0';
++        if (copy_to_user(buffer, &mode, 1))
++            return -EFAULT;
++        (*off)++;
+         return 1;
+     }
+     return 0;
+ }
+ 
+-int easy_slow_down_write(struct file *file, const char __user *buffer,
+-			   unsigned long count, void *data) {
++ssize_t easy_slow_down_write(struct file *filp, const char __user *buffer,
++                size_t count, loff_t *off) {
+     char mode = '0';
+     if (copy_from_user(&mode, buffer, 1)) {
+         return -EFAULT;
+@@ -167,22 +171,25 @@ int easy_slow_down_write(struct file *file, const char __user *buffer,
+     return count;
+ }
+ 
+-int easy_backlight_read(char *page, char **start, off_t off,
+-			  int count, int *eof, void *data) {
++ssize_t easy_backlight_read(struct file *filp, char __user *buffer,
++                size_t length, loff_t *off) {
+     struct sabi_retval sretval;
+-    
+-    if (off > 0) {
+-        *eof = 1;
+-    }
+-    else if (!sabi_exec_command(SABI_GET_BACKLIGHT, 0, &sretval)) {
+-        page[0] = sretval.retval[0] + '0';
++
++    if (*off > 0)
++        return 0;
++
++    if (!sabi_exec_command(SABI_GET_BACKLIGHT, 0, &sretval)) {
++        char mode = sretval.retval[0] + '0';
++        if (copy_to_user(buffer, &mode, 1))
++            return -EFAULT;
++        (*off)++;
+         return 1;
+     }
+     return 0;
+ }
+ 
+-int easy_backlight_write(struct file *file, const char __user *buffer,
+-			   unsigned long count, void *data) {
++ssize_t easy_backlight_write(struct file *file, const char __user *buffer,
++			   size_t count, loff_t *off) {
+     char mode = '0';
+     if (copy_from_user(&mode, buffer, 1)) {
+         return -EFAULT;
+@@ -193,22 +200,25 @@ int easy_backlight_write(struct file *file, const char __user *buffer,
+     return count;
+ }
+ 
+-int easy_wifi_kill_read(char *page, char **start, off_t off,
+-			  int count, int *eof, void *data) {
++ssize_t easy_wifi_kill_read(struct file *filp, char __user *buffer,
++                size_t length, loff_t *off) {
+     struct sabi_retval sretval;
+-    
+-    if (off > 0) {
+-        *eof = 1;
+-    }
+-    else if (!sabi_exec_command(SABI_GET_WIRELESS_BUTTON, 0, &sretval)) {
+-        page[0] = sretval.retval[0] + '0';
++
++    if (*off > 0)
++        return 0;
++
++    if (!sabi_exec_command(SABI_GET_WIRELESS_BUTTON, 0, &sretval)) {
++        char mode = sretval.retval[0] + '0';
++        if (copy_to_user(buffer, &mode, 1))
++            return -EFAULT;
++        (*off)++;
+         return 1;
+     }
+     return 0;
+ }
+ 
+-int easy_wifi_kill_write(struct file *file, const char __user *buffer,
+-			   unsigned long count, void *data) {
++ssize_t easy_wifi_kill_write(struct file *file, const char __user *buffer,
++			   size_t count, loff_t *off) {
+     char mode = '0';
+     if (copy_from_user(&mode, buffer, 1)) {
+         return -EFAULT;
+@@ -219,8 +229,26 @@ int easy_wifi_kill_write(struct file *file, const char __user *buffer,
+     return count;
+ }
+ 
++static const struct file_operations proc_fops_slow_down = {
++    .owner = THIS_MODULE,
++    .read = easy_slow_down_read,
++    .write = easy_slow_down_write
++};
++
++static const struct file_operations proc_fops_wifi_kill = {
++    .owner = THIS_MODULE,
++    .read = easy_wifi_kill_read,
++    .write = easy_wifi_kill_write
++};
++
++static const struct file_operations proc_fops_backlight = {
++    .owner = THIS_MODULE,
++    .read = easy_backlight_read,
++    .write = easy_backlight_write
++};
++
+ int __init easy_slow_down_init(void) {
+-    
++
+     const char *test_str = "SwSmi@";
+     int pos;
+     int index = 0;
+@@ -290,19 +318,15 @@ int __init easy_slow_down_init(void) {
+     }
+ 
+ 
+-    proc_entry_slow_down = create_proc_entry("easy_slow_down_manager", 0666, NULL);
++    proc_entry_slow_down = proc_create("easy_slow_down_manager", 0666, NULL, &proc_fops_slow_down);
+     if (proc_entry_slow_down == NULL) {
+         printk(KERN_INFO "Easy slow down manager: Couldn't create proc entry\n");
+         iounmap(sabi_iface);
+         iounmap(f0000_segment);
+         return -ENOMEM;
+     }
+-    else {
+-        proc_entry_slow_down->read_proc = easy_slow_down_read;
+-        proc_entry_slow_down->write_proc = easy_slow_down_write;
+-    }
+ 
+-    proc_entry_wifi_kill = create_proc_entry("easy_wifi_kill", 0666, NULL);
++    proc_entry_wifi_kill = proc_create("easy_wifi_kill", 0666, NULL, &proc_fops_wifi_kill);
+     if (proc_entry_wifi_kill == NULL) {
+         printk(KERN_INFO "Easy slow down manager: Couldn't create proc entry\n");
+         remove_proc_entry("easy_slow_down_manager", NULL);
+@@ -310,12 +334,8 @@ int __init easy_slow_down_init(void) {
+         iounmap(f0000_segment);
+         return -ENOMEM;
+     }
+-    else {
+-        proc_entry_wifi_kill->read_proc = easy_wifi_kill_read;
+-        proc_entry_wifi_kill->write_proc = easy_wifi_kill_write;
+-    }
+-    
+-    proc_entry_backlight = create_proc_entry("easy_backlight", 0666, NULL);
++
++    proc_entry_backlight = proc_create("easy_backlight", 0666, NULL, &proc_fops_backlight);
+     if (proc_entry_backlight == NULL) {
+         printk(KERN_INFO "Easy slow down manager: Couldn't create proc entry\n");
+         remove_proc_entry("easy_slow_down_manager", NULL);
+@@ -324,10 +344,6 @@ int __init easy_slow_down_init(void) {
+         iounmap(f0000_segment);
+         return -ENOMEM;
+     }
+-    else {
+-        proc_entry_backlight->read_proc = easy_backlight_read;
+-        proc_entry_backlight->write_proc = easy_backlight_write;
+-    }
+     return 0;
+ }
+