Index: uspace/drv/bus/usb/xhci/endpoint.h
===================================================================
--- uspace/drv/bus/usb/xhci/endpoint.h	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/endpoint.h	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -56,5 +56,5 @@
 /** Connector structure linking endpoint context to the endpoint. */
 typedef struct xhci_endpoint {
-  uint32_t slot_id;
+	uint32_t slot_id;
 } xhci_endpoint_t;
 
@@ -64,6 +64,6 @@
 static inline xhci_endpoint_t * endpoint_get(const endpoint_t *ep)
 {
-  assert(ep);
-  return ep->hc_data.data;
+	assert(ep);
+	return ep->hc_data.data;
 }
 
Index: uspace/drv/bus/usb/xhci/hc.h
===================================================================
--- uspace/drv/bus/usb/xhci/hc.h	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/hc.h	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -45,6 +45,6 @@
 
 typedef struct xhci_virt_device_ctx {
-    xhci_device_ctx_t *dev_ctx;
-    xhci_trb_ring_t *trs[XHCI_EP_COUNT];
+	xhci_device_ctx_t *dev_ctx;
+	xhci_trb_ring_t *trs[XHCI_EP_COUNT];
 } xhci_virt_device_ctx_t;
 
Index: uspace/drv/bus/usb/xhci/hw_struct/common.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/common.h	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/hw_struct/common.h	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -83,7 +83,7 @@
 static inline void xhci_qword_set_bits(xhci_qword_t *storage, uint64_t value, unsigned hi, unsigned lo)
 {
-   const uint64_t mask = host2xhci(64, BIT_RANGE(uint64_t, hi, lo));
-   const uint64_t set = host2xhci(64, value << lo);
-   *storage = (*storage & ~mask) | set;
+	const uint64_t mask = host2xhci(64, BIT_RANGE(uint64_t, hi, lo));
+	const uint64_t set = host2xhci(64, value << lo);
+	*storage = (*storage & ~mask) | set;
 }
 
Index: uspace/drv/bus/usb/xhci/hw_struct/context.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/context.h	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/hw_struct/context.h	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -65,21 +65,21 @@
 
 #define XHCI_EP_TYPE_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[1], val, 5, 3)
+	xhci_dword_set_bits(&(ctx).data[1], val, 5, 3)
 #define XHCI_EP_MAX_PACKET_SIZE_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[1], val, 31, 16)
+	xhci_dword_set_bits(&(ctx).data[1], val, 31, 16)
 #define XHCI_EP_MAX_BURST_SIZE_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[1], val, 15, 8)
+	xhci_dword_set_bits(&(ctx).data[1], val, 15, 8)
 #define XHCI_EP_TR_DPTR_SET(ctx, val) \
-    xhci_qword_set_bits(&(ctx).data2, (val >> 4), 63, 4)
+	xhci_qword_set_bits(&(ctx).data2, (val >> 4), 63, 4)
 #define XHCI_EP_DCS_SET(ctx, val) \
-    xhci_qword_set_bits(&(ctx).data2, val, 0, 0)
+	xhci_qword_set_bits(&(ctx).data2, val, 0, 0)
 #define XHCI_EP_INTERVAL_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[0], val, 23, 16)
+	xhci_dword_set_bits(&(ctx).data[0], val, 23, 16)
 #define XHCI_EP_MAX_P_STREAMS_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[0], val, 14, 10)
+	xhci_dword_set_bits(&(ctx).data[0], val, 14, 10)
 #define XHCI_EP_MULT_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[0], val, 9, 8)
+	xhci_dword_set_bits(&(ctx).data[0], val, 9, 8)
 #define XHCI_EP_ERROR_COUNT_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[1], val, 2, 1)
+	xhci_dword_set_bits(&(ctx).data[1], val, 2, 1)
 
 #define XHCI_EP_STATE(ctx)              XHCI_DWORD_EXTRACT((ctx).data[0],  2,  0)
@@ -108,7 +108,7 @@
 
 #define XHCI_SLOT_ROOT_HUB_PORT_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[1], val, 23, 16)
+	xhci_dword_set_bits(&(ctx).data[1], val, 23, 16)
 #define XHCI_SLOT_CTX_ENTRIES_SET(ctx, val) \
-    xhci_dword_set_bits(&(ctx).data[0], val, 31, 27)
+	xhci_dword_set_bits(&(ctx).data[0], val, 31, 27)
 #define XHCI_SLOT_ROUTE_STRING_SET(ctx, val) \
 	xhci_dword_set_bits(&(ctx).data[0], (val & 0xFFFFF), 19, 0)
Index: uspace/drv/bus/usb/xhci/hw_struct/regs.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/regs.h	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/hw_struct/regs.h	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -499,5 +499,5 @@
  */
 typedef struct xhci_psi {
-        xhci_dword_t psi;
+	xhci_dword_t psi;
 } xhci_psi_t;
 
@@ -547,5 +547,5 @@
 
 static const xhci_sp_name_t xhci_name_usb = {
-    .str = "USB "
+	.str = "USB "
 };
 
Index: uspace/drv/bus/usb/xhci/hw_struct/trb.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/trb.h	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/hw_struct/trb.h	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -170,11 +170,11 @@
 static inline void xhci_trb_copy(xhci_trb_t *dst, xhci_trb_t *src)
 {
-    /*
-     * As we do not know, whether our architecture is capable of copying 16
-     * bytes atomically, let's copy the fields one by one.
-     */
-    dst->parameter = src->parameter;
-    dst->status = src->status;
-    dst->control = src->control;
+	/*
+	 * As we do not know, whether our architecture is capable of copying 16
+	 * bytes atomically, let's copy the fields one by one.
+	 */
+	dst->parameter = src->parameter;
+	dst->status = src->status;
+	dst->control = src->control;
 }
 
Index: uspace/drv/bus/usb/xhci/main.c
===================================================================
--- uspace/drv/bus/usb/xhci/main.c	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/main.c	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -66,6 +66,6 @@
 		.schedule       = hcd_schedule,
 		.irq_hook       = hcd_interrupt,
-                .ep_add_hook    = endpoint_init,
-                .ep_remove_hook = endpoint_fini,
+		.ep_add_hook    = endpoint_init,
+		.ep_remove_hook = endpoint_fini,
 		.status_hook    = hcd_status,
 	}
Index: uspace/drv/bus/usb/xhci/rh.c
===================================================================
--- uspace/drv/bus/usb/xhci/rh.c	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/rh.c	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2017 Michal Staruch
+n * Copyright (c) 2017 Michal Staruch
  * All rights reserved.
  *
@@ -317,6 +317,6 @@
  */
 static int req_clear_hub_feature(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size)
+	const usb_device_request_setup_packet_t *setup_packet,
+	uint8_t *data, size_t *act_size)
 {
 	/* TODO: Implement me! */
@@ -337,6 +337,6 @@
  */
 static int req_get_port_status(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size)
+	const usb_device_request_setup_packet_t *setup_packet,
+	uint8_t *data, size_t *act_size)
 {
 	xhci_rh_t *hub = virthub_get_data(device);
@@ -380,6 +380,6 @@
  */
 static int req_clear_port_feature(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size)
+	const usb_device_request_setup_packet_t *setup_packet,
+	uint8_t *data, size_t *act_size)
 {
 	xhci_rh_t *hub = virthub_get_data(device);
@@ -437,6 +437,6 @@
  */
 static int req_set_port_feature(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size)
+	const usb_device_request_setup_packet_t *setup_packet,
+	uint8_t *data, size_t *act_size)
 {
 	xhci_rh_t *hub = virthub_get_data(device);
@@ -478,6 +478,6 @@
  */
 static int req_status_change_handler(usbvirt_device_t *device,
-    usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
-    void *buffer, size_t buffer_size, size_t *actual_size)
+	usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
+	void *buffer, size_t buffer_size, size_t *actual_size)
 {
 	xhci_rh_t *hub = virthub_get_data(device);
@@ -574,6 +574,6 @@
 /** Virtual XHCI root hub ops */
 static usbvirt_device_ops_t ops = {
-        .control = control_transfer_handlers,
-        .data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler,
+	.control = control_transfer_handlers,
+	.data_in[HUB_STATUS_CHANGE_PIPE] = req_status_change_handler,
 };
 
Index: uspace/drv/bus/usb/xhci/rh.h
===================================================================
--- uspace/drv/bus/usb/xhci/rh.h	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/rh.h	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -76,5 +76,5 @@
 	usb_transfer_batch_t *unfinished_interrupt_transfer;
 
-  /* Number of hub ports. */
+	/* Number of hub ports. */
 	uint8_t max_ports;
 } xhci_rh_t;
Index: uspace/drv/bus/usb/xhci/transfers.c
===================================================================
--- uspace/drv/bus/usb/xhci/transfers.c	(revision ac18b084c27350ad1ab8149b71552cb3aa81493e)
+++ uspace/drv/bus/usb/xhci/transfers.c	(revision eaf5e867c62f55c6dc6731c2cddfcdb4ba097009)
@@ -150,72 +150,72 @@
 		(usb_device_request_setup_packet_t*) batch->setup_buffer;
 
- 	/* For the TRB formats, see xHCI specification 6.4.1.2 */
+	/* For the TRB formats, see xHCI specification 6.4.1.2 */
 	xhci_transfer_t *transfer = xhci_transfer_alloc(batch);
 
- 	xhci_trb_t trb_setup;
- 	memset(&trb_setup, 0, sizeof(xhci_trb_t));
-
- 	TRB_CTRL_SET_SETUP_WVALUE(trb_setup, setup->value);
- 	TRB_CTRL_SET_SETUP_WLENGTH(trb_setup, setup->length);
- 	TRB_CTRL_SET_SETUP_WINDEX(trb_setup, setup->index);
- 	TRB_CTRL_SET_SETUP_BREQ(trb_setup, setup->request);
- 	TRB_CTRL_SET_SETUP_BMREQTYPE(trb_setup, setup->request_type);
-
- 	/* Size of the setup packet is always 8 */
- 	TRB_CTRL_SET_XFER_LEN(trb_setup, 8);
- 	// if we want an interrupt after this td is done, use
- 	// TRB_CTRL_SET_IOC(trb_setup, 1);
-
- 	/* Immediate data */
- 	TRB_CTRL_SET_IDT(trb_setup, 1);
- 	TRB_CTRL_SET_TRB_TYPE(trb_setup, XHCI_TRB_TYPE_SETUP_STAGE);
- 	TRB_CTRL_SET_TRT(trb_setup, get_transfer_type(&trb_setup, setup->request_type, setup->length));
-
- 	/* Data stage */
+	xhci_trb_t trb_setup;
+	memset(&trb_setup, 0, sizeof(xhci_trb_t));
+
+	TRB_CTRL_SET_SETUP_WVALUE(trb_setup, setup->value);
+	TRB_CTRL_SET_SETUP_WLENGTH(trb_setup, setup->length);
+	TRB_CTRL_SET_SETUP_WINDEX(trb_setup, setup->index);
+	TRB_CTRL_SET_SETUP_BREQ(trb_setup, setup->request);
+	TRB_CTRL_SET_SETUP_BMREQTYPE(trb_setup, setup->request_type);
+
+	/* Size of the setup packet is always 8 */
+	TRB_CTRL_SET_XFER_LEN(trb_setup, 8);
+	// if we want an interrupt after this td is done, use
+	// TRB_CTRL_SET_IOC(trb_setup, 1);
+
+	/* Immediate data */
+	TRB_CTRL_SET_IDT(trb_setup, 1);
+	TRB_CTRL_SET_TRB_TYPE(trb_setup, XHCI_TRB_TYPE_SETUP_STAGE);
+	TRB_CTRL_SET_TRT(trb_setup, get_transfer_type(&trb_setup, setup->request_type, setup->length));
+
+	/* Data stage */
 	xhci_trb_t trb_data;
 	memset(&trb_data, 0, sizeof(xhci_trb_t));
 
- 	if (setup->length > 0) {
- 		trb_data.parameter = (uintptr_t) addr_to_phys(batch->buffer);
-
- 		// data size (sent for OUT, or buffer size)
- 		TRB_CTRL_SET_XFER_LEN(trb_data, batch->buffer_size);
- 		// FIXME: TD size 4.11.2.4
- 		TRB_CTRL_SET_TD_SIZE(trb_data, 1);
-
- 		// if we want an interrupt after this td is done, use
- 		// TRB_CTRL_SET_IOC(trb_data, 1);
-
- 		// Some more fields here, no idea what they mean
- 		TRB_CTRL_SET_TRB_TYPE(trb_data, XHCI_TRB_TYPE_DATA_STAGE);
+	if (setup->length > 0) {
+		trb_data.parameter = (uintptr_t) addr_to_phys(batch->buffer);
+
+		// data size (sent for OUT, or buffer size)
+		TRB_CTRL_SET_XFER_LEN(trb_data, batch->buffer_size);
+		// FIXME: TD size 4.11.2.4
+		TRB_CTRL_SET_TD_SIZE(trb_data, 1);
+
+		// if we want an interrupt after this td is done, use
+		// TRB_CTRL_SET_IOC(trb_data, 1);
+
+		// Some more fields here, no idea what they mean
+		TRB_CTRL_SET_TRB_TYPE(trb_data, XHCI_TRB_TYPE_DATA_STAGE);
 
 		transfer->direction = get_data_direction(&trb_setup, setup->request_type, setup->length);
- 		TRB_CTRL_SET_DIR(trb_data, transfer->direction);
- 	}
-
- 	/* Status stage */
- 	xhci_trb_t trb_status;
- 	memset(&trb_status, 0, sizeof(xhci_trb_t));
-
- 	// FIXME: Evaluate next TRB? 4.12.3
- 	// TRB_CTRL_SET_ENT(trb_status, 1);
-
- 	// if we want an interrupt after this td is done, use
- 	TRB_CTRL_SET_IOC(trb_status, 1);
-
- 	TRB_CTRL_SET_TRB_TYPE(trb_status, XHCI_TRB_TYPE_STATUS_STAGE);
- 	TRB_CTRL_SET_DIR(trb_status, get_status_direction(&trb_setup, setup->request_type, setup->length));
+		TRB_CTRL_SET_DIR(trb_data, transfer->direction);
+	}
+
+	/* Status stage */
+	xhci_trb_t trb_status;
+	memset(&trb_status, 0, sizeof(xhci_trb_t));
+
+	// FIXME: Evaluate next TRB? 4.12.3
+	// TRB_CTRL_SET_ENT(trb_status, 1);
+
+	// if we want an interrupt after this td is done, use
+	TRB_CTRL_SET_IOC(trb_status, 1);
+
+	TRB_CTRL_SET_TRB_TYPE(trb_status, XHCI_TRB_TYPE_STATUS_STAGE);
+	TRB_CTRL_SET_DIR(trb_status, get_status_direction(&trb_setup, setup->request_type, setup->length));
 
 	uintptr_t dummy = 0;
- 	xhci_trb_ring_enqueue(ring, &trb_setup, &dummy);
+	xhci_trb_ring_enqueue(ring, &trb_setup, &dummy);
 	if (setup->length > 0) {
 		xhci_trb_ring_enqueue(ring, &trb_data, &dummy);
 	}
- 	xhci_trb_ring_enqueue(ring, &trb_status, &transfer->interrupt_trb_phys);
+	xhci_trb_ring_enqueue(ring, &trb_status, &transfer->interrupt_trb_phys);
 
 	list_append(&transfer->link, &hc->transfers);
 
- 	/* For control transfers, the target is always 1. */
- 	hc_ring_doorbell(hc, slot_id, 1);
+	/* For control transfers, the target is always 1. */
+	hc_ring_doorbell(hc, slot_id, 1);
 	return EOK;
 }
@@ -236,7 +236,7 @@
 
 	// data size (sent for OUT, or buffer size)
- 	TRB_CTRL_SET_XFER_LEN(trb, batch->buffer_size);
- 	// FIXME: TD size 4.11.2.4
- 	TRB_CTRL_SET_TD_SIZE(trb, 1);
+	TRB_CTRL_SET_XFER_LEN(trb, batch->buffer_size);
+	// FIXME: TD size 4.11.2.4
+	TRB_CTRL_SET_TD_SIZE(trb, 1);
 
 	// we want an interrupt after this td is done
@@ -245,9 +245,9 @@
 	TRB_CTRL_SET_TRB_TYPE(trb, XHCI_TRB_TYPE_NORMAL);
 
- 	xhci_trb_ring_enqueue(ring, &trb, &transfer->interrupt_trb_phys);
+	xhci_trb_ring_enqueue(ring, &trb, &transfer->interrupt_trb_phys);
 	list_append(&transfer->link, &hc->transfers);
 
- 	/* For control transfers, the target is always 1. */
- 	hc_ring_doorbell(hc, slot_id, 1);
+	/* For control transfers, the target is always 1. */
+	hc_ring_doorbell(hc, slot_id, 1);
 	return EOK;
 }