GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved some patches to upstream

Browse Source
This commit is contained in:
Devaev Maxim
2021-07-14 13:23:41 +03:00
parent f641afcc6b
commit 937d8320f8
6 changed files with 3 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hid/patch.py
View File

@@ -40,6 +40,3 @@ _patch(_get_pkg_path("framework-arduino-avr"), "patches/arduino-get-plugged-endp
_libs = _get_libs() _libs = _get_libs()
_patch(_libs["HID-Project"], "patches/hid-shut-up.patch") _patch(_libs["HID-Project"], "patches/hid-shut-up.patch")
_patch(_libs["HID-Project"], "patches/hid-no-singletones.patch") _patch(_libs["HID-Project"], "patches/hid-no-singletones.patch")
_patch(_libs["HID-Project"], "patches/hid-abs-mouse-win-fix.patch")
_patch(_libs["HID-Project"], "patches/hid-abs-mouse-mac-fix.patch")
_patch(_libs["HID-Project"], "patches/hid-boot-mouse-mac-fix.patch")

23
hid/patches/hid-abs-mouse-mac-fix.patch
View File

@@ -1,23 +0,0 @@
diff --git a/src/SingleReport/SingleAbsoluteMouse.cpp b/src/SingleReport/SingleAbsoluteMouse.cpp
index bad902c..88d16f0 100644
--- a/src/SingleReport/SingleAbsoluteMouse.cpp
+++ b/src/SingleReport/SingleAbsoluteMouse.cpp
@@ -29,6 +29,10 @@ static const uint8_t _hidSingleReportDescriptorAbsoluteMouse[] PROGMEM = {
0x09, 0x02, /* USAGE (Mouse) */
0xA1, 0x01, /* COLLECTION (Application) */
+ /* Pointer and Physical are required by Apple Recovery */
+ 0x09, 0x01, /* USAGE (Pointer) */
+ 0xa1, 0x00, /* COLLECTION (Physical) */
+
/* 8 Buttons */
0x05, 0x09, /* USAGE_PAGE (Button) */
0x19, 0x01, /* USAGE_MINIMUM (Button 1) */
@@ -58,6 +62,7 @@ static const uint8_t _hidSingleReportDescriptorAbsoluteMouse[] PROGMEM = {
0x81, 0x06, /* INPUT (Data,Var,Rel) */
/* End */
+ 0xc0, /* END_COLLECTION (Physical) */
0xc0 /* END_COLLECTION */
};

12
hid/patches/hid-abs-mouse-win-fix.patch
View File

@@ -1,12 +0,0 @@
See /kvmd/apps/otg/hid/keyboard.py for details
--- a/src/SingleReport/SingleAbsoluteMouse.cpp 2019-07-13 21:16:23.000000000 +0300
+++ b/src/SingleReport/SingleAbsoluteMouse.cpp 2019-10-05 00:58:34.592003332 +0300
@@ -43,7 +43,7 @@
0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */
0x09, 0x30, /* USAGE (X) */
0x09, 0x31, /* USAGE (Y) */
- 0x16, 0x00, 0x80, /* Logical Minimum (-32768) */
+ 0x16, 0x00, 0x00, /* Logical Minimum (0) */
0x26, 0xFF, 0x7F, /* Logical Maximum (32767) */
0x75, 0x10, /* Report Size (16), */
0x95, 0x02, /* Report Count (2), */

75
hid/patches/hid-boot-mouse-mac-fix.patch
View File

@@ -1,75 +0,0 @@
diff --git a/src/SingleReport/BootMouse.cpp b/src/SingleReport/BootMouse.cpp
index 27aee63..0de3644 100644
--- a/src/SingleReport/BootMouse.cpp
+++ b/src/SingleReport/BootMouse.cpp
@@ -29,6 +29,10 @@ static const uint8_t _hidReportDescriptorMouse[] PROGMEM = {
0x09, 0x02, /* USAGE (Mouse) */
0xa1, 0x01, /* COLLECTION (Application) */
+ /* Pointer and Physical are required by Apple Recovery */
+ 0x09, 0x01, /* USAGE (Pointer) */
+ 0xa1, 0x00, /* COLLECTION (Physical) */
+
/* 8 Buttons */
0x05, 0x09, /* USAGE_PAGE (Button) */
0x19, 0x01, /* USAGE_MINIMUM (Button 1) */
@@ -51,6 +55,7 @@ static const uint8_t _hidReportDescriptorMouse[] PROGMEM = {
0x81, 0x06, /* INPUT (Data,Var,Rel) */
/* End */
+ 0xc0, /* END_COLLECTION (Physical) */
0xc0 /* END_COLLECTION */
};
@@ -73,18 +78,24 @@ int BootMouse_::getInterface(uint8_t* interfaceCount)
int BootMouse_::getDescriptor(USBSetup& setup)
{
- // Check if this is a HID Class Descriptor request
- if (setup.bmRequestType != REQUEST_DEVICETOHOST_STANDARD_INTERFACE) { return 0; }
- if (setup.wValueH != HID_REPORT_DESCRIPTOR_TYPE) { return 0; }
-
// In a HID Class Descriptor wIndex cointains the interface number
if (setup.wIndex != pluggedInterface) { return 0; }
- // Reset the protocol on reenumeration. Normally the host should not assume the state of the protocol
- // due to the USB specs, but Windows and Linux just assumes its in report mode.
- protocol = HID_REPORT_PROTOCOL;
+ // Check if this is a HID Class Descriptor request
+ if (setup.bmRequestType != REQUEST_DEVICETOHOST_STANDARD_INTERFACE) { return 0; }
+
+ if (setup.wValueH == HID_HID_DESCRIPTOR_TYPE) {
+ // Apple UEFI wants it
+ HIDDescDescriptor desc = D_HIDREPORT(sizeof(_hidReportDescriptorMouse));
+ return USB_SendControl(0, &desc, sizeof(desc));
+ } else if (setup.wValueH == HID_REPORT_DESCRIPTOR_TYPE) {
+ // Reset the protocol on reenumeration. Normally the host should not assume the state of the protocol
+ // due to the USB specs, but Windows and Linux just assumes its in report mode.
+ protocol = HID_REPORT_PROTOCOL;
+ return USB_SendControl(TRANSFER_PGM, _hidReportDescriptorMouse, sizeof(_hidReportDescriptorMouse));
+ }
- return USB_SendControl(TRANSFER_PGM, _hidReportDescriptorMouse, sizeof(_hidReportDescriptorMouse));
+ return 0;
}
bool BootMouse_::setup(USBSetup& setup)
@@ -103,7 +114,17 @@ bool BootMouse_::setup(USBSetup& setup)
return true;
}
if (request == HID_GET_PROTOCOL) {
- // TODO: Send8(protocol);
+ // TODO improve
+#ifdef __AVR__
+ UEDATX = protocol;
+#endif
+ return true;
+ }
+ if (request == HID_GET_IDLE) {
+ // TODO improve
+#ifdef __AVR__
+ UEDATX = idle;
+#endif
return true;
}
}

2
hid/platformio.ini
View File

@@ -7,7 +7,7 @@ platform = atmelavr
board = micro board = micro
framework = arduino framework = arduino
lib_deps = lib_deps =
HID-Project@2.6.1 git+https://github.com/mdevaev/HID#2.8.2
git+https://github.com/Harvie/ps2dev#v0.0.3 git+https://github.com/Harvie/ps2dev#v0.0.3
digitalWriteFast@1.0.0 digitalWriteFast@1.0.0
extra_scripts = extra_scripts =

4
hid/src/main.cpp
View File

@@ -212,8 +212,8 @@ static void _cmdMouseMoveEvent(const uint8_t *data) { // 4 bytes
// See /kvmd/apps/otg/hid/keyboard.py for details // See /kvmd/apps/otg/hid/keyboard.py for details
if (_usb_mouse_abs) { if (_usb_mouse_abs) {
_usb_mouse_abs->sendMove( _usb_mouse_abs->sendMove(
(PROTO::merge8_int(data[0], data[1]) + 32768) / 2, PROTO::merge8_int(data[0], data[1]),
(PROTO::merge8_int(data[2], data[3]) + 32768) / 2 PROTO::merge8_int(data[2], data[3])
); );
} }
} }