Changeset d30e067 in mainline for uspace/lib/c/include

Timestamp:

2025-03-02T20:02:33Z (10 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

Location:

uspace/lib/c/include

Files:

• device/hw_res.h (modified) (4 diffs)
• rtld/module.h (modified) (1 diff)
• rtld/rtld.h (modified) (1 diff)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -57 +57 @@
         HW_RES_DMA_CHANNEL_SETUP,
         HW_RES_DMA_CHANNEL_REMAIN,
-        HW_RES_GET_FLAGS
+        HW_RES_QUERY_LEGACY_IO,
+        HW_RES_CLAIM_LEGACY_IO
 } hw_res_method_t;
 
@@ -118 +119 @@
 }
 
+/** Claims to legacy devices */
 typedef enum {
-        /** This is an PCI/ISA bridge, not 'classic' ISA bus */
-        hwf_isa_bridge = 0x1
-} hw_res_flags_t;
+        /** 'Legacy' ISA IDE I/O ranges */
+        hwc_isa_ide = 0x1
+} hw_res_claims_t;
 
 extern errno_t hw_res_get_resource_list(async_sess_t *, hw_resource_list_t *);
@@ -131 +133 @@
     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 *);
+extern errno_t hw_res_query_legacy_io(async_sess_t *, hw_res_claims_t *);
+extern errno_t hw_res_claim_legacy_io(async_sess_t *, hw_res_claims_t);
 
 #endif

uspace/lib/c/include/rtld/module.h

@@ -41 +41 @@
 #include <types/rtld/rtld.h>
 
-extern errno_t module_create_static_exec(rtld_t *, module_t **);
+extern errno_t module_create_entrypoint(elf_finfo_t *, rtld_t *, module_t **);
 extern void module_process_relocs(module_t *);
 extern module_t *module_find(rtld_t *, const char *);

uspace/lib/c/include/rtld/rtld.h

@@ -45 +45 @@
 extern rtld_t *runtime_env;
 
-extern errno_t rtld_init_static(void);
 extern errno_t rtld_prog_process(elf_finfo_t *, rtld_t **);
 extern tcb_t *rtld_tls_make(rtld_t *);