Changeset 2791fbb7 in mainline for uspace/drv/block/ata_bd/main.c

Timestamp:

2024-05-16T16:17:49Z (9 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

59c0f478

Parents:

64cf7a3

Message:

Move generic ATA code out to libata

File:

• uspace/drv/block/ata_bd/main.c (modified) (14 diffs)

uspace/drv/block/ata_bd/main.c

@@ -157 +157 @@
 }
 
-static char *ata_fun_name(disk_t *disk)
+static char *ata_fun_name(unsigned idx)
 {
         char *fun_name;
 
-        if (asprintf(&fun_name, "d%u", disk->disk_id) < 0)
+        if (asprintf(&fun_name, "d%u", idx) < 0)
                 return NULL;
 
@@ -167 +167 @@
 }
 
-errno_t ata_fun_create(disk_t *disk)
-{
-        ata_ctrl_t *ctrl = disk->ctrl;
+errno_t ata_fun_create(ata_ctrl_t *ctrl, unsigned idx, void *charg)
+{
         errno_t rc;
         char *fun_name = NULL;
@@ -176 +175 @@
         bool bound = false;
 
-        fun_name = ata_fun_name(disk);
+        fun_name = ata_fun_name(idx);
         if (fun_name == NULL) {
                 ddf_msg(LVL_ERROR, "Out of memory.");
@@ -199 +198 @@
 
         afun->fun = fun;
-        afun->disk = disk;
-
-        bd_srvs_init(&afun->bds);
-        afun->bds.ops = &ata_bd_ops;
-        afun->bds.sarg = disk;
+        afun->charg = charg;
 
         /* Set up a connection handler. */
@@ -225 +220 @@
 
         free(fun_name);
-        disk->afun = afun;
         return EOK;
 error:
@@ -238 +232 @@
 }
 
-errno_t ata_fun_remove(disk_t *disk)
+errno_t ata_fun_remove(ata_ctrl_t *ctrl, unsigned idx)
 {
         errno_t rc;
         char *fun_name;
-
-        if (disk->afun == NULL)
-                return EOK;
-
-        fun_name = ata_fun_name(disk);
+        ata_fun_t *afun = ctrl->fun[idx];
+
+        fun_name = ata_fun_name(idx);
         if (fun_name == NULL) {
                 ddf_msg(LVL_ERROR, "Out of memory.");
@@ -253 +245 @@
         }
 
-        ddf_msg(LVL_DEBUG, "ata_fun_remove(%p, '%s')", disk, fun_name);
-        rc = ddf_fun_offline(disk->afun->fun);
+        ddf_msg(LVL_DEBUG, "ata_fun_remove(%p, '%s')", afun, fun_name);
+        rc = ddf_fun_offline(afun->fun);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Error offlining function '%s'.", fun_name);
@@ -260 +252 @@
         }
 
-        rc = ddf_fun_unbind(disk->afun->fun);
+        rc = ddf_fun_unbind(afun->fun);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed unbinding function '%s'.", fun_name);
@@ -266 +258 @@
         }
 
-        ddf_fun_destroy(disk->afun->fun);
-        disk->afun = NULL;
+        ddf_fun_destroy(afun->fun);
         free(fun_name);
         return EOK;
@@ -276 +267 @@
 }
 
-errno_t ata_fun_unbind(disk_t *disk)
+errno_t ata_fun_unbind(ata_ctrl_t *ctrl, unsigned idx)
 {
         errno_t rc;
         char *fun_name;
-
-        if (disk->afun == NULL)
-                return EOK;
-
-        fun_name = ata_fun_name(disk);
+        ata_fun_t *afun = ctrl->fun[idx];
+
+        fun_name = ata_fun_name(idx);
         if (fun_name == NULL) {
                 ddf_msg(LVL_ERROR, "Out of memory.");
@@ -291 +280 @@
         }
 
-        ddf_msg(LVL_DEBUG, "ata_fun_unbind(%p, '%s')", disk, fun_name);
-        rc = ddf_fun_unbind(disk->afun->fun);
+        ddf_msg(LVL_DEBUG, "ata_fun_unbind(%p, '%s')", afun, fun_name);
+        rc = ddf_fun_unbind(afun->fun);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed unbinding function '%s'.", fun_name);
@@ -298 +287 @@
         }
 
-        ddf_fun_destroy(disk->afun->fun);
-        disk->afun = NULL;
+        ddf_fun_destroy(afun->fun);
         free(fun_name);
         return EOK;
@@ -338 +326 @@
 }
 
-/** Block device connection handler */
 static void ata_bd_connection(ipc_call_t *icall, void *arg)
 {
@@ -344 +331 @@
 
         afun = (ata_fun_t *) ddf_fun_data_get((ddf_fun_t *)arg);
-        bd_conn(icall, &afun->bds);
+        ata_connection(icall, afun->charg);
 }