Changes in / [25e03b3:cbaf408] in mainline

Location:

uspace

Files:

• app/sysinst/sysinst.c (modified) (12 diffs)
• drv/block/ahci/ahci.c (modified) (2 diffs)
• drv/hid/usbhid/mouse/mousedev.c (modified) (2 diffs)
• lib/drv/generic/remote_ahci.c (modified) (5 diffs)

uspace/app/sysinst/sysinst.c

@@ -158 +158 @@
 static void sysinst_futil_create_dir(void *, const char *);
 static errno_t sysinst_eject_dev(sysinst_t *, service_id_t);
-static errno_t sysinst_eject_phys_by_mp(sysinst_t *, const char *);
 
 static futil_cb_t sysinst_futil_cb = {
@@ -273 +272 @@
         case 0:
                 /* OK */
-                sysinst_action(sysinst, "Ejecting installation media.");
-                (void)sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT);
                 (void)sysinst_restart(sysinst);
                 break;
@@ -595 +592 @@
         rc = futil_rcopy_contents(sysinst->futil, CFG_FILES_SRC,
             CFG_FILES_DEST);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error copying initial configuration "
-                    "files.");
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
 
         return EOK;
@@ -619 +613 @@
             "sysinst_copy_boot_files(): copy bootloader files");
         rc = futil_rcopy_contents(sysinst->futil, BOOT_FILES_SRC, MOUNT_POINT);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error copying bootloader "
-                    "files.");
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
 
         sysinst_debug(sysinst, "sysinst_copy_boot_files(): OK");
@@ -900 +891 @@
         errno_t rc;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE,
-            "sysinst_eject_phys_by_mp(%s)", path);
-
         rc = vol_create(&vol);
         if (rc != EOK) {
@@ -946 +934 @@
         shutdown_failed = false;
 
-        sysinst_action(sysinst, "Restarting the system.");
-
         rc = system_open(SYSTEM_DEFAULT, &sysinst_system_cb, NULL, &system);
         if (rc != EOK) {
@@ -997 +983 @@
 {
         errno_t rc;
-        bool clean_dev = false;
 
         sysinst_action(sysinst, "Creating device label and file system.");
@@ -1003 +988 @@
         rc = sysinst_label_dev(sysinst, dev);
         if (rc != EOK)
-                goto error;
-
-        clean_dev = true;
+                return rc;
 
         sysinst_action(sysinst, "Creating system directory structure.");
         rc = sysinst_setup_sysvol(sysinst);
         if (rc != EOK)
-                goto error;
+                return rc;
 
         sysinst_action(sysinst, "Copying boot files.");
         rc = sysinst_copy_boot_files(sysinst);
         if (rc != EOK)
-                goto error;
+                return rc;
 
         sysinst_action(sysinst, "Configuring the system.");
         rc = sysinst_customize_initrd(sysinst);
         if (rc != EOK)
-                goto error;
+                return rc;
 
         sysinst_action(sysinst, "Finishing system volume.");
         rc = sysinst_finish_dev(sysinst);
         if (rc != EOK)
-                goto error;
-
-        clean_dev = false;
+                return rc;
 
         sysinst_action(sysinst, "Installing boot blocks.");
@@ -1034 +1015 @@
                 return rc;
 
-        return EOK;
-error:
-        if (clean_dev)
-                (void)sysinst_finish_dev(sysinst);
-        return rc;
+        sysinst_action(sysinst, "Ejecting installation media.");
+        rc = sysinst_eject_phys_by_mp(sysinst, CD_MOUNT_POINT);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
 }
 
@@ -1073 +1055 @@
 
         sysinst_progress_destroy(sysinst->progress);
-        sysinst->progress = NULL;
-
         rc = sysinst_restart_dlg_create(sysinst);
         if (rc != EOK)
@@ -1253 +1233 @@
 static void sysinst_action(sysinst_t *sysinst, const char *action)
 {
-        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
-
         if (sysinst->progress == NULL)
                 return;
@@ -1260 +1238 @@
         ui_label_set_text(sysinst->progress->action, action);
         ui_label_paint(sysinst->progress->action);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", action);
 }
 

uspace/drv/block/ahci/ahci.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2012 Petr Jerman
  * All rights reserved.
@@ -1076 +1075 @@
         }
 
-        fun = sata->fun;
         ddf_fun_set_ops(fun, &ahci_ops);
 

uspace/drv/hid/usbhid/mouse/mousedev.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2011 Lubos Slovak, Vojtech Horky
  * Copyright (c) 2018 Ondrej Hlavaty
@@ -167 +166 @@
         assert(mouse_dev != NULL);
 
-        if (mouse_dev->mouse_sess == NULL)
-                return;
+        if (mouse_dev->mouse_sess == NULL) {
+                usb_log_warning(NAME " No console session.");
+                return;
+        }
 
         const usb_hid_report_field_t *move_x = get_mouse_axis_move_field(

uspace/lib/drv/generic/remote_ahci.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2012 Petr Jerman
  * All rights reserved.
@@ -153 +152 @@
             IPC_M_AHCI_READ_BLOCKS, HI(blocknum),  LO(blocknum), count, NULL);
 
-        errno_t rc = async_data_read_start(exch, buf, count * 512);
+        async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE);
+
         async_exchange_end(exch);
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-
-        errno_t retval;
-        async_wait_for(req, &retval);
-        return retval;
+
+        errno_t rc;
+        async_wait_for(req, &rc);
+
+        return rc;
 }
 
@@ -175 +172 @@
             IPC_M_AHCI_WRITE_BLOCKS, HI(blocknum),  LO(blocknum), count, NULL);
 
-        errno_t rc = async_data_write_start(exch, buf, count * 512);
+        async_share_out_start(exch, buf, AS_AREA_READ | AS_AREA_WRITE);
+
         async_exchange_end(exch);
 
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-
-        errno_t retval;
-        async_wait_for(req, &retval);
-        return retval;
+        errno_t rc;
+        async_wait_for(req, &rc);
+
+        return rc;
 }
 
@@ -290 +284 @@
         }
 
-        ipc_call_t rcall;
-        size_t size;
-        if (!async_data_read_receive(&rcall, &size)) {
-                async_answer_0(&rcall, EINVAL);
-                async_answer_0(call, EINVAL);
-                return;
-        }
-
-        void *buf = malloc(size);
-        if (buf == NULL) {
-                async_answer_0(&rcall, ENOMEM);
-                async_answer_0(call, ENOMEM);
-                return;
-        }
-
-        uint64_t blocknum =
+        ipc_call_t data;
+        size_t maxblock_size;
+        unsigned int flags;
+        async_share_out_receive(&data, &maxblock_size, &flags);
+
+        void *buf;
+        async_share_out_finalize(&data, &buf);
+
+        const uint64_t blocknum =
             (((uint64_t) (DEV_IPC_GET_ARG1(*call))) << 32) |
             (((uint64_t) (DEV_IPC_GET_ARG2(*call))) & 0xffffffff);
-        size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
-
-        errno_t rc = ahci_iface->read_blocks(fun, blocknum, cnt, buf);
-        if (rc != EOK) {
-                async_answer_0(&rcall, ENOMEM);
-                async_answer_0(call, ENOMEM);
-                free(buf);
-                return;
-        }
-
-        async_data_read_finalize(&rcall, buf, size);
-
-        free(buf);
-        async_answer_0(call, EOK);
+        const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
+
+        const errno_t ret = ahci_iface->read_blocks(fun, blocknum, cnt, buf);
+
+        async_answer_0(call, ret);
 }
 
@@ -328 +306 @@
         const ahci_iface_t *ahci_iface = (ahci_iface_t *) iface;
 
-        if (ahci_iface->write_blocks == NULL) {
-                async_answer_0(call, ENOTSUP);
-                return;
-        }
-
-        void *data;
-        size_t dsize;
-        errno_t rc = async_data_write_accept(&data, false, 0, 0, 0, &dsize);
-        if (rc != EOK) {
-                async_answer_0(call, rc);
-                return;
-        }
-
-        uint64_t blocknum =
+        if (ahci_iface->read_blocks == NULL) {
+                async_answer_0(call, ENOTSUP);
+                return;
+        }
+
+        ipc_call_t data;
+        size_t maxblock_size;
+        unsigned int flags;
+        async_share_out_receive(&data, &maxblock_size, &flags);
+
+        void *buf;
+        async_share_out_finalize(&data, &buf);
+
+        const uint64_t blocknum =
             (((uint64_t)(DEV_IPC_GET_ARG1(*call))) << 32) |
             (((uint64_t)(DEV_IPC_GET_ARG2(*call))) & 0xffffffff);
-        size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
-
-        if (dsize != cnt * 512) {
-                async_answer_0(call, EINVAL);
-                return;
-        }
-
-        rc = ahci_iface->write_blocks(fun, blocknum, cnt, data);
-        free(data);
-        async_answer_0(call, rc);
+        const size_t cnt = (size_t) DEV_IPC_GET_ARG3(*call);
+
+        const errno_t ret = ahci_iface->write_blocks(fun, blocknum, cnt, buf);
+
+        async_answer_0(call, ret);
 }