From: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
Subject: [PATCH v2 8/9] Introduce gateway locking mechanism
Date: Mon, 22 Aug 2011 17:30:46 +0200 [thread overview]
Message-ID: <1314027047-5476-9-git-send-email-frederic.dalleau@linux.intel.com> (raw)
In-Reply-To: <1314027047-5476-1-git-send-email-frederic.dalleau@linux.intel.com>
---
audio/gateway.c | 38 ++++++++++++++++++++++++++++++++++++++
audio/gateway.h | 8 ++++++++
2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/audio/gateway.c b/audio/gateway.c
index d41bbc3..e1db84b 100644
--- a/audio/gateway.c
+++ b/audio/gateway.c
@@ -70,6 +70,7 @@ struct gateway {
struct hf_agent *agent;
DBusMessage *msg;
int version;
+ gateway_lock_t lock;
};
struct gateway_state_callback {
@@ -875,3 +876,40 @@ gboolean gateway_remove_state_cb(unsigned int id)
return FALSE;
}
+
+gateway_lock_t gateway_get_lock(struct audio_device *dev)
+{
+ struct gateway *gw = dev->gateway;
+
+ return gw->lock;
+}
+
+gboolean gateway_lock(struct audio_device *dev, gateway_lock_t lock)
+{
+ struct gateway *gw = dev->gateway;
+
+ if (gw->lock & lock)
+ return FALSE;
+
+ gw->lock |= lock;
+
+ return TRUE;
+}
+
+gboolean gateway_unlock(struct audio_device *dev, gateway_lock_t lock)
+{
+ struct gateway *gw = dev->gateway;
+
+ if (!(gw->lock & lock))
+ return FALSE;
+
+ gw->lock &= ~lock;
+
+ if (gw->lock)
+ return TRUE;
+
+ if (gw->state == GATEWAY_STATE_PLAYING)
+ gateway_suspend_stream(dev);
+
+ return TRUE;
+}
diff --git a/audio/gateway.h b/audio/gateway.h
index 32b5d6d..2dca32a 100644
--- a/audio/gateway.h
+++ b/audio/gateway.h
@@ -33,6 +33,11 @@ typedef enum {
GATEWAY_STATE_PLAYING,
} gateway_state_t;
+typedef enum {
+ GATEWAY_LOCK_READ = 1,
+ GATEWAY_LOCK_WRITE = 1 << 1,
+} gateway_lock_t;
+
typedef void (*gateway_state_cb) (struct audio_device *dev,
gateway_state_t old_state,
gateway_state_t new_state,
@@ -56,3 +61,6 @@ int gateway_get_sco_fd(struct audio_device *dev);
void gateway_suspend_stream(struct audio_device *dev);
unsigned int gateway_add_state_cb(gateway_state_cb cb, void *user_data);
gboolean gateway_remove_state_cb(unsigned int id);
+gateway_lock_t gateway_get_lock(struct audio_device *dev);
+gboolean gateway_lock(struct audio_device *dev, gateway_lock_t lock);
+gboolean gateway_unlock(struct audio_device *dev, gateway_lock_t lock);
--
1.7.1
next prev parent reply other threads:[~2011-08-22 15:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 15:30 [PATCH v2 0/9] Add support for HandsfreeGateway to Media Frédéric Dalleau
2011-08-22 15:30 ` [PATCH v2 1/9] Fix double free in error case in endpoint_reply Frédéric Dalleau
2011-08-24 10:48 ` Luiz Augusto von Dentz
2011-08-22 15:30 ` [PATCH v2 2/9] Add state change callback to HandsfreeGateway Frédéric Dalleau
2011-08-24 10:51 ` Luiz Augusto von Dentz
2011-08-22 15:30 ` [PATCH v2 3/9] Use state change callback from media interface Frédéric Dalleau
2011-08-24 10:53 ` Luiz Augusto von Dentz
2011-08-22 15:30 ` [PATCH v2 4/9] Update g_strcmp0 to strcasecmp Frédéric Dalleau
2011-08-24 10:53 ` Luiz Augusto von Dentz
2011-08-22 15:30 ` [PATCH v2 5/9] Fix RFCOMM disconnect on suspend request Frédéric Dalleau
2011-08-24 10:54 ` Luiz Augusto von Dentz
2011-08-22 15:30 ` [PATCH v2 6/9] Set state to "connecting" when AG connects Frédéric Dalleau
2011-08-24 10:54 ` Luiz Augusto von Dentz
2011-08-22 15:30 ` [PATCH v2 7/9] Fix invalid state at SCO disconnect in gateway Frédéric Dalleau
2011-08-24 10:57 ` Luiz Augusto von Dentz
2011-08-22 15:30 ` Frédéric Dalleau [this message]
2011-08-24 10:55 ` [PATCH v2 8/9] Introduce gateway locking mechanism Luiz Augusto von Dentz
2011-08-22 15:30 ` [PATCH v2 9/9] Implement media_transport for HFP_HS_UUID Frédéric Dalleau
2011-08-24 10:59 ` Luiz Augusto von Dentz
2011-08-24 11:24 ` [PATCH v2 0/9] Add support for HandsfreeGateway to Media Johan Hedberg
2011-08-24 12:06 ` Dalleau, Frederic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314027047-5476-9-git-send-email-frederic.dalleau@linux.intel.com \
--to=frederic.dalleau@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox