Skip to content
Snippets Groups Projects
Verified Commit 1bb79811 authored by rahix's avatar rahix
Browse files

chore(epicardium): Format remaining files


Signed-off-by: default avatarRahix <rahix@rahix.de>
parent 31a49f64
No related branches found
No related tags found
No related merge requests found
...@@ -117,7 +117,6 @@ void delay_us(unsigned int usec) ...@@ -117,7 +117,6 @@ void delay_us(unsigned int usec)
mxc_delay(usec); mxc_delay(usec);
} }
/******************************************************************************/ /******************************************************************************/
int cdcacm_init(void) int cdcacm_init(void)
{ {
...@@ -131,7 +130,8 @@ int cdcacm_init(void) ...@@ -131,7 +130,8 @@ int cdcacm_init(void)
/* Start out in full speed */ /* Start out in full speed */
usb_opts.enable_hs = 0; usb_opts.enable_hs = 0;
usb_opts.delay_us = delay_us; /* Function which will be used for delays */ usb_opts.delay_us =
delay_us; /* Function which will be used for delays */
usb_opts.init_callback = usb_startup_cb; usb_opts.init_callback = usb_startup_cb;
usb_opts.shutdown_callback = usb_shutdown_cb; usb_opts.shutdown_callback = usb_shutdown_cb;
...@@ -148,8 +148,12 @@ int cdcacm_init(void) ...@@ -148,8 +148,12 @@ int cdcacm_init(void)
} }
/* Register enumeration data */ /* Register enumeration data */
enum_register_descriptor(ENUM_DESC_DEVICE, (uint8_t*)&device_descriptor, 0); enum_register_descriptor(
enum_register_descriptor(ENUM_DESC_CONFIG, (uint8_t*)&config_descriptor, 0); ENUM_DESC_DEVICE, (uint8_t *)&device_descriptor, 0
);
enum_register_descriptor(
ENUM_DESC_CONFIG, (uint8_t *)&config_descriptor, 0
);
enum_register_descriptor(ENUM_DESC_STRING, lang_id_desc, 0); enum_register_descriptor(ENUM_DESC_STRING, lang_id_desc, 0);
enum_register_descriptor(ENUM_DESC_STRING, mfg_id_desc, 1); enum_register_descriptor(ENUM_DESC_STRING, mfg_id_desc, 1);
enum_register_descriptor(ENUM_DESC_STRING, prod_id_desc, 2); enum_register_descriptor(ENUM_DESC_STRING, prod_id_desc, 2);
...@@ -206,12 +210,13 @@ void cdcacm_write(uint8_t *data, int len) ...@@ -206,12 +210,13 @@ void cdcacm_write(uint8_t *data, int len)
LOG_ERR("cdcacm", "fifo lockup detected"); LOG_ERR("cdcacm", "fifo lockup detected");
lockup_disable = 1; lockup_disable = 1;
} else if (ret != len) { } else if (ret != len) {
LOG_WARN("cdcacm", "write length mismatch, got %d", ret); LOG_WARN(
"cdcacm", "write length mismatch, got %d", ret
);
} }
} }
} }
/******************************************************************************/ /******************************************************************************/
#if 0 #if 0
static void echo_usb(void) static void echo_usb(void)
...@@ -244,7 +249,8 @@ static void echo_usb(void) ...@@ -244,7 +249,8 @@ static void echo_usb(void)
static int setconfig_callback(usb_setup_pkt *sud, void *cbdata) static int setconfig_callback(usb_setup_pkt *sud, void *cbdata)
{ {
/* Confirm the configuration value */ /* Confirm the configuration value */
if (sud->wValue == config_descriptor.config_descriptor.bConfigurationValue) { if (sud->wValue ==
config_descriptor.config_descriptor.bConfigurationValue) {
configured = 1; configured = 1;
MXC_SETBIT(&event_flags, EVENT_ENUM_COMP); MXC_SETBIT(&event_flags, EVENT_ENUM_COMP);
return acm_configure(&acm_cfg); /* Configure the device class */ return acm_configure(&acm_cfg); /* Configure the device class */
...@@ -359,7 +365,9 @@ void USB_IRQHandler(void) ...@@ -359,7 +365,9 @@ void USB_IRQHandler(void)
if (serial_task_id != NULL) { if (serial_task_id != NULL) {
BaseType_t xHigherPriorityTaskWoken = pdFALSE; BaseType_t xHigherPriorityTaskWoken = pdFALSE;
vTaskNotifyGiveFromISR(serial_task_id, &xHigherPriorityTaskWoken); vTaskNotifyGiveFromISR(
serial_task_id, &xHigherPriorityTaskWoken
);
portYIELD_FROM_ISR(xHigherPriorityTaskWoken); portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
} }
} }
......
...@@ -62,8 +62,11 @@ void vPmicTask(void *pvParameters) ...@@ -62,8 +62,11 @@ void vPmicTask(void *pvParameters)
/* TODO: Remove when all interrupts are handled */ /* TODO: Remove when all interrupts are handled */
if (int_flag & ~(MAX77650_INT_nEN_F | MAX77650_INT_nEN_R)) { if (int_flag & ~(MAX77650_INT_nEN_F | MAX77650_INT_nEN_R)) {
LOG_WARN("pmic", "Unhandled PMIC Interrupt: %x", LOG_WARN(
int_flag); "pmic",
"Unhandled PMIC Interrupt: %x",
int_flag
);
} }
if (delay != portMAX_DELAY) { if (delay != portMAX_DELAY) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment