Changeset 29e7cc7 in mainline for abi/include

Timestamp:

2025-04-18T15:14:10Z (11 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (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 branch 'upstream/master' into helenraid

Location:

abi/include

Files:

• _bits/mbstate_t.h (moved) (moved from uspace/lib/c/include/uchar.h ) (3 diffs)
• _bits/uchar.h (modified) (1 diff)
• abi/syscall.h (modified) (1 diff)

abi/include/_bits/mbstate_t.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Martin Decky
+ * Copyright (c) 2025 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup bits
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef _LIBC_UCHAR_H_
-#define _LIBC_UCHAR_H_
+#ifndef _BITS_MBSTATE_T_H_
+#define _BITS_MBSTATE_T_H_
 
-#include <_bits/uchar.h>
+typedef struct {
+        unsigned short state;
+} mbstate_t;
 
 #endif

abi/include/_bits/uchar.h

@@ -46 +46 @@
 #endif
 
-typedef uint32_t char32_t;
+typedef uint_least16_t char16_t;
+typedef uint_least32_t char32_t;
 
 #endif

abi/include/abi/syscall.h

@@ -110 +110 @@
         SYS_DEBUG_CONSOLE,
 
-        SYS_KLOG
+        SYS_KLOG,
+        SYS_KIO_READ,
 } syscall_t;