From 53a75d39c947f78931a27b708e1f79d29b57d7a6 Mon Sep 17 00:00:00 2001 From: Markus Koch Date: Sun, 12 Jan 2020 14:23:11 +0100 Subject: [PATCH] Obsolete repository --- .gitignore | 8 - .gitmodules | 3 - LICENSE.txt | 339 ------------------ Makefile | 11 - README.MD | 17 +- fsia6b.c | 245 ------------- fsia6b.pro | 9 - init_controller.sh | 10 - linuxconsole | 1 - ...155200-to-the-list-of-valid-baud-rat.patch | 27 -- ...support-for-the-FlySky-FS-iA6B-RC-re.patch | 42 --- 11 files changed, 8 insertions(+), 704 deletions(-) delete mode 100644 .gitignore delete mode 100644 .gitmodules delete mode 100644 LICENSE.txt delete mode 100644 Makefile delete mode 100644 fsia6b.c delete mode 100644 fsia6b.pro delete mode 100755 init_controller.sh delete mode 160000 linuxconsole delete mode 100644 patches/0001-inputattach-add-155200-to-the-list-of-valid-baud-rat.patch delete mode 100644 patches/0002-inputattach-add-support-for-the-FlySky-FS-iA6B-RC-re.patch diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bdf26a5..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.o -*.ko -*.mod.c -*.cmd -.tmp_versions -*.pro.user -modules.order -Module.symvers diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3dce571..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "linuxconsole"] - path = linuxconsole - url = git://git.code.sf.net/p/linuxconsole/code diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index d159169..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/Makefile b/Makefile deleted file mode 100644 index 0c9e39a..0000000 --- a/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -obj-m := fsia6b.o -KDIR := /lib/modules/$(shell uname -r)/build -PWD := $(shell pwd) -default: fsia6b.ko -fsia6b.ko: fsia6b.c - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules - -clean: - rm -f ./*.o ./*.ko ./*.mod.c modules.order Module.symvers - -.phony: deploy clean diff --git a/README.MD b/README.MD index 6d38c94..515835a 100644 --- a/README.MD +++ b/README.MD @@ -1,15 +1,14 @@ # FS-iA6B iBus RC receiver Kernel driver and support software to use a FlySky FS-iA6B 14-channel RC receiver as a general purpose game controller in Linux. -## Build instructions -* Use `make` to compile the kernel module -* Make sure to clone all submodules: `git submodule init && git submodule update` -* Apply the patches from the `patches` directory -* Compile the linuxconsole utils `cd linuxconsole; make` +## Now Part of the Mainline Kernel +As of Linux kernel 5.4 and linux-console (inputattach) 1.4.9, this driver has been mainlined. + +This driver can now be found in the Linux kernel source tree in `drivers/input/joystick/fsia6b.c`. + +This repository will no longer be maintained and will only serve as an archive. All future updates will be made in the Linux kernel tree exclusively. ## Usage instructions +* Connect the hardware as described [here](https://notsyncing.net/?p=blog&b=2018.linux-fsia6b) * Modprobe `serio` and `fsia6b` -* Run 'linuxconsole/utils/inputattach --fsia6b /dev/ttyUSB1' - -# Known issues -* Very hacky code. The controller type ID is hardcoded to 100; should be moved to serio header. +* Run `inputattach --fsia6b /dev/ttyUSBx` diff --git a/fsia6b.c b/fsia6b.c deleted file mode 100644 index d93f864..0000000 --- a/fsia6b.c +++ /dev/null @@ -1,245 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * FS-iA6B iBus RC receiver driver - * - * Copyright (C) 2018 - 2019 Markus Koch - */ - -/* - * This driver will provide all 14 channels of the FlySky FS-ia6B RC receiver - * as analog values. - * - * Additionally, the channels can be converted to discrete switch values. - * By default, it is configured for the offical FS-i6 remote control. - * If you use a different hardware configuration, you can configure it - * using the `switch_config` parameter. - * - */ - -#include -#include -#include -#include -#include -#include -#include - -#ifndef SERIO_FSIA6B - #define SERIO_FSIA6B 0x42 -#endif - -#define DRIVER_DESC "FS-iA6B iBus RC receiver" - -MODULE_AUTHOR("Markus Koch "); -MODULE_DESCRIPTION(DRIVER_DESC); -MODULE_LICENSE("GPL"); - -#define IBUS_SERVO_COUNT 14 - -static char *switch_config = "00000022320000"; -module_param(switch_config, charp, 0444); -MODULE_PARM_DESC(switch_config, - "Amount of switch positions per channel (14 characters, 0-3)"); - -static int fsia6b_axes[IBUS_SERVO_COUNT] = { - ABS_X, ABS_Y, - ABS_Z, ABS_RX, - ABS_RY, ABS_RZ, - ABS_HAT0X, ABS_HAT0Y, - ABS_HAT1X, ABS_HAT1Y, - ABS_HAT2X, ABS_HAT2Y, - ABS_HAT3X, ABS_HAT3Y -}; - -enum ibus_state {SYNC, COLLECT, PROCESS}; - -struct ibus_packet { - enum ibus_state state; - - int offset; - u16 ibuf; - u16 channel[IBUS_SERVO_COUNT]; -}; - -struct fsia6b { - struct input_dev *dev; - struct ibus_packet packet; - - char phys[32]; -}; - -static irqreturn_t fsia6b_serio_irq(struct serio *serio, - unsigned char data, unsigned int flags) -{ - struct fsia6b *fsia6b = serio_get_drvdata(serio); - int i; - int sw_state; - int sw_id = BTN_0; - - fsia6b->packet.ibuf = (data << 8) | ((fsia6b->packet.ibuf >> 8) & 0xFF); - - switch (fsia6b->packet.state) { - case SYNC: - if (fsia6b->packet.ibuf == 0x4020) - fsia6b->packet.state = COLLECT; - break; - - case COLLECT: - fsia6b->packet.state = PROCESS; - break; - - case PROCESS: - fsia6b->packet.channel[fsia6b->packet.offset] = - fsia6b->packet.ibuf; - fsia6b->packet.offset++; - - if (fsia6b->packet.offset == IBUS_SERVO_COUNT) { - fsia6b->packet.offset = 0; - fsia6b->packet.state = SYNC; - for (i = 0; i < IBUS_SERVO_COUNT; ++i) { - input_report_abs(fsia6b->dev, fsia6b_axes[i], - fsia6b->packet.channel[i]); - - sw_state = 0; - if (fsia6b->packet.channel[i] > 1900) - sw_state = 1; - else if (fsia6b->packet.channel[i] < 1100) - sw_state = 2; - - switch (switch_config[i]) { - case '3': - input_report_key(fsia6b->dev, - sw_id++, - sw_state == 0); - /* fall-through */ - case '2': - input_report_key(fsia6b->dev, - sw_id++, - sw_state == 1); - /* fall-through */ - case '1': - input_report_key(fsia6b->dev, - sw_id++, - sw_state == 2); - } - } - input_sync(fsia6b->dev); - } else { - fsia6b->packet.state = COLLECT; - } - break; - } - - return IRQ_HANDLED; -} - -static int fsia6b_serio_connect(struct serio *serio, struct serio_driver *drv) -{ - struct fsia6b *fsia6b; - struct input_dev *input_dev; - int err; - int i, j; - int sw_id = 0; - - fsia6b = kzalloc(sizeof(*fsia6b), GFP_KERNEL); - if (!fsia6b) - return -ENOMEM; - - fsia6b->packet.ibuf = 0; - fsia6b->packet.offset = 0; - fsia6b->packet.state = SYNC; - - serio_set_drvdata(serio, fsia6b); - - err = serio_open(serio, drv); - if (err) - goto fail1; - - - input_dev = input_allocate_device(); - if (!input_dev) { - err = -ENOMEM; - goto fail2; - } - fsia6b->dev = input_dev; - - snprintf(fsia6b->phys, sizeof(fsia6b->phys), "%s/input0", serio->phys); - - input_dev->name = DRIVER_DESC; - input_dev->phys = fsia6b->phys; - input_dev->id.bustype = BUS_RS232; - input_dev->id.vendor = SERIO_FSIA6B; - input_dev->id.product = serio->id.id; - input_dev->id.version = 0x0100; - input_dev->dev.parent = &serio->dev; - - for (i = 0; i < IBUS_SERVO_COUNT; ++i) { - input_set_abs_params(input_dev, fsia6b_axes[i], - 1000, 2000, 2, 2); - } - - // Register switch configuration - for (i = 0; i < IBUS_SERVO_COUNT; ++i) { - if (((switch_config[i] == '\0') && (i != IBUS_SERVO_COUNT)) || - (switch_config[i] < '0') || - (switch_config[i] > '3')) { - dev_err(&fsia6b->dev->dev, - "Invalid switch configuration supplied for fsia6b.\n"); - err = -EINVAL; - goto fail3; - } - - for (j = '1'; j <= switch_config[i]; ++j) { - input_set_capability(input_dev, EV_KEY, BTN_0 + sw_id); - sw_id++; - } - - } - - err = input_register_device(fsia6b->dev); - if (err) - goto fail3; - - return 0; - -fail3: input_free_device(input_dev); -fail2: serio_close(serio); -fail1: serio_set_drvdata(serio, NULL); - kfree(fsia6b); - return err; -} - -static void fsia6b_serio_disconnect(struct serio *serio) -{ - struct fsia6b *fsia6b = serio_get_drvdata(serio); - - serio_close(serio); - serio_set_drvdata(serio, NULL); - input_unregister_device(fsia6b->dev); - kfree(fsia6b); -} - -static const struct serio_device_id fsia6b_serio_ids[] = { -{ - .type = SERIO_RS232, - .proto = SERIO_FSIA6B, - .id = SERIO_ANY, - .extra = SERIO_ANY, -}, -{ 0 } -}; - -MODULE_DEVICE_TABLE(serio, fsia6b_serio_ids); - -struct serio_driver fsia6b_serio_drv = { - .driver = { - .name = "fsia6b" - }, - .description = DRIVER_DESC, - .id_table = fsia6b_serio_ids, - .interrupt = fsia6b_serio_irq, - .connect = fsia6b_serio_connect, - .disconnect = fsia6b_serio_disconnect -}; - -module_serio_driver(fsia6b_serio_drv) diff --git a/fsia6b.pro b/fsia6b.pro deleted file mode 100644 index d344be6..0000000 --- a/fsia6b.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -CONFIG += console -CONFIG -= app_bundle -CONFIG -= qt - -INCLUDEPATH += /lib/modules/4.18.16-arch1-1-ARCH/build /lib/modules/4.18.16-arch1-1-ARCH/build/include /usr/include - -SOURCES += \ - fsia6b.c diff --git a/init_controller.sh b/init_controller.sh deleted file mode 100755 index c025a86..0000000 --- a/init_controller.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ "`whoami`" != "root" ]; then - echo "Need to be root." - exit 1 -fi - -modprobe serio -insmod fsia6b.ko -./linuxconsole/utils/inputattach --baud 115200 --fsia6b /dev/ttyUSB0 diff --git a/linuxconsole b/linuxconsole deleted file mode 160000 index 1cdbf7c..0000000 --- a/linuxconsole +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1cdbf7c95553adc175afc9f4157b67237bde8a2f diff --git a/patches/0001-inputattach-add-155200-to-the-list-of-valid-baud-rat.patch b/patches/0001-inputattach-add-155200-to-the-list-of-valid-baud-rat.patch deleted file mode 100644 index 1de6407..0000000 --- a/patches/0001-inputattach-add-155200-to-the-list-of-valid-baud-rat.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6b60b90b0cfa8e881324533082fbefb6aaaa2b8d Mon Sep 17 00:00:00 2001 -From: Markus Koch -Date: Fri, 26 Jul 2019 18:26:30 +0200 -Subject: [PATCH 1/2] inputattach: add 155200 to the list of valid baud rates - -There are multiple supported devices which work with this baud rate. - -Signed-off-by: Markus Koch ---- - utils/inputattach.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/inputattach.c b/utils/inputattach.c -index cdbec739..31cc431f 100644 ---- a/utils/inputattach.c -+++ b/utils/inputattach.c -@@ -1010,6 +1010,7 @@ int main(int argc, char **argv) - case 9600: type->speed = B9600; break; - case 19200: type->speed = B19200; break; - case 38400: type->speed = B38400; break; -+ case 115200: type->speed = B115200; break; - default: - fprintf(stderr, "inputattach: invalid baud rate '%d'\n", - baud); --- -2.22.0 - diff --git a/patches/0002-inputattach-add-support-for-the-FlySky-FS-iA6B-RC-re.patch b/patches/0002-inputattach-add-support-for-the-FlySky-FS-iA6B-RC-re.patch deleted file mode 100644 index 0548ae7..0000000 --- a/patches/0002-inputattach-add-support-for-the-FlySky-FS-iA6B-RC-re.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c34fff11dea62368151274dc307420b753ce2900 Mon Sep 17 00:00:00 2001 -From: Markus Koch -Date: Fri, 26 Jul 2019 18:35:31 +0200 -Subject: [PATCH 2/2] inputattach: add support for the FlySky FS-iA6B RC - receiver - -Signed-off-by: Markus Koch ---- - utils/inputattach.c | 3 +++ - utils/serio-ids.h | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/utils/inputattach.c b/utils/inputattach.c -index 31cc431f..90260f85 100644 ---- a/utils/inputattach.c -+++ b/utils/inputattach.c -@@ -902,6 +902,9 @@ static struct input_types input_types[] = { - { "--rainshadow-cec", "-rainshadow-cec", "RainShadow Tech HDMI CEC dongle", - B9600, CS8, - SERIO_RAINSHADOW_CEC, 0x00, 0x00, 0, NULL }, -+{ "--fsia6b", "-fsia6b", "FS-iA6B RC Receiver", -+ B115200, CS8, -+ SERIO_FSIA6B, 0x00, 0x00, 0, NULL }, - { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL } - }; - -diff --git a/utils/serio-ids.h b/utils/serio-ids.h -index ab52b0dc..aa0c48fb 100644 ---- a/utils/serio-ids.h -+++ b/utils/serio-ids.h -@@ -137,5 +137,8 @@ - #ifndef SERIO_RAINSHADOW_CEC - # define SERIO_RAINSHADOW_CEC 0x41 - #endif -+#ifndef SERIO_FSIA6B -+# define SERIO_FSIA6B 0x42 -+#endif - - #endif --- -2.22.0 -