Changeset 443695e in mainline for uspace/lib

Timestamp:

2024-05-21T11:33:56Z (18 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

3526f4f3

Parents:

1801005

git-author:

Jiri Svoboda <jiri@…> (2024-05-20 17:33:43)

git-committer:

Jiri Svoboda <jiri@…> (2024-05-21 11:33:56)

Message:

Basic PCI-IDE driver (no DMA support)

Also, make sure we avoid attaching ISA IDE and PCI IDE
at the same time. For simplicity, use ISA IDE on ISA systems
and PCI IDE on PCI-based systems.

Location:

uspace/lib

Files:

• c/generic/device/hw_res.c (modified) (2 diffs)
• c/include/device/hw_res.h (modified) (4 diffs)
• drv/generic/remote_hw_res.c (modified) (4 diffs)
• drv/include/ops/hw_res.h (modified) (2 diffs)

uspace/lib/c/generic/device/hw_res.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -161 +162 @@
 }
 
+/** Get bus flags.
+ *
+ * @param sess HW res session
+ * @param rflags Place to store the flags
+ *
+ * @return Error code.
+ *
+ */
+errno_t hw_res_get_flags(async_sess_t *sess, hw_res_flags_t *rflags)
+{
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        sysarg_t flags;
+        const errno_t ret = async_req_1_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
+            HW_RES_GET_FLAGS, &flags);
+
+        async_exchange_end(exch);
+
+        if (ret == EOK)
+                *rflags = flags;
+
+        return ret;
+}
+
 /** @}
  */

uspace/lib/c/include/device/hw_res.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -56 +57 @@
         HW_RES_DMA_CHANNEL_SETUP,
         HW_RES_DMA_CHANNEL_REMAIN,
+        HW_RES_GET_FLAGS
 } hw_res_method_t;
 
@@ -116 +118 @@
 }
 
+typedef enum {
+        /** This is an PCI/ISA bridge, not 'classic' ISA bus */
+        hwf_isa_bridge = 0x1
+} hw_res_flags_t;
+
 extern errno_t hw_res_get_resource_list(async_sess_t *, hw_resource_list_t *);
 extern errno_t hw_res_enable_interrupt(async_sess_t *, int);
@@ -124 +131 @@
     uint32_t, uint8_t);
 extern errno_t hw_res_dma_channel_remain(async_sess_t *, unsigned, size_t *);
+extern errno_t hw_res_get_flags(async_sess_t *, hw_res_flags_t *);
 
 #endif

uspace/lib/drv/generic/remote_hw_res.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * Copyright (c) 2011 Jan Vesely
@@ -47 +48 @@
 static void remote_hw_res_dma_channel_setup(ddf_fun_t *, void *, ipc_call_t *);
 static void remote_hw_res_dma_channel_remain(ddf_fun_t *, void *, ipc_call_t *);
+static void remote_hw_res_get_flags(ddf_fun_t *, void *, ipc_call_t *);
 
 static const remote_iface_func_ptr_t remote_hw_res_iface_ops [] = {
@@ -55 +57 @@
         [HW_RES_DMA_CHANNEL_SETUP] = &remote_hw_res_dma_channel_setup,
         [HW_RES_DMA_CHANNEL_REMAIN] = &remote_hw_res_dma_channel_remain,
+        [HW_RES_GET_FLAGS] = &remote_hw_res_get_flags
 };
 
@@ -171 +174 @@
 }
 
+static void remote_hw_res_get_flags(ddf_fun_t *fun, void *ops,
+    ipc_call_t *call)
+{
+        hw_res_ops_t *hw_res_ops = ops;
+
+        if (hw_res_ops->get_flags == NULL) {
+                async_answer_0(call, ENOTSUP);
+                return;
+        }
+
+        hw_res_flags_t flags = 0;
+        const errno_t ret = hw_res_ops->get_flags(fun, &flags);
+        async_answer_1(call, ret, flags);
+}
+
 /**
  * @}

uspace/lib/drv/include/ops/hw_res.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * Copyright (c) 2011 Jan Vesely
@@ -49 +50 @@
         errno_t (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint32_t, uint8_t);
         errno_t (*dma_channel_remain)(ddf_fun_t *, unsigned, size_t *);
+        errno_t (*get_flags)(ddf_fun_t *, hw_res_flags_t *);
 } hw_res_ops_t;