Import v7.4

diff --git a/keymap.default b/keymap.default
index ed0dcabf69da8f7df33712e62cbf944ff7b9469a..5c38b8e7263be9cafb693f34c75b1344239016c1 100644 (file)
--- a/keymap.default
+++ b/keymap.default
@@ -49,8 +49,8 @@ SAPPHIRE_PLAY            KEY_P|CTRL       NO_REPEAT                    ## Play/P
 SAPPHIRE_PAUSE           KEY_P            NO_REPEAT                    ## Play/Pause
 SAPPHIRE_VOLUP           KEY_RIGHTBRACE   FAST_REPEAT                  ## Volume Up
 SAPPHIRE_VOLDOWN         KEY_LEFTBRACE    FAST_REPEAT                  ## Volume Down
-SAPPHIRE_CHUP            KEY_PAGEUP       SLOW_REPEAT                  ## channel up    (CUSTOM)
-SAPPHIRE_CHDOWN          KEY_PAGEDOWN     SLOW_REPEAT                  ## channel down  (CUSTOM)
+SAPPHIRE_CHUP            KEY_PAGEUP       MED_REPEAT                   ## channel up    (CUSTOM)
+SAPPHIRE_CHDOWN          KEY_PAGEDOWN     MED_REPEAT                   ## channel down  (CUSTOM)
 SAPPHIRE_MUTE            KEY_F9           LONGKEY|KEY_F15              ## Mute (tap) or Audiosync (hold)
 SAPPHIRE_RECORD          KEY_R            NO_REPEAT                    ## Record/Delete (CUSTOM)
 SAPPHIRE_FWD             KEY_DOT          NO_REPEAT                    ## FFwd
@@ -98,3 +98,11 @@ KEY_MACRO_4
 KEY_MACRO_5
 KEY_MACRO_6
 KEY_MACRO_7
+
+#
+# These control how quickly buttons repeat:
+#
+RAMP_RATE 80 6
+SLOW_RATE 4
+MED_RATE  6
+FAST_RATE 8

diff --git a/sapphire.c b/sapphire.c
index 7e3033aae7ad78ae8e43c25ddeba6e1451149a53..0dd1aae734850899007b3a1cbfad868dcb34d2a6 100644 (file)
--- a/sapphire.c
+++ b/sapphire.c
@@ -1,7 +1,7 @@
 /*
  * sapphire.c
  *
- * Copyright Mark Lord <mlord@pobox.com>, 2012-2019.
+ * Copyright Mark Lord <mlord@pobox.com>, 2012-2020.
  * http://rtr.ca/sapphire_remote/
  *
  * This is a HID driver for the TopSeed Cyberlink receiver
@@ -38,7 +38,7 @@
 #include "sapphire.h"
 
 #define SAPPHIRE_NAME          "sapphire"
-#define SAPPHIRE_VERSION       "7.3"
+#define SAPPHIRE_VERSION       "7.4"
 
 /*
  * "LONGKEY":  Any button can be used to generate a second, different keycode,
@@ -73,8 +73,8 @@ static struct sapphire_map {
     {SAPPHIRE_PAUSE         , KEY_P          , NO_REPEAT               }, /* Play/Pause     */
     {SAPPHIRE_VOLUP         , KEY_RIGHTBRACE , FAST_REPEAT             }, /* Volume Up      */
     {SAPPHIRE_VOLDOWN       , KEY_LEFTBRACE  , FAST_REPEAT             }, /* Volume Down    */
-    {SAPPHIRE_CHUP          , KEY_PAGEUP     , SLOW_REPEAT             }, /* channel up    (CUSTOM) */
-    {SAPPHIRE_CHDOWN        , KEY_PAGEDOWN   , SLOW_REPEAT             }, /* channel down  (CUSTOM) */
+    {SAPPHIRE_CHUP          , KEY_PAGEUP     , MED_REPEAT              }, /* channel up    (CUSTOM) */
+    {SAPPHIRE_CHDOWN        , KEY_PAGEDOWN   , MED_REPEAT              }, /* channel down  (CUSTOM) */
     {SAPPHIRE_MUTE          , KEY_F9         , LONGKEY|KEY_F15         },  /* Mute (tap) or Audiosync (hold) */
     {SAPPHIRE_RECORD        , KEY_R          , NO_REPEAT               }, /* Record/Delete (CUSTOM) */
     {SAPPHIRE_FWD           , KEY_DOT        , NO_REPEAT               }, /* FFwd           */
@@ -163,16 +163,22 @@ static struct sapphire_dev {
 } sapphire_dev, *dev = &sapphire_dev;
 
 enum {
+       SLOW_RATE       = HZ /  4,              /* repeat rate for SLOW_REPEAT */
+       MED_RATE        = HZ /  6,              /* repeat rate for MED_REPEAT */
+       FAST_RATE       = HZ /  8,              /* repeat rate for FAST_REPEAT */
+       RAMP_MAX        = HZ / 10,              /* max repeat rate for RAMP_REPEAT */
+       RAMP_ADJ        = HZ / 40,              /* amount to speed up by after each repeat */
        RAMPING         = 0x80000000,           /* flag to indicate current dev->down_key is using RAMP_REPEAT */ 
-       RAMPING_RATE    = HZ / 40,              /* amount to speed up by after each repeat */
-       RAMPING_MAX     = HZ / 10,              /* max repeats/sec when RAMPING */
        MODIFIERS       = CTRL|SHIFT|ALT|META,  /* convenient mask of all modifier keys */
        PRESSED         = 1,                    /* for use with input_event() */
        RELEASED        = 0,                    /* for use with input_event() */
 };
 
-static unsigned int ramping_rate = RAMPING_RATE;
-static unsigned int ramping_max  = RAMPING_MAX;
+static unsigned int slow_rate = SLOW_RATE;
+static unsigned int med_rate  = MED_RATE;
+static unsigned int fast_rate = FAST_RATE;
+static unsigned int ramp_adj  = RAMP_ADJ;
+static unsigned int ramp_max  = RAMP_MAX;
 
 /*
  * Translate a [XS]APPHIRE_ "button" into a KEY_ "keycode" or "macro".
@@ -308,10 +314,10 @@ static void sapphire_key_timeout(SAPPHIRE_TIMER_ARG_T arg)
                unsigned int next_repeat = dev->next_repeat & ~RAMPING;
                if (dev->next_repeat & RAMPING) {
                        /* Gradually ramp-up the repeat rate for this key */
-                       if (next_repeat > ramping_max) {
-                               next_repeat -= ramping_rate;
-                               if (next_repeat < ramping_max)
-                                       next_repeat = ramping_max;
+                       if (next_repeat > ramp_max) {
+                               next_repeat -= ramp_adj;
+                               if (next_repeat < ramp_max)
+                                       next_repeat = ramp_max;
                        }
                        dev->next_repeat = next_repeat | RAMPING;
                }
@@ -328,7 +334,8 @@ static void sapphire_key_timeout(SAPPHIRE_TIMER_ARG_T arg)
  */
 static void sapphire_handle_key (unsigned int key, unsigned int repeats)
 {
-       unsigned int repeat_delay = NO_REPEAT, next_repeat = 0;
+       const unsigned int REPEAT_DELAY = (HZ/2) - (HZ/6);
+       unsigned int next_repeat = 0;
 
        switch (repeats) {
                case RAWKEY:
@@ -338,15 +345,15 @@ static void sapphire_handle_key (unsigned int key, unsigned int repeats)
                        dev->raw_key = key;
                        return;
                case SLOW_REPEAT:
-                       repeat_delay = HZ/2;
-                       next_repeat  = HZ/SLOW_REPEAT;
+                       next_repeat  = slow_rate;
+                       break;
+               case MED_REPEAT:
+                       next_repeat  = med_rate;
                        break;
                case FAST_REPEAT:
-                       repeat_delay = HZ/3;
-                       next_repeat  = HZ/FAST_REPEAT;
+                       next_repeat  = fast_rate;
                        break;
                case RAMP_REPEAT:
-                       repeat_delay = (HZ/2) - (HZ/6);
                        next_repeat  = (HZ/3) | RAMPING;
                        break;
                default:
@@ -362,7 +369,7 @@ static void sapphire_handle_key (unsigned int key, unsigned int repeats)
                                return;
                        }
        }
-       sapphire_send_key(key, repeat_delay);
+       sapphire_send_key(key, next_repeat ? REPEAT_DELAY : NO_REPEAT);
        if (next_repeat ) {
                dev->down_key    = key;
                dev->next_repeat = next_repeat;
@@ -543,14 +550,34 @@ static int sapphire_oldproc_read(char *buf, char **start, off_t offset, int coun
        return len;
 }
 
+static int sapphire_get_HZ_vals (u8 *line, const char *keyword, int *val1, int *val2)
+{
+       int v1, v2, keyword_len = strlen(keyword);
+
+       if (0 != strncmp(line, keyword, keyword_len) || line[keyword_len] != ' ')
+               return -EAGAIN;
+       line += keyword_len + 1;
+       if ((val2 && 2 == sscanf(line, "%u %u", &v1, &v2)) || (1 == sscanf(line, "%u", &v1))) {
+               *val1 = HZ / v1;
+               if (val2)
+                       *val2 = HZ / v2;
+               return 0;
+       }
+       return -EINVAL;
+}
+
 /*
  * Handles writes to /proc/ for altering key/macro mappings on the fly,
  * and also for injecting keycodes from scripts etc.
  */
 static int sapphire_oldproc_write(struct file *file, const char __user *ubuf, unsigned long count, void *data)
 {
-       static const char SENDKEY[] = "SENDKEY ";
-       static const char REPEAT_RATE[] = "REPEAT_RATE ";
+       static const char SENDKEY[7]    = "SENDKEY";
+       static const char REPEAT_RATE[] = "REPEAT_RATE";  // Original backward-compatible name for RAMP_RATE
+       static const char RAMP_RATE[]   = "RAMP_RATE";
+       static const char SLOW_RATE[]   = "SLOW_RATE";
+       static const char MED_RATE[]    = "MED_RATE";
+       static const char FAST_RATE[]   = "FAST_RATE";
        unsigned int len = count, val, ret = 0;
        u8 *buf = kmalloc(len + 2, GFP_KERNEL), *line, *eol;
        struct sapphire_map *map;
@@ -568,19 +595,24 @@ static int sapphire_oldproc_write(struct file *file, const char __user *ubuf, un
                int sendkey = 0;
                for (eol = line; *eol != '\n'; ++eol);
                *eol = '\0';
-               if (0 == strncmp(line, SENDKEY, sizeof(SENDKEY)-1)) {
-                       line += sizeof(SENDKEY)-1;
+               if (0 == strncmp(line, SENDKEY, sizeof(SENDKEY))) {
+                       line += sizeof(SENDKEY);
                        sendkey = 1;
-               } else if (0 == strncmp(line, REPEAT_RATE, sizeof(REPEAT_RATE)-1)) {
-                       unsigned int rate, max;
-                       line += sizeof(REPEAT_RATE)-1;
-                       if (2 != sscanf(line, "%u %u", &rate, &max)) {
-                               ret = -EINVAL;
+               } else {
+                       ret = sapphire_get_HZ_vals(line, REPEAT_RATE, &ramp_adj, &ramp_max);
+                       if (ret == -EAGAIN)
+                               ret = sapphire_get_HZ_vals(line, RAMP_RATE, &ramp_adj, &ramp_max);
+                       if (ret == -EAGAIN)
+                               ret = sapphire_get_HZ_vals(line, SLOW_RATE, &slow_rate, NULL);
+                       if (ret == -EAGAIN)
+                               ret = sapphire_get_HZ_vals(line, MED_RATE,  &med_rate, NULL);
+                       if (ret == -EAGAIN)
+                               ret = sapphire_get_HZ_vals(line, FAST_RATE, &fast_rate, NULL);
+                       if (ret != -EAGAIN) {
+                               if (ret == 0)
+                                       goto next_line;
                                break;
                        }
-                       ramping_rate = HZ / rate;
-                       ramping_max  = HZ / max;
-                       goto next_line;
                }
                if (1 != sscanf(line, "%x", &val)) {
                        ret = -EINVAL;

diff --git a/sapphire.h b/sapphire.h
index c794e17e76bdba30c37c08bd86cf9aa2c567505e..cd23f68195a984f1433f8680d953baec873326fe 100644 (file)
--- a/sapphire.h
+++ b/sapphire.h
@@ -1,7 +1,7 @@
 /*
  * sapphire.h
  *
- * Copyright Mark Lord <mlord@pobox.com>, 2012-2018.
+ * Copyright Mark Lord <mlord@pobox.com>, 2012-2020.
  * http://rtr.ca/sapphire_remote/
  *
  * Button definitions shared with sapphire_keymap.sh
@@ -93,9 +93,10 @@ enum {       /*
         * Per-button automatic repeat rates:
         */
        NO_REPEAT               = 0x00000000 ,  /* no autorepeat */
-       SLOW_REPEAT             = 0x00000004 ,  /* repeats 4 times per second */
-       FAST_REPEAT             = 0x00000008 ,  /* repeats 8 times per second */
-       RAMP_REPEAT             = 0x00000003 ,  /* repeats increase in rate as button is held, up to 10/sec */
+       SLOW_REPEAT             = 0x00000004 ,  /* repeats slowly  (default is 4/sec) */
+       MED_REPEAT              = 0x00000002 ,  /* repeats slowly  (default is 6/sec) */
+       FAST_REPEAT             = 0x00000008 ,  /* repeats quickly (default is 8/sec) */
+       RAMP_REPEAT             = 0x00000003 ,  /* repeat rate increases as button is held, up to 10/sec */
        RAWKEY                  = 0xffffffff ,  /* do not send "release" event until button is really released */
        LONGKEY                 = 0x08000000 ,  /* no autorepeat; short/long presses send different codes */
 };

diff --git a/sapphire_keymap.sh.part3 b/sapphire_keymap.sh.part3
index d694b3a3d1e9d92ff052c3aea2ab319cb516b7ec..7385692e6ccff8153ef8a7590ce801221d7627ca 100644 (file)
--- a/sapphire_keymap.sh.part3
+++ b/sapphire_keymap.sh.part3
@@ -28,6 +28,12 @@ function parse_keymap(){
                [ "$1" = "" ] && continue
                if [ "$1" = "REPEAT_RATE" -a "$3" != "" ]; then
                        out="$1 $2 $3"
+               elif [ "$1" = "SLOW_RATE" -a "$2" != "" ]; then
+                       out="$1 $2"
+               elif [ "$1" = "MED_RATE"  -a "$2" != "" ]; then
+                       out="$1 $2"
+               elif [ "$1" = "FAST_RATE" -a "$2" != "" ]; then
+                       out="$1 $2"
                else
                        blabel="$1"
                        bval="${B[$blabel]}"