From 1dd8cfa00ab955a51e21b09d7930e7f08a39bc1a Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 22 Feb 2026 15:50:13 +0300
Subject: [PATCH] Fix USB HID keyboard LED state reporting

OFW PR 4338 by Caballosanex
---
 targets/f7/furi_hal/furi_hal_usb_hid.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/targets/f7/furi_hal/furi_hal_usb_hid.c b/targets/f7/furi_hal/furi_hal_usb_hid.c
index 04f2ae400..7820ae8d2 100644
--- a/targets/f7/furi_hal/furi_hal_usb_hid.c
+++ b/targets/f7/furi_hal/furi_hal_usb_hid.c
@@ -7,8 +7,9 @@
 #include "usb.h"
 #include "usb_hid.h"
 
-#define HID_EP_IN 0x81
-#define HID_EP_SZ 0x10
+#define HID_EP_IN  0x81
+#define HID_EP_OUT 0x01
+#define HID_EP_SZ  0x10
 
 #define HID_INTERVAL 2
 
@@ -16,6 +17,7 @@ struct HidIntfDescriptor {
     struct usb_interface_descriptor hid;
     struct usb_hid_descriptor hid_desc;
     struct usb_endpoint_descriptor hid_ep_in;
+    struct usb_endpoint_descriptor hid_ep_out;
 };
 
 struct HidConfigDescriptor {
@@ -162,7 +164,7 @@ static const struct HidConfigDescriptor hid_cfg_desc = {
                     .bDescriptorType = USB_DTYPE_INTERFACE,
                     .bInterfaceNumber = 0,
                     .bAlternateSetting = 0,
-                    .bNumEndpoints = 1,
+                    .bNumEndpoints = 2,
                     .bInterfaceClass = USB_CLASS_HID,
                     .bInterfaceSubClass = USB_HID_SUBCLASS_BOOT,
                     .bInterfaceProtocol = USB_HID_PROTO_KEYBOARD,
@@ -187,6 +189,15 @@ static const struct HidConfigDescriptor hid_cfg_desc = {
                     .wMaxPacketSize = HID_EP_SZ,
                     .bInterval = HID_INTERVAL,
                 },
+            .hid_ep_out =
+                {
+                    .bLength = sizeof(struct usb_endpoint_descriptor),
+                    .bDescriptorType = USB_DTYPE_ENDPOINT,
+                    .bEndpointAddress = HID_EP_OUT,
+                    .bmAttributes = USB_EPTYPE_INTERRUPT,
+                    .wMaxPacketSize = HID_EP_SZ,
+                    .bInterval = HID_INTERVAL,
+                },
         },
 };
 
@@ -481,13 +492,17 @@ static usbd_respond hid_ep_config(usbd_device* dev, uint8_t cfg) {
     switch(cfg) {
     case 0:
         /* deconfiguring device */
+        usbd_ep_deconfig(dev, HID_EP_OUT);
         usbd_ep_deconfig(dev, HID_EP_IN);
+        usbd_reg_endpoint(dev, HID_EP_OUT, 0);
         usbd_reg_endpoint(dev, HID_EP_IN, 0);
         return usbd_ack;
     case 1:
         /* configuring device */
         usbd_ep_config(dev, HID_EP_IN, USB_EPTYPE_INTERRUPT, HID_EP_SZ);
+        usbd_ep_config(dev, HID_EP_OUT, USB_EPTYPE_INTERRUPT, HID_EP_SZ);
         usbd_reg_endpoint(dev, HID_EP_IN, hid_txrx_ep_callback);
+        usbd_reg_endpoint(dev, HID_EP_OUT, hid_txrx_ep_callback);
         usbd_ep_write(dev, HID_EP_IN, 0, 0);
         boot_protocol = false; /* BIOS will SET_PROTOCOL if it wants this */
         return usbd_ack;