Specify type within virtual_portal instead of having differnt start functions

helpers/pof_usb.c

@@ -41,8 +41,6 @@ static const uint8_t hid_report_desc[] = {0x06, 0x00, 0xFF, 0x09, 0x01, 0xA1, 0x
 static usbd_respond pof_usb_ep_config(usbd_device* dev, uint8_t cfg);
 static usbd_respond
     pof_hid_control(usbd_device* dev, usbd_ctlreq* req, usbd_rqc_callback* callback);
-static usbd_respond
-    pof_xbox_360_control(usbd_device* dev, usbd_ctlreq* req, usbd_rqc_callback* callback);
 static void pof_usb_send(usbd_device* dev, uint8_t* buf, uint16_t len);
 static int32_t pof_usb_receive(usbd_device* dev, uint8_t* buf, uint16_t max_len);
 
@@ -114,12 +112,23 @@ static int32_t pof_thread_worker(void* context) {
 
             if(pof_usb->dataAvailable > 0) {
                 memset(tx_data, 0, sizeof(tx_data));
-                int send_len =
-                    virtual_portal_process_message(virtual_portal, pof_usb->data + 2, tx_data + 2);
-                if(send_len > 0) {
-                    tx_data[0] = 0x1b;
-                    tx_data[1] = send_len;
-                    pof_usb_send(dev, tx_data, POF_USB_ACTUAL_OUTPUT_SIZE);
+                if (pof_usb ->virtual_portal->type == PoFXbox360) {
+                    int send_len =
+                        virtual_portal_process_message(virtual_portal, pof_usb->data + 2, tx_data + 2);
+                    if(send_len > 0) {
+                        tx_data[0] = 0x1b;
+                        tx_data[1] = send_len;
+                        pof_usb_send(dev, tx_data, POF_USB_ACTUAL_OUTPUT_SIZE);
+                    }
+                }
+                if (pof_usb ->virtual_portal->type == PoFHID) {
+                    int send_len =
+                        virtual_portal_process_message(virtual_portal, pof_usb->data + 2, tx_data + 2);
+                    if(send_len > 0) {
+                        tx_data[0] = 0x1b;
+                        tx_data[1] = send_len;
+                        pof_usb_send(dev, tx_data, POF_USB_ACTUAL_OUTPUT_SIZE);
+                    }
                 }
                 pof_usb->dataAvailable = 0;
             }
@@ -646,64 +655,6 @@ static usbd_respond
     return usbd_fail;
 }
 
-static usbd_respond
-    pof_xbox_360_control(usbd_device* dev, usbd_ctlreq* req, usbd_rqc_callback* callback) {
-    UNUSED(callback);
-    uint8_t wValueH = req->wValue >> 8;
-    uint8_t wValueL = req->wValue & 0xFF;
-
-    if(((USB_REQ_RECIPIENT | USB_REQ_TYPE) & req->bmRequestType) ==
-           (USB_REQ_INTERFACE | USB_REQ_STANDARD) &&
-       req->wIndex == 0 && req->bRequest == USB_STD_GET_DESCRIPTOR) {
-        switch(wValueH) {
-        case USB_DTYPE_STRING:
-            if (wValueL == 4) {
-                dev->status.data_ptr = (uint8_t*)&dev_security_desc;
-                dev->status.data_count = sizeof(dev_security_desc);
-                return usbd_ack;
-            }
-            return usbd_fail;
-        default:
-            return usbd_fail;
-        }
-    }
-    return usbd_fail;
-}
-
-PoFUsb* pof_usb_start_xbox_360(VirtualPortal* virtual_portal) {
-    PoFUsb* pof_usb = malloc(sizeof(PoFUsb));
-    pof_usb->virtual_portal = virtual_portal;
-    pof_usb->dataAvailable = 0;
-
-    pof_usb->usb_prev = furi_hal_usb_get_config();
-    pof_usb->usb.init = pof_usb_init_xbox_360;
-    pof_usb->usb.deinit = pof_usb_deinit;
-    pof_usb->usb.wakeup = pof_usb_wakeup;
-    pof_usb->usb.suspend = pof_usb_suspend;
-    pof_usb->usb.dev_descr = (struct usb_device_descriptor*)&usb_pof_dev_descr_xbox_360;
-    pof_usb->usb.str_manuf_descr = (void*)&dev_manuf_desc;
-    pof_usb->usb.str_prod_descr = (void*)&dev_product_desc;
-    pof_usb->usb.str_serial_descr = NULL;
-    pof_usb->usb.cfg_descr = (void*)&usb_pof_cfg_descr_x360;
-
-    if(!furi_hal_usb_set_config(&pof_usb->usb, pof_usb)) {
-        FURI_LOG_E(TAG, "USB locked, can not start");
-        if(pof_usb->usb.str_manuf_descr) {
-            free(pof_usb->usb.str_manuf_descr);
-        }
-        if(pof_usb->usb.str_prod_descr) {
-            free(pof_usb->usb.str_prod_descr);
-        }
-        if(pof_usb->usb.str_serial_descr) {
-            free(pof_usb->usb.str_serial_descr);
-        }
-
-        free(pof_usb);
-        return NULL;
-    }
-    return pof_usb;
-}
-
 PoFUsb* pof_usb_start(VirtualPortal* virtual_portal) {
     PoFUsb* pof_usb = malloc(sizeof(PoFUsb));
     pof_usb->virtual_portal = virtual_portal;
@@ -714,12 +665,19 @@ PoFUsb* pof_usb_start(VirtualPortal* virtual_portal) {
     pof_usb->usb.deinit = pof_usb_deinit;
     pof_usb->usb.wakeup = pof_usb_wakeup;
     pof_usb->usb.suspend = pof_usb_suspend;
-    pof_usb->usb.dev_descr = (struct usb_device_descriptor*)&usb_pof_dev_descr;
-    pof_usb->usb.str_manuf_descr = (void*)&dev_manuf_desc;
-    pof_usb->usb.str_prod_descr = (void*)&dev_product_desc;
-    pof_usb->usb.str_serial_descr = NULL;
-    pof_usb->usb.cfg_descr = (void*)&usb_pof_cfg_descr;
-
+    if (virtual_portal->type == PoFHID) {
+        pof_usb->usb.dev_descr = (struct usb_device_descriptor*)&usb_pof_dev_descr;
+        pof_usb->usb.str_manuf_descr = (void*)&dev_manuf_desc;
+        pof_usb->usb.str_prod_descr = (void*)&dev_product_desc;
+        pof_usb->usb.str_serial_descr = NULL;
+        pof_usb->usb.cfg_descr = (void*)&usb_pof_cfg_descr;
+    } else if (virtual_portal->type == PoFXbox360) {
+        pof_usb->usb.dev_descr = (struct usb_device_descriptor*)&usb_pof_dev_descr_xbox_360;
+        pof_usb->usb.str_manuf_descr = (void*)&dev_manuf_desc;
+        pof_usb->usb.str_prod_descr = (void*)&dev_product_desc;
+        pof_usb->usb.str_serial_descr = NULL;
+        pof_usb->usb.cfg_descr = (void*)&usb_pof_cfg_descr_x360;
+    }
     if(!furi_hal_usb_set_config(&pof_usb->usb, pof_usb)) {
         FURI_LOG_E(TAG, "USB locked, can not start");
         if(pof_usb->usb.str_manuf_descr) {

helpers/pof_usb.h

@@ -16,7 +16,6 @@
 typedef struct PoFUsb PoFUsb;
 
 PoFUsb* pof_usb_start(VirtualPortal* virtual_portal);
-PoFUsb* pof_usb_start_xbox_360(VirtualPortal* virtual_portal);
 void pof_usb_stop(PoFUsb* pof);
 
 /*descriptor type*/

portal_of_flipper.c

@@ -70,6 +70,7 @@ PoFApp* pof_app_alloc() {
     view_dispatcher_add_view(app->view_dispatcher, PoFViewWidget, widget_get_view(app->widget));
 
     app->virtual_portal = virtual_portal_alloc(app->notifications);
+    app->virtual_portal->type = PoFXbox360;
     // PoF emulation Start
     pof_start(app);
 

portal_of_flipper_i.c

@@ -7,8 +7,7 @@
 void pof_start(PoFApp* app) {
     furi_assert(app);
 
-    app->pof_usb = pof_usb_start_xbox_360(app->virtual_portal);
-    // app->pof_usb = pof_usb_start(app->virtual_portal);
+    app->pof_usb = pof_usb_start(app->virtual_portal);
 }
 
 void pof_stop(PoFApp* app) {

virtual_portal.h

@@ -6,12 +6,19 @@
 
 #define POF_TOKEN_LIMIT 16
 
+typedef enum {
+    PoFHID,
+    PoFXbox360,
+    PoFXboxOne
+} PoFType;
+
 typedef struct {
     PoFToken* tokens[POF_TOKEN_LIMIT];
     uint8_t sequence_number;
     bool active;
     bool speaker;
     NotificationApp* notifications;
+    PoFType type;
 } VirtualPortal;
 
 VirtualPortal* virtual_portal_alloc(NotificationApp* notifications);