Import v7.2

diff --git a/Makefile b/Makefile
index 16d0e143b28d54b1fc809b538c55650e8cc373bb..7aff8edcbea8f68814b13bcca45a21c1b67b4e4a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #
 # Makefile and (un-)Installer for Sapphire remote control driver,
-#    by Mark Lord 2012-2018.
+#    by Mark Lord 2012-2019.
 #
 MODNAME=sapphire
 MODSOURCE=$(MODNAME).c

diff --git a/sapphire.c b/sapphire.c
index 3d1ddb01f82c765d910e198f24d7bb5477156fad..9dfa0f982ae6466a8da104e3af8e3727760d28de 100644 (file)
--- a/sapphire.c
+++ b/sapphire.c
@@ -1,7 +1,7 @@
 /*
  * sapphire.c
  *
- * Copyright Mark Lord <mlord@pobox.com>, 2012-2018.
+ * Copyright Mark Lord <mlord@pobox.com>, 2012-2019.
  * 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.1"
+#define SAPPHIRE_VERSION       "7.2"
 
 /*
  * "LONGKEY":  Any button can be used to generate a second, different keycode,

diff --git a/sapphire_startup.sh b/sapphire_startup.sh
index dc4f8f68a2b4ab885c60808d7965421702cfc815..d8cc5991f8279f5d7b783285791fac5c800cf2f5 100755 (executable)
--- a/sapphire_startup.sh
+++ b/sapphire_startup.sh
@@ -8,8 +8,10 @@
 #
 TOPSEED=/sys/bus/hid/drivers/topseed
 SAPPHIRE=/sys/bus/hid/drivers/sapphire
-rmmod hid-topseed      &>/dev/null
+#rmmod hid-topseed     &>/dev/null
 modprobe sapphire      &>/dev/null
+
+# Transfer control of devices bound to hid-topseed over to sapphire
 if [ -d $SAPPHIRE -a -e $TOPSEED/unbind ]; then
        cd $TOPSEED
        for dev in [0-9]*[-0-9A-F] ; do
@@ -19,6 +21,8 @@ if [ -d $SAPPHIRE -a -e $TOPSEED/unbind ]; then
                fi
        done
 fi
+rmmod hid-topseed      &>/dev/null
+
 #
 # Ubuntu/Mint kernels (and likely others too) don't like it
 # when we unload and reload the sapphire driver.