Index: uspace/drv/bus/usb/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/generic/hiddev.c	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -92,5 +92,5 @@
 	usb_log_debug2("Generic HID: Get event length (fun: %p, "
 	    "fun->driver_data: %p.\n", fun, fun->driver_data);
-	
+
 	if (fun == NULL || fun->driver_data == NULL) {
 		return 0;
@@ -98,8 +98,8 @@
 
 	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-	
+
 	usb_log_debug2("hid_dev: %p, Max input report size (%zu).\n",
 	    hid_dev, hid_dev->max_input_report_size);
-	
+
 	return hid_dev->max_input_report_size;
 }
@@ -111,5 +111,5 @@
 {
 	usb_log_debug2("Generic HID: Get event.\n");
-	
+
 	if (fun == NULL || fun->driver_data == NULL || buffer == NULL
 	    || act_size == NULL || event_nr == NULL) {
@@ -119,5 +119,5 @@
 
 	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-	
+
 	if (hid_dev->input_report_size > size) {
 		usb_log_debug("input_report_size > size (%zu, %zu)\n", 
@@ -125,5 +125,5 @@
 		return EINVAL;	// TODO: other error code
 	}
-	
+
 	/*! @todo This should probably be somehow atomic. */
 	memcpy(buffer, hid_dev->input_report, 
@@ -131,7 +131,7 @@
 	*act_size = hid_dev->input_report_size;
 	*event_nr = usb_hid_report_number(hid_dev);
-	
+
 	usb_log_debug2("OK\n");
-	
+
 	return EOK;
 }
@@ -142,15 +142,15 @@
 {
 	usb_log_debug("Generic HID: Get report descriptor length.\n");
-	
+
 	if (fun == NULL || fun->driver_data == NULL) {
 		usb_log_debug("No function");
 		return EINVAL;
 	}
-	
-	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-	
+
+	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+
 	usb_log_debug2("hid_dev->report_desc_size = %zu\n", 
 	    hid_dev->report_desc_size);
-	
+
 	return hid_dev->report_desc_size;
 }
@@ -162,19 +162,19 @@
 {
 	usb_log_debug2("Generic HID: Get report descriptor.\n");
-	
+
 	if (fun == NULL || fun->driver_data == NULL) {
 		usb_log_debug("No function");
 		return EINVAL;
 	}
-	
-	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
-	
+
+	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+
 	if (hid_dev->report_desc_size > size) {
 		return EINVAL;
 	}
-	
+
 	memcpy(desc, hid_dev->report_desc, hid_dev->report_desc_size);
 	*actual_size = hid_dev->report_desc_size;
-	
+
 	return EOK;
 }
@@ -201,5 +201,5 @@
 		return ENOMEM;
 	}
-	
+
 	fun->ops = &usb_generic_hid_ops;
 	fun->driver_data = hid_dev;
@@ -212,7 +212,7 @@
 		return rc;
 	}
-	
+
 	usb_log_debug("HID function created. Handle: %" PRIun "\n", fun->handle);
-	
+
 	return EOK;
 }
@@ -225,5 +225,5 @@
 		return EINVAL;
 	}
-	
+
 	return usb_generic_hid_create_function(hid_dev);
 }
Index: uspace/drv/bus/usb/usbhid/kbd/conv.c
===================================================================
--- uspace/drv/bus/usb/usbhid/kbd/conv.c	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/kbd/conv.c	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -87,5 +87,5 @@
 	[0x26] = KC_9,
 	[0x27] = KC_0,
-	
+
 	[0x28] = KC_ENTER,
 	[0x29] = KC_ESCAPE,
@@ -109,5 +109,5 @@
 
 	[0x39] = KC_CAPS_LOCK,
-	
+
 	[0x3a] = KC_F1,
 	[0x3b] = KC_F2,
@@ -122,5 +122,5 @@
 	[0x44] = KC_F11,
 	[0x45] = KC_F12,
-	
+
 	[0x46] = KC_PRTSCR,
 	[0x47] = KC_SCROLL_LOCK,
@@ -136,7 +136,7 @@
 	[0x51] = KC_DOWN,
 	[0x52] = KC_UP,
-	
+
 	//[0x64] = // some funny key
-	
+
 	[0xe0] = KC_LCTRL,
 	[0xe1] = KC_LSHIFT,
@@ -147,5 +147,5 @@
 	[0xe6] = KC_RALT,
 	//[0xe7] = KC_R	// TODO: right GUI
-	
+
 	[0x53] = KC_NUM_LOCK,
 	[0x54] = KC_NSLASH,
@@ -165,5 +165,5 @@
 	[0x62] = KC_N0,
 	[0x63] = KC_NPERIOD
-	
+
 };
 
@@ -186,5 +186,5 @@
 
 	key = map[scancode];
-	
+
 	return key;
 }
Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/kbd/kbddev.c	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -174,5 +174,5 @@
 {
 	sysarg_t method = IPC_GET_IMETHOD(*icall);
-	
+
 	usb_kbd_t *kbd_dev = (usb_kbd_t *) fun->driver_data;
 	if (kbd_dev == NULL) {
@@ -182,5 +182,5 @@
 		return;
 	}
-	
+
 	async_sess_t *sess =
 	    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
@@ -240,5 +240,5 @@
 	    USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
 	    USB_HID_REPORT_TYPE_OUTPUT);
-	
+
 	while (field != NULL) {
 		
@@ -263,9 +263,9 @@
 			USB_HID_REPORT_TYPE_OUTPUT);
 	}
-	
+
 	// TODO: what about the Report ID?
 	int rc = usb_hid_report_output_translate(hid_dev->report, 0,
 	    kbd_dev->output_buffer, kbd_dev->output_size);
-	
+
 	if (rc != EOK) {
 		usb_log_warning("Error translating LED output to output report"
@@ -273,9 +273,9 @@
 		return;
 	}
-	
+
 	usb_log_debug("Output report buffer: %s\n", 
 	    usb_debug_str_buffer(kbd_dev->output_buffer, kbd_dev->output_size, 
 	        0));
-	
+
 	usbhid_req_set_report(&hid_dev->usb_dev->ctrl_pipe, 
 	    hid_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_OUTPUT, 
@@ -300,5 +300,5 @@
 		return;
 	}
-	
+
 	async_exch_t *exch = async_exchange_begin(kbd_dev->console_sess);
 	async_msg_2(exch, KBDEV_EVENT, type, key);
@@ -347,5 +347,5 @@
 	unsigned int key;
 	size_t i;
-	
+
 	/*
 	 * First of all, check if the kbd have reported phantom state.
@@ -362,5 +362,5 @@
 		return;
 	}
-	
+
 	/*
 	 * Key releases
@@ -382,5 +382,5 @@
 		}
 	}
-	
+
 	/*
 	 * Key presses
@@ -402,7 +402,7 @@
 		}
 	}
-	
+
 	memcpy(kbd_dev->keys_old, kbd_dev->keys, kbd_dev->key_count * 4);
-	
+
 	char key_buffer[512];
 	ddf_dump_buffer(key_buffer, 512,
@@ -435,12 +435,12 @@
 	assert(hid_dev != NULL);
 	assert(kbd_dev != NULL);
-	
+
 	usb_hid_report_path_t *path = usb_hid_report_path();
 	usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
 
 	usb_hid_report_path_set_report_id (path, hid_dev->report_id);
-	
+
 	// fill in the currently pressed keys
-	
+
 	usb_hid_report_field_t *field = usb_hid_report_get_sibling(
 	    hid_dev->report, NULL, path, 
@@ -448,5 +448,5 @@
 	    USB_HID_REPORT_TYPE_INPUT);
 	unsigned i = 0;
-	
+
 	while (field != NULL) {
 		usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 
@@ -470,7 +470,7 @@
 		    USB_HID_REPORT_TYPE_INPUT);
 	}
-	
+
 	usb_hid_report_path_free(path);
-	
+
 	usb_kbd_check_key_changes(hid_dev, kbd_dev);
 }
@@ -505,8 +505,8 @@
 		return NULL;
 	}
-	
+
 	kbd_dev->console_sess = NULL;
 	kbd_dev->initialized = USB_KBD_STATUS_UNINITIALIZED;
-	
+
 	return kbd_dev;
 }
@@ -519,5 +519,5 @@
 	assert(hid_dev->usb_dev != NULL);
 	assert(kbd_dev != NULL);
-	
+
 	/* Create the exposed function. */
 	usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
@@ -528,5 +528,5 @@
 		return ENOMEM;
 	}
-	
+
 	/*
 	 * Store the initialized HID device and HID ops
@@ -543,8 +543,8 @@
 		return rc;
 	}
-	
+
 	usb_log_debug("%s function created. Handle: %" PRIun "\n",
 	    HID_KBD_FUN_NAME, fun->handle);
-	
+
 	usb_log_debug("Adding DDF function to category %s...\n", 
 	    HID_KBD_CLASS_NAME);
@@ -557,5 +557,5 @@
 		return rc;
 	}
-	
+
 	return EOK;
 }
@@ -587,5 +587,5 @@
 {
 	usb_log_debug("Initializing HID/KBD structure...\n");
-	
+
 	if (hid_dev == NULL) {
 		usb_log_error("Failed to init keyboard structure: no structure"
@@ -593,5 +593,5 @@
 		return EINVAL;
 	}
-	
+
 	usb_kbd_t *kbd_dev = usb_kbd_new();
 	if (kbd_dev == NULL) {
@@ -603,5 +603,5 @@
 	/* Store link to HID device */
 	kbd_dev->hid_dev = hid_dev;
-	
+
 	/*
 	 * TODO: make more general
@@ -609,15 +609,15 @@
 	usb_hid_report_path_t *path = usb_hid_report_path();
 	usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
-	
+
 	usb_hid_report_path_set_report_id(path, 0);
-	
+
 	kbd_dev->key_count = usb_hid_report_size(
 	    hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT); 
 	usb_hid_report_path_free(path);
-	
+
 	usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count);
-	
+
 	kbd_dev->keys = (int32_t *)calloc(kbd_dev->key_count, sizeof(int32_t));
-	
+
 	if (kbd_dev->keys == NULL) {
 		usb_log_fatal("No memory!\n");
@@ -625,8 +625,8 @@
 		return ENOMEM;
 	}
-	
+
 	kbd_dev->keys_old = 
 		(int32_t *)calloc(kbd_dev->key_count, sizeof(int32_t));
-	
+
 	if (kbd_dev->keys_old == NULL) {
 		usb_log_fatal("No memory!\n");
@@ -635,5 +635,5 @@
 		return ENOMEM;
 	}
-	
+
 	/*
 	 * Output report
@@ -647,20 +647,20 @@
 		return ENOMEM;
 	}
-	
+
 	usb_log_debug("Output buffer size: %zu\n", kbd_dev->output_size);
-	
+
 	kbd_dev->led_path = usb_hid_report_path();
 	usb_hid_report_path_append_item(
 	    kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
-	
+
 	kbd_dev->led_output_size = usb_hid_report_size(hid_dev->report, 
 	    0, USB_HID_REPORT_TYPE_OUTPUT);
-	
+
 	usb_log_debug("Output report size (in items): %zu\n", 
 	    kbd_dev->led_output_size);
-	
+
 	kbd_dev->led_data = (int32_t *)calloc(
 	    kbd_dev->led_output_size, sizeof(int32_t));
-	
+
 	if (kbd_dev->led_data == NULL) {
 		usb_log_warning("Error creating buffer for LED output report."
@@ -671,5 +671,5 @@
 		return ENOMEM;
 	}
-	
+
 	/*
 	 * Modifiers and locks
@@ -678,5 +678,5 @@
 	kbd_dev->mods = DEFAULT_ACTIVE_MODS;
 	kbd_dev->lock_keys = 0;
-	
+
 	/*
 	 * Autorepeat
@@ -686,5 +686,5 @@
 	kbd_dev->repeat.delay_before = DEFAULT_DELAY_BEFORE_FIRST_REPEAT;
 	kbd_dev->repeat.delay_between = DEFAULT_REPEAT_DELAY;
-	
+
 	kbd_dev->repeat_mtx = (fibril_mutex_t *)(
 	    malloc(sizeof(fibril_mutex_t)));
@@ -696,13 +696,13 @@
 		return ENOMEM;
 	}
-	
+
 	fibril_mutex_initialize(kbd_dev->repeat_mtx);
-	
+
 	// save the KBD device structure into the HID device structure
 	*data = kbd_dev;
-	
+
 	// set handler for incoming calls
 	kbd_dev->ops.default_handler = default_connection_handler;
-	
+
 	/*
 	 * Set LEDs according to initial setup.
@@ -710,8 +710,8 @@
 	 */
 	usb_kbd_set_led(hid_dev, kbd_dev);
-	
+
 	usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
 	    hid_dev->usb_dev->interface_no, IDLE_RATE);
-	
+
 	/*
 	 * Create new fibril for auto-repeat
@@ -723,8 +723,8 @@
 	}
 	fibril_add_ready(fid);
-	
+
 	kbd_dev->initialized = USB_KBD_STATUS_INITIALIZED;
 	usb_log_debug("HID/KBD device structure initialized.\n");
-	
+
 	usb_log_debug("Creating KBD function...\n");
 	int rc = usb_kbd_create_function(hid_dev, kbd_dev);
@@ -733,5 +733,5 @@
 		return rc;
 	}
-	
+
 	return EOK;
 }
@@ -745,11 +745,11 @@
 		return false;
 	}
-	
+
 	usb_kbd_t *kbd_dev = (usb_kbd_t *)data;
 	assert(kbd_dev != NULL);
-	
+
 	// TODO: add return value from this function
 	usb_kbd_process_data(hid_dev, kbd_dev);
-	
+
 	return true;
 }
@@ -780,8 +780,8 @@
 		return;
 	}
-	
+
 	// hangup session to the console
 	async_hangup(kbd_dev->console_sess);
-	
+
 	if (kbd_dev->repeat_mtx != NULL) {
 		//assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
@@ -791,5 +791,5 @@
 		free(kbd_dev->repeat_mtx);
 	}
-	
+
 	// free all buffers
 	if (kbd_dev->keys != NULL) {
@@ -817,5 +817,5 @@
 		return;
 	}
-	
+
 	if (data != NULL) {
 		usb_kbd_t *kbd_dev = (usb_kbd_t *)data;
@@ -835,5 +835,5 @@
 	    USB_KBD_BOOT_REPORT_DESCRIPTOR, 
 	    USB_KBD_BOOT_REPORT_DESCRIPTOR_SIZE);
-	
+
 	if (rc != EOK) {
 		usb_log_error("Failed to parse boot report descriptor: %s\n",
@@ -841,8 +841,8 @@
 		return rc;
 	}
-	
+
 	rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe, 
 	    hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
-	
+
 	if (rc != EOK) {
 		usb_log_warning("Failed to set boot protocol to the device: "
@@ -850,5 +850,5 @@
 		return rc;
 	}
-	
+
 	return EOK;
 }
Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.h
===================================================================
--- uspace/drv/bus/usb/usbhid/kbd/kbddev.h	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/kbd/kbddev.h	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -75,33 +75,33 @@
 	/** Currently pressed modifiers (bitmap). */
 	uint8_t modifiers;
-	
+
 	/** Currently active modifiers including locks. Sent to the console. */
 	unsigned mods;
-	
+
 	/** Currently active lock keys. */
 	unsigned lock_keys;
-	
+
 	/** IPC session to the console device (for sending key events). */
 	async_sess_t *console_sess;
-	
+
 	/** @todo What is this actually? */
 	ddf_dev_ops_t ops;
-	
+
 	/** Information for auto-repeat of keys. */
 	usb_kbd_repeat_t repeat;
-	
+
 	/** Mutex for accessing the information about auto-repeat. */
 	fibril_mutex_t *repeat_mtx;
-	
+
 	uint8_t *output_buffer;
-	
+
 	size_t output_size;
-	
+
 	size_t led_output_size;
-	
+
 	usb_hid_report_path_t *led_path;
-	
+
 	int32_t *led_data;
-	
+
 	/** State of the structure (for checking before use). 
 	 * 
Index: uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c
===================================================================
--- uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -73,5 +73,5 @@
 {
 	unsigned int delay = 0;
-	
+
 	usb_log_debug("Starting autorepeat loop.\n");
 
@@ -130,14 +130,14 @@
 {
 	usb_log_debug("Autorepeat fibril spawned.\n");
-	
+
 	if (arg == NULL) {
 		usb_log_error("No device!\n");
 		return EINVAL;
 	}
-	
+
 	usb_kbd_t *kbd = (usb_kbd_t *)arg;
-	
+
 	usb_kbd_repeat_loop(kbd);
-	
+
 	return EOK;
 }
Index: uspace/drv/bus/usb/usbhid/main.c
===================================================================
--- uspace/drv/bus/usb/usbhid/main.c	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/main.c	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -76,10 +76,10 @@
 {
 	assert(dev != NULL);
-	
+
 	/* 
 	 * Initialize device (get and process descriptors, get address, etc.)
 	 */
 	usb_log_debug("Initializing USB/HID device...\n");
-	
+
 	usb_hid_dev_t *hid_dev = usb_hid_new();
 	if (hid_dev == NULL) {
@@ -88,7 +88,7 @@
 		return ENOMEM;
 	}
-	
+
 	int rc = usb_hid_init(hid_dev, dev);
-	
+
 	if (rc != EOK) {
 		usb_log_error("Failed to initialize USB/HID device.\n");
@@ -96,7 +96,7 @@
 		return rc;
 	}	
-	
+
 	usb_log_debug("USB/HID device structure initialized.\n");
-	
+
 	/*
 	 * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
@@ -109,5 +109,5 @@
 	 *    pouzit usb/classes/hid/iface.h - prvy int je telefon
 	 */
-	
+
 	/* Start automated polling function.
 	 * This will create a separate fibril that will query the device
@@ -125,6 +125,6 @@
 	   /* Custom argument. */
 	   hid_dev);
-	
-	
+
+
 	if (rc != EOK) {
 		usb_log_error("Failed to start polling fibril for `%s'.\n",
@@ -153,10 +153,10 @@
 {
 	usb_log_debug("usb_hid_device_add()\n");
-	
+
 	if (dev == NULL) {
 		usb_log_warning("Wrong parameter given for add_device().\n");
 		return EINVAL;
 	}
-	
+
 	if (dev->interface_no < 0) {
 		usb_log_warning("Device is not a supported HID device.\n");
@@ -165,7 +165,7 @@
 		return ENOTSUP;
 	}
-	
+
 	int rc = usb_hid_try_add_device(dev);
-	
+
 	if (rc != EOK) {
 		usb_log_warning("Device is not a supported HID device.\n");
@@ -174,5 +174,5 @@
 		return rc;
 	}
-	
+
 	usb_log_info("HID device `%s' ready to use.\n", dev->ddf_dev->name);
 
Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -124,5 +124,5 @@
 {
 	usb_mouse_t *mouse_dev = (usb_mouse_t *) fun->driver_data;
-	
+
 	if (mouse_dev == NULL) {
 		usb_log_debug("default_connection_handler: Missing "
@@ -131,14 +131,14 @@
 		return;
 	}
-	
+
 	usb_log_debug("default_connection_handler: fun->name: %s\n",
 	              fun->name);
 	usb_log_debug("default_connection_handler: mouse_sess: %p, "
 	    "wheel_sess: %p\n", mouse_dev->mouse_sess, mouse_dev->wheel_sess);
-	
+
 	async_sess_t **sess_ptr =
 	    (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0) ?
 	    &mouse_dev->mouse_sess : &mouse_dev->wheel_sess;
-	
+
 	async_sess_t *sess =
 	    async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
@@ -170,5 +170,5 @@
 	mouse->mouse_sess = NULL;
 	mouse->wheel_sess = NULL;
-	
+
 	return mouse;
 }
@@ -179,9 +179,9 @@
 {
 	assert(mouse_dev != NULL);
-	
+
 	// hangup session to the console
 	if (mouse_dev->mouse_sess != NULL)
 		async_hangup(mouse_dev->mouse_sess);
-	
+
 	if (mouse_dev->wheel_sess != NULL)
 		async_hangup(mouse_dev->wheel_sess);
@@ -199,8 +199,8 @@
 		return;
 	}
-	
+
 	int count = ((wheel < 0) ? -wheel : wheel) * ARROWS_PER_SINGLE_WHEEL;
 	int i;
-	
+
 	for (i = 0; i < count; i++) {
 		/* Send arrow press and release. */
@@ -246,5 +246,5 @@
 {
 	assert(mouse_dev != NULL);
-	
+
 	if (mouse_dev->mouse_sess == NULL) {
 		usb_log_warning(NAME " No console session.\n");
@@ -264,8 +264,8 @@
 		async_exchange_end(exch);
 	}
-	
+
 	if (wheel != 0)
 		usb_mouse_send_wheel(mouse_dev, wheel);
-	
+
 	/*
 	 * Buttons
@@ -274,5 +274,5 @@
 	usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
 	usb_hid_report_path_set_report_id(path, hid_dev->report_id);
-	
+
 	usb_hid_report_field_t *field = usb_hid_report_get_sibling(
 	    hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
@@ -309,5 +309,5 @@
 		    USB_HID_REPORT_TYPE_INPUT);
 	}
-	
+
 	usb_hid_report_path_free(path);
 
@@ -321,5 +321,5 @@
 	assert(hid_dev != NULL);
 	assert(mouse != NULL);
-	
+
 	/* Create the exposed function. */
 	usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
@@ -330,5 +330,5 @@
 		return ENOMEM;
 	}
-	
+
 	fun->ops = &mouse->ops;
 	fun->driver_data = mouse;
@@ -341,5 +341,5 @@
 		return rc;
 	}
-	
+
 	usb_log_debug("Adding DDF function to category %s...\n", 
 	    HID_MOUSE_CATEGORY);
@@ -352,5 +352,5 @@
 		return rc;
 	}
-	
+
 	/*
 	 * Special function for acting as keyboard (wheel)
@@ -364,5 +364,5 @@
 		return ENOMEM;
 	}
-	
+
 	/*
 	 * Store the initialized HID device and HID ops
@@ -379,5 +379,5 @@
 		return rc;
 	}
-	
+
 	usb_log_debug("Adding DDF function to category %s...\n", 
 	    HID_MOUSE_WHEEL_CATEGORY);
@@ -390,5 +390,5 @@
 		return rc;
 	}
-	
+
 	return EOK;
 }
@@ -441,5 +441,5 @@
 {
 	usb_log_debug("Initializing HID/Mouse structure...\n");
-	
+
 	if (hid_dev == NULL) {
 		usb_log_error("Failed to init keyboard structure: no structure"
@@ -447,5 +447,5 @@
 		return EINVAL;
 	}
-	
+
 	usb_mouse_t *mouse_dev = usb_mouse_new();
 	if (mouse_dev == NULL) {
@@ -454,5 +454,5 @@
 		return ENOMEM;
 	}
-	
+
 	// FIXME: This may not be optimal since stupid hardware vendor may
 	// use buttons 1, 2, 3 and 6000 and we would allocate array of
@@ -464,5 +464,5 @@
 	    hid_dev->report_id) + 1;
 	mouse_dev->buttons = calloc(mouse_dev->buttons_count, sizeof(int32_t));
-	
+
 	if (mouse_dev->buttons == NULL) {
 		usb_log_error(NAME ": out of memory, giving up on device!\n");
@@ -474,12 +474,12 @@
 	// save the Mouse device structure into the HID device structure
 	*data = mouse_dev;
-	
+
 	// set handler for incoming calls
 	mouse_dev->ops.default_handler = default_connection_handler;
-	
+
 	// TODO: how to know if the device supports the request???
 	usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
 	    hid_dev->usb_dev->interface_no, IDLE_RATE);
-	
+
 	int rc = usb_mouse_create_function(hid_dev, mouse_dev);
 	if (rc != EOK) {
@@ -487,5 +487,5 @@
 		return rc;
 	}
-	
+
 	return EOK;
 }
@@ -500,5 +500,5 @@
 		return false;
 	}
-	
+
 	usb_mouse_t *mouse_dev = (usb_mouse_t *)data;
 		
@@ -522,5 +522,5 @@
 	    USB_MOUSE_BOOT_REPORT_DESCRIPTOR, 
 	    USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE);
-	
+
 	if (rc != EOK) {
 		usb_log_error("Failed to parse boot report descriptor: %s\n",
@@ -528,8 +528,8 @@
 		return rc;
 	}
-	
+
 	rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe, 
 	    hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
-	
+
 	if (rc != EOK) {
 		usb_log_warning("Failed to set boot protocol to the device: "
@@ -537,5 +537,5 @@
 		return rc;
 	}
-	
+
 	return EOK;
 }
Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.h
===================================================================
--- uspace/drv/bus/usb/usbhid/mouse/mousedev.h	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/mouse/mousedev.h	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -49,9 +49,9 @@
 	async_sess_t *mouse_sess;
 	async_sess_t *wheel_sess;
-	
+
 	/* Mouse buttons statuses. */
 	int32_t *buttons;
 	size_t buttons_count;
-	
+
 	ddf_dev_ops_t ops;
 } usb_mouse_t;
Index: uspace/drv/bus/usb/usbhid/subdrivers.h
===================================================================
--- uspace/drv/bus/usb/usbhid/subdrivers.h	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/subdrivers.h	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -64,17 +64,17 @@
 	 */
 	const usb_hid_subdriver_usage_t *usage_path;
-	
+
 	/** Report ID for which the path should apply. */
 	int report_id;
-	
+
 	/** Compare type for the Usage path. */
 	int compare;
-	
+
 	/** Vendor ID (set to -1 if not specified). */
 	int vendor_id;
-	
+
 	/** Product ID (set to -1 if not specified). */
 	int product_id;
-	
+
 	/** Subdriver for controlling this device. */
 	usb_hid_subdriver_t subdriver;
Index: uspace/drv/bus/usb/usbhid/usbhid.c
===================================================================
--- uspace/drv/bus/usb/usbhid/usbhid.c	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/usbhid.c	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -68,5 +68,5 @@
 {
 	assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
-	
+
 	hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
 	    sizeof(usb_hid_subdriver_t));
@@ -74,23 +74,23 @@
 		return ENOMEM;
 	}
-	
+
 	assert(hid_dev->subdriver_count >= 0);
-	
+
 	// set the init callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].init = usb_kbd_init;
-	
+
 	// set the polling callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].poll = 
 	    usb_kbd_polling_callback;
-	
+
 	// set the polling ended callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].poll_end = NULL;
-	
+
 	// set the deinit callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].deinit = usb_kbd_deinit;
-	
+
 	// set subdriver count
 	++hid_dev->subdriver_count;
-	
+
 	return EOK;
 }
@@ -101,5 +101,5 @@
 {
 	assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
-	
+
 	hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
 	    sizeof(usb_hid_subdriver_t));
@@ -107,23 +107,23 @@
 		return ENOMEM;
 	}
-	
+
 	assert(hid_dev->subdriver_count >= 0);
-	
+
 	// set the init callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].init = usb_mouse_init;
-	
+
 	// set the polling callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].poll = 
 	    usb_mouse_polling_callback;
-	
+
 	// set the polling ended callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].poll_end = NULL;
-	
+
 	// set the deinit callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].deinit = usb_mouse_deinit;
-	
+
 	// set subdriver count
 	++hid_dev->subdriver_count;
-	
+
 	return EOK;
 }
@@ -134,5 +134,5 @@
 {
 	assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
-	
+
 	hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
 	    sizeof(usb_hid_subdriver_t));
@@ -140,24 +140,24 @@
 		return ENOMEM;
 	}
-	
+
 	assert(hid_dev->subdriver_count >= 0);
-	
+
 	// set the init callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].init =
 	    usb_generic_hid_init;
-	
+
 	// set the polling callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].poll = 
 	    usb_generic_hid_polling_callback;
-	
+
 	// set the polling ended callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].poll_end = NULL;
-	
+
 	// set the deinit callback
 	hid_dev->subdrivers[hid_dev->subdriver_count].deinit = NULL;
-	
+
 	// set subdriver count
 	++hid_dev->subdriver_count;
-	
+
 	return EOK;
 }
@@ -170,5 +170,5 @@
 	assert(hid_dev != NULL);
 	assert(hid_dev->usb_dev != NULL);
-	
+
 	return (hid_dev->usb_dev->descriptors.device.vendor_id 
 	    == mapping->vendor_id
@@ -184,5 +184,5 @@
 	assert(hid_dev != NULL);
 	assert(mapping != NULL);
-	
+
 	usb_hid_report_path_t *usage_path = usb_hid_report_path();
 	if (usage_path == NULL) {
@@ -202,9 +202,9 @@
 		++i;
 	}
-	
+
 	assert(hid_dev->report != NULL);
-	
+
 	usb_log_debug("Compare flags: %d\n", mapping->compare);
-	
+
 	bool matches = false;
 	uint8_t report_id = mapping->report_id;
@@ -234,7 +234,7 @@
 		    USB_HID_REPORT_TYPE_INPUT);
 	} while (!matches && report_id != 0);
-	
+
 	usb_hid_report_path_free(usage_path);
-	
+
 	return matches;
 }
@@ -246,5 +246,5 @@
 {
 	int i;
-	
+
 	if (count <= 0) {
 		hid_dev->subdriver_count = 0;
@@ -252,7 +252,7 @@
 		return EOK;
 	}
-	
+
 	// add one generic HID subdriver per device
-	
+
 	hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc((count + 1) * 
 	    sizeof(usb_hid_subdriver_t));
@@ -260,5 +260,5 @@
 		return ENOMEM;
 	}
-	
+
 	for (i = 0; i < count; ++i) {
 		hid_dev->subdrivers[i].init = subdrivers[i]->init;
@@ -267,12 +267,12 @@
 		hid_dev->subdrivers[i].poll_end = subdrivers[i]->poll_end;
 	}
-	
+
 	hid_dev->subdrivers[count].init = usb_generic_hid_init;
 	hid_dev->subdrivers[count].poll = usb_generic_hid_polling_callback;
 	hid_dev->subdrivers[count].deinit = NULL;
 	hid_dev->subdrivers[count].poll_end = NULL;
-	
+
 	hid_dev->subdriver_count = count + 1;
-	
+
 	return EOK;
 }
@@ -283,7 +283,7 @@
 {
 	assert(hid_dev != NULL);
-	
+
 	const usb_hid_subdriver_t *subdrivers[USB_HID_MAX_SUBDRIVERS];
-	
+
 	int i = 0, count = 0;
 	const usb_hid_subdriver_mapping_t *mapping = &usb_hid_subdrivers[i];
@@ -291,5 +291,5 @@
 	bool ids_matched;
 	bool matched;
-	
+
 	while (count < USB_HID_MAX_SUBDRIVERS &&
 	    (mapping->usage_path != NULL
@@ -339,5 +339,5 @@
 		mapping = &usb_hid_subdrivers[++i];
 	}
-	
+
 	// we have all subdrivers determined, save them into the hid device
 	return usb_hid_save_subdrivers(hid_dev, subdrivers, count);
@@ -349,7 +349,7 @@
 {
 	assert(hid_dev != NULL && dev != NULL);
-	
+
 	int rc = EOK;
-	
+
 	if (dev->pipes[USB_HID_KBD_POLL_EP_NO].present) {
 		usb_log_debug("Found keyboard endpoint.\n");
@@ -369,5 +369,5 @@
 		rc = ENOTSUP;
 	}
-	
+
 	return rc;
 }
@@ -378,10 +378,10 @@
 {
 	assert(hid_dev != NULL && hid_dev->report != NULL);
-	
+
 	uint8_t report_id = 0;
 	size_t size;
-	
+
 	size_t max_size = 0;
-	
+
 	do {
 		usb_log_debug("Getting size of the report.\n");
@@ -394,10 +394,10 @@
 		    report_id, USB_HID_REPORT_TYPE_INPUT);
 	} while (report_id != 0);
-	
+
 	usb_log_debug("Max size of input report: %zu\n", max_size);
-	
+
 	hid_dev->max_input_report_size = max_size;
 	assert(hid_dev->input_report == NULL);
-	
+
 	hid_dev->input_report = malloc(max_size);
 	if (hid_dev->input_report == NULL) {
@@ -405,5 +405,5 @@
 	}
 	memset(hid_dev->input_report, 0, max_size);
-	
+
 	return EOK;
 }
@@ -415,10 +415,10 @@
 	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)calloc(1,
 	    sizeof(usb_hid_dev_t));
-	
+
 	if (hid_dev == NULL) {
 		usb_log_fatal("No memory!\n");
 		return NULL;
 	}
-	
+
 	hid_dev->report = (usb_hid_report_t *)(malloc(sizeof(
 	    usb_hid_report_t)));
@@ -428,7 +428,7 @@
 		return NULL;
 	}
-	
+
 	hid_dev->poll_pipe_index = -1;
-	
+
 	return hid_dev;
 }
@@ -439,7 +439,7 @@
 {
 	int rc, i;
-	
+
 	usb_log_debug("Initializing HID structure...\n");
-	
+
 	if (hid_dev == NULL) {
 		usb_log_error("Failed to init HID structure: no structure given"
@@ -447,5 +447,5 @@
 		return EINVAL;
 	}
-	
+
 	if (dev == NULL) {
 		usb_log_error("Failed to init HID structure: no USB device"
@@ -453,8 +453,8 @@
 		return EINVAL;
 	}
-	
+
 	/* The USB device should already be initialized, save it in structure */
 	hid_dev->usb_dev = dev;
-	
+
 	rc = usb_hid_check_pipes(hid_dev, dev);
 	if (rc != EOK) {
@@ -465,7 +465,7 @@
 	rc = usb_hid_process_report_descriptor(hid_dev->usb_dev, 
 	    hid_dev->report, &hid_dev->report_desc, &hid_dev->report_desc_size);
-	
+
 	bool fallback = false;
-	
+
 	if (rc == EOK) {
 		// try to find subdrivers that may want to handle this device
@@ -484,5 +484,5 @@
 		fallback = true;
 	}
-	
+
 	if (fallback) {
 		// fall back to boot protocol
@@ -510,5 +510,5 @@
 		}
 	}
-	
+
 	if (rc != EOK) {
 		usb_log_error("No subdriver for handling this device could be"
@@ -542,6 +542,6 @@
 		rc = (ok) ? EOK : -1;	// what error to report
 	}
-	
-	
+
+
 	if (rc == EOK) {
 		// save max input report size and allocate space for the report
@@ -552,6 +552,6 @@
 		}
 	}
-	
-	
+
+
 	return rc;
 }
@@ -563,12 +563,12 @@
 {
 	int i;
-	
+
 	if (dev == NULL || arg == NULL || buffer == NULL) {
 		usb_log_error("Missing arguments to polling callback.\n");
 		return false;
 	}
-	
+
 	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
-	
+
 	assert(hid_dev->input_report != NULL);
 	usb_log_debug("New data [%zu/%zu]: %s\n", buffer_size,
@@ -582,17 +582,17 @@
 		usb_hid_new_report(hid_dev);
 	}
-	
+
 	// parse the input report
-	
+
 	int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
 	    &hid_dev->report_id);
-	
+
 	if (rc != EOK) {
 		usb_log_warning("Error in usb_hid_parse_report():"
 		    "%s\n", str_error(rc));
 	}	
-	
+
 	bool cont = false;
-	
+
 	// continue if at least one of the subdrivers want to continue
 	for (i = 0; i < hid_dev->subdriver_count; ++i) {
@@ -603,5 +603,5 @@
 		}
 	}
-	
+
 	return cont;
 }
@@ -613,11 +613,11 @@
 {
 	int i; 
-	
+
 	if (dev == NULL || arg == NULL) {
 		return;
 	}
-	
+
 	usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
-	
+
 	for (i = 0; i < hid_dev->subdriver_count; ++i) {
 		if (hid_dev->subdrivers[i].poll_end != NULL) {
@@ -626,5 +626,5 @@
 		}
 	}
-	
+
 	usb_hid_destroy(hid_dev);
 }
@@ -649,15 +649,15 @@
 {
 	int i;
-	
+
 	if (hid_dev == NULL) {
 		return;
 	}
-	
+
 	usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 
 	    hid_dev->subdrivers, hid_dev->subdriver_count);
-	
+
 	assert(hid_dev->subdrivers != NULL 
 	    || hid_dev->subdriver_count == 0);
-	
+
 	for (i = 0; i < hid_dev->subdriver_count; ++i) {
 		if (hid_dev->subdrivers[i].deinit != NULL) {
@@ -666,5 +666,5 @@
 		}
 	}
-	
+
 	// free the subdrivers info
 	if (hid_dev->subdrivers != NULL) {
Index: uspace/drv/bus/usb/usbhid/usbhid.h
===================================================================
--- uspace/drv/bus/usb/usbhid/usbhid.h	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbhid/usbhid.h	(revision cc29622c2362c27d447a898ebb308e3a3b34586b)
@@ -102,14 +102,14 @@
 	/** Structure holding generic USB device information. */
 	usb_device_t *usb_dev;
-	
+
 	/** Index of the polling pipe in usb_hid_endpoints array. */
 	int poll_pipe_index;
-	
+
 	/** Subdrivers. */
 	usb_hid_subdriver_t *subdrivers;
-	
+
 	/** Number of subdrivers. */
 	int subdriver_count;
-	
+
 	/** Report descriptor. */
 	uint8_t *report_desc;
@@ -117,15 +117,15 @@
 	/** Report descriptor size. */
 	size_t report_desc_size;
-	
+
 	/** HID Report parser. */
 	usb_hid_report_t *report;
-	
+
 	uint8_t report_id;
-	
+
 	uint8_t *input_report;
-	
+
 	size_t input_report_size;
 	size_t max_input_report_size;
-	
+
 	int report_nr;
 };