Index: uspace/srv/hid/display/client.c =================================================================== --- uspace/srv/hid/display/client.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/client.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -128,5 +128,4 @@ * @param id Window ID */ -#include ds_window_t *ds_client_find_window(ds_client_t *client, ds_wnd_id_t id) { @@ -134,9 +133,6 @@ // TODO Make this faster - printf("ds_client_find_window: id=0x%x\n", (unsigned) id); wnd = ds_client_first_window(client); while (wnd != NULL) { - printf("ds_client_find_window: wnd=%p wnd->id=0x%x\n", wnd, - (unsigned) wnd->id); if (wnd->id == id) return wnd; Index: uspace/srv/hid/display/ddev.c =================================================================== --- uspace/srv/hid/display/ddev.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/ddev.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -38,5 +38,4 @@ #include #include -#include #include #include "display.h" @@ -100,5 +99,6 @@ rc = loc_service_get_name(svc_id, &name); if (rc != EOK) { - printf("Error resolving name of service %lu.\n", + log_msg(LOG_DEFAULT, LVL_ERROR, + "Error resolving name of service %lu.\n", (unsigned long) svc_id); return rc; @@ -107,5 +107,6 @@ rc = ddev_open(name, &dd); if (rc != EOK) { - printf("Error opening display device '%s'.\n", name); + log_msg(LOG_DEFAULT, LVL_ERROR, + "Error opening display device '%s'.\n", name); free(name); return rc; @@ -114,5 +115,6 @@ rc = ddev_get_info(dd, &info); if (rc != EOK) { - printf("Error getting information for display device '%s'.\n", + log_msg(LOG_DEFAULT, LVL_ERROR, + "Error getting information for display device '%s'.\n", name); free(name); @@ -121,5 +123,5 @@ } - log_msg(LOG_DEFAULT, LVL_NOTE, "Device rectangle for '%s': " + log_msg(LOG_DEFAULT, LVL_DEBUG, "Device rectangle for '%s': " "%d,%d,%d,%d\n", name, info.rect.p0.x, info.rect.p0.y, info.rect.p1.x, info.rect.p1.y); @@ -127,5 +129,6 @@ rc = ddev_get_gc(dd, &gc); if (rc != EOK) { - printf("Error getting device context for '%s'.\n", name); + log_msg(LOG_DEFAULT, LVL_ERROR, + "Error getting device context for '%s'.\n", name); ddev_close(dd); free(name); Index: uspace/srv/hid/display/display.c =================================================================== --- uspace/srv/hid/display/display.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/display.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -208,5 +208,4 @@ * @param id Window ID */ -#include ds_window_t *ds_display_find_window(ds_display_t *display, ds_wnd_id_t id) { @@ -214,19 +213,13 @@ ds_window_t *wnd; - printf("ds_display_find_window: id=0x%x\n", (unsigned) id); - client = ds_display_first_client(display); while (client != NULL) { - printf("ds_display_find_window: client=%p\n", client); wnd = ds_client_find_window(client, id); - if (wnd != NULL) { - printf("ds_display_find_window: found wnd=%p id=0x%x\n", - wnd, (unsigned) wnd->id); + if (wnd != NULL) return wnd; - } + client = ds_display_next_client(client); } - printf("ds_display_find_window: not found\n"); return NULL; } Index: uspace/srv/hid/display/dsops.c =================================================================== --- uspace/srv/hid/display/dsops.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/dsops.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -138,5 +138,5 @@ } - log_msg(LVL_NOTE, LVL_DEBUG, "disp_window_move_req()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_move_req()"); ds_window_move_req(wnd, pos); ds_display_unlock(client->display); @@ -157,5 +157,5 @@ } - log_msg(LVL_NOTE, LVL_DEBUG, "disp_window_move()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_move()"); ds_window_move(wnd, pos); ds_display_unlock(client->display); @@ -180,5 +180,5 @@ } - log_msg(LVL_NOTE, LVL_DEBUG, "disp_window_resize_req()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_resize_req()"); ds_window_resize_req(wnd, rsztype, pos); ds_display_unlock(client->display); @@ -201,5 +201,5 @@ } - log_msg(LOG_DEFAULT, LVL_NOTE, "disp_window_resize()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_resize()"); rc = ds_window_resize(wnd, offs, nbound); ds_display_unlock(client->display); @@ -222,5 +222,5 @@ } - log_msg(LOG_DEFAULT, LVL_NOTE, "disp_window_set_cursor()"); + log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_set_cursor()"); rc = ds_window_set_cursor(wnd, cursor); ds_display_unlock(client->display); Index: uspace/srv/hid/display/input.c =================================================================== --- uspace/srv/hid/display/input.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/input.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -35,6 +35,6 @@ #include #include +#include #include -#include #include #include "display.h" @@ -153,5 +153,6 @@ errno_t rc = loc_service_get_id(svc, &dsid, 0); if (rc != EOK) { - printf("%s: Input service %s not found\n", NAME, svc); + log_msg(LOG_DEFAULT, LVL_ERROR, "Input service %s not found\n", + svc); return rc; } @@ -159,6 +160,6 @@ sess = loc_service_connect(dsid, INTERFACE_INPUT, 0); if (sess == NULL) { - printf("%s: Unable to connect to input service %s\n", NAME, - svc); + log_msg(LOG_DEFAULT, LVL_ERROR, + "Unable to connect to input service %s\n", svc); return EIO; } @@ -168,6 +169,7 @@ if (rc != EOK) { async_hangup(sess); - printf("%s: Unable to communicate with service %s (%s)\n", - NAME, svc, str_error(rc)); + log_msg(LOG_DEFAULT, LVL_ERROR, + "Unable to communicate with service %s (%s)\n", + svc, str_error(rc)); return rc; } Index: uspace/srv/hid/display/main.c =================================================================== --- uspace/srv/hid/display/main.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/main.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -161,5 +161,5 @@ errno_t rc; - log_msg(LOG_DEFAULT, LVL_NOTE, "display_client_conn arg1=%zu arg2=%zu arg3=%zu arg4=%zu.", + log_msg(LOG_DEFAULT, LVL_DEBUG, "display_client_conn arg1=%zu arg2=%zu arg3=%zu arg4=%zu.", ipc_get_arg1(icall), ipc_get_arg2(icall), ipc_get_arg3(icall), ipc_get_arg4(icall)); Index: uspace/srv/hid/display/output.c =================================================================== --- uspace/srv/hid/display/output.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/output.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -38,7 +38,7 @@ #include #include +#include #include #include -#include #include #include "ddev.h" @@ -63,5 +63,6 @@ IPC_FLAG_BLOCKING); if (rc != EOK) { - printf("Error looking up category 'display-device'.\n"); + log_msg(LOG_DEFAULT, LVL_ERROR, + "Error looking up category 'display-device'.\n"); return EIO; } @@ -72,5 +73,6 @@ rc = loc_category_get_svcs(ddev_cid, &svcs, &count); if (rc != EOK) { - printf("Error getting list of display devices.\n"); + log_msg(LOG_DEFAULT, LVL_ERROR, + "Error getting list of display devices.\n"); return EIO; } @@ -90,5 +92,6 @@ rc = ds_ddev_open(output->def_display, svcs[i], &nddev); if (rc != EOK) { - printf("Error adding display device.\n"); + log_msg(LOG_DEFAULT, LVL_ERROR, + "Error adding display device.\n"); continue; } @@ -96,5 +99,6 @@ list_append(&nddev->loutdevs, &output->ddevs); - printf("Added display device '%lu'\n", + log_msg(LOG_DEFAULT, LVL_NOTE, + "Added display device '%lu'\n", (unsigned long) svcs[i]); } @@ -114,5 +118,4 @@ ds_output_t *output = (ds_output_t *) arg; - printf("ds_ddev_change_cb\n"); fibril_mutex_lock(&output->lock); (void) ds_output_check_new_devs(output); @@ -151,5 +154,6 @@ rc = loc_register_cat_change_cb(ds_ddev_change_cb, output); if (rc != EOK) { - printf("Failed registering callback for device discovery.\n"); + log_msg(LOG_DEFAULT, LVL_ERROR, + "Failed registering callback for device discovery.\n"); return rc; } Index: uspace/srv/hid/display/test/client.c =================================================================== --- uspace/srv/hid/display/test/client.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/test/client.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -30,5 +30,4 @@ #include #include -#include #include @@ -50,7 +49,5 @@ { bool *called_cb = (bool *) arg; - printf("test_ds_ev_pending\n"); *called_cb = true; - } Index: uspace/srv/hid/display/test/display.c =================================================================== --- uspace/srv/hid/display/test/display.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/test/display.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -30,5 +30,4 @@ #include #include -#include #include @@ -51,5 +50,4 @@ { bool *called_cb = (bool *) arg; - printf("test_ds_ev_pending\n"); *called_cb = true; } Index: uspace/srv/hid/display/test/seat.c =================================================================== --- uspace/srv/hid/display/test/seat.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/test/seat.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -30,5 +30,4 @@ #include #include -#include #include @@ -51,5 +50,4 @@ { bool *called_cb = (bool *) arg; - printf("test_ds_ev_pending\n"); *called_cb = true; } Index: uspace/srv/hid/display/window.c =================================================================== --- uspace/srv/hid/display/window.c (revision 5271e4ce7c269901a92de4f2e7b3ed4926eec5f2) +++ uspace/srv/hid/display/window.c (revision 195b7b3b6644a81319441b12cec13540aa9edf26) @@ -669,5 +669,5 @@ gfx_coord2_t orig_pos; - log_msg(LOG_DEFAULT, LVL_NOTE, "ds_window_resize_req (%d, %d, %d)", + log_msg(LOG_DEFAULT, LVL_DEBUG, "ds_window_resize_req (%d, %d, %d)", (int) rsztype, (int) pos->x, (int) pos->y);