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

HAL usb: api optimization

Browse Source
This commit is contained in:
SG
2022-11-12 09:16:05 +10:00
parent 77d12f4a8e
commit 370d2cbc90
1 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
firmware/targets/f7/furi_hal/furi_hal_usb.c
View File

@@ -57,11 +57,11 @@ typedef struct {
bool enabled; bool enabled;
bool connected; bool connected;
bool mode_lock; bool mode_lock;
bool request_pending;
FuriHalUsbInterface* interface; FuriHalUsbInterface* interface;
void* interface_context; void* interface_context;
FuriHalUsbStateCallback callback; FuriHalUsbStateCallback callback;
void* callback_context; void* callback_context;
bool request_pending;
} UsbSrv; } UsbSrv;
typedef enum { typedef enum {
@@ -125,6 +125,12 @@ void furi_hal_usb_init(void) {
FURI_LOG_I(TAG, "Init OK"); FURI_LOG_I(TAG, "Init OK");
} }
static void furi_hal_usb_send_message(UsbApiEventMessage* message) {
furi_message_queue_put(usb.queue, message, FuriWaitForever);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(message->lock);
}
bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) { bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) {
UsbApiEventReturnData return_data = { UsbApiEventReturnData return_data = {
.bool_value = false, .bool_value = false,
@@ -141,10 +147,7 @@ bool furi_hal_usb_set_config(FuriHalUsbInterface* new_if, void* ctx) {
.return_data = &return_data, .return_data = &return_data,
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
return return_data.bool_value; return return_data.bool_value;
} }
@@ -159,10 +162,7 @@ FuriHalUsbInterface* furi_hal_usb_get_config() {
.return_data = &return_data, .return_data = &return_data,
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
return return_data.void_value; return return_data.void_value;
} }
@@ -172,9 +172,7 @@ void furi_hal_usb_lock() {
.type = UsbApiEventTypeLock, .type = UsbApiEventTypeLock,
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
} }
void furi_hal_usb_unlock() { void furi_hal_usb_unlock() {
@@ -183,9 +181,7 @@ void furi_hal_usb_unlock() {
.type = UsbApiEventTypeUnlock, .type = UsbApiEventTypeUnlock,
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
} }
bool furi_hal_usb_is_locked() { bool furi_hal_usb_is_locked() {
@@ -199,10 +195,7 @@ bool furi_hal_usb_is_locked() {
.return_data = &return_data, .return_data = &return_data,
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
return return_data.bool_value; return return_data.bool_value;
} }
@@ -212,9 +205,7 @@ void furi_hal_usb_disable() {
.type = UsbApiEventTypeDisable, .type = UsbApiEventTypeDisable,
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
} }
void furi_hal_usb_enable() { void furi_hal_usb_enable() {
@@ -223,9 +214,7 @@ void furi_hal_usb_enable() {
.type = UsbApiEventTypeEnable, .type = UsbApiEventTypeEnable,
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
} }
void furi_hal_usb_reinit() { void furi_hal_usb_reinit() {
@@ -234,9 +223,7 @@ void furi_hal_usb_reinit() {
.type = UsbApiEventTypeReinit, .type = UsbApiEventTypeReinit,
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
} }
void furi_hal_usb_set_state_callback(FuriHalUsbStateCallback cb, void* ctx) { void furi_hal_usb_set_state_callback(FuriHalUsbStateCallback cb, void* ctx) {
@@ -250,9 +237,7 @@ void furi_hal_usb_set_state_callback(FuriHalUsbStateCallback cb, void* ctx) {
}, },
}; };
furi_message_queue_put(usb.queue, &msg, FuriWaitForever); furi_hal_usb_send_message(&msg);
furi_thread_flags_set(furi_thread_get_id(usb.thread), UsbEventMessage);
api_lock_wait_unlock_and_free(msg.lock);
} }
/* Get device / configuration descriptors */ /* Get device / configuration descriptors */
@@ -386,7 +371,7 @@ static void usb_process_mode_reinit() {
usb_process_mode_start(usb.interface, usb.interface_context); usb_process_mode_start(usb.interface, usb.interface_context);
} }
bool usb_process_set_config(FuriHalUsbInterface* interface, void* context) { static bool usb_process_set_config(FuriHalUsbInterface* interface, void* context) {
if(usb.mode_lock) { if(usb.mode_lock) {
return false; return false;
} else { } else {
@@ -395,7 +380,7 @@ bool usb_process_set_config(FuriHalUsbInterface* interface, void* context) {
} }
} }
void usb_process_enable(bool enable) { static void usb_process_enable(bool enable) {
if(enable) { if(enable) {
if((!usb.enabled) && (usb.interface != NULL)) { if((!usb.enabled) && (usb.interface != NULL)) {
usbd_connect(&udev, true); usbd_connect(&udev, true);
@@ -413,7 +398,7 @@ void usb_process_enable(bool enable) {
} }
} }
void usb_process_message(UsbApiEventMessage* message) { static void usb_process_message(UsbApiEventMessage* message) {
switch(message->type) { switch(message->type) {
case UsbApiEventTypeSetConfig: case UsbApiEventTypeSetConfig:
message->return_data->bool_value = usb_process_set_config( message->return_data->bool_value = usb_process_set_config(