Diff: fll.h

Revision:

3:edbf31a8589f

Parent:

2:165723d41023

Child:

5:130721ce29f7

--- a/fll.h	Sat Feb 14 04:49:28 2015 +0000
+++ b/fll.h	Sat Feb 14 06:39:14 2015 +0000
@@ -24,18 +24,18 @@
 
 #define MAIL_BOX_SIZE 16
 
-typedef uint16_t button;
+typedef uint16_t button_t;
 
 class Source
 {
 private:
     int i;
-    button* button_seq;
+    button_t* button_t_seq;
     int size;
     bool loop;
 public:
-    Source(button *bs, int s, bool l);
-    virtual button await();
+    Source(button_t *bs, int s, bool l);
+    virtual button_t await();
 };
 
 class Flow : Source
@@ -44,8 +44,8 @@
     vector<Source*>& sources;
 public:
     Flow(vector<Source*> &srcs);
-    virtual button fold(vector<button> &bs);
-    virtual button await();
+    virtual button_t fold(vector<button_t> &bs);
+    virtual button_t await();
 };
 
 // ストリームの終端になっていて、キー入力をするスレッドに向けてキーを送る
@@ -53,10 +53,10 @@
 {
 private:
     Source* source;
-    rtos::Mail<button, MAIL_BOX_SIZE>* mail_box;
+    rtos::Mail<button_t, MAIL_BOX_SIZE>* mail_box;
     Mutex* mutex;
 public:
-    Sink(Source* src, rtos::Mail<button, MAIL_BOX_SIZE>* box, Mutex* mut);
+    Sink(Source* src, rtos::Mail<button_t, MAIL_BOX_SIZE>* box, Mutex* mut);
     void run();
     void reset(Source* src);
 };
@@ -65,10 +65,10 @@
 class Output
 {
 private:
-    rtos::Mail<button, MAIL_BOX_SIZE>* mail_box;
+    rtos::Mail<button_t, MAIL_BOX_SIZE>* mail_box;
 public:
-    Output(rtos::Mail<button, MAIL_BOX_SIZE>* box);
+    Output(rtos::Mail<button_t, MAIL_BOX_SIZE>* box);
     void run();
 };
 
-void press(button btn);
+void press(button_t btn);