Index: uspace/drv/block/ddisk/ddisk.c =================================================================== --- uspace/drv/block/ddisk/ddisk.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/block/ddisk/ddisk.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -198,6 +198,5 @@ } -static -errno_t ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf) +static errno_t ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf) { fibril_mutex_lock(&ddisk->lock); @@ -235,7 +234,6 @@ } -static -errno_t ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf, - size_t size, bool is_read) +static errno_t ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, + void *buf, size_t size, bool is_read) { ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg; Index: uspace/drv/bus/usb/uhci/uhci_batch.c =================================================================== --- uspace/drv/bus/usb/uhci/uhci_batch.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/bus/usb/uhci/uhci_batch.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -53,5 +53,5 @@ /** Transfer batch setup table. */ -static void (*const batch_setup[])(uhci_transfer_batch_t*); +static void (*const batch_setup[])(uhci_transfer_batch_t *); /** Destroys uhci_transfer_batch_t structure. @@ -72,5 +72,5 @@ * NULL otherwise. */ -uhci_transfer_batch_t * uhci_transfer_batch_create(endpoint_t *ep) +uhci_transfer_batch_t *uhci_transfer_batch_create(endpoint_t *ep) { uhci_transfer_batch_t *uhci_batch = @@ -99,6 +99,6 @@ usb_transfer_batch_t *usb_batch = &uhci_batch->base; - uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1) - / usb_batch->ep->max_packet_size; + uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1) / + usb_batch->ep->max_packet_size; if (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) { @@ -106,10 +106,10 @@ } - const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) - ? USB_SETUP_PACKET_SIZE - : 0; - - const size_t total_size = (sizeof(td_t) * uhci_batch->td_count) - + sizeof(qh_t) + setup_size; + const size_t setup_size = (usb_batch->ep->transfer_type == USB_TRANSFER_CONTROL) ? + USB_SETUP_PACKET_SIZE : + 0; + + const size_t total_size = (sizeof(td_t) * uhci_batch->td_count) + + sizeof(qh_t) + setup_size; if (dma_buffer_alloc(&uhci_batch->uhci_dma_buffer, total_size)) { @@ -162,5 +162,5 @@ uhci_endpoint_t *uhci_ep = (uhci_endpoint_t *) batch->ep; - for (size_t i = 0;i < uhci_batch->td_count; ++i) { + for (size_t i = 0; i < uhci_batch->td_count; ++i) { if (td_is_active(&uhci_batch->tds[i])) { return false; @@ -180,6 +180,6 @@ } - batch->transferred_size - += td_act_size(&uhci_batch->tds[i]); + batch->transferred_size += + td_act_size(&uhci_batch->tds[i]); if (td_is_short(&uhci_batch->tds[i])) goto substract_ret; @@ -235,6 +235,6 @@ const size_t packet_size = min(remain_size, mps); - const td_t *next_td = (td + 1 < uhci_batch->td_count) - ? &uhci_batch->tds[td + 1] : NULL; + const td_t *next_td = (td + 1 < uhci_batch->td_count) ? + &uhci_batch->tds[td + 1] : NULL; assert(td < uhci_batch->td_count); @@ -328,6 +328,6 @@ } -static void (*const batch_setup[])(uhci_transfer_batch_t*) = -{ +static void (*const batch_setup[])(uhci_transfer_batch_t *) = + { [USB_TRANSFER_CONTROL] = batch_control, [USB_TRANSFER_BULK] = batch_data, Index: uspace/drv/bus/usb/vhc/hub/hub.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/hub.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/bus/usb/vhc/hub/hub.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -148,6 +148,6 @@ */ //if (port->state == HUB_PORT_STATE_DISCONNECTED) { - port->state = HUB_PORT_STATE_DISABLED; - set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION); + port->state = HUB_PORT_STATE_DISABLED; + set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION); //} @@ -343,6 +343,6 @@ port->state == HUB_PORT_STATE_ENABLED ? 1 : 0, /* Suspend. */ - (port->state == HUB_PORT_STATE_SUSPENDED) - || (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0, + (port->state == HUB_PORT_STATE_SUSPENDED) || + (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0, /* Over-current. */ 0, @@ -358,6 +358,5 @@ 0, /* Reserved. */ - 0, 0, 0, 0, 0, 0 - ) << 8; + 0, 0, 0, 0, 0, 0) << 8; status |= (port->status_change << 16); Index: uspace/drv/char/ns8250/ns8250.c =================================================================== --- uspace/drv/char/ns8250/ns8250.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/char/ns8250/ns8250.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -1013,7 +1013,6 @@ * @param stop_bits The number of stop bits used. */ -static void - ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate, unsigned int *parity, - unsigned int *word_length, unsigned int *stop_bits) +static void ns8250_get_props(ddf_dev_t *dev, unsigned int *baud_rate, + unsigned int *parity, unsigned int *word_length, unsigned int *stop_bits) { ns8250_t *data = dev_ns8250(dev); Index: uspace/drv/hid/usbhid/kbd/kbddev.c =================================================================== --- uspace/drv/hid/usbhid/kbd/kbddev.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/hid/usbhid/kbd/kbddev.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -191,13 +191,13 @@ } else { usb_log_error("%s: console session already set", - __FUNCTION__); + __FUNCTION__); async_answer_0(icall_handle, ELIMIT); } break; default: - usb_log_error("%s: Unknown method: %d.", - __FUNCTION__, (int) method); - async_answer_0(icall_handle, EINVAL); - break; + usb_log_error("%s: Unknown method: %d.", + __FUNCTION__, (int) method); + async_answer_0(icall_handle, EINVAL); + break; } @@ -236,16 +236,16 @@ while (field != NULL) { - if ((field->usage == USB_HID_LED_NUM_LOCK) - && (kbd_dev->mods & KM_NUM_LOCK)){ + if ((field->usage == USB_HID_LED_NUM_LOCK) && + (kbd_dev->mods & KM_NUM_LOCK)) { field->value = 1; } - if ((field->usage == USB_HID_LED_CAPS_LOCK) - && (kbd_dev->mods & KM_CAPS_LOCK)){ + if ((field->usage == USB_HID_LED_CAPS_LOCK) && + (kbd_dev->mods & KM_CAPS_LOCK)) { field->value = 1; } - if ((field->usage == USB_HID_LED_SCROLL_LOCK) - && (kbd_dev->mods & KM_SCROLL_LOCK)){ + if ((field->usage == USB_HID_LED_SCROLL_LOCK) && + (kbd_dev->mods & KM_SCROLL_LOCK)) { field->value = 1; } @@ -253,5 +253,5 @@ field = usb_hid_report_get_sibling( &hid_dev->report, field, kbd_dev->led_path, - USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_OUTPUT); } @@ -269,5 +269,5 @@ usb_log_debug("Output report buffer: %s", usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size, - 0)); + 0)); rc = usbhid_req_set_report( @@ -308,7 +308,7 @@ static inline int usb_kbd_is_lock(unsigned int key_code) { - return (key_code == KC_NUM_LOCK - || key_code == KC_SCROLL_LOCK - || key_code == KC_CAPS_LOCK); + return (key_code == KC_NUM_LOCK || + key_code == KC_SCROLL_LOCK || + key_code == KC_CAPS_LOCK); } @@ -437,5 +437,5 @@ errno_t ret = - usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); + usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); if (ret != EOK) { usb_log_error("Failed to append to hid/kbd report path."); @@ -461,6 +461,5 @@ if (field->value != 0) { kbd_dev->keys[i] = field->usage; - } - else { + } else { kbd_dev->keys[i] = 0; } @@ -469,6 +468,6 @@ ++i; field = usb_hid_report_get_sibling( - &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END - | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END | + USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT); } @@ -742,5 +741,6 @@ // FIXME - the fibril_mutex_is_locked may not cause // fibril scheduling - while (fibril_mutex_is_locked(&kbd_dev->repeat_mtx)) {} + while (fibril_mutex_is_locked(&kbd_dev->repeat_mtx)) { + } /* Free all buffers. */ Index: uspace/drv/hid/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/hid/usbhid/mouse/mousedev.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/hid/usbhid/mouse/mousedev.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -184,5 +184,5 @@ hid_dev->report_id, &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_Y); - const usb_hid_report_field_t *wheel= get_mouse_axis_move_field( + const usb_hid_report_field_t *wheel = get_mouse_axis_move_field( hid_dev->report_id, &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL); @@ -232,5 +232,5 @@ } errno_t ret = - usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0); + usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0); if (ret != EOK) { usb_hid_report_path_free(path); @@ -241,6 +241,6 @@ usb_hid_report_field_t *field = usb_hid_report_get_sibling( - &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END - | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT); + &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END | + USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT); while (field != NULL) { @@ -263,6 +263,6 @@ field = usb_hid_report_get_sibling( - &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END - | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END | + USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT); } Index: uspace/drv/hid/usbhid/multimedia/multimedia.c =================================================================== --- uspace/drv/hid/usbhid/multimedia/multimedia.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/hid/usbhid/multimedia/multimedia.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -260,6 +260,6 @@ usb_hid_report_field_t *field = usb_hid_report_get_sibling( - &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END - | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END | + USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT); @@ -279,6 +279,6 @@ field = usb_hid_report_get_sibling( - &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END - | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END | + USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT); } Index: uspace/drv/nic/rtl8139/defs.h =================================================================== --- uspace/drv/nic/rtl8139/defs.h (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/nic/rtl8139/defs.h (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -219,5 +219,5 @@ static inline void rtl8139_regs_unlock(void *io_base) { - pio_write_8((io_base) + CR9346, RTL8139_REGS_UNLOCKED); + pio_write_8(io_base + CR9346, RTL8139_REGS_UNLOCKED); } @@ -261,19 +261,19 @@ /** Transmit status descriptor registers bits */ enum rtl8139_tsd { - TSD_CRS = (1 << 31), /**< Carrier Sense Lost */ - TSD_TABT = (1 << 30), /**< Transmit Abort */ - TSD_OWC = (1 << 29), /**< Out of Window Collision */ - TSD_CDH = (1 << 28), /**< CD Heart Beat */ - TSD_NCC_SHIFT = 24, /**< Collision Count - bit shift */ - TSD_NCC_SIZE = 4, /**< Collision Count - bit size */ - TSD_NCC_MASK = (1 << 4)-1, /**< Collision Count - bit size */ - TSD_ERTXTH_SHIFT = 16, /**< Early Tx Threshold - bit shift */ - TSD_ERTXTH_SIZE = 6, /**< Early Tx Treshold - bit size */ - TSD_TOK = (1 << 15), /**< Transmit OK */ - TSD_TUN = (1 << 14), /**< Transmit FIFO Underrun */ - TSD_OWN = (1 << 13), /**< OWN */ - TSD_SIZE_SHIFT = 0, /**< Size - bit shift */ - TSD_SIZE_SIZE = 13, /**< Size - bit size */ - TSD_SIZE_MASK = 0x1fff /**< Size - bit mask */ + TSD_CRS = (1 << 31), /**< Carrier Sense Lost */ + TSD_TABT = (1 << 30), /**< Transmit Abort */ + TSD_OWC = (1 << 29), /**< Out of Window Collision */ + TSD_CDH = (1 << 28), /**< CD Heart Beat */ + TSD_NCC_SHIFT = 24, /**< Collision Count - bit shift */ + TSD_NCC_SIZE = 4, /**< Collision Count - bit size */ + TSD_NCC_MASK = (1 << 4) - 1, /**< Collision Count - bit size */ + TSD_ERTXTH_SHIFT = 16, /**< Early Tx Threshold - bit shift */ + TSD_ERTXTH_SIZE = 6, /**< Early Tx Treshold - bit size */ + TSD_TOK = (1 << 15), /**< Transmit OK */ + TSD_TUN = (1 << 14), /**< Transmit FIFO Underrun */ + TSD_OWN = (1 << 13), /**< OWN */ + TSD_SIZE_SHIFT = 0, /**< Size - bit shift */ + TSD_SIZE_SIZE = 13, /**< Size - bit size */ + TSD_SIZE_MASK = 0x1fff /**< Size - bit mask */ }; @@ -480,5 +480,5 @@ /** Mapping of HW version -> version ID */ extern const struct rtl8139_hwver_map rtl8139_versions[RTL8139_VER_COUNT + 1]; -extern const char* model_names[RTL8139_VER_COUNT]; +extern const char *model_names[RTL8139_VER_COUNT]; /** Size in the frame header while copying from RxFIFO to Rx buffer */ Index: uspace/drv/platform/amdm37x/amdm37x.c =================================================================== --- uspace/drv/platform/amdm37x/amdm37x.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/platform/amdm37x/amdm37x.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -48,5 +48,5 @@ void *data, bool write) { - printf("PIO %s: %p(%p) %#"PRIx64"\n", write ? "WRITE" : "READ", + printf("PIO %s: %p(%p) %#" PRIx64 "\n", write ? "WRITE" : "READ", (place - base) + data, place, val); } @@ -58,59 +58,59 @@ errno_t ret = EOK; - ret = pio_enable((void*)USBHOST_CM_BASE_ADDRESS, USBHOST_CM_SIZE, - (void**)&device->cm.usbhost); - if (ret != EOK) - return ret; - - ret = pio_enable((void*)CORE_CM_BASE_ADDRESS, CORE_CM_SIZE, - (void**)&device->cm.core); - if (ret != EOK) - return ret; - - ret = pio_enable((void*)CLOCK_CONTROL_CM_BASE_ADDRESS, - CLOCK_CONTROL_CM_SIZE, (void**)&device->cm.clocks); - if (ret != EOK) - return ret; - - ret = pio_enable((void*)MPU_CM_BASE_ADDRESS, - MPU_CM_SIZE, (void**)&device->cm.mpu); - if (ret != EOK) - return ret; - - ret = pio_enable((void*)IVA2_CM_BASE_ADDRESS, - IVA2_CM_SIZE, (void**)&device->cm.iva2); - if (ret != EOK) - return ret; - - ret = pio_enable((void*)CLOCK_CONTROL_PRM_BASE_ADDRESS, - CLOCK_CONTROL_PRM_SIZE, (void**)&device->prm.clocks); - if (ret != EOK) - return ret; - - ret = pio_enable((void*)GLOBAL_REG_PRM_BASE_ADDRESS, - GLOBAL_REG_PRM_SIZE, (void**)&device->prm.global); - if (ret != EOK) - return ret; - - ret = pio_enable((void*)AMDM37x_USBTLL_BASE_ADDRESS, - AMDM37x_USBTLL_SIZE, (void**)&device->tll); - if (ret != EOK) - return ret; - - ret = pio_enable((void*)AMDM37x_UHH_BASE_ADDRESS, - AMDM37x_UHH_SIZE, (void**)&device->uhh); + ret = pio_enable((void *)USBHOST_CM_BASE_ADDRESS, USBHOST_CM_SIZE, + (void **)&device->cm.usbhost); + if (ret != EOK) + return ret; + + ret = pio_enable((void *)CORE_CM_BASE_ADDRESS, CORE_CM_SIZE, + (void **)&device->cm.core); + if (ret != EOK) + return ret; + + ret = pio_enable((void *)CLOCK_CONTROL_CM_BASE_ADDRESS, + CLOCK_CONTROL_CM_SIZE, (void **)&device->cm.clocks); + if (ret != EOK) + return ret; + + ret = pio_enable((void *)MPU_CM_BASE_ADDRESS, + MPU_CM_SIZE, (void **)&device->cm.mpu); + if (ret != EOK) + return ret; + + ret = pio_enable((void *)IVA2_CM_BASE_ADDRESS, + IVA2_CM_SIZE, (void **)&device->cm.iva2); + if (ret != EOK) + return ret; + + ret = pio_enable((void *)CLOCK_CONTROL_PRM_BASE_ADDRESS, + CLOCK_CONTROL_PRM_SIZE, (void **)&device->prm.clocks); + if (ret != EOK) + return ret; + + ret = pio_enable((void *)GLOBAL_REG_PRM_BASE_ADDRESS, + GLOBAL_REG_PRM_SIZE, (void **)&device->prm.global); + if (ret != EOK) + return ret; + + ret = pio_enable((void *)AMDM37x_USBTLL_BASE_ADDRESS, + AMDM37x_USBTLL_SIZE, (void **)&device->tll); + if (ret != EOK) + return ret; + + ret = pio_enable((void *)AMDM37x_UHH_BASE_ADDRESS, + AMDM37x_UHH_SIZE, (void **)&device->uhh); if (ret != EOK) return ret; if (trace) { - pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log_message, (void*)AMDM37x_USBTLL_BASE_ADDRESS); - pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log_message, (void*)CLOCK_CONTROL_CM_BASE_ADDRESS); - pio_trace_enable(device->cm.core, CORE_CM_SIZE, log_message, (void*)CORE_CM_BASE_ADDRESS); - pio_trace_enable(device->cm.mpu, MPU_CM_SIZE, log_message, (void*)MPU_CM_BASE_ADDRESS); - pio_trace_enable(device->cm.iva2, IVA2_CM_SIZE, log_message, (void*)IVA2_CM_BASE_ADDRESS); - pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log_message, (void*)USBHOST_CM_BASE_ADDRESS); - pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log_message, (void*)AMDM37x_UHH_BASE_ADDRESS); - pio_trace_enable(device->prm.clocks, CLOCK_CONTROL_PRM_SIZE, log_message, (void*)CLOCK_CONTROL_PRM_BASE_ADDRESS); - pio_trace_enable(device->prm.global, GLOBAL_REG_PRM_SIZE, log_message, (void*)GLOBAL_REG_PRM_BASE_ADDRESS); + pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log_message, (void *)AMDM37x_USBTLL_BASE_ADDRESS); + pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log_message, (void *)CLOCK_CONTROL_CM_BASE_ADDRESS); + pio_trace_enable(device->cm.core, CORE_CM_SIZE, log_message, (void *)CORE_CM_BASE_ADDRESS); + pio_trace_enable(device->cm.mpu, MPU_CM_SIZE, log_message, (void *)MPU_CM_BASE_ADDRESS); + pio_trace_enable(device->cm.iva2, IVA2_CM_SIZE, log_message, (void *)IVA2_CM_BASE_ADDRESS); + pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log_message, (void *)USBHOST_CM_BASE_ADDRESS); + pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log_message, (void *)AMDM37x_UHH_BASE_ADDRESS); + pio_trace_enable(device->prm.clocks, CLOCK_CONTROL_PRM_SIZE, log_message, (void *)CLOCK_CONTROL_PRM_BASE_ADDRESS); + pio_trace_enable(device->prm.global, GLOBAL_REG_PRM_SIZE, log_message, (void *)GLOBAL_REG_PRM_BASE_ADDRESS); } return EOK; @@ -129,9 +129,9 @@ /* Get SYS_CLK value, it is used as reference clock by all DPLLs, * NFI who sets this or why it is set to specific value. */ - const unsigned osc_clk = pio_read_32(&device->prm.clocks->clksel) - & CLOCK_CONTROL_PRM_CLKSEL_SYS_CLKIN_MASK; + const unsigned osc_clk = pio_read_32(&device->prm.clocks->clksel) & + CLOCK_CONTROL_PRM_CLKSEL_SYS_CLKIN_MASK; const unsigned clk_reg = pio_read_32(&device->prm.global->clksrc_ctrl); - const unsigned base_freq = sys_clk_freq_kHz(osc_clk) - / GLOBAL_REG_PRM_CLKSRC_CTRL_SYSCLKDIV_GET(clk_reg); + const unsigned base_freq = sys_clk_freq_kHz(osc_clk) / + GLOBAL_REG_PRM_CLKSRC_CTRL_SYSCLKDIV_GET(clk_reg); ddf_msg(LVL_NOTE, "Base frequency: %d.%dMhz", base_freq / 1000, base_freq % 1000); @@ -150,17 +150,17 @@ const uint32_t reg = pio_read_32(&mpu->clksel1_pll); const unsigned multiplier = - (reg & MPU_CM_CLKSEL1_PLL_MPU_DPLL_MULT_MASK) - >> MPU_CM_CLKSEL1_PLL_MPU_DPLL_MULT_SHIFT; + (reg & MPU_CM_CLKSEL1_PLL_MPU_DPLL_MULT_MASK) >> + MPU_CM_CLKSEL1_PLL_MPU_DPLL_MULT_SHIFT; const unsigned divisor = - (reg & MPU_CM_CLKSEL1_PLL_MPU_DPLL_DIV_MASK) - >> MPU_CM_CLKSEL1_PLL_MPU_DPLL_DIV_SHIFT; + (reg & MPU_CM_CLKSEL1_PLL_MPU_DPLL_DIV_MASK) >> + MPU_CM_CLKSEL1_PLL_MPU_DPLL_DIV_SHIFT; const unsigned divisor2 = - (pio_read_32(&mpu->clksel2_pll) - & MPU_CM_CLKSEL2_PLL_MPU_DPLL_CLKOUT_DIV_MASK); + (pio_read_32(&mpu->clksel2_pll) & + MPU_CM_CLKSEL2_PLL_MPU_DPLL_CLKOUT_DIV_MASK); if (multiplier && divisor && divisor2) { /** See AMDM37x TRM p. 300 for the formula */ const unsigned freq = - ((base_freq * multiplier) / (divisor + 1)) - / divisor2; + ((base_freq * multiplier) / (divisor + 1)) / + divisor2; ddf_msg(LVL_NOTE, "MPU running at %d.%d MHz", freq / 1000, freq % 1000); @@ -174,5 +174,5 @@ const unsigned divisor = MPU_CM_CLKSEL1_PLL_MPU_CLK_SRC_VAL( - pio_read_32(&mpu->clksel1_pll)); + pio_read_32(&mpu->clksel1_pll)); ddf_msg(LVL_NOTE, "MPU DPLL in bypass mode, running at" " CORE CLK / %d MHz", divisor); @@ -226,6 +226,6 @@ freq / 1000, freq % 1000); const unsigned l3_div = - pio_read_32(&device->cm.core->clksel) - & CORE_CM_CLKSEL_CLKSEL_L3_MASK; + pio_read_32(&device->cm.core->clksel) & + CORE_CM_CLKSEL_CLKSEL_L3_MASK; if (l3_div == CORE_CM_CLKSEL_CLKSEL_L3_DIVIDED1 || l3_div == CORE_CM_CLKSEL_CLKSEL_L3_DIVIDED2) { @@ -234,5 +234,5 @@ (freq / l3_div) % 1000); } else { - ddf_msg(LVL_WARN,"L3 interface clock divisor is" + ddf_msg(LVL_WARN, "L3 interface clock divisor is" " invalid: %d", l3_div); } @@ -244,5 +244,5 @@ } else { ddf_msg(LVL_WARN, "CORE CLK in bypass mode, fruunig at SYS_CLK" - " frreq of %d.%d MHz", base_freq / 1000, base_freq % 1000); + " frreq of %d.%d MHz", base_freq / 1000, base_freq % 1000); } @@ -268,7 +268,7 @@ */ // TODO setup DPLL5 - if ((pio_read_32(&device->cm.clocks->clken2_pll) - & CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_MASK) - != CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_LOCK) { + if ((pio_read_32(&device->cm.clocks->clken2_pll) & + CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_MASK) != + CLOCK_CONTROL_CM_CLKEN2_PLL_EN_PERIPH2_DPLL_LOCK) { /* Compute divisors and multiplier * See AMDM37x TRM p. 300 for the formula */ @@ -278,5 +278,5 @@ const unsigned div = (base_freq / 1000) - 1; const unsigned div2 = 1; - if ( ((base_freq % 1000) != 0) || (div > 127)) { + if (((base_freq % 1000) != 0) || (div > 127)) { ddf_msg(LVL_ERROR, "Rounding error, or divisor to big " "freq: %d, div: %d", base_freq, div); @@ -333,5 +333,5 @@ #if 0 printf("DPLL5 (and everything else) should be on: %" - PRIx32" %"PRIx32".\n", + PRIx32 " %" PRIx32 ".\n", pio_read_32(&device->cm.clocks->idlest_ckgen), pio_read_32(&device->cm.clocks->idlest2_ckgen)); @@ -369,5 +369,6 @@ pio_set_32(&device->tll->sysconfig, TLL_SYSCONFIG_SOFTRESET_FLAG, 5); ddf_msg(LVL_DEBUG2, "Waiting for USB TLL reset"); - while (!(pio_read_32(&device->tll->sysstatus) & TLL_SYSSTATUS_RESET_DONE_FLAG)); + while (!(pio_read_32(&device->tll->sysstatus) & TLL_SYSSTATUS_RESET_DONE_FLAG)) + ; ddf_msg(LVL_DEBUG, "USB TLL Reset done."); Index: uspace/drv/platform/malta/malta.c =================================================================== --- uspace/drv/platform/malta/malta.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/platform/malta/malta.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -239,5 +239,5 @@ ret = pio_enable((void *) GT_BASE, GT_SIZE, (void **) >); if (ret != EOK) - return ret; + return ret; val = uint32_t_le2host(pio_read_32( >[GT_PCI_CMD / sizeof(ioport32_t)])); Index: uspace/drv/time/cmos-rtc/cmos-rtc.c =================================================================== --- uspace/drv/time/cmos-rtc/cmos-rtc.c (revision 8ebe212533840cb545a4f768a0689f6940125144) +++ uspace/drv/time/cmos-rtc/cmos-rtc.c (revision c1f44ca9058d587a92a07d661a9e0197a5bf1f93) @@ -362,5 +362,5 @@ /* Now check if it is stable */ - } while(t->tm_sec != rtc_register_read(rtc, RTC_SEC) || + } while (t->tm_sec != rtc_register_read(rtc, RTC_SEC) || t->tm_min != rtc_register_read(rtc, RTC_MIN) || t->tm_mday != rtc_register_read(rtc, RTC_DAY) ||