Changes in / [cbaf408:25e03b3] in mainline
- Location:
- uspace
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/sysinst/sysinst.c
rcbaf408 r25e03b3 158 158 static void sysinst_futil_create_dir(void *, const char *); 159 159 static errno_t sysinst_eject_dev(sysinst_t *, service_id_t); 160 static errno_t sysinst_eject_phys_by_mp(sysinst_t *, const char *); 160 161 161 162 static futil_cb_t sysinst_futil_cb = { … … 272 273 case 0: 273 274 /* OK */ 275 sysinst_action(sysinst, "Ejecting installation media."); 276 (void)sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT); 274 277 (void)sysinst_restart(sysinst); 275 278 break; … … 592 595 rc = futil_rcopy_contents(sysinst->futil, CFG_FILES_SRC, 593 596 CFG_FILES_DEST); 594 if (rc != EOK) 595 return rc; 597 if (rc != EOK) { 598 sysinst_error(sysinst, "Error copying initial configuration " 599 "files."); 600 return rc; 601 } 596 602 597 603 return EOK; … … 613 619 "sysinst_copy_boot_files(): copy bootloader files"); 614 620 rc = futil_rcopy_contents(sysinst->futil, BOOT_FILES_SRC, MOUNT_POINT); 615 if (rc != EOK) 616 return rc; 621 if (rc != EOK) { 622 sysinst_error(sysinst, "Error copying bootloader " 623 "files."); 624 return rc; 625 } 617 626 618 627 sysinst_debug(sysinst, "sysinst_copy_boot_files(): OK"); … … 891 900 errno_t rc; 892 901 902 log_msg(LOG_DEFAULT, LVL_NOTE, 903 "sysinst_eject_phys_by_mp(%s)", path); 904 893 905 rc = vol_create(&vol); 894 906 if (rc != EOK) { … … 934 946 shutdown_failed = false; 935 947 948 sysinst_action(sysinst, "Restarting the system."); 949 936 950 rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system); 937 951 if (rc != EOK) { … … 983 997 { 984 998 errno_t rc; 999 bool clean_dev = false; 985 1000 986 1001 sysinst_action(sysinst, "Creating device label and file system."); … … 988 1003 rc = sysinst_label_dev(sysinst, dev); 989 1004 if (rc != EOK) 990 return rc; 1005 goto error; 1006 1007 clean_dev = true; 991 1008 992 1009 sysinst_action(sysinst, "Creating system directory structure."); 993 1010 rc = sysinst_setup_sysvol(sysinst); 994 1011 if (rc != EOK) 995 return rc;1012 goto error; 996 1013 997 1014 sysinst_action(sysinst, "Copying boot files."); 998 1015 rc = sysinst_copy_boot_files(sysinst); 999 1016 if (rc != EOK) 1000 return rc;1017 goto error; 1001 1018 1002 1019 sysinst_action(sysinst, "Configuring the system."); 1003 1020 rc = sysinst_customize_initrd(sysinst); 1004 1021 if (rc != EOK) 1005 return rc;1022 goto error; 1006 1023 1007 1024 sysinst_action(sysinst, "Finishing system volume."); 1008 1025 rc = sysinst_finish_dev(sysinst); 1009 1026 if (rc != EOK) 1010 return rc; 1027 goto error; 1028 1029 clean_dev = false; 1011 1030 1012 1031 sysinst_action(sysinst, "Installing boot blocks."); … … 1015 1034 return rc; 1016 1035 1017 sysinst_action(sysinst, "Ejecting installation media."); 1018 rc = sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT); 1019 if (rc != EOK) 1020 return rc; 1021 1022 return EOK; 1036 return EOK; 1037 error: 1038 if (clean_dev) 1039 (void)sysinst_finish_dev(sysinst); 1040 return rc; 1023 1041 } 1024 1042 … … 1055 1073 1056 1074 sysinst_progress_destroy(sysinst->progress); 1075 sysinst->progress = NULL; 1076 1057 1077 rc = sysinst_restart_dlg_create(sysinst); 1058 1078 if (rc != EOK) … … 1233 1253 static void sysinst_action(sysinst_t *sysinst, const char *action) 1234 1254 { 1255 log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action); 1256 1235 1257 if (sysinst->progress == NULL) 1236 1258 return; … … 1238 1260 ui_label_set_text(sysinst->progress->action, action); 1239 1261 ui_label_paint(sysinst->progress->action); 1240 log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);1241 1262 } 1242 1263 -
uspace/drv/block/ahci/ahci.c
rcbaf408 r25e03b3 1 1 /* 2 * Copyright (c) 2025 Jiri Svoboda 2 3 * Copyright (c) 2012 Petr Jerman 3 4 * All rights reserved. … … 1075 1076 } 1076 1077 1078 fun = sata->fun; 1077 1079 ddf_fun_set_ops(fun, &ahci_ops); 1078 1080 -
uspace/drv/hid/usbhid/mouse/mousedev.c
rcbaf408 r25e03b3 1 1 /* 2 * Copyright (c) 2025 Jiri Svoboda 2 3 * Copyright (c) 2011 Lubos Slovak, Vojtech Horky 3 4 * Copyright (c) 2018 Ondrej Hlavaty … … 166 167 assert(mouse_dev != NULL); 167 168 168 if (mouse_dev->mouse_sess == NULL) { 169 usb_log_warning(NAME " No console session."); 170 return; 171 } 169 if (mouse_dev->mouse_sess == NULL) 170 return; 172 171 173 172 const usb_hid_report_field_t *move_x = get_mouse_axis_move_field( -
uspace/lib/drv/generic/remote_ahci.c
rcbaf408 r25e03b3 1 1 /* 2 * Copyright (c) 2025 Jiri Svoboda 2 3 * Copyright (c) 2012 Petr Jerman 3 4 * All rights reserved. … … 152 153 IPC_M_AHCI_READ_BLOCKS, HI(blocknum), LO(blocknum), count, NULL); 153 154 154 async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE); 155 155 errno_t rc = async_data_read_start(exch, buf, count * 512); 156 156 async_exchange_end(exch); 157 158 errno_t rc; 159 async_wait_for(req, &rc); 160 161 return rc; 157 if (rc != EOK) { 158 async_forget(req); 159 return rc; 160 } 161 162 errno_t retval; 163 async_wait_for(req, &retval); 164 return retval; 162 165 } 163 166 … … 172 175 IPC_M_AHCI_WRITE_BLOCKS, HI(blocknum), LO(blocknum), count, NULL); 173 176 174 async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE); 175 177 errno_t rc = async_data_write_start(exch, buf, count * 512); 176 178 async_exchange_end(exch); 177 179 178 errno_t rc; 179 async_wait_for(req, &rc); 180 181 return rc; 180 if (rc != EOK) { 181 async_forget(req); 182 return rc; 183 } 184 185 errno_t retval; 186 async_wait_for(req, &retval); 187 return retval; 182 188 } 183 189 … … 284 290 } 285 291 286 ipc_call_t data; 287 size_t maxblock_size; 288 unsigned int flags; 289 async_share_out_receive(&data, &maxblock_size, &flags); 290 291 void *buf; 292 async_share_out_finalize(&data, &buf); 293 294 const uint64_t blocknum = 292 ipc_call_t rcall; 293 size_t size; 294 if (!async_data_read_receive(&rcall, &size)) { 295 async_answer_0(&rcall, EINVAL); 296 async_answer_0(call, EINVAL); 297 return; 298 } 299 300 void *buf = malloc(size); 301 if (buf == NULL) { 302 async_answer_0(&rcall, ENOMEM); 303 async_answer_0(call, ENOMEM); 304 return; 305 } 306 307 uint64_t blocknum = 295 308 (((uint64_t) (DEV_IPC_GET_ARG1(*call))) << 32) | 296 309 (((uint64_t) (DEV_IPC_GET_ARG2(*call))) & 0xffffffff); 297 const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call); 298 299 const errno_t ret = ahci_iface->read_blocks(fun, blocknum, cnt, buf); 300 301 async_answer_0(call, ret); 310 size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call); 311 312 errno_t rc = ahci_iface->read_blocks(fun, blocknum, cnt, buf); 313 if (rc != EOK) { 314 async_answer_0(&rcall, ENOMEM); 315 async_answer_0(call, ENOMEM); 316 free(buf); 317 return; 318 } 319 320 async_data_read_finalize(&rcall, buf, size); 321 322 free(buf); 323 async_answer_0(call, EOK); 302 324 } 303 325 … … 306 328 const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface; 307 329 308 if (ahci_iface-> read_blocks == NULL) {309 async_answer_0(call, ENOTSUP); 310 return; 311 } 312 313 ipc_call_tdata;314 size_t maxblock_size;315 unsigned int flags;316 async_share_out_receive(&data, &maxblock_size, &flags);317 318 void *buf;319 async_share_out_finalize(&data, &buf);320 321 constuint64_t blocknum =330 if (ahci_iface->write_blocks == NULL) { 331 async_answer_0(call, ENOTSUP); 332 return; 333 } 334 335 void *data; 336 size_t dsize; 337 errno_t rc = async_data_write_accept(&data, false, 0, 0, 0, &dsize); 338 if (rc != EOK) { 339 async_answer_0(call, rc); 340 return; 341 } 342 343 uint64_t blocknum = 322 344 (((uint64_t)(DEV_IPC_GET_ARG1(*call))) << 32) | 323 345 (((uint64_t)(DEV_IPC_GET_ARG2(*call))) & 0xffffffff); 324 const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call); 325 326 const errno_t ret = ahci_iface->write_blocks(fun, blocknum, cnt, buf); 327 328 async_answer_0(call, ret); 346 size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call); 347 348 if (dsize != cnt * 512) { 349 async_answer_0(call, EINVAL); 350 return; 351 } 352 353 rc = ahci_iface->write_blocks(fun, blocknum, cnt, data); 354 free(data); 355 async_answer_0(call, rc); 329 356 } 330 357
Note:
See TracChangeset
for help on using the changeset viewer.