[Keyboard] Fix info.json for Aranck handwired (#7206)

[qmk_firmware.git] / tmk_core / ring_buffer.h

diff --git a/tmk_core/ring_buffer.h b/tmk_core/ring_buffer.h
index 7bdebbcf34f6bc0854a329e275d6f7e2cf58f3e0..6bea3509b3328eeb796c780c8f0a4c4cb736d6a3 100644 (file)
--- a/tmk_core/ring_buffer.h
+++ b/tmk_core/ring_buffer.h
@@ -4,50 +4,39 @@
  * Ring buffer to store scan codes from keyboard
  *------------------------------------------------------------------*/
 #define RBUF_SIZE 32
-static uint8_t rbuf[RBUF_SIZE];
-static uint8_t rbuf_head = 0;
-static uint8_t rbuf_tail = 0;
-static inline void rbuf_enqueue(uint8_t data)
-{
-    uint8_t sreg = SREG;
-    cli();
-    uint8_t next = (rbuf_head + 1) % RBUF_SIZE;
-    if (next != rbuf_tail) {
-        rbuf[rbuf_head] = data;
-        rbuf_head = next;
-    } else {
-        print("rbuf: full\n");
+#include <util/atomic.h>
+static uint8_t     rbuf[RBUF_SIZE];
+static uint8_t     rbuf_head = 0;
+static uint8_t     rbuf_tail = 0;
+static inline void rbuf_enqueue(uint8_t data) {
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        uint8_t next = (rbuf_head + 1) % RBUF_SIZE;
+        if (next != rbuf_tail) {
+            rbuf[rbuf_head] = data;
+            rbuf_head       = next;
+        } else {
+            print("rbuf: full\n");
+        }
     }
-    SREG = sreg;
 }
-static inline uint8_t rbuf_dequeue(void)
-{
+static inline uint8_t rbuf_dequeue(void) {
     uint8_t val = 0;
-
-    uint8_t sreg = SREG;
-    cli();
-    if (rbuf_head != rbuf_tail) {
-        val = rbuf[rbuf_tail];
-        rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE;
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        if (rbuf_head != rbuf_tail) {
+            val       = rbuf[rbuf_tail];
+            rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE;
+        }
     }
-    SREG = sreg;
 
     return val;
 }
-static inline bool rbuf_has_data(void)
-{
-    uint8_t sreg = SREG;
-    cli();
-    bool has_data = (rbuf_head != rbuf_tail);
-    SREG = sreg;
+static inline bool rbuf_has_data(void) {
+    bool has_data;
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { has_data = (rbuf_head != rbuf_tail); }
     return has_data;
 }
-static inline void rbuf_clear(void)
-{
-    uint8_t sreg = SREG;
-    cli();
-    rbuf_head = rbuf_tail = 0;
-    SREG = sreg;
+static inline void rbuf_clear(void) {
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { rbuf_head = rbuf_tail = 0; }
 }
 
-#endif  /* RING_BUFFER_H */
+#endif /* RING_BUFFER_H */