From 4b380c934ebedc2d7c500c4d6048fbee34e469dc Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Wed, 20 Feb 2019 09:24:44 +0000 Subject: [PATCH] Import v7.2 --- Makefile | 2 +- sapphire.c | 4 ++-- sapphire_startup.sh | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 16d0e14..7aff8ed 100644 --- 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 3d1ddb0..9dfa0f9 100644 --- a/sapphire.c +++ b/sapphire.c @@ -1,7 +1,7 @@ /* * sapphire.c * - * Copyright Mark Lord , 2012-2018. + * Copyright Mark Lord , 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 dc4f8f6..d8cc599 100755 --- 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. -- 2.30.2