From da1f11cc7b95dd9cbf1291aa6d8455f58cf88a23 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 13 Oct 2015 11:29:13 +1000 Subject: [PATCH] Drop the remainder of the uLogitech project We've moved the bits we're interested in out already. Signed-off-by: Peter Hutterer --- uLogitech/.gitignore | 17 ------- uLogitech/Makefile.am | 21 --------- uLogitech/README.md | 20 --------- uLogitech/autogen.sh | 12 ----- uLogitech/configure.ac | 37 --------------- uLogitech/lib/Makefile.am | 43 ------------------ uLogitech/src/Makefile.am | 33 -------------- uLogitech/src/list_unifying_devices.c | 59 ------------------------ uLogitech/src/pairing_tool.c | 61 ------------------------- uLogitech/src/unpairing_tool.c | 65 --------------------------- 10 files changed, 368 deletions(-) delete mode 100644 uLogitech/.gitignore delete mode 100644 uLogitech/Makefile.am delete mode 100644 uLogitech/README.md delete mode 100755 uLogitech/autogen.sh delete mode 100644 uLogitech/configure.ac delete mode 100644 uLogitech/lib/Makefile.am delete mode 100644 uLogitech/src/Makefile.am delete mode 100644 uLogitech/src/list_unifying_devices.c delete mode 100644 uLogitech/src/pairing_tool.c delete mode 100644 uLogitech/src/unpairing_tool.c diff --git a/uLogitech/.gitignore b/uLogitech/.gitignore deleted file mode 100644 index 7ace91ac..00000000 --- a/uLogitech/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -autom4te.cache/* -config-aux/* -*.o -*.in -*.m4 -*.log -*.status -*.Po -*.a -configure -Makefile -config.h -stamp-h1 -m705_button6_toggler -pairing_tool -unpairing_tool -list_unifying_devices diff --git a/uLogitech/Makefile.am b/uLogitech/Makefile.am deleted file mode 100644 index b773bcc4..00000000 --- a/uLogitech/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -SUBDIRS = \ - lib \ - src - -pkgconfigdir = $(libdir)/pkgconfig - -AM_CPPFLAGS = $(top_srcdir)/include/ - -.PHONY: ChangeLog INSTALL -INSTALL: - $(INSTALL_CMD) - -ChangeLog: - @if test -d ".git"; then \ - cmd=git; \ - else \ - cmd="echo could not generate change"; \ - fi; \ - $${cmd} log > ChangeLog; - -dist-hook: ChangeLog INSTALL diff --git a/uLogitech/README.md b/uLogitech/README.md deleted file mode 100644 index cddcd52d..00000000 --- a/uLogitech/README.md +++ /dev/null @@ -1,20 +0,0 @@ -User space tools for Logitech Unifying devices -============================================== - -run : - - $> ./autogen.sh - $> make - -Currently contains: -------------------- - -* *m705_button6_toggler*: an app that toggle the button 6 functionality for some -M705 mice with the build number 0x0015 -* *list_unifying_devices*: list all unifying devices attached to a receiver -* *(un)pairing_tool*: two apps that allows to (un)pair an unifying device - -Copyright ---------- - - * Copyright (C) 2013 Red Hat, Inc. diff --git a/uLogitech/autogen.sh b/uLogitech/autogen.sh deleted file mode 100755 index 2fe90c2f..00000000 --- a/uLogitech/autogen.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -./configure $@ || exit $? diff --git a/uLogitech/configure.ac b/uLogitech/configure.ac deleted file mode 100644 index a0b3ead6..00000000 --- a/uLogitech/configure.ac +++ /dev/null @@ -1,37 +0,0 @@ -# Initialize Autoconf -AC_PREREQ([2.60]) -AC_INIT([user-space Logitech tools], - [0.1.0], - [], - []) -AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_AUX_DIR([config-aux]) - -# Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE - -LIB_VERSION=1:0:0 -AC_SUBST([LIB_VERSION]) - -# Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_RANLIB - -# man page generation -AC_ARG_VAR([XMLTO], [Path to xmlto command]) -AC_PATH_PROG([XMLTO], [xmlto]) -AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) -AC_PATH_PROG([ASCIIDOC], [asciidoc]) -AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$XMLTO" != "x" && test "x$ASCIIDOC" != "x"]) -if test "x$XMLTO" = "x" || test "x$ASCIIDOC" = "x"; then - AC_MSG_WARN([xmlto or asciidoc not found - cannot create man pages without it]) -fi - - -AC_CONFIG_FILES([Makefile - lib/Makefile - src/Makefile]) -AC_OUTPUT diff --git a/uLogitech/lib/Makefile.am b/uLogitech/lib/Makefile.am deleted file mode 100644 index 219ed1ab..00000000 --- a/uLogitech/lib/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -lib_LIBRARIES = \ - libhidpp10.a \ - libunifying.a - -AM_CPPFLAGS=-I$(top_srcdir)/include/ - -libhidpp10_adir = \ - $(top_srcdir)/lib -libhidpp10_a_HEADERS = \ - $(top_srcdir)/include/hidpp10.h -libhidpp10_a_SOURCES = \ - libhidpp10_a_HEADERS \ - $(top_srcdir)/lib/hidpp10.c - -libunifying_adir = \ - $(top_srcdir)/lib -libunifying_a_HEADERS = \ - $(top_srcdir)/include/unifying.h -libunifying_a_SOURCES = \ - libunifying_a_HEADERS \ - $(top_srcdir)/lib/unifying.c - -# man page generation -if HAVE_DOCTOOLS -# actual man pages -man_pages_sources = -# shadow man pages -man_pages_shadows = - -man_pages = $(man_pages_sources:.txt=.1) $(man_pages_shadows) - -SUFFIXES = .1 .txt .xml - -.xml.1: - @$(XMLTO) man $< - -.txt.xml: - @$(ASCIIDOC) -b docbook -d manpage -o $@ $< - -dist_man_MANS = $(man_pages) -CLEANFILES = $(dist_man_MANS) -MAINTAINERCLEANFILES = $(man_pages) *.xml -endif diff --git a/uLogitech/src/Makefile.am b/uLogitech/src/Makefile.am deleted file mode 100644 index b7c3e101..00000000 --- a/uLogitech/src/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -noinst_PROGRAMS = - -bin_PROGRAMS = \ - m705_button6_toggler \ - pairing_tool \ - unpairing_tool \ - list_unifying_devices - -LDADD = $(top_srcdir)/lib/libhidpp10.a $(top_srcdir)/lib/libunifying.a $(AM_LDFLAGS) - -AM_CPPFLAGS = -I$(top_srcdir)/include/ - -# man page generation -if HAVE_DOCTOOLS -# actual man pages -man_pages_sources = -# shadow man pages -man_pages_shadows = - -man_pages = $(man_pages_sources:.txt=.1) $(man_pages_shadows) - -SUFFIXES = .1 .txt .xml - -.xml.1: - @$(XMLTO) man $< - -.txt.xml: - @$(ASCIIDOC) -b docbook -d manpage -o $@ $< - -dist_man_MANS = $(man_pages) -CLEANFILES = $(dist_man_MANS) -MAINTAINERCLEANFILES = $(man_pages) *.xml -endif diff --git a/uLogitech/src/list_unifying_devices.c b/uLogitech/src/list_unifying_devices.c deleted file mode 100644 index c93ee63a..00000000 --- a/uLogitech/src/list_unifying_devices.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * List unifying devices attached to a receiver. - * - * Copyright 2013 Benjamin Tissoires - * Copyright 2013 Red Hat, Inc - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -/* - * Based on the HID++ 1.0 documentation provided by Nestor Lopez Casado at: - * https://drive.google.com/folderview?id=0BxbRzx7vEV7eWmgwazJ3NUFfQ28&usp=sharing - */ - -#include -#include -#include - -#include -#include - -int main(int argc, char **argv) -{ - int fd; - - /* Open the Unifying Receiver. */ - if (argc == 1) - fd = unifying_find_receiver(); - else { - fd = unifying_open_receiver(argv[1]); - if (fd < 0) - perror("Unable to open device"); - } - - if (fd < 0) - return 1; - - hidpp10_list_devices(fd); - - close(fd); - return 0; -} diff --git a/uLogitech/src/pairing_tool.c b/uLogitech/src/pairing_tool.c deleted file mode 100644 index ef80ad00..00000000 --- a/uLogitech/src/pairing_tool.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Paring tool. - * - * Copyright 2013 Benjamin Tissoires - * Copyright 2013 Red Hat, Inc - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -/* - * Based on the HID++ 1.0 documentation provided by Nestor Lopez Casado at: - * https://drive.google.com/folderview?id=0BxbRzx7vEV7eWmgwazJ3NUFfQ28&usp=sharing - */ - -#include -#include -#include - -#include -#include - -int main(int argc, char **argv) -{ - int fd; - - /* Open the Unifying Receiver. */ - if (argc == 1) - fd = unifying_find_receiver(); - else { - fd = unifying_open_receiver(argv[1]); - if (fd < 0) - perror("Unable to open device"); - } - - if (fd < 0) - return 1; - - hidpp10_open_lock(fd); - printf("The receiver is ready to pair a new device.\n" - "Switch your device on to pair it.\n"); - - close(fd); - return 0; -} diff --git a/uLogitech/src/unpairing_tool.c b/uLogitech/src/unpairing_tool.c deleted file mode 100644 index 722a3096..00000000 --- a/uLogitech/src/unpairing_tool.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Un-pairing tool. - * - * Copyright 2013 Benjamin Tissoires - * Copyright 2013 Red Hat, Inc - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -/* - * Based on the HID++ 1.0 documentation provided by Nestor Lopez Casado at: - * https://drive.google.com/folderview?id=0BxbRzx7vEV7eWmgwazJ3NUFfQ28&usp=sharing - */ - -#include -#include -#include - -#include -#include - -int main(int argc, char **argv) -{ - int fd; - int idx; - - /* Open the Unifying Receiver. */ - if (argc == 1) - fd = unifying_find_receiver(); - else { - fd = unifying_open_receiver(argv[1]); - perror("Unable to open device"); - } - - if (fd < 0) - return 1; - - hidpp10_list_devices(fd); - - fprintf(stderr, "Select the device index [0-5]: "); - scanf("%d", &idx); - - if (idx >= 0 && idx < 6) - hidpp10_disconnect(fd, idx); - - close(fd); - return 0; -}