зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1171017: Rename |BluetoothSocketPDU| to |DaemonSocketPDU|, r=shuang
This commit is contained in:
Thomas Zimmermann
Родитель
4a2cc0e217
Коммит
160760d61d
|
|
@ -27,7 +27,7 @@ BluetoothDaemonA2dpModule::SetNotificationHandler(
|
|||
}
|
||||
|
||||
nsresult
|
||||
BluetoothDaemonA2dpModule::Send(BluetoothDaemonPDU* aPDU,
|
||||
BluetoothDaemonA2dpModule::Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothA2dpResultHandler* aRes)
|
||||
{
|
||||
aRes->AddRef(); // Keep reference for response
|
||||
|
|
@ -35,11 +35,11 @@ BluetoothDaemonA2dpModule::Send(BluetoothDaemonPDU* aPDU,
|
|||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData)
|
||||
BluetoothDaemonA2dpModule::HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonA2dpModule::* const HandleOp[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&, void*) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonA2dpModule::HandleRsp),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonA2dpModule::HandleNtf),
|
||||
};
|
||||
|
|
@ -61,7 +61,7 @@ BluetoothDaemonA2dpModule::ConnectCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(SERVICE_ID,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(SERVICE_ID,
|
||||
OPCODE_CONNECT,
|
||||
6)); // Address
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -83,7 +83,7 @@ BluetoothDaemonA2dpModule::DisconnectCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(SERVICE_ID,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(SERVICE_ID,
|
||||
OPCODE_DISCONNECT,
|
||||
6)); // Address
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -104,8 +104,8 @@ BluetoothDaemonA2dpModule::DisconnectCmd(
|
|||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::ErrorRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothA2dpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothA2dpResultHandler* aRes)
|
||||
{
|
||||
ErrorRunnable::Dispatch(
|
||||
aRes, &BluetoothA2dpResultHandler::OnError, UnpackPDUInitOp(aPDU));
|
||||
|
|
@ -113,7 +113,7 @@ BluetoothDaemonA2dpModule::ErrorRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::ConnectRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothA2dpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -122,7 +122,7 @@ BluetoothDaemonA2dpModule::ConnectRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::DisconnectRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothA2dpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -131,12 +131,12 @@ BluetoothDaemonA2dpModule::DisconnectRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::HandleRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonA2dpModule::* const HandleRsp[])(
|
||||
const BluetoothDaemonPDUHeader&,
|
||||
BluetoothDaemonPDU&,
|
||||
const DaemonSocketPDUHeader&,
|
||||
DaemonSocketPDU&,
|
||||
BluetoothA2dpResultHandler*) = {
|
||||
INIT_ARRAY_AT(OPCODE_ERROR,
|
||||
&BluetoothDaemonA2dpModule::ErrorRsp),
|
||||
|
|
@ -186,14 +186,14 @@ class BluetoothDaemonA2dpModule::ConnectionStateInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
ConnectionStateInitOp(BluetoothDaemonPDU& aPDU)
|
||||
ConnectionStateInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (BluetoothA2dpConnectionState& aArg1, nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read state */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -214,7 +214,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::ConnectionStateNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ConnectionStateNotification::Dispatch(
|
||||
&BluetoothA2dpNotificationHandler::ConnectionStateNotification,
|
||||
|
|
@ -226,7 +226,7 @@ class BluetoothDaemonA2dpModule::AudioStateInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
AudioStateInitOp(BluetoothDaemonPDU& aPDU)
|
||||
AudioStateInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ public:
|
|||
operator () (BluetoothA2dpAudioState& aArg1,
|
||||
nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read state */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -255,7 +255,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::AudioStateNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
AudioStateNotification::Dispatch(
|
||||
&BluetoothA2dpNotificationHandler::AudioStateNotification,
|
||||
|
|
@ -267,14 +267,14 @@ class BluetoothDaemonA2dpModule::AudioConfigInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
AudioConfigInitOp(BluetoothDaemonPDU& aPDU)
|
||||
AudioConfigInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (nsString& aArg1, uint32_t aArg2, uint8_t aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read address */
|
||||
nsresult rv = UnpackPDU(
|
||||
|
|
@ -301,7 +301,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::AudioConfigNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
AudioConfigNotification::Dispatch(
|
||||
&BluetoothA2dpNotificationHandler::AudioConfigNotification,
|
||||
|
|
@ -310,11 +310,11 @@ BluetoothDaemonA2dpModule::AudioConfigNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonA2dpModule::HandleNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonA2dpModule::* const HandleNtf[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonA2dpModule::ConnectionStateNtf),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonA2dpModule::AudioStateNtf),
|
||||
#if ANDROID_VERSION >= 21
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public:
|
|||
|
||||
static const int MAX_NUM_CLIENTS;
|
||||
|
||||
virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
|
||||
virtual nsresult Send(DaemonSocketPDU* aPDU, void* aUserData) = 0;
|
||||
|
||||
virtual nsresult RegisterModule(uint8_t aId, uint8_t aMode,
|
||||
uint32_t aMaxNumClients,
|
||||
|
|
@ -52,11 +52,11 @@ public:
|
|||
BluetoothA2dpResultHandler* aRes);
|
||||
|
||||
protected:
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU,
|
||||
nsresult Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothA2dpResultHandler* aRes);
|
||||
|
||||
void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
|
||||
//
|
||||
// Responses
|
||||
|
|
@ -69,20 +69,20 @@ protected:
|
|||
BluetoothStatus, BluetoothStatus>
|
||||
ErrorRunnable;
|
||||
|
||||
void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothA2dpResultHandler* aRes);
|
||||
|
||||
void ConnectRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ConnectRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothA2dpResultHandler* aRes);
|
||||
|
||||
void DisconnectRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void DisconnectRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothA2dpResultHandler* aRes);
|
||||
|
||||
void HandleRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void HandleRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData);
|
||||
|
||||
//
|
||||
|
|
@ -114,17 +114,17 @@ protected:
|
|||
class AudioStateInitOp;
|
||||
class AudioConfigInitOp;
|
||||
|
||||
void ConnectionStateNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ConnectionStateNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void AudioStateNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void AudioStateNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void AudioConfigNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void AudioConfigNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void HandleNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void HandleNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData);
|
||||
|
||||
static BluetoothA2dpNotificationHandler* sNotificationHandler;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ BluetoothDaemonAvrcpModule::SetNotificationHandler(
|
|||
}
|
||||
|
||||
nsresult
|
||||
BluetoothDaemonAvrcpModule::Send(BluetoothDaemonPDU* aPDU,
|
||||
BluetoothDaemonAvrcpModule::Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
if (aRes) {
|
||||
|
|
@ -37,11 +37,11 @@ BluetoothDaemonAvrcpModule::Send(BluetoothDaemonPDU* aPDU,
|
|||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData)
|
||||
BluetoothDaemonAvrcpModule::HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonAvrcpModule::* const HandleOp[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&, void*) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonAvrcpModule::HandleRsp),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonAvrcpModule::HandleNtf),
|
||||
};
|
||||
|
|
@ -63,8 +63,8 @@ BluetoothDaemonAvrcpModule::GetPlayStatusRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_PLAY_STATUS_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_GET_PLAY_STATUS_RSP,
|
||||
1 + // Play status
|
||||
4 + // Duration
|
||||
4)); // Position
|
||||
|
|
@ -88,8 +88,8 @@ BluetoothDaemonAvrcpModule::ListPlayerAppAttrRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_LIST_PLAYER_APP_ATTR_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_LIST_PLAYER_APP_ATTR_RSP,
|
||||
1 + // # Attributes
|
||||
aNumAttr)); // Player attributes
|
||||
|
||||
|
|
@ -113,8 +113,8 @@ BluetoothDaemonAvrcpModule::ListPlayerAppValueRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_LIST_PLAYER_APP_VALUE_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_LIST_PLAYER_APP_VALUE_RSP,
|
||||
1 + // # Values
|
||||
aNumVal)); // Player values
|
||||
|
||||
|
|
@ -138,8 +138,8 @@ BluetoothDaemonAvrcpModule::GetPlayerAppValueRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_PLAYER_APP_VALUE_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_GET_PLAYER_APP_VALUE_RSP,
|
||||
1 + // # Pairs
|
||||
2 * aNumAttrs)); // Attribute-value pairs
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -163,8 +163,8 @@ BluetoothDaemonAvrcpModule::GetPlayerAppAttrTextRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_PLAYER_APP_ATTR_TEXT_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_GET_PLAYER_APP_ATTR_TEXT_RSP,
|
||||
0)); // Dynamically allocated
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<int, uint8_t>(aNumAttr),
|
||||
|
|
@ -187,8 +187,8 @@ BluetoothDaemonAvrcpModule::GetPlayerAppValueTextRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_PLAYER_APP_VALUE_TEXT_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_GET_PLAYER_APP_VALUE_TEXT_RSP,
|
||||
0)); // Dynamically allocated
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<int, uint8_t>(aNumVal),
|
||||
|
|
@ -211,8 +211,8 @@ BluetoothDaemonAvrcpModule::GetElementAttrRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_GET_ELEMENT_ATTR_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_GET_ELEMENT_ATTR_RSP,
|
||||
0)); // Dynamically allocated
|
||||
nsresult rv = PackPDU(
|
||||
aNumAttr,
|
||||
|
|
@ -234,8 +234,8 @@ BluetoothDaemonAvrcpModule::SetPlayerAppValueRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_SET_PLAYER_APP_VALUE_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_SET_PLAYER_APP_VALUE_RSP,
|
||||
1)); // Status code
|
||||
|
||||
nsresult rv = PackPDU(aRspStatus, *pdu);
|
||||
|
|
@ -258,8 +258,8 @@ BluetoothDaemonAvrcpModule::RegisterNotificationRspCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_REGISTER_NOTIFICATION_RSP,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_REGISTER_NOTIFICATION_RSP,
|
||||
1 + // Event
|
||||
1 + // Type
|
||||
1 + // Data length
|
||||
|
|
@ -285,8 +285,8 @@ BluetoothDaemonAvrcpModule::SetVolumeCmd(uint8_t aVolume,
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_SET_VOLUME,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_SET_VOLUME,
|
||||
1)); // Volume
|
||||
|
||||
nsresult rv = PackPDU(aVolume, *pdu);
|
||||
|
|
@ -306,8 +306,8 @@ BluetoothDaemonAvrcpModule::SetVolumeCmd(uint8_t aVolume,
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::ErrorRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ErrorRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::OnError, UnpackPDUInitOp(aPDU));
|
||||
|
|
@ -315,8 +315,8 @@ BluetoothDaemonAvrcpModule::ErrorRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetPlayStatusRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::GetPlayStatusRsp,
|
||||
|
|
@ -325,8 +325,8 @@ BluetoothDaemonAvrcpModule::GetPlayStatusRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::ListPlayerAppAttrRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::ListPlayerAppAttrRsp,
|
||||
|
|
@ -335,8 +335,8 @@ BluetoothDaemonAvrcpModule::ListPlayerAppAttrRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::ListPlayerAppValueRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::ListPlayerAppValueRsp,
|
||||
|
|
@ -345,8 +345,8 @@ BluetoothDaemonAvrcpModule::ListPlayerAppValueRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetPlayerAppValueRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::GetPlayerAppValueRsp,
|
||||
|
|
@ -355,8 +355,8 @@ BluetoothDaemonAvrcpModule::GetPlayerAppValueRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetPlayerAppAttrTextRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::GetPlayerAppAttrTextRsp,
|
||||
|
|
@ -365,8 +365,8 @@ BluetoothDaemonAvrcpModule::GetPlayerAppAttrTextRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetPlayerAppValueTextRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::GetPlayerAppValueTextRsp,
|
||||
|
|
@ -375,8 +375,8 @@ BluetoothDaemonAvrcpModule::GetPlayerAppValueTextRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetElementAttrRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::GetElementAttrRsp,
|
||||
|
|
@ -385,8 +385,8 @@ BluetoothDaemonAvrcpModule::GetElementAttrRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::SetPlayerAppValueRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::SetPlayerAppValueRsp,
|
||||
|
|
@ -395,8 +395,8 @@ BluetoothDaemonAvrcpModule::SetPlayerAppValueRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::RegisterNotificationRspRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::RegisterNotificationRsp,
|
||||
|
|
@ -405,8 +405,8 @@ BluetoothDaemonAvrcpModule::RegisterNotificationRspRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::SetVolumeRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothAvrcpResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothAvrcpResultHandler::SetVolume,
|
||||
|
|
@ -415,12 +415,12 @@ BluetoothDaemonAvrcpModule::SetVolumeRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::HandleRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonAvrcpModule::* const HandleRsp[])(
|
||||
const BluetoothDaemonPDUHeader&,
|
||||
BluetoothDaemonPDU&,
|
||||
const DaemonSocketPDUHeader&,
|
||||
DaemonSocketPDU&,
|
||||
BluetoothAvrcpResultHandler*) = {
|
||||
INIT_ARRAY_AT(OPCODE_ERROR,
|
||||
&BluetoothDaemonAvrcpModule::ErrorRsp),
|
||||
|
|
@ -486,14 +486,14 @@ class BluetoothDaemonAvrcpModule::RemoteFeatureInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
RemoteFeatureInitOp(BluetoothDaemonPDU& aPDU)
|
||||
RemoteFeatureInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (nsString& aArg1, unsigned long& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read address */
|
||||
nsresult rv = UnpackPDU(
|
||||
|
|
@ -516,7 +516,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::RemoteFeatureNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
RemoteFeatureNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::RemoteFeatureNotification,
|
||||
|
|
@ -525,7 +525,7 @@ BluetoothDaemonAvrcpModule::RemoteFeatureNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetPlayStatusNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
GetPlayStatusNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::GetPlayStatusNotification,
|
||||
|
|
@ -534,7 +534,7 @@ BluetoothDaemonAvrcpModule::GetPlayStatusNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::ListPlayerAppAttrNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ListPlayerAppAttrNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::ListPlayerAppAttrNotification,
|
||||
|
|
@ -543,7 +543,7 @@ BluetoothDaemonAvrcpModule::ListPlayerAppAttrNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::ListPlayerAppValuesNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ListPlayerAppValuesNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::ListPlayerAppValuesNotification,
|
||||
|
|
@ -555,7 +555,7 @@ class BluetoothDaemonAvrcpModule::GetPlayerAppValueInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
GetPlayerAppValueInitOp(BluetoothDaemonPDU& aPDU)
|
||||
GetPlayerAppValueInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -563,7 +563,7 @@ public:
|
|||
operator () (uint8_t& aArg1,
|
||||
nsAutoArrayPtr<BluetoothAvrcpPlayerAttribute>& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read number of attributes */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -584,7 +584,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetPlayerAppValueNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
GetPlayerAppValueNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::GetPlayerAppValueNotification,
|
||||
|
|
@ -596,7 +596,7 @@ class BluetoothDaemonAvrcpModule::GetPlayerAppAttrsTextInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
GetPlayerAppAttrsTextInitOp(BluetoothDaemonPDU& aPDU)
|
||||
GetPlayerAppAttrsTextInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -604,7 +604,7 @@ public:
|
|||
operator () (uint8_t& aArg1,
|
||||
nsAutoArrayPtr<BluetoothAvrcpPlayerAttribute>& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read number of attributes */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -625,7 +625,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetPlayerAppAttrsTextNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
GetPlayerAppAttrsTextNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::GetPlayerAppAttrsTextNotification,
|
||||
|
|
@ -637,7 +637,7 @@ class BluetoothDaemonAvrcpModule::GetPlayerAppValuesTextInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
GetPlayerAppValuesTextInitOp(BluetoothDaemonPDU& aPDU)
|
||||
GetPlayerAppValuesTextInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -645,7 +645,7 @@ public:
|
|||
operator () (uint8_t& aArg1, uint8_t& aArg2,
|
||||
nsAutoArrayPtr<uint8_t>& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read attribute */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -671,7 +671,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetPlayerAppValuesTextNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
GetPlayerAppValuesTextNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::GetPlayerAppValuesTextNotification,
|
||||
|
|
@ -680,7 +680,7 @@ BluetoothDaemonAvrcpModule::GetPlayerAppValuesTextNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::SetPlayerAppValueNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
SetPlayerAppValueNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::SetPlayerAppValueNotification,
|
||||
|
|
@ -692,7 +692,7 @@ class BluetoothDaemonAvrcpModule::GetElementAttrInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
GetElementAttrInitOp(BluetoothDaemonPDU& aPDU)
|
||||
GetElementAttrInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -700,7 +700,7 @@ public:
|
|||
operator () (uint8_t& aArg1,
|
||||
nsAutoArrayPtr<BluetoothAvrcpMediaAttribute>& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read number of attributes */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -721,7 +721,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::GetElementAttrNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
GetElementAttrNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::GetElementAttrNotification,
|
||||
|
|
@ -730,7 +730,7 @@ BluetoothDaemonAvrcpModule::GetElementAttrNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::RegisterNotificationNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
RegisterNotificationNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::RegisterNotificationNotification,
|
||||
|
|
@ -740,7 +740,7 @@ BluetoothDaemonAvrcpModule::RegisterNotificationNtf(
|
|||
#if ANDROID_VERSION >= 19
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::VolumeChangeNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
VolumeChangeNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::VolumeChangeNotification,
|
||||
|
|
@ -752,14 +752,14 @@ class BluetoothDaemonAvrcpModule::PassthroughCmdInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
PassthroughCmdInitOp(BluetoothDaemonPDU& aPDU)
|
||||
PassthroughCmdInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (int& aArg1, int& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
nsresult rv = UnpackPDU(pdu, UnpackConversion<uint8_t, int>(aArg1));
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -776,7 +776,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::PassthroughCmdNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
PassthroughCmdNotification::Dispatch(
|
||||
&BluetoothAvrcpNotificationHandler::PassthroughCmdNotification,
|
||||
|
|
@ -786,11 +786,11 @@ BluetoothDaemonAvrcpModule::PassthroughCmdNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonAvrcpModule::HandleNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonAvrcpModule::* const HandleNtf[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&) = {
|
||||
#if ANDROID_VERSION >= 19
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonAvrcpModule::RemoteFeatureNtf),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonAvrcpModule::GetPlayStatusNtf),
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ public:
|
|||
|
||||
static const int MAX_NUM_CLIENTS;
|
||||
|
||||
virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
|
||||
virtual nsresult Send(DaemonSocketPDU* aPDU, void* aUserData) = 0;
|
||||
|
||||
virtual nsresult RegisterModule(uint8_t aId, uint8_t aMode,
|
||||
uint32_t aMaxNumClients,
|
||||
|
|
@ -116,11 +116,11 @@ public:
|
|||
nsresult SetVolumeCmd(uint8_t aVolume, BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
protected:
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU,
|
||||
nsresult Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
|
||||
//
|
||||
// Responses
|
||||
|
|
@ -133,52 +133,52 @@ protected:
|
|||
BluetoothStatus, BluetoothStatus>
|
||||
ErrorRunnable;
|
||||
|
||||
void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void GetPlayStatusRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetPlayStatusRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void ListPlayerAppAttrRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ListPlayerAppAttrRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void ListPlayerAppValueRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ListPlayerAppValueRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void GetPlayerAppValueRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetPlayerAppValueRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void GetPlayerAppAttrTextRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetPlayerAppAttrTextRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void GetPlayerAppValueTextRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetPlayerAppValueTextRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void GetElementAttrRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetElementAttrRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void SetPlayerAppValueRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void SetPlayerAppValueRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void RegisterNotificationRspRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void RegisterNotificationRspRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void SetVolumeRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void SetVolumeRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothAvrcpResultHandler* aRes);
|
||||
|
||||
void HandleRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void HandleRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData);
|
||||
|
||||
//
|
||||
|
|
@ -247,44 +247,44 @@ protected:
|
|||
class PassthroughCmdInitOp;
|
||||
class RemoteFeatureInitOp;
|
||||
|
||||
void RemoteFeatureNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void RemoteFeatureNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void GetPlayStatusNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void GetPlayStatusNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ListPlayerAppAttrNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ListPlayerAppAttrNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ListPlayerAppValuesNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ListPlayerAppValuesNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void GetPlayerAppValueNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void GetPlayerAppValueNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void GetPlayerAppAttrsTextNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void GetPlayerAppAttrsTextNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void GetPlayerAppValuesTextNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void GetPlayerAppValuesTextNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void SetPlayerAppValueNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void SetPlayerAppValueNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void GetElementAttrNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void GetElementAttrNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void RegisterNotificationNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void RegisterNotificationNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void VolumeChangeNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void VolumeChangeNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void PassthroughCmdNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void PassthroughCmdNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void HandleNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void HandleNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData);
|
||||
|
||||
static BluetoothAvrcpNotificationHandler* sNotificationHandler;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ BluetoothDaemonGattModule::SetNotificationHandler(
|
|||
}
|
||||
|
||||
nsresult
|
||||
BluetoothDaemonGattModule::Send(BluetoothDaemonPDU* aPDU,
|
||||
BluetoothDaemonGattModule::Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothGattResultHandler* aRes)
|
||||
{
|
||||
if (aRes) {
|
||||
|
|
@ -37,7 +37,7 @@ BluetoothDaemonGattModule::Send(BluetoothDaemonPDU* aPDU,
|
|||
}
|
||||
|
||||
nsresult
|
||||
BluetoothDaemonGattModule::Send(BluetoothDaemonPDU* aPDU,
|
||||
BluetoothDaemonGattModule::Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
if (aRes) {
|
||||
|
|
@ -47,11 +47,11 @@ BluetoothDaemonGattModule::Send(BluetoothDaemonPDU* aPDU,
|
|||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonGattModule::HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData)
|
||||
BluetoothDaemonGattModule::HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonGattModule::* const HandleOp[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&, void*) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonGattModule::HandleRsp),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonGattModule::HandleNtf),
|
||||
};
|
||||
|
|
@ -73,8 +73,8 @@ BluetoothDaemonGattModule::ClientRegisterCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_REGISTER,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_REGISTER,
|
||||
16)); // Service UUID
|
||||
|
||||
nsresult rv = PackPDU(aUuid, *pdu);
|
||||
|
|
@ -96,8 +96,8 @@ BluetoothDaemonGattModule::ClientUnregisterCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_UNREGISTER,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_UNREGISTER,
|
||||
4)); // Client Interface
|
||||
|
||||
nsresult rv = PackPDU(aClientIf, *pdu);
|
||||
|
|
@ -118,8 +118,8 @@ BluetoothDaemonGattModule::ClientScanCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_SCAN,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_SCAN,
|
||||
4 + // Client Interface
|
||||
1)); // Start
|
||||
|
||||
|
|
@ -143,8 +143,8 @@ BluetoothDaemonGattModule::ClientConnectCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_CONNECT,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_CONNECT,
|
||||
4 + // Client Interface
|
||||
6 + // Remote Address
|
||||
1 + // Is Direct
|
||||
|
|
@ -173,8 +173,8 @@ BluetoothDaemonGattModule::ClientDisconnectCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_DISCONNECT,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_DISCONNECT,
|
||||
4 + // Client Interface
|
||||
6 + // Remote Address
|
||||
4)); // Connection ID
|
||||
|
|
@ -200,8 +200,8 @@ BluetoothDaemonGattModule::ClientListenCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_LISTEN,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_LISTEN,
|
||||
4 + // Client Interface
|
||||
1)); // Start
|
||||
|
||||
|
|
@ -226,8 +226,8 @@ BluetoothDaemonGattModule::ClientRefreshCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_REFRESH,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_REFRESH,
|
||||
4 + // Client Interface
|
||||
6)); // Remote Address
|
||||
|
||||
|
|
@ -252,11 +252,11 @@ BluetoothDaemonGattModule::ClientSearchServiceCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_SEARCH_SERVICE,
|
||||
4 + // Connection ID
|
||||
1 + // Filtered
|
||||
16)); // UUID
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_SEARCH_SERVICE,
|
||||
4 + // Connection ID
|
||||
1 + // Filtered
|
||||
16)); // UUID
|
||||
|
||||
nsresult rv = PackPDU(PackConversion<int, int32_t>(aConnId),
|
||||
PackConversion<bool, uint8_t>(aFiltered),
|
||||
|
|
@ -281,8 +281,8 @@ BluetoothDaemonGattModule::ClientGetIncludedServiceCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_GET_INCLUDED_SERVICE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_GET_INCLUDED_SERVICE,
|
||||
4 + // Connection ID
|
||||
18 + // Service ID
|
||||
1 + // Continuation
|
||||
|
|
@ -310,8 +310,8 @@ BluetoothDaemonGattModule::ClientGetCharacteristicCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_GET_CHARACTERISTIC,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_GET_CHARACTERISTIC,
|
||||
4 + // Connection ID
|
||||
18 + // Service ID
|
||||
1 + // Continuation
|
||||
|
|
@ -341,8 +341,8 @@ BluetoothDaemonGattModule::ClientGetDescriptorCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_GET_DESCRIPTOR,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_GET_DESCRIPTOR,
|
||||
4 + // Connection ID
|
||||
18 + // Service ID
|
||||
17 + // Characteristic ID
|
||||
|
|
@ -372,8 +372,8 @@ BluetoothDaemonGattModule::ClientReadCharacteristicCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_READ_CHARACTERISTIC,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_READ_CHARACTERISTIC,
|
||||
4 + // Connection ID
|
||||
18 + // Service ID
|
||||
17 + // Characteristic ID
|
||||
|
|
@ -401,8 +401,8 @@ BluetoothDaemonGattModule::ClientWriteCharacteristicCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_WRITE_CHARACTERISTIC, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_WRITE_CHARACTERISTIC, 0));
|
||||
|
||||
nsresult rv = PackPDU(PackConversion<int, int32_t>(aConnId), aServiceId,
|
||||
aCharId, aWriteType,
|
||||
|
|
@ -427,8 +427,8 @@ BluetoothDaemonGattModule::ClientReadDescriptorCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_READ_DESCRIPTOR,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_READ_DESCRIPTOR,
|
||||
4 + // Connection ID
|
||||
18 + // Service ID
|
||||
17 + // Characteristic ID
|
||||
|
|
@ -458,8 +458,8 @@ BluetoothDaemonGattModule::ClientWriteDescriptorCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_WRITE_DESCRIPTOR, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_WRITE_DESCRIPTOR, 0));
|
||||
|
||||
nsresult rv = PackPDU(PackConversion<int, int32_t>(aConnId), aServiceId,
|
||||
aCharId, aDescriptorId, aWriteType,
|
||||
|
|
@ -482,8 +482,8 @@ BluetoothDaemonGattModule::ClientExecuteWriteCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_EXECUTE_WRITE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_EXECUTE_WRITE,
|
||||
4 + // Connection ID
|
||||
4)); // Execute
|
||||
|
||||
|
|
@ -508,8 +508,8 @@ BluetoothDaemonGattModule::ClientRegisterNotificationCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_REGISTER_NOTIFICATION,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_REGISTER_NOTIFICATION,
|
||||
4 + // Client Interface
|
||||
6 + // Remote Address
|
||||
18 + // Service ID
|
||||
|
|
@ -537,8 +537,8 @@ BluetoothDaemonGattModule::ClientDeregisterNotificationCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_DEREGISTER_NOTIFICATION,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_DEREGISTER_NOTIFICATION,
|
||||
4 + // Client Interface
|
||||
6 + // Remote Address
|
||||
18 + // Service ID
|
||||
|
|
@ -565,8 +565,8 @@ BluetoothDaemonGattModule::ClientReadRemoteRssiCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_READ_REMOTE_RSSI,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_READ_REMOTE_RSSI,
|
||||
4 + // Client Interface
|
||||
6)); // Remote Address
|
||||
|
||||
|
|
@ -590,8 +590,8 @@ BluetoothDaemonGattModule::ClientGetDeviceTypeCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_GET_DEVICE_TYPE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_GET_DEVICE_TYPE,
|
||||
6)); // Remote Address
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -618,8 +618,8 @@ BluetoothDaemonGattModule::ClientSetAdvDataCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_SET_ADV_DATA, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_SET_ADV_DATA, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<int, int32_t>(aServerIf),
|
||||
|
|
@ -650,8 +650,8 @@ BluetoothDaemonGattModule::ClientTestCommandCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLIENT_TEST_COMMAND,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLIENT_TEST_COMMAND,
|
||||
4 + // Command
|
||||
6 + // Address
|
||||
16 + // UUID
|
||||
|
|
@ -682,8 +682,8 @@ BluetoothDaemonGattModule::ClientTestCommandCmd(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ErrorRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothGattResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothGattResultHandler* aRes)
|
||||
{
|
||||
ErrorRunnable::Dispatch(
|
||||
aRes, &BluetoothGattResultHandler::OnError, UnpackPDUInitOp(aPDU));
|
||||
|
|
@ -691,7 +691,7 @@ BluetoothDaemonGattModule::ErrorRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientRegisterRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -701,7 +701,7 @@ BluetoothDaemonGattModule::ClientRegisterRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientUnregisterRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -711,7 +711,7 @@ BluetoothDaemonGattModule::ClientUnregisterRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientScanRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -720,7 +720,7 @@ BluetoothDaemonGattModule::ClientScanRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientConnectRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -729,7 +729,7 @@ BluetoothDaemonGattModule::ClientConnectRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientDisconnectRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -739,7 +739,7 @@ BluetoothDaemonGattModule::ClientDisconnectRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientListenRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -748,7 +748,7 @@ BluetoothDaemonGattModule::ClientListenRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientRefreshRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -757,7 +757,7 @@ BluetoothDaemonGattModule::ClientRefreshRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientSearchServiceRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -767,7 +767,7 @@ BluetoothDaemonGattModule::ClientSearchServiceRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientGetIncludedServiceRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -777,7 +777,7 @@ BluetoothDaemonGattModule::ClientGetIncludedServiceRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientGetCharacteristicRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -787,7 +787,7 @@ BluetoothDaemonGattModule::ClientGetCharacteristicRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientGetDescriptorRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -797,7 +797,7 @@ BluetoothDaemonGattModule::ClientGetDescriptorRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientReadCharacteristicRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -807,7 +807,7 @@ BluetoothDaemonGattModule::ClientReadCharacteristicRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientWriteCharacteristicRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -817,7 +817,7 @@ BluetoothDaemonGattModule::ClientWriteCharacteristicRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientReadDescriptorRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -827,7 +827,7 @@ BluetoothDaemonGattModule::ClientReadDescriptorRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientWriteDescriptorRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -837,7 +837,7 @@ BluetoothDaemonGattModule::ClientWriteDescriptorRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientExecuteWriteRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -847,7 +847,7 @@ BluetoothDaemonGattModule::ClientExecuteWriteRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientRegisterNotificationRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -857,7 +857,7 @@ BluetoothDaemonGattModule::ClientRegisterNotificationRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientDeregisterNotificationRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -867,7 +867,7 @@ BluetoothDaemonGattModule::ClientDeregisterNotificationRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientReadRemoteRssiRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -877,7 +877,7 @@ BluetoothDaemonGattModule::ClientReadRemoteRssiRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientGetDeviceTypeRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -887,7 +887,7 @@ BluetoothDaemonGattModule::ClientGetDeviceTypeRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientSetAdvDataRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -897,7 +897,7 @@ BluetoothDaemonGattModule::ClientSetAdvDataRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientTestCommandRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes)
|
||||
{
|
||||
ClientResultRunnable::Dispatch(
|
||||
|
|
@ -907,20 +907,20 @@ BluetoothDaemonGattModule::ClientTestCommandRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::HandleRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonGattModule::* const HandleRsp[])(
|
||||
const BluetoothDaemonPDUHeader&,
|
||||
BluetoothDaemonPDU&,
|
||||
const DaemonSocketPDUHeader&,
|
||||
DaemonSocketPDU&,
|
||||
BluetoothGattResultHandler*) = {
|
||||
INIT_ARRAY_AT(OPCODE_ERROR,
|
||||
&BluetoothDaemonGattModule::ErrorRsp)
|
||||
};
|
||||
|
||||
static void (BluetoothDaemonGattModule::* const HandleClientRsp[])(
|
||||
const BluetoothDaemonPDUHeader&,
|
||||
BluetoothDaemonPDU&,
|
||||
const DaemonSocketPDUHeader&,
|
||||
DaemonSocketPDU&,
|
||||
BluetoothGattClientResultHandler*) = {
|
||||
INIT_ARRAY_AT(0, nullptr),
|
||||
INIT_ARRAY_AT(OPCODE_CLIENT_REGISTER,
|
||||
|
|
@ -1032,7 +1032,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientRegisterNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientRegisterNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::RegisterClientNotification,
|
||||
|
|
@ -1044,7 +1044,7 @@ class BluetoothDaemonGattModule::ClientScanResultInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
ClientScanResultInitOp(BluetoothDaemonPDU& aPDU)
|
||||
ClientScanResultInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1053,7 +1053,7 @@ public:
|
|||
int& aArg2,
|
||||
BluetoothGattAdvData& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read address */
|
||||
nsresult rv = UnpackPDU(
|
||||
|
|
@ -1085,7 +1085,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientScanResultNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientScanResultNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::ScanResultNotification,
|
||||
|
|
@ -1097,7 +1097,7 @@ class BluetoothDaemonGattModule::ClientConnectDisconnectInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
ClientConnectDisconnectInitOp(BluetoothDaemonPDU& aPDU)
|
||||
ClientConnectDisconnectInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1107,7 +1107,7 @@ public:
|
|||
int& aArg3,
|
||||
nsString& aArg4) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read connection ID */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1138,7 +1138,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientConnectNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientConnectNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::ConnectNotification,
|
||||
|
|
@ -1147,7 +1147,7 @@ BluetoothDaemonGattModule::ClientConnectNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientDisconnectNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientDisconnectNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::DisconnectNotification,
|
||||
|
|
@ -1156,7 +1156,7 @@ BluetoothDaemonGattModule::ClientDisconnectNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientSearchCompleteNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientSearchCompleteNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::SearchCompleteNotification,
|
||||
|
|
@ -1165,7 +1165,7 @@ BluetoothDaemonGattModule::ClientSearchCompleteNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientSearchResultNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientSearchResultNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::SearchResultNotification,
|
||||
|
|
@ -1174,7 +1174,7 @@ BluetoothDaemonGattModule::ClientSearchResultNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientGetCharacteristicNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientGetCharacteristicNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::GetCharacteristicNotification,
|
||||
|
|
@ -1183,7 +1183,7 @@ BluetoothDaemonGattModule::ClientGetCharacteristicNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientGetDescriptorNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientGetDescriptorNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::GetDescriptorNotification,
|
||||
|
|
@ -1192,7 +1192,7 @@ BluetoothDaemonGattModule::ClientGetDescriptorNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientGetIncludedServiceNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientGetIncludedServiceNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::GetIncludedServiceNotification,
|
||||
|
|
@ -1201,7 +1201,7 @@ BluetoothDaemonGattModule::ClientGetIncludedServiceNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientRegisterNotificationNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientRegisterNotificationNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::RegisterNotificationNotification,
|
||||
|
|
@ -1210,7 +1210,7 @@ BluetoothDaemonGattModule::ClientRegisterNotificationNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientNotifyNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientNotifyNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::NotifyNotification,
|
||||
|
|
@ -1219,7 +1219,7 @@ BluetoothDaemonGattModule::ClientNotifyNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientReadCharacteristicNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientReadCharacteristicNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::ReadCharacteristicNotification,
|
||||
|
|
@ -1228,7 +1228,7 @@ BluetoothDaemonGattModule::ClientReadCharacteristicNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientWriteCharacteristicNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientWriteCharacteristicNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::WriteCharacteristicNotification,
|
||||
|
|
@ -1237,7 +1237,7 @@ BluetoothDaemonGattModule::ClientWriteCharacteristicNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientReadDescriptorNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientReadDescriptorNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::ReadDescriptorNotification,
|
||||
|
|
@ -1246,7 +1246,7 @@ BluetoothDaemonGattModule::ClientReadDescriptorNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientWriteDescriptorNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientWriteDescriptorNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::WriteDescriptorNotification,
|
||||
|
|
@ -1255,7 +1255,7 @@ BluetoothDaemonGattModule::ClientWriteDescriptorNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientExecuteWriteNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientExecuteWriteNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::ExecuteWriteNotification,
|
||||
|
|
@ -1267,7 +1267,7 @@ class BluetoothDaemonGattModule::ClientReadRemoteRssiInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
ClientReadRemoteRssiInitOp(BluetoothDaemonPDU& aPDU)
|
||||
ClientReadRemoteRssiInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1277,7 +1277,7 @@ public:
|
|||
int& aArg3,
|
||||
BluetoothGattStatus& aArg4) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read client interface */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1307,7 +1307,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientReadRemoteRssiNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientReadRemoteRssiNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::ReadRemoteRssiNotification,
|
||||
|
|
@ -1316,7 +1316,7 @@ BluetoothDaemonGattModule::ClientReadRemoteRssiNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::ClientListenNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClientListenNotification::Dispatch(
|
||||
&BluetoothGattClientNotificationHandler::ListenNotification,
|
||||
|
|
@ -1325,11 +1325,11 @@ BluetoothDaemonGattModule::ClientListenNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonGattModule::HandleNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonGattModule::* const HandleNtf[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonGattModule::ClientRegisterNtf),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonGattModule::ClientScanResultNtf),
|
||||
INIT_ARRAY_AT(2, &BluetoothDaemonGattModule::ClientConnectNtf),
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public:
|
|||
|
||||
static const int MAX_NUM_CLIENTS;
|
||||
|
||||
virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
|
||||
virtual nsresult Send(DaemonSocketPDU* aPDU, void* aUserData) = 0;
|
||||
|
||||
virtual nsresult RegisterModule(uint8_t aId, uint8_t aMode,
|
||||
uint32_t aMaxNumClients,
|
||||
|
|
@ -211,14 +211,14 @@ public:
|
|||
// TODO: Add server commands
|
||||
|
||||
protected:
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU,
|
||||
nsresult Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothGattResultHandler* aRes);
|
||||
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU,
|
||||
nsresult Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
|
||||
//
|
||||
// Responses
|
||||
|
|
@ -234,100 +234,100 @@ protected:
|
|||
BluetoothStatus, BluetoothStatus>
|
||||
ErrorRunnable;
|
||||
|
||||
void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattResultHandler* aRes);
|
||||
|
||||
void ClientRegisterRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientRegisterRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientUnregisterRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientUnregisterRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientScanRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientScanRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientConnectRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientConnectRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientDisconnectRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientDisconnectRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientListenRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientListenRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientRefreshRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientRefreshRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientSearchServiceRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientSearchServiceRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientGetIncludedServiceRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientGetIncludedServiceRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientGetCharacteristicRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientGetCharacteristicRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientGetDescriptorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientGetDescriptorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientReadCharacteristicRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientReadCharacteristicRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientWriteCharacteristicRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientWriteCharacteristicRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientReadDescriptorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientReadDescriptorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientWriteDescriptorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientWriteDescriptorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientExecuteWriteRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientExecuteWriteRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientRegisterNotificationRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientRegisterNotificationRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientDeregisterNotificationRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientDeregisterNotificationRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientReadRemoteRssiRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientReadRemoteRssiRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientGetDeviceTypeRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientGetDeviceTypeRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientSetAdvDataRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientSetAdvDataRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void ClientTestCommandRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClientTestCommandRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothGattClientResultHandler* aRes);
|
||||
|
||||
void HandleRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void HandleRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData);
|
||||
|
||||
// TODO: Add Server responses
|
||||
|
|
@ -456,62 +456,62 @@ protected:
|
|||
class ClientConnectDisconnectInitOp;
|
||||
class ClientReadRemoteRssiInitOp;
|
||||
|
||||
void ClientRegisterNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientRegisterNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientScanResultNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientScanResultNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientConnectNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientConnectNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientDisconnectNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientDisconnectNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientSearchCompleteNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientSearchCompleteNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientSearchResultNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientSearchResultNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientGetCharacteristicNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientGetCharacteristicNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientGetDescriptorNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientGetDescriptorNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientGetIncludedServiceNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientGetIncludedServiceNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientRegisterNotificationNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientRegisterNotificationNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientNotifyNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientNotifyNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientReadCharacteristicNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientReadCharacteristicNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientWriteCharacteristicNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientWriteCharacteristicNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientReadDescriptorNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientReadDescriptorNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientWriteDescriptorNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientWriteDescriptorNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientExecuteWriteNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientExecuteWriteNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientReadRemoteRssiNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientReadRemoteRssiNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClientListenNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClientListenNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void HandleNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void HandleNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData);
|
||||
|
||||
static BluetoothGattNotificationHandler* sNotificationHandler;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ BluetoothDaemonHandsfreeModule::SetNotificationHandler(
|
|||
}
|
||||
|
||||
nsresult
|
||||
BluetoothDaemonHandsfreeModule::Send(BluetoothDaemonPDU* aPDU,
|
||||
BluetoothDaemonHandsfreeModule::Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
aRes->AddRef(); // Keep reference for response
|
||||
|
|
@ -38,11 +38,11 @@ BluetoothDaemonHandsfreeModule::Send(BluetoothDaemonPDU* aPDU,
|
|||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData)
|
||||
BluetoothDaemonHandsfreeModule::HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonHandsfreeModule::* const HandleOp[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&, void*) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonHandsfreeModule::HandleRsp),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonHandsfreeModule::HandleNtf),
|
||||
};
|
||||
|
|
@ -64,8 +64,8 @@ BluetoothDaemonHandsfreeModule::ConnectCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CONNECT,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CONNECT,
|
||||
6)); // Address
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -87,8 +87,8 @@ BluetoothDaemonHandsfreeModule::DisconnectCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DISCONNECT,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_DISCONNECT,
|
||||
6)); // Address
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -110,8 +110,8 @@ BluetoothDaemonHandsfreeModule::ConnectAudioCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CONNECT_AUDIO,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CONNECT_AUDIO,
|
||||
6)); // Address
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -133,8 +133,8 @@ BluetoothDaemonHandsfreeModule::DisconnectAudioCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DISCONNECT_AUDIO,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_DISCONNECT_AUDIO,
|
||||
6)); // Address
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -156,8 +156,8 @@ BluetoothDaemonHandsfreeModule::StartVoiceRecognitionCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_START_VOICE_RECOGNITION,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_START_VOICE_RECOGNITION,
|
||||
6)); // Address (BlueZ 5.25)
|
||||
|
||||
nsresult rv;
|
||||
|
|
@ -182,8 +182,8 @@ BluetoothDaemonHandsfreeModule::StopVoiceRecognitionCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_STOP_VOICE_RECOGNITION,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_STOP_VOICE_RECOGNITION,
|
||||
6)); // Address (BlueZ 5.25)
|
||||
|
||||
nsresult rv;
|
||||
|
|
@ -209,8 +209,8 @@ BluetoothDaemonHandsfreeModule::VolumeControlCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_VOLUME_CONTROL,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_VOLUME_CONTROL,
|
||||
1 + // Volume type
|
||||
1 + // Volume
|
||||
6)); // Address (BlueZ 5.25)
|
||||
|
|
@ -241,8 +241,8 @@ BluetoothDaemonHandsfreeModule::DeviceStatusNotificationCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_DEVICE_STATUS_NOTIFICATION,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_DEVICE_STATUS_NOTIFICATION,
|
||||
1 + // Network state
|
||||
1 + // Service type
|
||||
1 + // Signal strength
|
||||
|
|
@ -269,8 +269,8 @@ BluetoothDaemonHandsfreeModule::CopsResponseCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_COPS_RESPONSE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_COPS_RESPONSE,
|
||||
0 + // Dynamically allocated
|
||||
6)); // Address (BlueZ 5.25)
|
||||
|
||||
|
|
@ -302,8 +302,8 @@ BluetoothDaemonHandsfreeModule::CindResponseCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CIND_RESPONSE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CIND_RESPONSE,
|
||||
1 + // Service
|
||||
1 + // # Active
|
||||
1 + // # Held
|
||||
|
|
@ -350,8 +350,8 @@ BluetoothDaemonHandsfreeModule::FormattedAtResponseCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_FORMATTED_AT_RESPONSE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_FORMATTED_AT_RESPONSE,
|
||||
0 + // Dynamically allocated
|
||||
6)); // Address (BlueZ 5.25)
|
||||
|
||||
|
|
@ -380,8 +380,8 @@ BluetoothDaemonHandsfreeModule::AtResponseCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_AT_RESPONSE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_AT_RESPONSE,
|
||||
1 + // AT Response code
|
||||
1 + // Error code
|
||||
6)); // Address (BlueZ 5.25)
|
||||
|
|
@ -417,8 +417,8 @@ BluetoothDaemonHandsfreeModule::ClccResponseCmd(
|
|||
|
||||
NS_ConvertUTF16toUTF8 number(aNumber);
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CLCC_RESPONSE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CLCC_RESPONSE,
|
||||
1 + // Call index
|
||||
1 + // Call direction
|
||||
1 + // Call state
|
||||
|
|
@ -460,8 +460,8 @@ BluetoothDaemonHandsfreeModule::PhoneStateChangeCmd(
|
|||
|
||||
NS_ConvertUTF16toUTF8 number(aNumber);
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_PHONE_STATE_CHANGE,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_PHONE_STATE_CHANGE,
|
||||
1 + // # Active
|
||||
1 + // # Held
|
||||
1 + // Call state
|
||||
|
|
@ -491,8 +491,8 @@ BluetoothDaemonHandsfreeModule::ConfigureWbsCmd(
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(
|
||||
new BluetoothDaemonPDU(SERVICE_ID, OPCODE_CONFIGURE_WBS,
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(
|
||||
new DaemonSocketPDU(SERVICE_ID, OPCODE_CONFIGURE_WBS,
|
||||
6 + // Address
|
||||
1)); // Config
|
||||
|
||||
|
|
@ -514,8 +514,8 @@ BluetoothDaemonHandsfreeModule::ConfigureWbsCmd(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::ErrorRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, BluetoothHandsfreeResultHandler* aRes)
|
||||
const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ErrorRunnable::Dispatch(
|
||||
aRes, &BluetoothHandsfreeResultHandler::OnError, UnpackPDUInitOp(aPDU));
|
||||
|
|
@ -523,7 +523,7 @@ BluetoothDaemonHandsfreeModule::ErrorRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::ConnectRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -532,7 +532,7 @@ BluetoothDaemonHandsfreeModule::ConnectRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::DisconnectRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -541,7 +541,7 @@ BluetoothDaemonHandsfreeModule::DisconnectRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::ConnectAudioRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -551,7 +551,7 @@ BluetoothDaemonHandsfreeModule::ConnectAudioRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::DisconnectAudioRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -561,7 +561,7 @@ BluetoothDaemonHandsfreeModule::DisconnectAudioRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::StartVoiceRecognitionRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -571,7 +571,7 @@ BluetoothDaemonHandsfreeModule::StartVoiceRecognitionRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::StopVoiceRecognitionRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -581,7 +581,7 @@ BluetoothDaemonHandsfreeModule::StopVoiceRecognitionRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::VolumeControlRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -591,7 +591,7 @@ BluetoothDaemonHandsfreeModule::VolumeControlRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::DeviceStatusNotificationRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -601,7 +601,7 @@ BluetoothDaemonHandsfreeModule::DeviceStatusNotificationRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::CopsResponseRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -611,7 +611,7 @@ BluetoothDaemonHandsfreeModule::CopsResponseRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::CindResponseRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -621,7 +621,7 @@ BluetoothDaemonHandsfreeModule::CindResponseRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::FormattedAtResponseRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -631,7 +631,7 @@ BluetoothDaemonHandsfreeModule::FormattedAtResponseRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::AtResponseRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -641,7 +641,7 @@ BluetoothDaemonHandsfreeModule::AtResponseRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::ClccResponseRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -651,7 +651,7 @@ BluetoothDaemonHandsfreeModule::ClccResponseRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::PhoneStateChangeRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -661,7 +661,7 @@ BluetoothDaemonHandsfreeModule::PhoneStateChangeRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::ConfigureWbsRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -671,12 +671,12 @@ BluetoothDaemonHandsfreeModule::ConfigureWbsRsp(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::HandleRsp(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonHandsfreeModule::* const HandleRsp[])(
|
||||
const BluetoothDaemonPDUHeader&,
|
||||
BluetoothDaemonPDU&,
|
||||
const DaemonSocketPDUHeader&,
|
||||
DaemonSocketPDU&,
|
||||
BluetoothHandsfreeResultHandler*) = {
|
||||
INIT_ARRAY_AT(OPCODE_ERROR,
|
||||
&BluetoothDaemonHandsfreeModule::ErrorRsp),
|
||||
|
|
@ -752,7 +752,7 @@ class BluetoothDaemonHandsfreeModule::ConnectionStateInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
ConnectionStateInitOp(BluetoothDaemonPDU& aPDU)
|
||||
ConnectionStateInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -760,7 +760,7 @@ public:
|
|||
operator () (BluetoothHandsfreeConnectionState& aArg1,
|
||||
nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read state */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -789,7 +789,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::ConnectionStateNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ConnectionStateNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::ConnectionStateNotification,
|
||||
|
|
@ -801,14 +801,14 @@ class BluetoothDaemonHandsfreeModule::AudioStateInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
AudioStateInitOp(BluetoothDaemonPDU& aPDU)
|
||||
AudioStateInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (BluetoothHandsfreeAudioState& aArg1, nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read state */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -829,7 +829,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::AudioStateNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
AudioStateNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::AudioStateNotification,
|
||||
|
|
@ -841,7 +841,7 @@ class BluetoothDaemonHandsfreeModule::VoiceRecognitionInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
VoiceRecognitionInitOp(BluetoothDaemonPDU& aPDU)
|
||||
VoiceRecognitionInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -849,7 +849,7 @@ public:
|
|||
operator () (BluetoothHandsfreeVoiceRecognitionState& aArg1,
|
||||
nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read state */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -874,7 +874,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::VoiceRecognitionNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
VoiceRecognitionNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::VoiceRecognitionNotification,
|
||||
|
|
@ -886,7 +886,7 @@ class BluetoothDaemonHandsfreeModule::AnswerCallInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
AnswerCallInitOp(BluetoothDaemonPDU& aPDU)
|
||||
AnswerCallInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -910,7 +910,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::AnswerCallNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
AnswerCallNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::AnswerCallNotification,
|
||||
|
|
@ -922,7 +922,7 @@ class BluetoothDaemonHandsfreeModule::HangupCallInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
HangupCallInitOp(BluetoothDaemonPDU& aPDU)
|
||||
HangupCallInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -946,7 +946,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::HangupCallNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
HangupCallNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::HangupCallNotification,
|
||||
|
|
@ -958,7 +958,7 @@ class BluetoothDaemonHandsfreeModule::VolumeInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
VolumeInitOp(BluetoothDaemonPDU& aPDU)
|
||||
VolumeInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -966,7 +966,7 @@ public:
|
|||
operator () (BluetoothHandsfreeVolumeType& aArg1, int& aArg2,
|
||||
nsString& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read volume type */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -997,7 +997,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::VolumeNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
VolumeNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::VolumeNotification,
|
||||
|
|
@ -1009,14 +1009,14 @@ class BluetoothDaemonHandsfreeModule::DialCallInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
DialCallInitOp(BluetoothDaemonPDU& aPDU)
|
||||
DialCallInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (nsString& aArg1, nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
nsresult rv;
|
||||
/* Read address
|
||||
|
|
@ -1045,7 +1045,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::DialCallNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
DialCallNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::DialCallNotification,
|
||||
|
|
@ -1057,14 +1057,14 @@ class BluetoothDaemonHandsfreeModule::DtmfInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
DtmfInitOp(BluetoothDaemonPDU& aPDU)
|
||||
DtmfInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (char& aArg1, nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read tone */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1089,7 +1089,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::DtmfNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
DtmfNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::DtmfNotification,
|
||||
|
|
@ -1101,14 +1101,14 @@ class BluetoothDaemonHandsfreeModule::NRECInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
NRECInitOp(BluetoothDaemonPDU& aPDU)
|
||||
NRECInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (BluetoothHandsfreeNRECState& aArg1, nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read state */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1133,7 +1133,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::NRECNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
NRECNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::NRECNotification,
|
||||
|
|
@ -1145,14 +1145,14 @@ class BluetoothDaemonHandsfreeModule::CallHoldInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
CallHoldInitOp(BluetoothDaemonPDU& aPDU)
|
||||
CallHoldInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (BluetoothHandsfreeCallHoldType& aArg1, nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read type */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1177,7 +1177,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::CallHoldNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
CallHoldNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::CallHoldNotification,
|
||||
|
|
@ -1189,7 +1189,7 @@ class BluetoothDaemonHandsfreeModule::CnumInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
CnumInitOp(BluetoothDaemonPDU& aPDU)
|
||||
CnumInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1213,7 +1213,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::CnumNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
CnumNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::CnumNotification,
|
||||
|
|
@ -1225,7 +1225,7 @@ class BluetoothDaemonHandsfreeModule::CindInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
CindInitOp(BluetoothDaemonPDU& aPDU)
|
||||
CindInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1249,7 +1249,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::CindNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
CindNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::CindNotification,
|
||||
|
|
@ -1261,7 +1261,7 @@ class BluetoothDaemonHandsfreeModule::CopsInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
CopsInitOp(BluetoothDaemonPDU& aPDU)
|
||||
CopsInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1285,7 +1285,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::CopsNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
CopsNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::CopsNotification,
|
||||
|
|
@ -1297,7 +1297,7 @@ class BluetoothDaemonHandsfreeModule::ClccInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
ClccInitOp(BluetoothDaemonPDU& aPDU)
|
||||
ClccInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1321,7 +1321,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::ClccNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
ClccNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::ClccNotification,
|
||||
|
|
@ -1333,14 +1333,14 @@ class BluetoothDaemonHandsfreeModule::UnknownAtInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
UnknownAtInitOp(BluetoothDaemonPDU& aPDU)
|
||||
UnknownAtInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (nsCString& aArg1, nsString& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
nsresult rv;
|
||||
/* Read address
|
||||
|
|
@ -1369,7 +1369,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::UnknownAtNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
UnknownAtNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::UnknownAtNotification,
|
||||
|
|
@ -1381,7 +1381,7 @@ class BluetoothDaemonHandsfreeModule::KeyPressedInitOp final
|
|||
: private PDUInitOp
|
||||
{
|
||||
public:
|
||||
KeyPressedInitOp(BluetoothDaemonPDU& aPDU)
|
||||
KeyPressedInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1405,7 +1405,7 @@ public:
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::KeyPressedNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU)
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
KeyPressedNotification::Dispatch(
|
||||
&BluetoothHandsfreeNotificationHandler::KeyPressedNotification,
|
||||
|
|
@ -1414,11 +1414,11 @@ BluetoothDaemonHandsfreeModule::KeyPressedNtf(
|
|||
|
||||
void
|
||||
BluetoothDaemonHandsfreeModule::HandleNtf(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonHandsfreeModule::* const HandleNtf[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonHandsfreeModule::ConnectionStateNtf),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonHandsfreeModule::AudioStateNtf),
|
||||
INIT_ARRAY_AT(2, &BluetoothDaemonHandsfreeModule::VoiceRecognitionNtf),
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public:
|
|||
OPCODE_CONFIGURE_WBS = 0x0f
|
||||
};
|
||||
|
||||
virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
|
||||
virtual nsresult Send(DaemonSocketPDU* aPDU, void* aUserData) = 0;
|
||||
|
||||
virtual nsresult RegisterModule(uint8_t aId, uint8_t aMode,
|
||||
uint32_t aMaxNumClients,
|
||||
|
|
@ -125,11 +125,11 @@ public:
|
|||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
protected:
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU,
|
||||
nsresult Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
|
||||
//
|
||||
// Responses
|
||||
|
|
@ -142,72 +142,72 @@ protected:
|
|||
BluetoothStatus, BluetoothStatus>
|
||||
ErrorRunnable;
|
||||
|
||||
void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void ConnectRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ConnectRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void DisconnectRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void DisconnectRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void ConnectAudioRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ConnectAudioRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void DisconnectAudioRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void DisconnectAudioRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void StartVoiceRecognitionRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void StartVoiceRecognitionRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void StopVoiceRecognitionRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void StopVoiceRecognitionRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void VolumeControlRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void VolumeControlRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void DeviceStatusNotificationRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void DeviceStatusNotificationRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void CopsResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void CopsResponseRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void CindResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void CindResponseRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void FormattedAtResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void FormattedAtResponseRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void AtResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void AtResponseRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void ClccResponseRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ClccResponseRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void PhoneStateChangeRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void PhoneStateChangeRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void ConfigureWbsRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ConfigureWbsRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeResultHandler* aRes);
|
||||
|
||||
void HandleRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void HandleRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData);
|
||||
|
||||
//
|
||||
|
|
@ -318,56 +318,56 @@ protected:
|
|||
class UnknownAtInitOp;
|
||||
class KeyPressedInitOp;
|
||||
|
||||
void ConnectionStateNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ConnectionStateNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void AudioStateNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void AudioStateNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void VoiceRecognitionNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void VoiceRecognitionNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void AnswerCallNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void AnswerCallNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void HangupCallNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void HangupCallNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void VolumeNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void VolumeNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void DialCallNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void DialCallNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void DtmfNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void DtmfNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void NRECNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void NRECNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void CallHoldNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void CallHoldNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void CnumNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void CnumNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void CindNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void CindNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void CopsNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void CopsNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void ClccNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void ClccNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void UnknownAtNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void UnknownAtNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void KeyPressedNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
void KeyPressedNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
void HandleNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void HandleNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData);
|
||||
|
||||
static BluetoothHandsfreeNotificationHandler* sNotificationHandler;
|
||||
|
|
|
|||
|
|
@ -1070,20 +1070,20 @@ Convert(const ConvertArray<Tin>& aIn, Tout& aOut)
|
|||
//
|
||||
|
||||
nsresult
|
||||
PackPDU(bool aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(bool aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<bool, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAddress& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothAddress& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackArray<uint8_t>(aIn.mAddr, sizeof(aIn.mAddr)), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAvrcpAttributeTextPairs& aIn,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
|
|
@ -1119,7 +1119,7 @@ PackPDU(const BluetoothAvrcpAttributeTextPairs& aIn,
|
|||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAvrcpAttributeValuePairs& aIn,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
|
|
@ -1137,7 +1137,7 @@ PackPDU(const BluetoothAvrcpAttributeValuePairs& aIn,
|
|||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAvrcpElementAttribute& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothAvrcpElementAttribute& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(PackConversion<uint32_t, uint8_t>(aIn.mId), aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -1163,13 +1163,13 @@ PackPDU(const BluetoothAvrcpElementAttribute& aIn, BluetoothDaemonPDU& aPDU)
|
|||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothAvrcpEvent aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothAvrcpEvent aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothAvrcpEvent, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAvrcpEventParamPair& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothAvrcpEventParamPair& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
|
|
@ -1211,110 +1211,110 @@ PackPDU(const BluetoothAvrcpEventParamPair& aIn, BluetoothDaemonPDU& aPDU)
|
|||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothAvrcpNotification aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothAvrcpNotification aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothAvrcpNotification, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothAvrcpPlayerAttribute aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothAvrcpPlayerAttribute aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothAvrcpPlayerAttribute, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothAvrcpStatus aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothAvrcpStatus aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothAvrcpStatus, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothConfigurationParameter& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothConfigurationParameter& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(aIn.mType, aIn.mLength,
|
||||
PackArray<uint8_t>(aIn.mValue.get(), aIn.mLength), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothDaemonPDUHeader& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const DaemonSocketPDUHeader& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(aIn.mService, aIn.mOpcode, aIn.mLength, aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeAtResponse& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeAtResponse& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeAtResponse, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallAddressType& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeCallAddressType& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeCallAddressType, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallDirection& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeCallDirection& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeCallDirection, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallMode& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeCallMode& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeCallMode, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallMptyType& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeCallMptyType& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeCallMptyType, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallState& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeCallState& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeCallState, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeNetworkState& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeNetworkState& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeNetworkState, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeServiceType& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeServiceType& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeServiceType, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeVolumeType& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeVolumeType& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeVolumeType, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeWbsConfig& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothHandsfreeWbsConfig& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackConversion<BluetoothHandsfreeWbsConfig, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothNamedValue& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothNamedValue& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsString, BluetoothPropertyType>(aIn.name()), aPDU);
|
||||
|
|
@ -1350,7 +1350,7 @@ PackPDU(const BluetoothNamedValue& aIn, BluetoothDaemonPDU& aPDU)
|
|||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothPinCode& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothPinCode& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(aIn.mLength,
|
||||
PackArray<uint8_t>(aIn.mPinCode, sizeof(aIn.mPinCode)),
|
||||
|
|
@ -1358,56 +1358,56 @@ PackPDU(const BluetoothPinCode& aIn, BluetoothDaemonPDU& aPDU)
|
|||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothPropertyType aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothPropertyType aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothPropertyType, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothSspVariant aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothSspVariant aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothSspVariant, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothScanMode aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothScanMode aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothScanMode, int32_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothServiceName& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothServiceName& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackArray<uint8_t>(aIn.mName, sizeof(aIn.mName)), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothSocketType aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothSocketType aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothSocketType, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(ControlPlayStatus aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(ControlPlayStatus aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<ControlPlayStatus, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothTransport aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothTransport aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothTransport, uint8_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothUuid& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothUuid& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackArray<uint8_t>(aIn.mUuid, sizeof(aIn.mUuid)), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothGattId& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothGattId& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(PackReversed<BluetoothUuid>(aIn.mUuid), aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -1417,7 +1417,7 @@ PackPDU(const BluetoothGattId& aIn, BluetoothDaemonPDU& aPDU)
|
|||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothGattServiceId& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const BluetoothGattServiceId& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(aIn.mId, aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -1427,13 +1427,13 @@ PackPDU(const BluetoothGattServiceId& aIn, BluetoothDaemonPDU& aPDU)
|
|||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothGattAuthReq aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothGattAuthReq aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothGattAuthReq, int32_t>(aIn), aPDU);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothGattWriteType aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(BluetoothGattWriteType aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(PackConversion<BluetoothGattWriteType, int32_t>(aIn), aPDU);
|
||||
}
|
||||
|
|
@ -1443,60 +1443,60 @@ PackPDU(BluetoothGattWriteType aIn, BluetoothDaemonPDU& aPDU)
|
|||
//
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, bool& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, bool& aOut)
|
||||
{
|
||||
return UnpackPDU(aPDU, UnpackConversion<uint8_t, bool>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, char& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, char& aOut)
|
||||
{
|
||||
return UnpackPDU(aPDU, UnpackConversion<uint8_t, char>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothA2dpAudioState& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothA2dpAudioState& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothA2dpAudioState>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothA2dpConnectionState& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothA2dpConnectionState& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothA2dpConnectionState>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAclState& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAclState& aOut)
|
||||
{
|
||||
return UnpackPDU(aPDU, UnpackConversion<uint8_t, BluetoothAclState>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpEvent& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpEvent& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothAvrcpEvent>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpMediaAttribute& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpMediaAttribute& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothAvrcpMediaAttribute>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpPlayerAttribute& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpPlayerAttribute& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothAvrcpPlayerAttribute>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpPlayerSettings& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpPlayerSettings& aOut)
|
||||
{
|
||||
/* Read number of attribute-value pairs */
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mNumAttr);
|
||||
|
|
@ -1518,55 +1518,55 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpPlayerSettings& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpRemoteFeature& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpRemoteFeature& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothAvrcpRemoteFeature>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothBondState& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothBondState& aOut)
|
||||
{
|
||||
return UnpackPDU(aPDU, UnpackConversion<uint8_t, BluetoothBondState>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothTypeOfDevice& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothTypeOfDevice& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<int32_t, BluetoothTypeOfDevice>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeAudioState& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeAudioState& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeAudioState>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeCallHoldType& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeCallHoldType& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeCallHoldType>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeConnectionState& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeConnectionState& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeConnectionState>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeNRECState& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeNRECState& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeNRECState>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU,
|
||||
UnpackPDU(DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeVoiceRecognitionState& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
|
|
@ -1575,14 +1575,14 @@ UnpackPDU(BluetoothDaemonPDU& aPDU,
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeVolumeType& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeVolumeType& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothHandsfreeVolumeType>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothProperty& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothProperty& aOut)
|
||||
{
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mType);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -1667,14 +1667,14 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothProperty& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothPropertyType& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothPropertyType& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothPropertyType>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothRemoteInfo& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothRemoteInfo& aOut)
|
||||
{
|
||||
nsresult rv = UnpackPDU(aPDU,
|
||||
UnpackConversion<uint32_t, int>(aOut.mVerMajor));
|
||||
|
|
@ -1689,13 +1689,13 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothRemoteInfo& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothScanMode& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothScanMode& aOut)
|
||||
{
|
||||
return UnpackPDU(aPDU, UnpackConversion<int32_t, BluetoothScanMode>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothServiceRecord& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothServiceRecord& aOut)
|
||||
{
|
||||
/* unpack UUID */
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mUuid);
|
||||
|
|
@ -1712,26 +1712,26 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothServiceRecord& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothSspVariant& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothSspVariant& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
aPDU, UnpackConversion<uint8_t, BluetoothSspVariant>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothStatus& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothStatus& aOut)
|
||||
{
|
||||
return UnpackPDU(aPDU, UnpackConversion<uint8_t, BluetoothStatus>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattStatus& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattStatus& aOut)
|
||||
{
|
||||
return UnpackPDU(aPDU, UnpackConversion<int32_t, BluetoothGattStatus>(aOut));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattId& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattId& aOut)
|
||||
{
|
||||
/* unpack UUID */
|
||||
nsresult rv = UnpackPDU(aPDU, UnpackReversed<BluetoothUuid>(aOut.mUuid));
|
||||
|
|
@ -1743,7 +1743,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattId& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattServiceId& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattServiceId& aOut)
|
||||
{
|
||||
/* unpack id */
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mId);
|
||||
|
|
@ -1755,7 +1755,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattServiceId& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattReadParam& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattReadParam& aOut)
|
||||
{
|
||||
/* unpack service id */
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mServiceId);
|
||||
|
|
@ -1792,7 +1792,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattReadParam& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattWriteParam& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattWriteParam& aOut)
|
||||
{
|
||||
/* unpack service id */
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mServiceId);
|
||||
|
|
@ -1814,7 +1814,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattWriteParam& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattNotifyParam& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattNotifyParam& aOut)
|
||||
{
|
||||
|
||||
/* unpack address and convert to nsString */
|
||||
|
|
@ -1851,7 +1851,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattNotifyParam& aOut)
|
|||
return aPDU.Read(aOut.mValue, aOut.mLength);
|
||||
}
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, nsDependentCString& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, nsDependentCString& aOut)
|
||||
{
|
||||
// We get a pointer to the first character in the PDU, a length
|
||||
// of 1 ensures we consume the \0 byte. With 'str' pointing to
|
||||
|
|
@ -1881,7 +1881,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, nsDependentCString& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackCString0& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, const UnpackCString0& aOut)
|
||||
{
|
||||
nsDependentCString cstring;
|
||||
|
||||
|
|
@ -1896,7 +1896,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackCString0& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackString0& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, const UnpackString0& aOut)
|
||||
{
|
||||
nsDependentCString cstring;
|
||||
|
||||
|
|
|
|||
|
|
@ -106,14 +106,14 @@ struct BluetoothConfigurationParameter {
|
|||
nsAutoArrayPtr<uint8_t> mValue;
|
||||
};
|
||||
|
||||
struct BluetoothDaemonPDUHeader {
|
||||
BluetoothDaemonPDUHeader()
|
||||
struct DaemonSocketPDUHeader {
|
||||
DaemonSocketPDUHeader()
|
||||
: mService(0x00)
|
||||
, mOpcode(0x00)
|
||||
, mLength(0x00)
|
||||
{ }
|
||||
|
||||
BluetoothDaemonPDUHeader(uint8_t aService, uint8_t aOpcode, uint8_t aLength)
|
||||
DaemonSocketPDUHeader(uint8_t aService, uint8_t aOpcode, uint8_t aLength)
|
||||
: mService(aService)
|
||||
, mOpcode(aOpcode)
|
||||
, mLength(aLength)
|
||||
|
|
@ -346,141 +346,141 @@ Convert(BluetoothGattWriteType aIn, int32_t& aOut);
|
|||
// introduce link errors on non-handled data types
|
||||
template <typename T>
|
||||
nsresult
|
||||
PackPDU(T aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(T aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(bool aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(bool aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
inline nsresult
|
||||
PackPDU(uint8_t aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(uint8_t aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return aPDU.Write(aIn);
|
||||
}
|
||||
|
||||
inline nsresult
|
||||
PackPDU(uint16_t aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(uint16_t aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return aPDU.Write(aIn);
|
||||
}
|
||||
|
||||
inline nsresult
|
||||
PackPDU(int32_t aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(int32_t aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return aPDU.Write(aIn);
|
||||
}
|
||||
|
||||
inline nsresult
|
||||
PackPDU(uint32_t aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(uint32_t aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return aPDU.Write(aIn);
|
||||
}
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAddress& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothAddress& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAvrcpAttributeTextPairs& aIn,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAvrcpAttributeValuePairs& aIn,
|
||||
BluetoothDaemonPDU& aPDU);
|
||||
DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAvrcpElementAttribute& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothAvrcpElementAttribute& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothAvrcpEvent aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothAvrcpEvent aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothAvrcpEventParamPair& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothAvrcpEventParamPair& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothAvrcpNotification aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothAvrcpNotification aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothAvrcpPlayerAttribute aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothAvrcpPlayerAttribute aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothAvrcpStatus aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothAvrcpStatus aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothConfigurationParameter& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothConfigurationParameter& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothDaemonPDUHeader& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const DaemonSocketPDUHeader& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeAtResponse& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeAtResponse& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallAddressType& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeCallAddressType& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallDirection& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeCallDirection& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallMode& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeCallMode& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallMptyType& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeCallMptyType& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeCallState& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeCallState& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeNetworkState& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeNetworkState& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeServiceType& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeServiceType& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeVolumeType& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeVolumeType& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothHandsfreeWbsConfig& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothHandsfreeWbsConfig& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothNamedValue& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothNamedValue& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothPinCode& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothPinCode& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothPropertyType aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothPropertyType aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothServiceName& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothServiceName& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothSocketType aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothSocketType aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothSspVariant aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothSspVariant aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothScanMode aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothScanMode aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(ControlPlayStatus aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(ControlPlayStatus aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothUuid& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothUuid& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothGattId& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothGattId& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(const BluetoothGattServiceId& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const BluetoothGattServiceId& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothGattAuthReq aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothGattAuthReq aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothGattWriteType aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothGattWriteType aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
nsresult
|
||||
PackPDU(BluetoothTransport aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(BluetoothTransport aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
/* |PackConversion| is a helper for packing converted values. Pass
|
||||
* an instance of this structure to |PackPDU| to convert a value from
|
||||
|
|
@ -497,7 +497,7 @@ struct PackConversion {
|
|||
|
||||
template<typename Tin, typename Tout>
|
||||
inline nsresult
|
||||
PackPDU(const PackConversion<Tin, Tout>& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const PackConversion<Tin, Tout>& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
Tout out;
|
||||
|
||||
|
|
@ -529,7 +529,7 @@ struct PackArray
|
|||
*/
|
||||
template<typename T>
|
||||
inline nsresult
|
||||
PackPDU(const PackArray<T>& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const PackArray<T>& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
for (size_t i = 0; i < aIn.mLength; ++i) {
|
||||
nsresult rv = PackPDU(aIn.mData[i], aPDU);
|
||||
|
|
@ -542,7 +542,7 @@ PackPDU(const PackArray<T>& aIn, BluetoothDaemonPDU& aPDU)
|
|||
|
||||
template<>
|
||||
inline nsresult
|
||||
PackPDU<uint8_t>(const PackArray<uint8_t>& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU<uint8_t>(const PackArray<uint8_t>& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
/* Write raw bytes in one pass */
|
||||
return aPDU.Write(aIn.mData, aIn.mLength);
|
||||
|
|
@ -550,7 +550,7 @@ PackPDU<uint8_t>(const PackArray<uint8_t>& aIn, BluetoothDaemonPDU& aPDU)
|
|||
|
||||
template<>
|
||||
inline nsresult
|
||||
PackPDU<char>(const PackArray<char>& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU<char>(const PackArray<char>& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
/* Write raw bytes in one pass */
|
||||
return aPDU.Write(aIn.mData, aIn.mLength);
|
||||
|
|
@ -572,7 +572,7 @@ struct PackCString0
|
|||
/* This implementation of |PackPDU| packs a 0-terminated C string.
|
||||
*/
|
||||
inline nsresult
|
||||
PackPDU(const PackCString0& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const PackCString0& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackArray<uint8_t>(reinterpret_cast<const uint8_t*>(aIn.mString.get()),
|
||||
|
|
@ -598,14 +598,14 @@ struct PackReversed
|
|||
*/
|
||||
template<typename T>
|
||||
nsresult
|
||||
PackPDU(const PackReversed<T>& aIn, BluetoothDaemonPDU& aPDU);
|
||||
PackPDU(const PackReversed<T>& aIn, DaemonSocketPDU& aPDU);
|
||||
|
||||
/* This implementation of |PackPDU| packs elements in |PackArray| in reversed
|
||||
* order. (ex. reversed GATT UUID, see bug 1171866)
|
||||
*/
|
||||
template<typename U>
|
||||
inline nsresult
|
||||
PackPDU(const PackReversed<PackArray<U>>& aIn, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const PackReversed<PackArray<U>>& aIn, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
for (size_t i = 0; i < aIn.mValue.mLength; ++i) {
|
||||
nsresult rv = PackPDU(aIn.mValue.mData[aIn.mValue.mLength - i - 1], aPDU);
|
||||
|
|
@ -622,7 +622,7 @@ PackPDU(const PackReversed<PackArray<U>>& aIn, BluetoothDaemonPDU& aPDU)
|
|||
template <>
|
||||
inline nsresult
|
||||
PackPDU<BluetoothUuid>(const PackReversed<BluetoothUuid>& aIn,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
return PackPDU(
|
||||
PackReversed<PackArray<uint8_t>>(
|
||||
|
|
@ -632,7 +632,7 @@ PackPDU<BluetoothUuid>(const PackReversed<BluetoothUuid>& aIn,
|
|||
|
||||
template <typename T1, typename T2>
|
||||
inline nsresult
|
||||
PackPDU(const T1& aIn1, const T2& aIn2, BluetoothDaemonPDU& aPDU)
|
||||
PackPDU(const T1& aIn1, const T2& aIn2, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(aIn1, aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -644,7 +644,7 @@ PackPDU(const T1& aIn1, const T2& aIn2, BluetoothDaemonPDU& aPDU)
|
|||
template <typename T1, typename T2, typename T3>
|
||||
inline nsresult
|
||||
PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(aIn1, aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -660,7 +660,7 @@ PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
|
|||
template <typename T1, typename T2, typename T3, typename T4>
|
||||
inline nsresult
|
||||
PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3, const T4& aIn4,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(aIn1, aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -682,7 +682,7 @@ template <typename T1, typename T2, typename T3,
|
|||
inline nsresult
|
||||
PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
|
||||
const T4& aIn4, const T5& aIn5,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(aIn1, aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -709,7 +709,7 @@ template <typename T1, typename T2, typename T3,
|
|||
inline nsresult
|
||||
PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
|
||||
const T4& aIn4, const T5& aIn5, const T6& aIn6,
|
||||
const T7& aIn7, BluetoothDaemonPDU& aPDU)
|
||||
const T7& aIn7, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(aIn1, aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -744,7 +744,7 @@ template <typename T1, typename T2, typename T3,
|
|||
inline nsresult
|
||||
PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
|
||||
const T4& aIn4, const T5& aIn5, const T6& aIn6,
|
||||
const T7& aIn7, const T8& aIn8, BluetoothDaemonPDU& aPDU)
|
||||
const T7& aIn7, const T8& aIn8, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(aIn1, aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -787,7 +787,7 @@ PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
|
|||
const T4& aIn4, const T5& aIn5, const T6& aIn6,
|
||||
const T7& aIn7, const T8& aIn8, const T9& aIn9,
|
||||
const T10& aIn10, const T11& aIn11, const T12& aIn12,
|
||||
const T13& aIn13, BluetoothDaemonPDU& aPDU)
|
||||
const T13& aIn13, DaemonSocketPDU& aPDU)
|
||||
{
|
||||
nsresult rv = PackPDU(aIn1, aPDU);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -847,79 +847,79 @@ PackPDU(const T1& aIn1, const T2& aIn2, const T3& aIn3,
|
|||
// introduce link errors on non-handled data types
|
||||
template <typename T>
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, T& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, T& aOut);
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, int8_t& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, int8_t& aOut)
|
||||
{
|
||||
return aPDU.Read(aOut);
|
||||
}
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, uint8_t& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, uint8_t& aOut)
|
||||
{
|
||||
return aPDU.Read(aOut);
|
||||
}
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, uint16_t& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, uint16_t& aOut)
|
||||
{
|
||||
return aPDU.Read(aOut);
|
||||
}
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, int32_t& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, int32_t& aOut)
|
||||
{
|
||||
return aPDU.Read(aOut);
|
||||
}
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, uint32_t& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, uint32_t& aOut)
|
||||
{
|
||||
return aPDU.Read(aOut);
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, bool& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, bool& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, char& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, char& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothA2dpAudioState& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothA2dpAudioState& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothA2dpConnectionState& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothA2dpConnectionState& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAclState& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAclState& aOut);
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAddress& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAddress& aOut)
|
||||
{
|
||||
return aPDU.Read(aOut.mAddr, sizeof(aOut.mAddr));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpEvent& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpEvent& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpMediaAttribute& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpMediaAttribute& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpPlayerAttribute& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpPlayerAttribute& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpPlayerSettings& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpPlayerSettings& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothAvrcpRemoteFeature& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothAvrcpRemoteFeature& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothBondState& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothBondState& aOut);
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothDaemonPDUHeader& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, DaemonSocketPDUHeader& aOut)
|
||||
{
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mService);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -933,80 +933,80 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothDaemonPDUHeader& aOut)
|
|||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothTypeOfDevice& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothTypeOfDevice& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeAudioState& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeAudioState& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeCallHoldType& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeCallHoldType& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeConnectionState& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeConnectionState& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeNRECState& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeNRECState& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU,
|
||||
UnpackPDU(DaemonSocketPDU& aPDU,
|
||||
BluetoothHandsfreeVoiceRecognitionState& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothHandsfreeVolumeType& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothHandsfreeVolumeType& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothRemoteInfo& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothRemoteInfo& aOut);
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothRemoteName& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothRemoteName& aOut)
|
||||
{
|
||||
return aPDU.Read(aOut.mName, sizeof(aOut.mName));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothProperty& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothProperty& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothPropertyType& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothPropertyType& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothScanMode& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothScanMode& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothServiceRecord& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothServiceRecord& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothSspVariant& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothSspVariant& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothStatus& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothStatus& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattStatus& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattStatus& aOut);
|
||||
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothUuid& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothUuid& aOut)
|
||||
{
|
||||
return aPDU.Read(aOut.mUuid, sizeof(aOut.mUuid));
|
||||
}
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattId& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattId& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattServiceId& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattServiceId& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattReadParam& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattReadParam& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattWriteParam& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattWriteParam& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, BluetoothGattNotifyParam& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, BluetoothGattNotifyParam& aOut);
|
||||
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, nsDependentCString& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, nsDependentCString& aOut);
|
||||
|
||||
/* |UnpackConversion| is a helper for convering unpacked values. Pass
|
||||
* an instance of this structure to |UnpackPDU| to read a value from
|
||||
|
|
@ -1023,7 +1023,7 @@ struct UnpackConversion {
|
|||
|
||||
template<typename Tin, typename Tout>
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackConversion<Tin, Tout>& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, const UnpackConversion<Tin, Tout>& aOut)
|
||||
{
|
||||
Tin in;
|
||||
nsresult rv = UnpackPDU(aPDU, in);
|
||||
|
|
@ -1067,7 +1067,7 @@ struct UnpackArray
|
|||
|
||||
template<typename T>
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackArray<T>& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, const UnpackArray<T>& aOut)
|
||||
{
|
||||
for (size_t i = 0; i < aOut.mLength; ++i) {
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mData[i]);
|
||||
|
|
@ -1080,7 +1080,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackArray<T>& aOut)
|
|||
|
||||
template<typename T>
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, UnpackArray<T>& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, UnpackArray<T>& aOut)
|
||||
{
|
||||
for (size_t i = 0; i < aOut.mLength; ++i) {
|
||||
nsresult rv = UnpackPDU(aPDU, aOut.mData[i]);
|
||||
|
|
@ -1093,7 +1093,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, UnpackArray<T>& aOut)
|
|||
|
||||
template<>
|
||||
inline nsresult
|
||||
UnpackPDU<uint8_t>(BluetoothDaemonPDU& aPDU, const UnpackArray<uint8_t>& aOut)
|
||||
UnpackPDU<uint8_t>(DaemonSocketPDU& aPDU, const UnpackArray<uint8_t>& aOut)
|
||||
{
|
||||
/* Read raw bytes in one pass */
|
||||
return aPDU.Read(aOut.mData, aOut.mLength);
|
||||
|
|
@ -1101,7 +1101,7 @@ UnpackPDU<uint8_t>(BluetoothDaemonPDU& aPDU, const UnpackArray<uint8_t>& aOut)
|
|||
|
||||
template<typename T>
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, nsTArray<T>& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, nsTArray<T>& aOut)
|
||||
{
|
||||
for (typename nsTArray<T>::size_type i = 0; i < aOut.Length(); ++i) {
|
||||
nsresult rv = UnpackPDU(aPDU, aOut[i]);
|
||||
|
|
@ -1128,7 +1128,7 @@ struct UnpackCString0
|
|||
/* This implementation of |UnpackPDU| unpacks a 0-terminated C string.
|
||||
*/
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackCString0& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, const UnpackCString0& aOut);
|
||||
|
||||
/* |UnpackString0| is a helper for unpacking 0-terminated C string,
|
||||
* including the \0 character. Pass an instance of this structure
|
||||
|
|
@ -1148,7 +1148,7 @@ struct UnpackString0
|
|||
* and converts it to wide-character encoding.
|
||||
*/
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackString0& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, const UnpackString0& aOut);
|
||||
|
||||
/* |UnpackReversed| is a helper for unpacking data in reversed order. Pass an
|
||||
* instance of this structure as the second argument to |UnpackPDU| to unpack
|
||||
|
|
@ -1173,11 +1173,11 @@ struct UnpackReversed
|
|||
*/
|
||||
template<typename T>
|
||||
nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackReversed<T>& aOut);
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, const UnpackReversed<T>& aOut);
|
||||
|
||||
template<typename U>
|
||||
inline nsresult
|
||||
UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackReversed<UnpackArray<U>>& aOut)
|
||||
UnpackPDU(DaemonSocketPDU& aPDU, const UnpackReversed<UnpackArray<U>>& aOut)
|
||||
{
|
||||
for (size_t i = 0; i < aOut.mValue->mLength; ++i) {
|
||||
nsresult rv = UnpackPDU(aPDU,
|
||||
|
|
@ -1194,7 +1194,7 @@ UnpackPDU(BluetoothDaemonPDU& aPDU, const UnpackReversed<UnpackArray<U>>& aOut)
|
|||
*/
|
||||
template<>
|
||||
inline nsresult
|
||||
UnpackPDU<BluetoothUuid>(BluetoothDaemonPDU& aPDU,
|
||||
UnpackPDU<BluetoothUuid>(DaemonSocketPDU& aPDU,
|
||||
const UnpackReversed<BluetoothUuid>& aOut)
|
||||
{
|
||||
return UnpackPDU(
|
||||
|
|
@ -1211,11 +1211,11 @@ UnpackPDU<BluetoothUuid>(BluetoothDaemonPDU& aPDU,
|
|||
class PDUInitOp
|
||||
{
|
||||
protected:
|
||||
PDUInitOp(BluetoothDaemonPDU& aPDU)
|
||||
PDUInitOp(DaemonSocketPDU& aPDU)
|
||||
: mPDU(&aPDU)
|
||||
{ }
|
||||
|
||||
BluetoothDaemonPDU& GetPDU() const
|
||||
DaemonSocketPDU& GetPDU() const
|
||||
{
|
||||
return *mPDU; // cannot be nullptr
|
||||
}
|
||||
|
|
@ -1237,7 +1237,7 @@ protected:
|
|||
}
|
||||
|
||||
private:
|
||||
BluetoothDaemonPDU* mPDU; // Hold pointer to allow for constant instances
|
||||
DaemonSocketPDU* mPDU; // Hold pointer to allow for constant instances
|
||||
};
|
||||
|
||||
// |UnpackPDUInitOp| is a general-purpose init operator for all variants
|
||||
|
|
@ -1247,7 +1247,7 @@ private:
|
|||
class UnpackPDUInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
UnpackPDUInitOp(BluetoothDaemonPDU& aPDU)
|
||||
UnpackPDUInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1271,7 +1271,7 @@ public:
|
|||
template<typename T1, typename T2>
|
||||
nsresult operator () (T1& aArg1, T2& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -1288,7 +1288,7 @@ public:
|
|||
template<typename T1, typename T2, typename T3>
|
||||
nsresult operator () (T1& aArg1, T2& aArg2, T3& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -1309,7 +1309,7 @@ public:
|
|||
template<typename T1, typename T2, typename T3, typename T4>
|
||||
nsresult operator () (T1& aArg1, T2& aArg2, T3& aArg3, T4& aArg4) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -1335,7 +1335,7 @@ public:
|
|||
nsresult operator () (T1& aArg1, T2& aArg2, T3& aArg3, T4& aArg4,
|
||||
T5& aArg5) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ static const int sRetryInterval = 100; // ms
|
|||
class BluetoothDaemonSetupModule
|
||||
{
|
||||
public:
|
||||
virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
|
||||
virtual nsresult Send(DaemonSocketPDU* aPDU, void* aUserData) = 0;
|
||||
|
||||
// Commands
|
||||
//
|
||||
|
|
@ -45,7 +45,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x00, 0x01, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x00, 0x01, 0));
|
||||
|
||||
#if ANDROID_VERSION >= 21
|
||||
nsresult rv = PackPDU(aId, aMode, aMaxNumClients, *pdu);
|
||||
|
|
@ -68,7 +68,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x00, 0x02, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x00, 0x02, 0));
|
||||
|
||||
nsresult rv = PackPDU(aId, *pdu);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -87,7 +87,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x00, 0x03, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x00, 0x03, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
aLen, PackArray<BluetoothConfigurationParameter>(aParam, aLen), *pdu);
|
||||
|
|
@ -106,12 +106,12 @@ protected:
|
|||
|
||||
// Called to handle PDUs with Service field equal to 0x00, which
|
||||
// contains internal operations for setup and configuration.
|
||||
void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData)
|
||||
void HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonSetupModule::* const HandleRsp[])(
|
||||
const BluetoothDaemonPDUHeader&,
|
||||
BluetoothDaemonPDU&,
|
||||
const DaemonSocketPDUHeader&,
|
||||
DaemonSocketPDU&,
|
||||
BluetoothSetupResultHandler*) = {
|
||||
INIT_ARRAY_AT(0x00, &BluetoothDaemonSetupModule::ErrorRsp),
|
||||
INIT_ARRAY_AT(0x01, &BluetoothDaemonSetupModule::RegisterModuleRsp),
|
||||
|
|
@ -135,7 +135,7 @@ protected:
|
|||
(this->*(HandleRsp[aHeader.mOpcode]))(aHeader, aPDU, res);
|
||||
}
|
||||
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU, BluetoothSetupResultHandler* aRes)
|
||||
nsresult Send(DaemonSocketPDU* aPDU, BluetoothSetupResultHandler* aRes)
|
||||
{
|
||||
aRes->AddRef(); // Keep reference for response
|
||||
return Send(aPDU, static_cast<void*>(aRes));
|
||||
|
|
@ -154,8 +154,8 @@ private:
|
|||
ErrorRunnable;
|
||||
|
||||
void
|
||||
ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
ErrorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSetupResultHandler* aRes)
|
||||
{
|
||||
ErrorRunnable::Dispatch(
|
||||
|
|
@ -163,8 +163,8 @@ private:
|
|||
}
|
||||
|
||||
void
|
||||
RegisterModuleRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
RegisterModuleRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSetupResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -173,8 +173,8 @@ private:
|
|||
}
|
||||
|
||||
void
|
||||
UnregisterModuleRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
UnregisterModuleRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSetupResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -183,8 +183,8 @@ private:
|
|||
}
|
||||
|
||||
void
|
||||
ConfigurationRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
ConfigurationRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSetupResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -205,13 +205,13 @@ public:
|
|||
|
||||
static const int MAX_NUM_CLIENTS;
|
||||
|
||||
virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
|
||||
virtual nsresult Send(DaemonSocketPDU* aPDU, void* aUserData) = 0;
|
||||
|
||||
nsresult EnableCmd(BluetoothResultHandler* aRes)
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x01, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x01, 0));
|
||||
|
||||
nsresult rv = Send(pdu, aRes);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -225,7 +225,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x02, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x02, 0));
|
||||
|
||||
nsresult rv = Send(pdu, aRes);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -239,7 +239,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x03, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x03, 0));
|
||||
|
||||
nsresult rv = Send(pdu, aRes);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -254,7 +254,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x04, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x04, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<const nsAString, BluetoothPropertyType>(aName), *pdu);
|
||||
|
|
@ -274,7 +274,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x05, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x05, 0));
|
||||
|
||||
nsresult rv = PackPDU(aProperty, *pdu);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -293,7 +293,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x06, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x06, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aRemoteAddr), *pdu);
|
||||
|
|
@ -314,7 +314,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x07, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x07, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aRemoteAddr),
|
||||
|
|
@ -336,7 +336,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x08, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x08, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aRemoteAddr),
|
||||
|
|
@ -358,7 +358,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x09, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x09, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aRemoteAddr),
|
||||
|
|
@ -379,7 +379,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x0a, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x0a, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aRemoteAddr), *pdu);
|
||||
|
|
@ -398,7 +398,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x0b, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x0b, 0));
|
||||
|
||||
nsresult rv = Send(pdu, aRes);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -412,7 +412,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x0c, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x0c, 0));
|
||||
|
||||
nsresult rv = Send(pdu, aRes);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -428,7 +428,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x0d, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x0d, 0));
|
||||
|
||||
#if ANDROID_VERSION >= 21
|
||||
nsresult rv = PackPDU(
|
||||
|
|
@ -453,7 +453,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x0e, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x0e, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aBdAddr), *pdu);
|
||||
|
|
@ -473,7 +473,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x0f, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x0f, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aBdAddr), *pdu);
|
||||
|
|
@ -494,7 +494,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x10, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x10, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aBdAddr),
|
||||
|
|
@ -517,7 +517,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x11, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x11, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aBdAddr),
|
||||
|
|
@ -537,7 +537,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x12, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x12, 0));
|
||||
|
||||
nsresult rv = PackPDU(aEnable, *pdu);
|
||||
if (NS_FAILED(rv)) {
|
||||
|
|
@ -556,7 +556,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x13, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x13, 0));
|
||||
|
||||
nsresult rv = PackPDU(aOpcode, aLen, PackArray<uint8_t>(aBuf, aLen),
|
||||
*pdu);
|
||||
|
|
@ -576,7 +576,7 @@ public:
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x01, 0x14, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x01, 0x14, 0));
|
||||
|
||||
nsresult rv = PackPDU(aOpcode, aLen, PackArray<uint8_t>(aBuf, aLen),
|
||||
*pdu);
|
||||
|
|
@ -593,11 +593,11 @@ public:
|
|||
|
||||
protected:
|
||||
|
||||
void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData)
|
||||
void HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonCoreModule::* const HandleOp[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&, void*) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonCoreModule::HandleRsp),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonCoreModule::HandleNtf),
|
||||
};
|
||||
|
|
@ -607,7 +607,7 @@ protected:
|
|||
(this->*(HandleOp[!!(aHeader.mOpcode & 0x80)]))(aHeader, aPDU, aUserData);
|
||||
}
|
||||
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU, BluetoothResultHandler* aRes)
|
||||
nsresult Send(DaemonSocketPDU* aPDU, BluetoothResultHandler* aRes)
|
||||
{
|
||||
aRes->AddRef(); // Keep reference for response
|
||||
return Send(aPDU, static_cast<void*>(aRes));
|
||||
|
|
@ -625,32 +625,32 @@ private:
|
|||
BluetoothStatus, BluetoothStatus>
|
||||
ErrorRunnable;
|
||||
|
||||
void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ErrorRunnable::Dispatch(
|
||||
aRes, &BluetoothResultHandler::OnError, UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void EnableRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void EnableRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothResultHandler::Enable, UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void DisableRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void DisableRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
aRes, &BluetoothResultHandler::Disable, UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void GetAdapterPropertiesRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetAdapterPropertiesRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -658,8 +658,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void GetAdapterPropertyRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetAdapterPropertyRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -667,8 +667,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void SetAdapterPropertyRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void SetAdapterPropertyRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -676,8 +676,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void GetRemoteDevicePropertiesRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetRemoteDevicePropertiesRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -686,8 +686,8 @@ private:
|
|||
}
|
||||
|
||||
void
|
||||
GetRemoteDevicePropertyRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
GetRemoteDevicePropertyRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -695,8 +695,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void SetRemoteDevicePropertyRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void SetRemoteDevicePropertyRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -704,8 +704,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void GetRemoteServiceRecordRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetRemoteServiceRecordRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -713,8 +713,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void GetRemoteServicesRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void GetRemoteServicesRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -722,8 +722,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void StartDiscoveryRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void StartDiscoveryRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -731,8 +731,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void CancelDiscoveryRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void CancelDiscoveryRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -740,8 +740,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void CreateBondRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void CreateBondRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -749,8 +749,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void RemoveBondRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void RemoveBondRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -758,8 +758,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void CancelBondRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void CancelBondRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -767,8 +767,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void PinReplyRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void PinReplyRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -776,8 +776,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void SspReplyRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void SspReplyRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -785,8 +785,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void DutModeConfigureRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void DutModeConfigureRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -794,8 +794,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void DutModeSendRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void DutModeSendRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -803,8 +803,8 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void LeTestModeRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void LeTestModeRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothResultHandler* aRes)
|
||||
{
|
||||
ResultRunnable::Dispatch(
|
||||
|
|
@ -812,12 +812,12 @@ private:
|
|||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void HandleRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData)
|
||||
void HandleRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonCoreModule::* const HandleRsp[])(
|
||||
const BluetoothDaemonPDUHeader&,
|
||||
BluetoothDaemonPDU&,
|
||||
const DaemonSocketPDUHeader&,
|
||||
DaemonSocketPDU&,
|
||||
BluetoothResultHandler*) = {
|
||||
INIT_ARRAY_AT(0x00, &BluetoothDaemonCoreModule::ErrorRsp),
|
||||
INIT_ARRAY_AT(0x01, &BluetoothDaemonCoreModule::EnableRsp),
|
||||
|
|
@ -939,8 +939,8 @@ private:
|
|||
BluetoothStatus, uint16_t>
|
||||
LeTestModeNotification;
|
||||
|
||||
void AdapterStateChangedNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void AdapterStateChangedNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
AdapterStateChangedNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::AdapterStateChangedNotification,
|
||||
|
|
@ -951,7 +951,7 @@ private:
|
|||
class AdapterPropertiesInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
AdapterPropertiesInitOp(BluetoothDaemonPDU& aPDU)
|
||||
AdapterPropertiesInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -959,7 +959,7 @@ private:
|
|||
operator () (BluetoothStatus& aArg1, int& aArg2,
|
||||
nsAutoArrayPtr<BluetoothProperty>& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read status */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -986,8 +986,8 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
void AdapterPropertiesNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void AdapterPropertiesNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
AdapterPropertiesNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::AdapterPropertiesNotification,
|
||||
|
|
@ -998,7 +998,7 @@ private:
|
|||
class RemoteDevicePropertiesInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
RemoteDevicePropertiesInitOp(BluetoothDaemonPDU& aPDU)
|
||||
RemoteDevicePropertiesInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1006,7 +1006,7 @@ private:
|
|||
operator () (BluetoothStatus& aArg1, nsString& aArg2, int& aArg3,
|
||||
nsAutoArrayPtr<BluetoothProperty>& aArg4) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read status */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1040,8 +1040,8 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
void RemoteDevicePropertiesNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void RemoteDevicePropertiesNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
RemoteDevicePropertiesNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::RemoteDevicePropertiesNotification,
|
||||
|
|
@ -1052,14 +1052,14 @@ private:
|
|||
class DeviceFoundInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
DeviceFoundInitOp(BluetoothDaemonPDU& aPDU)
|
||||
DeviceFoundInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (int& aArg1, nsAutoArrayPtr<BluetoothProperty>& aArg2) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read number of properties */
|
||||
uint8_t numProperties;
|
||||
|
|
@ -1080,16 +1080,16 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
void DeviceFoundNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void DeviceFoundNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
DeviceFoundNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::DeviceFoundNotification,
|
||||
DeviceFoundInitOp(aPDU));
|
||||
}
|
||||
|
||||
void DiscoveryStateChangedNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void DiscoveryStateChangedNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
DiscoveryStateChangedNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::DiscoveryStateChangedNotification,
|
||||
|
|
@ -1100,14 +1100,14 @@ private:
|
|||
class PinRequestInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
PinRequestInitOp(BluetoothDaemonPDU& aPDU)
|
||||
PinRequestInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (nsString& aArg1, nsString& aArg2, uint32_t& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read remote address */
|
||||
nsresult rv = UnpackPDU(
|
||||
|
|
@ -1133,8 +1133,8 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
void PinRequestNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void PinRequestNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
PinRequestNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::PinRequestNotification,
|
||||
|
|
@ -1145,7 +1145,7 @@ private:
|
|||
class SspRequestInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
SspRequestInitOp(BluetoothDaemonPDU& aPDU)
|
||||
SspRequestInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1153,7 +1153,7 @@ private:
|
|||
operator () (nsString& aArg1, nsString& aArg2, uint32_t& aArg3,
|
||||
BluetoothSspVariant& aArg4, uint32_t& aArg5) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read remote address */
|
||||
nsresult rv = UnpackPDU(
|
||||
|
|
@ -1191,8 +1191,8 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
void SspRequestNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void SspRequestNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
SspRequestNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::SspRequestNotification,
|
||||
|
|
@ -1203,7 +1203,7 @@ private:
|
|||
class BondStateChangedInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
BondStateChangedInitOp(BluetoothDaemonPDU& aPDU)
|
||||
BondStateChangedInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1211,7 +1211,7 @@ private:
|
|||
operator () (BluetoothStatus& aArg1, nsString& aArg2,
|
||||
BluetoothBondState& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read status */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1236,8 +1236,8 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
void BondStateChangedNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void BondStateChangedNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
BondStateChangedNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::BondStateChangedNotification,
|
||||
|
|
@ -1248,14 +1248,14 @@ private:
|
|||
class AclStateChangedInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
AclStateChangedInitOp(BluetoothDaemonPDU& aPDU)
|
||||
AclStateChangedInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (BluetoothStatus& aArg1, nsString& aArg2, bool& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read status */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1281,8 +1281,8 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
void AclStateChangedNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void AclStateChangedNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
AclStateChangedNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::AclStateChangedNotification,
|
||||
|
|
@ -1293,7 +1293,7 @@ private:
|
|||
class DutModeRecvInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
DutModeRecvInitOp(BluetoothDaemonPDU& aPDU)
|
||||
DutModeRecvInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
|
|
@ -1301,7 +1301,7 @@ private:
|
|||
operator () (uint16_t& aArg1, nsAutoArrayPtr<uint8_t>& aArg2,
|
||||
uint8_t& aArg3) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
/* Read opcode */
|
||||
nsresult rv = UnpackPDU(pdu, aArg1);
|
||||
|
|
@ -1325,27 +1325,27 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
void DutModeRecvNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void DutModeRecvNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
DutModeRecvNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::DutModeRecvNotification,
|
||||
DutModeRecvInitOp(aPDU));
|
||||
}
|
||||
|
||||
void LeTestModeNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU)
|
||||
void LeTestModeNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU)
|
||||
{
|
||||
LeTestModeNotification::Dispatch(
|
||||
&BluetoothNotificationHandler::LeTestModeNotification,
|
||||
UnpackPDUInitOp(aPDU));
|
||||
}
|
||||
|
||||
void HandleNtf(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData)
|
||||
void HandleNtf(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonCoreModule::* const HandleNtf[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&) = {
|
||||
INIT_ARRAY_AT(0, &BluetoothDaemonCoreModule::AdapterStateChangedNtf),
|
||||
INIT_ARRAY_AT(1, &BluetoothDaemonCoreModule::AdapterPropertiesNtf),
|
||||
INIT_ARRAY_AT(2, &BluetoothDaemonCoreModule::RemoteDevicePropertiesNtf),
|
||||
|
|
@ -1450,32 +1450,32 @@ public:
|
|||
// Outgoing PDUs
|
||||
//
|
||||
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) override;
|
||||
nsresult Send(DaemonSocketPDU* aPDU, void* aUserData) override;
|
||||
|
||||
void StoreUserData(const BluetoothDaemonPDU& aPDU) override;
|
||||
void StoreUserData(const DaemonSocketPDU& aPDU) override;
|
||||
|
||||
// Incoming PUDs
|
||||
//
|
||||
|
||||
void Handle(BluetoothDaemonPDU& aPDU) override;
|
||||
void Handle(DaemonSocketPDU& aPDU) override;
|
||||
|
||||
void* FetchUserData(const BluetoothDaemonPDUHeader& aHeader);
|
||||
void* FetchUserData(const DaemonSocketPDUHeader& aHeader);
|
||||
|
||||
private:
|
||||
void HandleSetupSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleCoreSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleSocketSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleHandsfreeSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleA2dpSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleAvrcpSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleGattSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleSetupSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
void HandleCoreSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
void HandleSocketSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
void HandleHandsfreeSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
void HandleA2dpSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
void HandleAvrcpSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
void HandleGattSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
|
||||
BluetoothDaemonConnection* mConnection;
|
||||
nsTArray<void*> mUserDataQ;
|
||||
|
|
@ -1507,7 +1507,7 @@ BluetoothDaemonProtocol::UnregisterModule(uint8_t aId,
|
|||
}
|
||||
|
||||
nsresult
|
||||
BluetoothDaemonProtocol::Send(BluetoothDaemonPDU* aPDU, void* aUserData)
|
||||
BluetoothDaemonProtocol::Send(DaemonSocketPDU* aPDU, void* aUserData)
|
||||
{
|
||||
MOZ_ASSERT(mConnection);
|
||||
MOZ_ASSERT(aPDU);
|
||||
|
|
@ -1528,7 +1528,7 @@ BluetoothDaemonProtocol::Send(BluetoothDaemonPDU* aPDU, void* aUserData)
|
|||
|
||||
void
|
||||
BluetoothDaemonProtocol::HandleSetupSvc(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
BluetoothDaemonSetupModule::HandleSvc(aHeader, aPDU, aUserData);
|
||||
|
|
@ -1536,7 +1536,7 @@ BluetoothDaemonProtocol::HandleSetupSvc(
|
|||
|
||||
void
|
||||
BluetoothDaemonProtocol::HandleCoreSvc(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
BluetoothDaemonCoreModule::HandleSvc(aHeader, aPDU, aUserData);
|
||||
|
|
@ -1544,7 +1544,7 @@ BluetoothDaemonProtocol::HandleCoreSvc(
|
|||
|
||||
void
|
||||
BluetoothDaemonProtocol::HandleSocketSvc(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
BluetoothDaemonSocketModule::HandleSvc(aHeader, aPDU, aUserData);
|
||||
|
|
@ -1552,7 +1552,7 @@ BluetoothDaemonProtocol::HandleSocketSvc(
|
|||
|
||||
void
|
||||
BluetoothDaemonProtocol::HandleHandsfreeSvc(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
BluetoothDaemonHandsfreeModule::HandleSvc(aHeader, aPDU, aUserData);
|
||||
|
|
@ -1560,7 +1560,7 @@ BluetoothDaemonProtocol::HandleHandsfreeSvc(
|
|||
|
||||
void
|
||||
BluetoothDaemonProtocol::HandleA2dpSvc(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
BluetoothDaemonA2dpModule::HandleSvc(aHeader, aPDU, aUserData);
|
||||
|
|
@ -1568,7 +1568,7 @@ BluetoothDaemonProtocol::HandleA2dpSvc(
|
|||
|
||||
void
|
||||
BluetoothDaemonProtocol::HandleAvrcpSvc(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
BluetoothDaemonAvrcpModule::HandleSvc(aHeader, aPDU, aUserData);
|
||||
|
|
@ -1576,17 +1576,17 @@ BluetoothDaemonProtocol::HandleAvrcpSvc(
|
|||
|
||||
void
|
||||
BluetoothDaemonProtocol::HandleGattSvc(
|
||||
const BluetoothDaemonPDUHeader& aHeader, BluetoothDaemonPDU& aPDU,
|
||||
const DaemonSocketPDUHeader& aHeader, DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
BluetoothDaemonGattModule::HandleSvc(aHeader, aPDU, aUserData);
|
||||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonProtocol::Handle(BluetoothDaemonPDU& aPDU)
|
||||
BluetoothDaemonProtocol::Handle(DaemonSocketPDU& aPDU)
|
||||
{
|
||||
static void (BluetoothDaemonProtocol::* const HandleSvc[])(
|
||||
const BluetoothDaemonPDUHeader&, BluetoothDaemonPDU&, void*) = {
|
||||
const DaemonSocketPDUHeader&, DaemonSocketPDU&, void*) = {
|
||||
INIT_ARRAY_AT(0x00, &BluetoothDaemonProtocol::HandleSetupSvc),
|
||||
INIT_ARRAY_AT(0x01, &BluetoothDaemonProtocol::HandleCoreSvc),
|
||||
INIT_ARRAY_AT(0x02, &BluetoothDaemonProtocol::HandleSocketSvc),
|
||||
|
|
@ -1603,7 +1603,7 @@ BluetoothDaemonProtocol::Handle(BluetoothDaemonPDU& aPDU)
|
|||
&BluetoothDaemonProtocol::HandleGattSvc)
|
||||
};
|
||||
|
||||
BluetoothDaemonPDUHeader header;
|
||||
DaemonSocketPDUHeader header;
|
||||
|
||||
if (NS_FAILED(UnpackPDU(aPDU, header)) ||
|
||||
NS_WARN_IF(!(header.mService < MOZ_ARRAY_LENGTH(HandleSvc))) ||
|
||||
|
|
@ -1615,7 +1615,7 @@ BluetoothDaemonProtocol::Handle(BluetoothDaemonPDU& aPDU)
|
|||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonProtocol::StoreUserData(const BluetoothDaemonPDU& aPDU)
|
||||
BluetoothDaemonProtocol::StoreUserData(const DaemonSocketPDU& aPDU)
|
||||
{
|
||||
MOZ_ASSERT(!NS_IsMainThread());
|
||||
|
||||
|
|
@ -1623,7 +1623,7 @@ BluetoothDaemonProtocol::StoreUserData(const BluetoothDaemonPDU& aPDU)
|
|||
}
|
||||
|
||||
void*
|
||||
BluetoothDaemonProtocol::FetchUserData(const BluetoothDaemonPDUHeader& aHeader)
|
||||
BluetoothDaemonProtocol::FetchUserData(const DaemonSocketPDUHeader& aHeader)
|
||||
{
|
||||
MOZ_ASSERT(!NS_IsMainThread());
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ BluetoothDaemonSocketModule::ListenCmd(BluetoothSocketType aType,
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x02, 0x01, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x02, 0x01, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
aType,
|
||||
|
|
@ -59,7 +59,7 @@ BluetoothDaemonSocketModule::ConnectCmd(const nsAString& aBdAddr,
|
|||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
nsAutoPtr<BluetoothDaemonPDU> pdu(new BluetoothDaemonPDU(0x02, 0x02, 0));
|
||||
nsAutoPtr<DaemonSocketPDU> pdu(new DaemonSocketPDU(0x02, 0x02, 0));
|
||||
|
||||
nsresult rv = PackPDU(
|
||||
PackConversion<nsAString, BluetoothAddress>(aBdAddr),
|
||||
|
|
@ -156,13 +156,13 @@ BluetoothDaemonSocketModule::CloseCmd(BluetoothSocketResultHandler* aRes)
|
|||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonSocketModule::HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
BluetoothDaemonSocketModule::HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
void* aUserData)
|
||||
{
|
||||
static void (BluetoothDaemonSocketModule::* const HandleRsp[])(
|
||||
const BluetoothDaemonPDUHeader&,
|
||||
BluetoothDaemonPDU&,
|
||||
const DaemonSocketPDUHeader&,
|
||||
DaemonSocketPDU&,
|
||||
BluetoothSocketResultHandler*) = {
|
||||
INIT_ARRAY_AT(0x00, &BluetoothDaemonSocketModule::ErrorRsp),
|
||||
INIT_ARRAY_AT(0x01, &BluetoothDaemonSocketModule::ListenRsp),
|
||||
|
|
@ -186,7 +186,7 @@ BluetoothDaemonSocketModule::HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
|||
}
|
||||
|
||||
nsresult
|
||||
BluetoothDaemonSocketModule::Send(BluetoothDaemonPDU* aPDU,
|
||||
BluetoothDaemonSocketModule::Send(DaemonSocketPDU* aPDU,
|
||||
BluetoothSocketResultHandler* aRes)
|
||||
{
|
||||
aRes->AddRef(); // Keep reference for response
|
||||
|
|
@ -203,8 +203,8 @@ BluetoothDaemonSocketModule::SocketFlags(bool aEncrypt, bool aAuth)
|
|||
//
|
||||
|
||||
void
|
||||
BluetoothDaemonSocketModule::ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
BluetoothDaemonSocketModule::ErrorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSocketResultHandler* aRes)
|
||||
{
|
||||
ErrorRunnable::Dispatch(
|
||||
|
|
@ -214,14 +214,14 @@ BluetoothDaemonSocketModule::ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
|||
class BluetoothDaemonSocketModule::ListenInitOp final : private PDUInitOp
|
||||
{
|
||||
public:
|
||||
ListenInitOp(BluetoothDaemonPDU& aPDU)
|
||||
ListenInitOp(DaemonSocketPDU& aPDU)
|
||||
: PDUInitOp(aPDU)
|
||||
{ }
|
||||
|
||||
nsresult
|
||||
operator () (int& aArg1) const
|
||||
{
|
||||
BluetoothDaemonPDU& pdu = GetPDU();
|
||||
DaemonSocketPDU& pdu = GetPDU();
|
||||
|
||||
aArg1 = pdu.AcquireFd();
|
||||
|
||||
|
|
@ -234,8 +234,8 @@ public:
|
|||
};
|
||||
|
||||
void
|
||||
BluetoothDaemonSocketModule::ListenRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
BluetoothDaemonSocketModule::ListenRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSocketResultHandler* aRes)
|
||||
{
|
||||
IntResultRunnable::Dispatch(
|
||||
|
|
@ -274,8 +274,8 @@ public:
|
|||
};
|
||||
|
||||
void
|
||||
BluetoothDaemonSocketModule::ConnectRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
BluetoothDaemonSocketModule::ConnectRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSocketResultHandler* aRes)
|
||||
{
|
||||
/* the file descriptor is attached in the PDU's ancillary data */
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class BluetoothDaemonSocketModule
|
|||
public:
|
||||
static const int MAX_NUM_CLIENTS;
|
||||
|
||||
virtual nsresult Send(BluetoothDaemonPDU* aPDU, void* aUserData) = 0;
|
||||
virtual nsresult Send(DaemonSocketPDU* aPDU, void* aUserData) = 0;
|
||||
|
||||
// Commands
|
||||
//
|
||||
|
|
@ -43,10 +43,10 @@ public:
|
|||
|
||||
protected:
|
||||
|
||||
void HandleSvc(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU, void* aUserData);
|
||||
void HandleSvc(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU, void* aUserData);
|
||||
|
||||
nsresult Send(BluetoothDaemonPDU* aPDU, BluetoothSocketResultHandler* aRes);
|
||||
nsresult Send(DaemonSocketPDU* aPDU, BluetoothSocketResultHandler* aRes);
|
||||
|
||||
private:
|
||||
class AcceptWatcher;
|
||||
|
|
@ -74,16 +74,16 @@ private:
|
|||
int, const nsAString_internal&, int>
|
||||
IntStringIntResultRunnable;
|
||||
|
||||
void ErrorRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSocketResultHandler* aRes);
|
||||
|
||||
void ListenRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ListenRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSocketResultHandler* aRes);
|
||||
|
||||
void ConnectRsp(const BluetoothDaemonPDUHeader& aHeader,
|
||||
BluetoothDaemonPDU& aPDU,
|
||||
void ConnectRsp(const DaemonSocketPDUHeader& aHeader,
|
||||
DaemonSocketPDU& aPDU,
|
||||
BluetoothSocketResultHandler* aRes);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -37,10 +37,10 @@ namespace ipc {
|
|||
static const char sBluetoothdSocketName[] = "bluez_hal_socket";
|
||||
|
||||
//
|
||||
// BluetoothDaemonPDU
|
||||
// DaemonSocketPDU
|
||||
//
|
||||
|
||||
BluetoothDaemonPDU::BluetoothDaemonPDU(uint8_t aService, uint8_t aOpcode,
|
||||
DaemonSocketPDU::DaemonSocketPDU(uint8_t aService, uint8_t aOpcode,
|
||||
uint16_t aPayloadSize)
|
||||
: mConsumer(nullptr)
|
||||
, mUserData(nullptr)
|
||||
|
|
@ -59,7 +59,7 @@ BluetoothDaemonPDU::BluetoothDaemonPDU(uint8_t aService, uint8_t aOpcode,
|
|||
memcpy(data + OFF_LENGTH, &aPayloadSize, sizeof(aPayloadSize));
|
||||
}
|
||||
|
||||
BluetoothDaemonPDU::BluetoothDaemonPDU(size_t aPayloadSize)
|
||||
DaemonSocketPDU::DaemonSocketPDU(size_t aPayloadSize)
|
||||
: mConsumer(nullptr)
|
||||
, mUserData(nullptr)
|
||||
{
|
||||
|
|
@ -67,14 +67,14 @@ BluetoothDaemonPDU::BluetoothDaemonPDU(size_t aPayloadSize)
|
|||
ResetBuffer(new uint8_t[availableSpace], 0, 0, availableSpace);
|
||||
}
|
||||
|
||||
BluetoothDaemonPDU::~BluetoothDaemonPDU()
|
||||
DaemonSocketPDU::~DaemonSocketPDU()
|
||||
{
|
||||
nsAutoArrayPtr<uint8_t> data(GetBuffer());
|
||||
ResetBuffer(nullptr, 0, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonPDU::GetHeader(uint8_t& aService, uint8_t& aOpcode,
|
||||
DaemonSocketPDU::GetHeader(uint8_t& aService, uint8_t& aOpcode,
|
||||
uint16_t& aPayloadSize)
|
||||
{
|
||||
memcpy(&aService, GetData(OFF_SERVICE), sizeof(aService));
|
||||
|
|
@ -83,7 +83,7 @@ BluetoothDaemonPDU::GetHeader(uint8_t& aService, uint8_t& aOpcode,
|
|||
}
|
||||
|
||||
ssize_t
|
||||
BluetoothDaemonPDU::Send(int aFd)
|
||||
DaemonSocketPDU::Send(int aFd)
|
||||
{
|
||||
struct iovec iv;
|
||||
memset(&iv, 0, sizeof(iv));
|
||||
|
|
@ -120,7 +120,7 @@ BluetoothDaemonPDU::Send(int aFd)
|
|||
((_cmsghdr)->cmsg_type == SCM_RIGHTS) )
|
||||
|
||||
ssize_t
|
||||
BluetoothDaemonPDU::Receive(int aFd)
|
||||
DaemonSocketPDU::Receive(int aFd)
|
||||
{
|
||||
struct iovec iv;
|
||||
memset(&iv, 0, sizeof(iv));
|
||||
|
|
@ -163,13 +163,13 @@ BluetoothDaemonPDU::Receive(int aFd)
|
|||
}
|
||||
|
||||
int
|
||||
BluetoothDaemonPDU::AcquireFd()
|
||||
DaemonSocketPDU::AcquireFd()
|
||||
{
|
||||
return mReceivedFd.forget();
|
||||
}
|
||||
|
||||
nsresult
|
||||
BluetoothDaemonPDU::UpdateHeader()
|
||||
DaemonSocketPDU::UpdateHeader()
|
||||
{
|
||||
size_t len = GetPayloadSize();
|
||||
if (len >= MAX_PAYLOAD_LENGTH) {
|
||||
|
|
@ -183,7 +183,7 @@ BluetoothDaemonPDU::UpdateHeader()
|
|||
}
|
||||
|
||||
size_t
|
||||
BluetoothDaemonPDU::GetPayloadSize() const
|
||||
DaemonSocketPDU::GetPayloadSize() const
|
||||
{
|
||||
MOZ_ASSERT(GetSize() >= HEADER_SIZE);
|
||||
|
||||
|
|
@ -191,7 +191,7 @@ BluetoothDaemonPDU::GetPayloadSize() const
|
|||
}
|
||||
|
||||
void
|
||||
BluetoothDaemonPDU::OnError(const char* aFunction, int aErrno)
|
||||
DaemonSocketPDU::OnError(const char* aFunction, int aErrno)
|
||||
{
|
||||
CHROMIUM_LOG("%s failed with error %d (%s)",
|
||||
aFunction, aErrno, strerror(aErrno));
|
||||
|
|
@ -242,7 +242,7 @@ public:
|
|||
private:
|
||||
BluetoothDaemonConnection* mConnection;
|
||||
DaemonSocketIOConsumer* mConsumer;
|
||||
nsAutoPtr<BluetoothDaemonPDU> mPDU;
|
||||
nsAutoPtr<DaemonSocketPDU> mPDU;
|
||||
bool mShuttingDownOnIOThread;
|
||||
};
|
||||
|
||||
|
|
@ -276,7 +276,7 @@ BluetoothDaemonConnectionIO::QueryReceiveBuffer(UnixSocketIOBuffer** aBuffer)
|
|||
|
||||
if (!mPDU) {
|
||||
/* There's only one PDU for receiving. We reuse it every time. */
|
||||
mPDU = new BluetoothDaemonPDU(BluetoothDaemonPDU::MAX_PAYLOAD_LENGTH);
|
||||
mPDU = new DaemonSocketPDU(DaemonSocketPDU::MAX_PAYLOAD_LENGTH);
|
||||
}
|
||||
*aBuffer = mPDU.get();
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ class BluetoothDaemonConnectionIO;
|
|||
class DaemonSocketIOConsumer;
|
||||
|
||||
/*
|
||||
* |BlutoothDaemonPDU| represents a single PDU that is transfered from or to
|
||||
* |DaemonSocketPDU| represents a single PDU that is transfered from or to
|
||||
* the Bluetooth daemon. Each PDU contains exactly one command.
|
||||
*
|
||||
* A PDU as the following format
|
||||
|
|
@ -41,7 +41,7 @@ class DaemonSocketIOConsumer;
|
|||
* https://git.kernel.org/cgit/bluetooth/bluez.git/tree/android/hal-ipc-api.txt?id=5.24
|
||||
*
|
||||
*/
|
||||
class BluetoothDaemonPDU final : public UnixSocketIOBuffer
|
||||
class DaemonSocketPDU final : public UnixSocketIOBuffer
|
||||
{
|
||||
public:
|
||||
enum {
|
||||
|
|
@ -53,10 +53,10 @@ public:
|
|||
MAX_PAYLOAD_LENGTH = 1 << 16
|
||||
};
|
||||
|
||||
BluetoothDaemonPDU(uint8_t aService, uint8_t aOpcode,
|
||||
DaemonSocketPDU(uint8_t aService, uint8_t aOpcode,
|
||||
uint16_t aPayloadSize);
|
||||
BluetoothDaemonPDU(size_t aPayloadSize);
|
||||
~BluetoothDaemonPDU();
|
||||
DaemonSocketPDU(size_t aPayloadSize);
|
||||
~DaemonSocketPDU();
|
||||
|
||||
void SetConsumer(DaemonSocketIOConsumer* aConsumer)
|
||||
{
|
||||
|
|
@ -102,8 +102,8 @@ class DaemonSocketIOConsumer
|
|||
public:
|
||||
virtual ~DaemonSocketIOConsumer();
|
||||
|
||||
virtual void Handle(BluetoothDaemonPDU& aPDU) = 0;
|
||||
virtual void StoreUserData(const BluetoothDaemonPDU& aPDU) = 0;
|
||||
virtual void Handle(DaemonSocketPDU& aPDU) = 0;
|
||||
virtual void StoreUserData(const DaemonSocketPDU& aPDU) = 0;
|
||||
|
||||
protected:
|
||||
DaemonSocketIOConsumer();
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче