Fill in multi-hogp sessions.

kareltucek · kareltucek · commit 3690c415d767 · 2026-07-21T11:20:48.000+02:00
diff --git a/device/src/bt_conn.h b/device/src/bt_conn.h
@@ -28,6 +28,9 @@
     #define BLE_ADDR_LEN 6
     #define BLE_KEY_LEN 16
 
+    // Holds each host peer's c2usb ble_session (~144 B); size checked in transport_ble.cpp.
+    #define BLE_HID_SESSION_STORAGE_SIZE 160
+
 
 // Typedefs:
 
@@ -46,6 +49,8 @@
         struct bt_conn* conn;
         uint32_t lastSwitchover;
         uint32_t bleReportIntervalMs;
+        bool hidSessionActive;
+        uint8_t hidSessionStorage[BLE_HID_SESSION_STORAGE_SIZE] __attribute__((aligned(8)));
     } peer_t;
 
 typedef enum {
diff --git a/device/src/main.c b/device/src/main.c
@@ -196,6 +196,10 @@ void mainRuntime(void) {
 
     }
 
+#if DEVICE_IS_UHK80_RIGHT
+    HOGP_Register(); // must be before bt_enable() registers static GATT services
+#endif
+
     bt_enable(NULL); // has to be before InitSettings
 
     // has to be after bt_enable; has to be before ApplyConfig
diff --git a/right/src/hid/transport.cpp b/right/src/hid/transport.cpp
@@ -28,6 +28,9 @@ extern "C" {
 #include "controls_app.hpp"
 #include "keyboard_app.hpp"
 #include "mouse_app.hpp"
+#if DEVICE_IS_UHK80_RIGHT
+    #include "ble_app.hpp"
+#endif
 
 #if defined(__ZEPHYR__) && (defined(CONFIG_DEBUG) == defined(NDEBUG))
     #error "Either CONFIG_DEBUG or NDEBUG must be defined"
@@ -97,6 +100,23 @@ static report_sink_t determineSink()
 #endif
 }
 
+#if DEVICE_IS_UHK80_RIGHT
+// Resolve the BLE HID session bound to the current host connection, if any.
+static ble_session *currentHostBleSession()
+{
+    connection_id_t connId = ActiveHostConnectionId;
+    if (connId <= ConnectionId_Invalid || connId >= ConnectionId_Count) {
+        return nullptr;
+    }
+    uint8_t peerId = Connections[connId].peerId;
+    if (peerId < PeerIdFirstHost || peerId > PeerIdLastHost) {
+        return nullptr;
+    }
+    struct bt_conn *conn = Peers[peerId].conn;
+    return conn ? ble_session::lookup_by_conn(conn) : nullptr;
+}
+#endif
+
 // TODO: when switching sinks, or when USB only and transport comes up
 // keyboard_buffer.reset_to(session->protocol(), (session->channel() == hid::channel::BLE) ? HID_ROLLOVER_N_KEY : HID_GetKeyboardRollover());
 
@@ -120,8 +140,7 @@ extern "C" errno_t Hid_SendKeyboardReport(const hid_keyboard_report_t *report)
         break;
 #if DEVICE_IS_UHK80_RIGHT
     case ReportSink_BleHid: {
-        // TODO: select the BLE session by bt_conn pointer
-        hid::session *session = nullptr;
+        hid::session *session = currentHostBleSession();
 
         if (!session) {
             break;
@@ -204,8 +223,7 @@ extern "C" errno_t Hid_SendMouseReport(const hid_mouse_report_t *report)
         break;
 #if DEVICE_IS_UHK80_RIGHT
     case ReportSink_BleHid: {
-        // TODO: select the BLE session by bt_conn pointer
-        hid::session *session = nullptr;
+        hid::session *session = currentHostBleSession();
 
         if (!session) {
             break;
@@ -268,8 +286,7 @@ extern "C" errno_t Hid_SendControlsReport(const hid_controls_report_t *report)
         break;
 #if DEVICE_IS_UHK80_RIGHT
     case ReportSink_BleHid: {
-        // TODO: select the BLE session by bt_conn pointer
-        hid::session *session = nullptr;
+        hid::session *session = currentHostBleSession();
 
         if (!session) {
             break;
@@ -361,7 +378,7 @@ extern "C" void Hid_UpdateKeyboardLedsState()
         break;
     #if DEVICE_IS_UHK80_RIGHT
     case ConnectionType_BtHid:
-        // TODO
+        session = currentHostBleSession();
         break;
     #endif
     case ConnectionType_NusDongle:
@@ -382,8 +399,16 @@ extern "C" void Hid_UpdateKeyboardLedsState()
 void keyboard_leds_changed_callback(keyboard_base_session &session)
 {
 #if DEVICE_IS_UHK80_RIGHT
-    // TODO: adapt connection check
-    connection_id_t connectionId = ConnectionId_UsbHidRight;
+    connection_id_t connectionId;
+    if (session.channel() == hid::channel::USB) {
+        connectionId = ConnectionId_UsbHidRight;
+    } else {
+        struct bt_conn *conn = static_cast<ble_session &>(session).get_conn();
+        int8_t peerId = conn ? GetPeerIdByConn(conn) : PeerIdUnknown;
+        connectionId = (peerId >= PeerIdFirstHost && peerId <= PeerIdLastHost)
+            ? (connection_id_t)Peers[peerId].connectionId
+            : ConnectionId_Invalid;
+    }
     if (Connections_IsActiveHostConnection(connectionId)) {
         setKeyboardLedsState(session.get_leds_report());
     }
@@ -408,7 +433,9 @@ extern "C" float VerticalScrollMultiplier(void)
     switch (Connections_Type(ActiveHostConnectionId)) {
     #if DEVICE_IS_UHK80_RIGHT
     case ConnectionType_BtHid:
-        // TODO: adapt to multiple BLE sessions
+        if (auto *session = currentHostBleSession(); session) {
+            return session->resolution_report().vertical_scroll_multiplier();
+        }
         return 1.f;
     #endif
     case ConnectionType_NusDongle:
@@ -435,7 +462,9 @@ extern "C" float HorizontalScrollMultiplier(void)
     switch (Connections_Type(ActiveHostConnectionId)) {
     #if DEVICE_IS_UHK80_RIGHT
     case ConnectionType_BtHid:
-        // TODO: adapt to multiple BLE sessions
+        if (auto *session = currentHostBleSession(); session) {
+            return session->resolution_report().horizontal_scroll_multiplier();
+        }
         return 1.f;
     #endif
     case ConnectionType_NusDongle:
diff --git a/right/src/hid/transport.h b/right/src/hid/transport.h
@@ -57,4 +57,7 @@ void USB_Reconfigure(void);
 bool USB_IsMsHost(void);
 
 // HOGP (BLE HID) management
+// Instantiates the HOGP GATT service; must be called before bt_enable() so the
+// static service entry is populated when Zephyr registers static services.
+void HOGP_Register(void);
 int HOGP_HealthCheck(void);
diff --git a/right/src/hid/transport_ble.cpp b/right/src/hid/transport_ble.cpp
@@ -2,9 +2,21 @@
 #include <bluetooth/hid_over_gatt.hpp>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/kernel.h>
+#include <new>
+extern "C" {
+#include "bt_conn.h"
+}
 
 using namespace magic_enum::bitwise_operators;
 
+static_assert(sizeof(ble_session) <= BLE_HID_SESSION_STORAGE_SIZE, "BLE_HID_SESSION_STORAGE_SIZE too small for ble_session");
+static_assert(alignof(ble_session) <= 8, "ble_session alignment exceeds peer storage alignment");
+
+static ble_session *peerSession(peer_t *peer)
+{
+    return std::launder(reinterpret_cast<ble_session *>(peer->hidSessionStorage));
+}
+
 static auto &hog_service()
 {
     using namespace magic_enum::bitwise_operators;
@@ -34,39 +46,88 @@ ::bt_conn *ble_session::get_conn()
 
 hid::session &ble_app::start(const hid::session_params &params)
 {
-    ::bt_conn *conn = static_cast<bluetooth::hid_over_gatt::session_params>(params).conn;
-    ble_session *sess;
-    // TODO
-    // create session from memory pool (allocate + construct)
-    // Connections_SetStateAsync
+    ::bt_conn *conn = static_cast<const bluetooth::hid_over_gatt::session_params &>(params).conn;
+    int8_t peerId = GetPeerIdByConn(conn);
+    if (peerId < PeerIdFirstHost || peerId > PeerIdLastHost) {
+        // A HOGP session should only ever start for a connected host peer 
+        printk("ble_app::start: no host peer for conn (peerId %d)\n", peerId);
+        static ble_session fallback;
+        return fallback;
+    }
+    peer_t *peer = &Peers[peerId];
+
+    // destroy any stale session left in this slot
+    if (peer->hidSessionActive) {
+        peerSession(peer)->~ble_session();
+        peer->hidSessionActive = false;
+    }
 
-    // mouse_resolution_changed_callback(*sess, sess->resolution_report());
+    ble_session *sess = new (peer->hidSessionStorage) ble_session();
+    peer->hidSessionActive = true;
+
+    if (peer->connectionId != ConnectionId_Invalid) {
+        printk("ble_app::start: marking BtHid connection %d (peer %d) ready\n",
+            peer->connectionId, peerId);
+        Connections_SetStateAsync((connection_id_t)peer->connectionId, ConnectionState_Ready);
+    } else {
+        printk("ble_app::start: peer %d has invalid connectionId, cannot mark ready\n", peerId);
+    }
     return *sess;
 }
 
 void ble_app::stop(hid::session &sess)
 {
-    // TODO
-    // return session to memory pool (destruct + dealloc)
-    // Connections_SetStateAsync
+    for (uint8_t peerId = PeerIdFirstHost; peerId <= PeerIdLastHost; peerId++) {
+        peer_t *peer = &Peers[peerId];
+        if (!peer->hidSessionActive) {
+            continue;
+        }
+        ble_session *ps = peerSession(peer);
+        if (static_cast<hid::session *>(ps) == &sess) {
+            // On a real disconnect bt_conn.c may already have cleared connectionId.
+            if (peer->connectionId != ConnectionId_Invalid) {
+                printk("ble_app::stop: marking BtHid connection %d (peer %d) disconnected\n",
+                    peer->connectionId, peerId);
+                Connections_SetStateAsync(
+                    (connection_id_t)peer->connectionId, ConnectionState_Disconnected);
+            } else {
+                printk("ble_app::stop: peer %d has invalid connectionId\n", peerId);
+            }
+            ps->~ble_session();
+            peer->hidSessionActive = false;
+            return;
+        }
+    }
 }
 
-extern "C" int HOGP_HealthCheck()
+extern "C" void HOGP_Register()
 {
-    // TODO: refactoring needed
-    struct bt_conn *peer = nullptr;
-    if (!peer) {
-        printk("HOGP HealthCheck: service registered, no active peer\n");
-        return -2;
-    }
+    // Forces the function-local static HOGP service (and its bt_gatt_service_static
+    // entry) to be constructed so bt_enable() can register it.
+    (void)hog_service();
+}
 
-    struct bt_conn_info info;
-    int err = bt_conn_get_info(peer, &info);
-    if (err) {
-        printk("HOGP HealthCheck: active peer has INVALID conn pointer (err %d)\n", err);
-        return -3;
+extern "C" int HOGP_HealthCheck()
+{
+    int activeSessions = 0;
+    for (uint8_t peerId = PeerIdFirstHost; peerId <= PeerIdLastHost; peerId++) {
+        peer_t *peer = &Peers[peerId];
+        if (!peer->hidSessionActive) {
+            continue;
+        }
+        activeSessions++;
+        if (peer->conn == nullptr) {
+            printk("HOGP HealthCheck: peer %s has an active session but no conn\n", peer->name);
+            return -2;
+        }
+        struct bt_conn_info info;
+        int err = bt_conn_get_info(peer->conn, &info);
+        if (err) {
+            printk("HOGP HealthCheck: peer %s has INVALID conn pointer (err %d)\n", peer->name, err);
+            return -3;
+        }
     }
 
-    printk("HOGP HealthCheck: OK (registered, peer connected, interval %u)\n", info.le.interval_us);
+    printk("HOGP HealthCheck: OK (%d active HID session(s))\n", activeSessions);
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,10 @@ void mainRuntime(void) {`
`196`	`196`
`197`	`197`	`}`
`198`	`198`
	`199`	`+#if DEVICE_IS_UHK80_RIGHT`
	`200`	`+ HOGP_Register(); // must be before bt_enable() registers static GATT services`
	`201`	`+#endif`
	`202`	`+`
`199`	`203`	`bt_enable(NULL); // has to be before InitSettings`
`200`	`204`
`201`	`205`	`// has to be after bt_enable; has to be before ApplyConfig`