From 523d193b089111849873d9de0ec1bf29f4176fbc Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg@euromail.se>
Date: Wed, 16 Jun 2010 10:24:09 +0200
Subject: Correct mtdev API names

The mtdev queue api functions had wrong names. This patch changes
them to the familiar put and get.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
 include/mtdev-evbuf.h |  6 +++---
 include/mtdev.h       |  8 ++++----
 mtdev/core.c          | 24 ++++++++++++------------
 mtdev/test.c          |  4 ++--
 src/hwstate.c         |  2 +-
 src/mtouch.c          |  2 +-
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/include/mtdev-evbuf.h b/include/mtdev-evbuf.h
index 6a63d6d..77fec41 100644
--- a/include/mtdev-evbuf.h
+++ b/include/mtdev-evbuf.h
@@ -40,14 +40,14 @@ static inline int evbuf_empty(const struct EventBuffer *evbuf)
 	return evbuf->head == evbuf->tail;
 }
 
-static inline void evbuf_push(struct EventBuffer *evbuf,
-			      const struct input_event *ev)
+static inline void evbuf_put(struct EventBuffer *evbuf,
+			     const struct input_event *ev)
 {
 	evbuf->buffer[evbuf->head++] = *ev;
 	evbuf->head &= DIM_EVENTS - 1;
 }
 
-static inline void evbuf_pop(struct EventBuffer *evbuf,
+static inline void evbuf_get(struct EventBuffer *evbuf,
 			     struct input_event *ev)
 {
 	*ev = evbuf->buffer[evbuf->tail++];
diff --git a/include/mtdev.h b/include/mtdev.h
index ab2d044..936d597 100644
--- a/include/mtdev.h
+++ b/include/mtdev.h
@@ -44,12 +44,12 @@ static inline int mtdev_empty(struct MTDev *mtdev)
 	return evbuf_empty(&mtdev->outbuf);
 }
 
-void mtdev_push(struct MTDev *dev, const struct Capabilities *caps,
-		const struct input_event *ev);
+void mtdev_put(struct MTDev *dev, const struct Capabilities *caps,
+	       const struct input_event *ev);
 
-static inline void mtdev_pop(struct MTDev *mtdev, struct input_event* ev)
+static inline void mtdev_get(struct MTDev *mtdev, struct input_event* ev)
 {
-	evbuf_pop(&mtdev->outbuf, ev);
+	evbuf_get(&mtdev->outbuf, ev);
 }
 
 void mtdev_destroy(struct MTDev *mtdev);
diff --git a/mtdev/core.c b/mtdev/core.c
index c8eae37..f13da13 100644
--- a/mtdev/core.c
+++ b/mtdev/core.c
@@ -181,7 +181,7 @@ static int process_typeA(struct MTDev *dev,
 	int mtcnt = 0, size = 0;
 	prop[size] = 0;
 	while (!evbuf_empty(&dev->inbuf)) {
-		evbuf_pop(&dev->inbuf, &ev);
+		evbuf_get(&dev->inbuf, &ev);
 		consumed = 0;
 		switch (ev.type) {
 		case EV_SYN:
@@ -216,7 +216,7 @@ static int process_typeA(struct MTDev *dev,
 			break;
 		}
 		if (!consumed)
-			evbuf_push(&dev->outbuf, &ev);
+			evbuf_put(&dev->outbuf, &ev);
 	}
 	return mtcnt ? size : -1;
 }
@@ -232,8 +232,8 @@ static void process_typeB(struct MTDev *dev)
 {
 	struct input_event ev;
 	while (!evbuf_empty(&dev->inbuf)) {
-		evbuf_pop(&dev->inbuf, &ev);
-		evbuf_push(&dev->outbuf, &ev);
+		evbuf_get(&dev->inbuf, &ev);
+		evbuf_put(&dev->outbuf, &ev);
 	}
 }
 
@@ -283,14 +283,14 @@ static void push_slot_changes(struct MTDev *dev,
 	ev.code = ABS_MT_SLOT;
 	ev.value = slot;
 	if (priv->slot != ev.value) {
-		evbuf_push(&dev->outbuf, &ev);
+		evbuf_put(&dev->outbuf, &ev);
 		priv->slot = ev.value;
 	}
 	foreach_bit(i, prop) {
 		ev.code = mt2abs(i);
 		ev.value = data->abs[i];
 		if (priv->data[slot].abs[i] != ev.value) {
-			evbuf_push(&dev->outbuf, &ev);
+			evbuf_put(&dev->outbuf, &ev);
 			priv->data[slot].abs[i] = ev.value;
 		}
 	}
@@ -369,14 +369,14 @@ static void convert_A_to_B(struct MTDev *dev,
 }
 
 /**
- * mtdev_push - insert event into MT device
+ * mtdev_put - insert event into MT device
  * @dev: MT device
  * @caps: device capabilities
  * @syn: reference to the SYN_REPORT event
  */
-void mtdev_push(struct MTDev *dev,
-		const struct Capabilities *caps,
-		const struct input_event *ev)
+void mtdev_put(struct MTDev *dev,
+	       const struct Capabilities *caps,
+	       const struct input_event *ev)
 {
 	if (ev->type == EV_SYN && ev->code == SYN_REPORT) {
 		bitmask_t head = dev->outbuf.head;
@@ -385,9 +385,9 @@ void mtdev_push(struct MTDev *dev,
 		else
 			process_typeB(dev);
 		if (dev->outbuf.head != head)
-			evbuf_push(&dev->outbuf, ev);
+			evbuf_put(&dev->outbuf, ev);
 	} else {
-		evbuf_push(&dev->inbuf, ev);
+		evbuf_put(&dev->inbuf, ev);
 	}
 }
 
diff --git a/mtdev/test.c b/mtdev/test.c
index bbe4829..9f73fcd 100644
--- a/mtdev/test.c
+++ b/mtdev/test.c
@@ -53,9 +53,9 @@ static void loop_device(int fd)
 	}
 	init_iobuf(&iobuf);
 	while (ev = get_iobuf_event(&iobuf, fd)) {
-		mtdev_push(&mtdev, &caps, ev);
+		mtdev_put(&mtdev, &caps, ev);
 		while (!mtdev_empty(&mtdev)) {
-			mtdev_pop(&mtdev, &event);
+			mtdev_get(&mtdev, &event);
 			print_event(&event);
 		}
 	}
diff --git a/src/hwstate.c b/src/hwstate.c
index f4f2972..b29ee54 100644
--- a/src/hwstate.c
+++ b/src/hwstate.c
@@ -113,7 +113,7 @@ int modify_hwstate(struct HWState *s, struct MTDev *dev,
 {
 	struct input_event ev;
 	while (!mtdev_empty(dev)) {
-		mtdev_pop(dev, &ev);
+		mtdev_get(dev, &ev);
 		if (read_event(s, caps, &ev))
 			return 1;
 	}
diff --git a/src/mtouch.c b/src/mtouch.c
index db75b6f..7272edf 100644
--- a/src/mtouch.c
+++ b/src/mtouch.c
@@ -60,7 +60,7 @@ int close_mtouch(struct MTouch *mt, int fd)
 
 int parse_event(struct MTouch *mt, const struct input_event *ev)
 {
-	mtdev_push(&mt->dev, &mt->caps, ev);
+	mtdev_put(&mt->dev, &mt->caps, ev);
 	if (!modify_hwstate(&mt->hs, &mt->dev, &mt->caps))
 		return 0;
 	extract_mtstate(&mt->state, &mt->hs, &mt->caps);
-- 
cgit v1.2.3