Changeset 8b863a62 in mainline for uspace/drv/char/grlib_uart/cyclic_buffer.h

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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 mainline changes

File:

• uspace/drv/char/grlib_uart/cyclic_buffer.h (moved) (moved from uspace/lib/c/include/device/pci.h ) (3 diffs)

uspace/drv/char/grlib_uart/cyclic_buffer.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Michalec
+ * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup ns8250
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef LIBC_DEVICE_PCI_H_
-#define LIBC_DEVICE_PCI_H_
+#ifndef CYCLIC_BUFFER_H_
+#define CYCLIC_BUFFER_H_
 
-#include <async.h>
+#define BUF_LEN 4096
 
-#define PCI_DEVICE_ID  0x02
+typedef struct cyclic_buffer {
+        uint8_t buf[BUF_LEN];
+        int start;
+        int cnt;
+}  cyclic_buffer_t;
 
-typedef enum {
-        IPC_M_CONFIG_SPACE_READ_8,
-        IPC_M_CONFIG_SPACE_READ_16,
-        IPC_M_CONFIG_SPACE_READ_32,
+/*
+ * @return              False if the buffer is full.
+ */
+static inline bool buf_push_back(cyclic_buffer_t *buf, uint8_t item)
+{
+        if (buf->cnt >= BUF_LEN)
+                return false;
         
-        IPC_M_CONFIG_SPACE_WRITE_8,
-        IPC_M_CONFIG_SPACE_WRITE_16,
-        IPC_M_CONFIG_SPACE_WRITE_32
-} pci_dev_iface_funcs_t;
+        int pos = (buf->start + buf->cnt) % BUF_LEN;
+        buf->buf[pos] = item;
+        buf->cnt++;
+        return true;
+}
 
-extern int pci_config_space_read_8(async_sess_t *, uint32_t, uint8_t *);
-extern int pci_config_space_read_16(async_sess_t *, uint32_t, uint16_t *);
-extern int pci_config_space_read_32(async_sess_t *, uint32_t, uint32_t *);
+static inline bool buf_is_empty(cyclic_buffer_t *buf)
+{
+        return buf->cnt == 0;
+}
 
-extern int pci_config_space_write_8(async_sess_t *, uint32_t, uint8_t);
-extern int pci_config_space_write_16(async_sess_t *, uint32_t, uint16_t);
-extern int pci_config_space_write_32(async_sess_t *, uint32_t, uint32_t);
+static inline uint8_t buf_pop_front(cyclic_buffer_t *buf)
+{
+        assert(!buf_is_empty(buf));
+        
+        uint8_t res = buf->buf[buf->start];
+        buf->start = (buf->start + 1) % BUF_LEN;
+        buf->cnt--;
+        return res;
+}
+
+static inline void buf_clear(cyclic_buffer_t *buf)
+{
+        buf->cnt = 0;
+}
 
 #endif
 
-/** @}
+/**
+ * @}
  */