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

Timestamp:

2024-10-13T08:23:40Z (19 months ago)

Author:

GitHub <noreply@…>

Parents:

2a0c827c (diff), b3b79981 (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.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

Location:

uspace/lib/c/include

Files:

• align.h (modified) (2 diffs)
• dbgcon.h (moved) (moved from uspace/drv/block/ata_bd/main.h ) (2 diffs)
• ddi.h (modified) (1 diff)
• device/hw_res.h (modified) (4 diffs)
• rndgen.h (modified) (1 diff)
• types/uuid.h (modified) (1 diff)
• uuid.h (modified) (1 diff)

uspace/lib/c/include/align.h

@@ -41 +41 @@
  * @param a             Size of alignment, must be power of 2.
  */
-#define ALIGN_DOWN(s, a)        ((s) & ~((a) - 1))
+#define ALIGN_DOWN(s, a)        ((s) & ~((typeof(s))(a) - 1))
 
 /** Align to the nearest higher address which is a power of two.
@@ -48 +48 @@
  * @param a             Size of alignment, must be power of 2.
  */
-#define ALIGN_UP(s, a)          ((long)((s) + ((a) - 1)) & ~((long) (a) - 1))
+#define ALIGN_UP(s, a)          ((((s) + ((a) - 1)) & ~((typeof(s))(a) - 1)))
 
 /** Round up to the nearest higher boundary.

uspace/lib/c/include/dbgcon.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ata_bd
+/** @addtogroup libc
  * @{
  */
-/** @file ATA driver main module
+/** @file
  */
 
-#ifndef __ATA_MAIN_H__
-#define __ATA_MAIN_H__
+#ifndef _LIBC_DBGCON_H_
+#define _LIBC_DBGCON_H_
 
-#include "ata_bd.h"
+#include <stdbool.h>
 
-extern errno_t ata_fun_create(disk_t *);
-extern errno_t ata_fun_remove(disk_t *);
-extern errno_t ata_fun_unbind(disk_t *);
+extern bool dbgcon_enable(void);
 
 #endif

uspace/lib/c/include/ddi.h

@@ -47 +47 @@
 #include <task.h>
 
+#define DMAMEM_1MiB   ((uintptr_t) UINT64_C(0xfffffffffff00000))
 #define DMAMEM_16MiB  ((uintptr_t) UINT64_C(0xffffffffff000000))
 #define DMAMEM_4GiB   ((uintptr_t) UINT64_C(0xffffffff00000000))

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/c/include/rndgen.h

@@ -47 +47 @@
 extern void rndgen_destroy(rndgen_t *);
 extern errno_t rndgen_uint8(rndgen_t *, uint8_t *);
+extern errno_t rndgen_uint16(rndgen_t *, uint16_t *);
 extern errno_t rndgen_uint32(rndgen_t *, uint32_t *);
 

uspace/lib/c/include/types/uuid.h

@@ -38 +38 @@
 #include <stdint.h>
 
-enum {
-        uuid_bytes = 16
-};
+#define _UUID_NODE_LEN 6
 
 /** Universally Unique Identifier */
+
 typedef struct {
-        uint8_t b[uuid_bytes];
+        uint32_t time_low;
+        uint16_t time_mid;
+        uint16_t time_hi_and_version;
+        uint8_t clock_seq_hi_and_reserved;
+        uint8_t clock_seq_low;
+        uint8_t node[_UUID_NODE_LEN];
 } uuid_t;
 

uspace/lib/c/include/uuid.h

@@ -43 +43 @@
 extern void uuid_encode(uuid_t *, uint8_t *);
 extern void uuid_decode(uint8_t *, uuid_t *);
+extern void uuid_encode_le(uuid_t *, uint8_t *);
+extern void uuid_decode_le(uint8_t *, uuid_t *);
 extern errno_t uuid_parse(const char *, uuid_t *, const char **);
 extern errno_t uuid_format(uuid_t *, char **, bool);