Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

usb: restored previous api

Browse Source
This commit is contained in:
hedger
2025-02-22 20:40:52 +00:00
parent 6c17b785ec
commit 15a5e652e0
16 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
targets/f7/furi_hal/furi_hal_usb.c
View File

@@ -32,7 +32,7 @@ typedef struct {
} UsbApiEventDataStateCallback;
typedef struct {
const FuriHalUsbInterface* interface;
FuriHalUsbInterface* interface;
void* context;
} UsbApiEventDataInterface;
@@ -43,7 +43,7 @@ typedef union {
typedef union {
bool bool_value;
const void* void_value;
void* void_value;
} UsbApiEventReturnData;
typedef struct {
@@ -60,7 +60,7 @@ typedef struct {
bool connected;
bool mode_lock;
bool request_pending;
const FuriHalUsbInterface* interface;
FuriHalUsbInterface* interface;
void* interface_context;
FuriHalUsbStateCallback callback;
void* callback_context;
@@ -132,7 +132,7 @@ static void furi_hal_usb_send_message(UsbApiEventMessage* message) {
api_lock_wait_unlock_and_free(message->lock);
}
bool furi_hal_usb_set_config(const FuriHalUsbInterface* new_if, void* ctx) {
bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) {
UsbApiEventReturnData return_data = {
.bool_value = false,
};
@@ -152,7 +152,7 @@ bool furi_hal_usb_set_config(const FuriHalUsbInterface* new_if, void* ctx) {
return return_data.bool_value;
}
const FuriHalUsbInterface* furi_hal_usb_get_config(void) {
FuriHalUsbInterface* furi_hal_usb_get_config(void) {
UsbApiEventReturnData return_data = {
.void_value = NULL,
};
@@ -326,7 +326,7 @@ static void wkup_evt(usbd_device* dev, uint8_t event, uint8_t ep) {
}
}
static void usb_process_mode_start(const FuriHalUsbInterface* interface, void* context) {
static void usb_process_mode_start(FuriHalUsbInterface* interface, void* context) {
if(usb.interface != NULL) {
usb.interface->deinit(&udev);
}
@@ -344,7 +344,7 @@ static void usb_process_mode_start(const FuriHalUsbInterface* interface, void* c
}
}
static void usb_process_mode_change(const FuriHalUsbInterface* interface, void* context) {
static void usb_process_mode_change(FuriHalUsbInterface* interface, void* context) {
if((interface != usb.interface) || (context != usb.interface_context)) {
if(usb.enabled) {
// Disable current interface
@@ -374,7 +374,7 @@ static void usb_process_mode_reinit(void) {
usb_process_mode_start(usb.interface, usb.interface_context);
}
static bool usb_process_set_config(const FuriHalUsbInterface* interface, void* context) {
static bool usb_process_set_config(FuriHalUsbInterface* interface, void* context) {
if(usb.mode_lock) {
return false;
} else {

4
targets/f7/furi_hal/furi_hal_usb_ccid.c
View File

@@ -170,7 +170,7 @@ static const struct CcidConfigDescriptor ccid_cfg_desc = {
},
};
static void ccid_init(usbd_device* dev, const FuriHalUsbInterface* intf, void* ctx);
static void ccid_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx);
static void ccid_deinit(usbd_device* dev);
static void ccid_on_wakeup(usbd_device* dev);
static void ccid_on_suspend(usbd_device* dev);
@@ -223,7 +223,7 @@ static void* ccid_set_string_descr(char* str) {
return dev_str_desc;
}
static void ccid_init(usbd_device* dev, const FuriHalUsbInterface* intf, void* ctx) {
static void ccid_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx) {
UNUSED(intf);
FuriHalUsbCcidConfig* cfg = (FuriHalUsbCcidConfig*)ctx;

9
targets/f7/furi_hal/furi_hal_usb_cdc.c
View File

@@ -385,7 +385,7 @@ static const struct CdcConfigDescriptorDual
static struct usb_cdc_line_coding cdc_config[IF_NUM_MAX] = {};
static uint8_t cdc_ctrl_line_state[IF_NUM_MAX];
static void cdc_init(usbd_device* dev, const FuriHalUsbInterface* intf, void* ctx);
static void cdc_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx);
static void cdc_deinit(usbd_device* dev);
static void cdc_on_wakeup(usbd_device* dev);
static void cdc_on_suspend(usbd_device* dev);
@@ -429,11 +429,11 @@ FuriHalUsbInterface usb_cdc_dual = {
.cfg_descr = (void*)&cdc_cfg_desc_dual,
};
static void cdc_init(usbd_device* dev, const FuriHalUsbInterface* intf, void* ctx) {
static void cdc_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx) {
UNUSED(ctx);
usb_dev = dev;
cdc_if_cur = malloc(sizeof(FuriHalUsbInterface));
memcpy((void*)cdc_if_cur, intf, sizeof(FuriHalUsbInterface));
cdc_if_cur = intf;
char* name = (char*)furi_hal_version_get_device_name_ptr();
uint8_t len = (name == NULL) ? (0) : (strlen(name));
@@ -470,7 +470,6 @@ static void cdc_deinit(usbd_device* dev) {
free(cdc_if_cur->str_prod_descr);
free(cdc_if_cur->str_serial_descr);
free((void*)cdc_if_cur);
cdc_if_cur = NULL;
}

4
targets/f7/furi_hal/furi_hal_usb_hid.c
View File

@@ -226,7 +226,7 @@ static struct HidReport {
struct HidReportConsumer consumer;
} FURI_PACKED hid_report;
static void hid_init(usbd_device* dev, const FuriHalUsbInterface* intf, void* ctx);
static void hid_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx);
static void hid_deinit(usbd_device* dev);
static void hid_on_wakeup(usbd_device* dev);
static void hid_on_suspend(usbd_device* dev);
@@ -374,7 +374,7 @@ static void* hid_set_string_descr(char* str) {
return dev_str_desc;
}
static void hid_init(usbd_device* dev, const FuriHalUsbInterface* intf, void* ctx) {
static void hid_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx) {
UNUSED(intf);
FuriHalUsbHidConfig* cfg = (FuriHalUsbHidConfig*)ctx;
if(hid_semaphore == NULL) hid_semaphore = furi_semaphore_alloc(1, 1);

6
targets/f7/furi_hal/furi_hal_usb_u2f.c
View File

@@ -137,7 +137,7 @@ static const struct HidConfigDescriptor hid_u2f_cfg_desc = {
},
};
static void hid_u2f_init(usbd_device* dev, const FuriHalUsbInterface* intf, void* ctx);
static void hid_u2f_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx);
static void hid_u2f_deinit(usbd_device* dev);
static void hid_u2f_on_wakeup(usbd_device* dev);
static void hid_u2f_on_suspend(usbd_device* dev);
@@ -174,7 +174,7 @@ void furi_hal_hid_u2f_set_callback(HidU2fCallback cb, void* ctx) {
}
}
const FuriHalUsbInterface usb_hid_u2f = {
FuriHalUsbInterface usb_hid_u2f = {
.init = hid_u2f_init,
.deinit = hid_u2f_deinit,
.wakeup = hid_u2f_on_wakeup,
@@ -189,7 +189,7 @@ const FuriHalUsbInterface usb_hid_u2f = {
.cfg_descr = (void*)&hid_u2f_cfg_desc,
};
static void hid_u2f_init(usbd_device* dev, const FuriHalUsbInterface* intf, void* ctx) {
static void hid_u2f_init(usbd_device* dev, FuriHalUsbInterface* intf, void* ctx) {
UNUSED(intf);
UNUSED(ctx);
if(hid_u2f_semaphore == NULL) {