Changes in uspace/srv/hid/display/main.c [6fbd1f9:4c6fd56] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/display/main.c
r6fbd1f9 r4c6fd56 1 1 /* 2 * Copyright (c) 202 4Jiri Svoboda2 * Copyright (c) 2023 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 54 54 #include "display.h" 55 55 #include "dsops.h" 56 #include "ievent.h"57 56 #include "input.h" 58 57 #include "main.h" … … 62 61 #include "wmclient.h" 63 62 #include "wmops.h" 64 65 const char *cfg_file_path = "/w/cfg/display.sif";66 63 67 64 static void display_client_conn(ipc_call_t *, void *); … … 140 137 goto error; 141 138 142 rc = ds_display_load_cfg(disp, cfg_file_path); 143 if (rc != EOK) { 144 log_msg(LOG_DEFAULT, LVL_NOTE, 145 "Starting with fresh configuration."); 146 147 /* Create first seat */ 148 rc = ds_seat_create(disp, "Alice", &seat); 149 if (rc != EOK) 150 goto error; 151 } 139 rc = ds_seat_create(disp, "Alice", &seat); 140 if (rc != EOK) 141 goto error; 152 142 153 143 rc = ds_output_create(&output); … … 157 147 output->def_display = disp; 158 148 rc = ds_output_start_discovery(output); 159 if (rc != EOK)160 goto error;161 162 rc = ds_ievent_init(disp);163 149 if (rc != EOK) 164 150 goto error; … … 216 202 ds_input_close(disp); 217 203 #endif 218 ds_ievent_fini(disp);219 204 if (output != NULL) 220 205 ds_output_destroy(output);
Note:
See TracChangeset
for help on using the changeset viewer.