Changeset ac307b2 in mainline for uspace/lib/c/include/adt/circ_buf.h

Timestamp:

2017-11-25T11:12:23Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

98cb5e0d

Parents:

f571ca49 (diff), 0851a3d (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 'master' into callcaps

File:

• uspace/lib/c/include/adt/circ_buf.h (moved) (moved from uspace/lib/c/include/ipc/char.h ) (2 diffs)

uspace/lib/c/include/adt/circ_buf.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcipc
+/** @addtogroup libc
  * @{
  */
-/** @file
- * @brief Character device interface.
+/** @file Circular buffer
  */
 
-#ifndef LIBC_IPC_CHAR_H_
-#define LIBC_IPC_CHAR_H_
+#ifndef LIBC_CIRC_BUF_H_
+#define LIBC_CIRC_BUF_H_
 
-#include <ipc/common.h>
+#include <stddef.h>
 
-typedef enum {
-        CHAR_WRITE_BYTE = IPC_FIRST_USER_METHOD
-} char_request_t;
+/** Circular buffer */
+typedef struct {
+        /** Buffer */
+        void *buf;
+        /** Number of buffer members */
+        size_t nmemb;
+        /** Member size */
+        size_t size;
+        /** Read position */
+        size_t rp;
+        /** Write position */
+        size_t wp;
+        /** Number of used entries */
+        size_t nused;
+} circ_buf_t;
 
-typedef enum {
-        CHAR_NOTIF_BYTE = IPC_FIRST_USER_METHOD
-} char_notif_t;
+extern void circ_buf_init(circ_buf_t *, void *, size_t, size_t);
+extern size_t circ_buf_nfree(circ_buf_t *);
+extern size_t circ_buf_nused(circ_buf_t *);
+extern int circ_buf_push(circ_buf_t *, const void *);
+extern int circ_buf_pop(circ_buf_t *, void *);
 
 #endif