mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1053116 - Part 2: add error code in NfcGonkMessages.h. r=dimi
This commit is contained in:
parent
e1a9da9bc9
commit
28a952bc1e
@ -11,33 +11,68 @@ namespace mozilla {
|
||||
#define NFCD_MINOR_VERSION 7
|
||||
|
||||
enum NfcRequest {
|
||||
eNfcRequest_Config = 0,
|
||||
eNfcRequest_Connect,
|
||||
eNfcRequest_Close,
|
||||
eNfcRequest_GetDetailsNDEF,
|
||||
eNfcRequest_ReadNDEF,
|
||||
eNfcRequest_WriteNDEF,
|
||||
eNfcRequest_MakeReadOnlyNDEF,
|
||||
ConfigReq = 0,
|
||||
ConnectReq,
|
||||
CloseReq,
|
||||
GetDetailsNDEFReq,
|
||||
ReadNDEFReq,
|
||||
WriteNDEFReq,
|
||||
MakeReadOnlyNDEFReq,
|
||||
};
|
||||
|
||||
enum NfcResponse {
|
||||
eNfcResponse_General = 1000,
|
||||
eNfcResponse_Config,
|
||||
eNfcResponse_GetDetailsNDEF,
|
||||
eNfcResponse_ReadNDEF,
|
||||
GeneralRsp = 1000,
|
||||
ConfigRsp,
|
||||
GetDetailsNDEFRsp,
|
||||
ReadNDEFRsp,
|
||||
};
|
||||
|
||||
enum NfcNotification {
|
||||
eNfcNotification_Initialized = 2000,
|
||||
eNfcNotification_TechDiscovered,
|
||||
eNfcNotification_TechLost,
|
||||
Initialized = 2000,
|
||||
TechDiscovered,
|
||||
TechLost,
|
||||
};
|
||||
|
||||
enum NfcTechlogy {
|
||||
eNfcTechlogy_NDEF = 0,
|
||||
eNfcTechlogy_NDEFWritable,
|
||||
eNfcTechlogy_NDEFFormattable,
|
||||
eNfcTechlogy_P2P,
|
||||
NDEF = 0,
|
||||
NDEFWritable,
|
||||
NDEFFormattable,
|
||||
P2P,
|
||||
};
|
||||
|
||||
enum NfcErrorCode {
|
||||
Success = 0,
|
||||
IOErr = -1,
|
||||
Cancelled = -2,
|
||||
Timeout = -3,
|
||||
BusyErr = -4,
|
||||
ConnectErr = -5,
|
||||
DisconnectErr = -6,
|
||||
ReadErr = -7,
|
||||
WriteErr = -8,
|
||||
InvalidParam = -9,
|
||||
InsufficientResources = -10,
|
||||
SocketCreation = -11,
|
||||
SocketNotConnected = -12,
|
||||
BufferTooSmall = -13,
|
||||
SapUsed = -14,
|
||||
ServiceNameUsed = -15,
|
||||
SocketOptions = -16,
|
||||
FailEnableDiscovery = -17,
|
||||
FailDisableDiscovery = -18,
|
||||
NotInitialized = -19,
|
||||
InitializeFail = -20,
|
||||
DeinitializeFail = -21,
|
||||
SeConnected = -22,
|
||||
NoSeConnected = -23,
|
||||
NotSupported = -24,
|
||||
BadSessionId = -25,
|
||||
LostTech = -26,
|
||||
BadTechType = -27,
|
||||
SelectSeFail = -28,
|
||||
DeselectSeFail = -29,
|
||||
FailEnableLowPowerMode = -30,
|
||||
FailDisableLowPowerMode = -31,
|
||||
};
|
||||
|
||||
} // namespace mozilla
|
||||
|
@ -48,16 +48,16 @@ NfcMessageHandler::Marshall(Parcel& aParcel, const CommandOptions& aOptions)
|
||||
result = ReadNDEFRequest(aParcel, aOptions);
|
||||
} else if (!strcmp(type, kWriteNDEFRequest)) {
|
||||
result = WriteNDEFRequest(aParcel, aOptions);
|
||||
mPendingReqQueue.AppendElement(eNfcRequest_WriteNDEF);
|
||||
mPendingReqQueue.AppendElement(NfcRequest::WriteNDEFReq);
|
||||
} else if (!strcmp(type, kMakeReadOnlyNDEFRequest)) {
|
||||
result = MakeReadOnlyNDEFRequest(aParcel, aOptions);
|
||||
mPendingReqQueue.AppendElement(eNfcRequest_MakeReadOnlyNDEF);
|
||||
mPendingReqQueue.AppendElement(NfcRequest::MakeReadOnlyNDEFReq);
|
||||
} else if (!strcmp(type, kConnectRequest)) {
|
||||
result = ConnectRequest(aParcel, aOptions);
|
||||
mPendingReqQueue.AppendElement(eNfcRequest_Connect);
|
||||
mPendingReqQueue.AppendElement(NfcRequest::ConnectReq);
|
||||
} else if (!strcmp(type, kCloseRequest)) {
|
||||
result = CloseRequest(aParcel, aOptions);
|
||||
mPendingReqQueue.AppendElement(eNfcRequest_Close);
|
||||
mPendingReqQueue.AppendElement(NfcRequest::CloseReq);
|
||||
} else {
|
||||
result = false;
|
||||
}
|
||||
@ -73,25 +73,25 @@ NfcMessageHandler::Unmarshall(const Parcel& aParcel, EventOptions& aOptions)
|
||||
int32_t type = aParcel.readInt32();
|
||||
|
||||
switch (type) {
|
||||
case eNfcResponse_General:
|
||||
case NfcResponse::GeneralRsp:
|
||||
result = GeneralResponse(aParcel, aOptions);
|
||||
break;
|
||||
case eNfcResponse_Config:
|
||||
case NfcResponse::ConfigRsp:
|
||||
result = ConfigResponse(aParcel, aOptions);
|
||||
break;
|
||||
case eNfcResponse_GetDetailsNDEF:
|
||||
case NfcResponse::GetDetailsNDEFRsp:
|
||||
result = GetDetailsNDEFResponse(aParcel, aOptions);
|
||||
break;
|
||||
case eNfcResponse_ReadNDEF:
|
||||
case NfcResponse::ReadNDEFRsp:
|
||||
result = ReadNDEFResponse(aParcel, aOptions);
|
||||
break;
|
||||
case eNfcNotification_Initialized:
|
||||
case NfcNotification::Initialized:
|
||||
result = InitializeNotification(aParcel, aOptions);
|
||||
break;
|
||||
case eNfcNotification_TechDiscovered:
|
||||
case NfcNotification::TechDiscovered:
|
||||
result = TechDiscoveredNotification(aParcel, aOptions);
|
||||
break;
|
||||
case eNfcNotification_TechLost:
|
||||
case NfcNotification::TechLost:
|
||||
result = TechLostNotification(aParcel, aOptions);
|
||||
break;
|
||||
default:
|
||||
@ -111,16 +111,16 @@ NfcMessageHandler::GeneralResponse(const Parcel& aParcel, EventOptions& aOptions
|
||||
mPendingReqQueue.RemoveElementAt(0);
|
||||
|
||||
switch (pendingReq) {
|
||||
case eNfcRequest_WriteNDEF:
|
||||
case NfcRequest::WriteNDEFReq:
|
||||
type = kWriteNDEFResponse;
|
||||
break;
|
||||
case eNfcRequest_MakeReadOnlyNDEF:
|
||||
case NfcRequest::MakeReadOnlyNDEFReq:
|
||||
type = kMakeReadOnlyNDEFResponse;
|
||||
break;
|
||||
case eNfcRequest_Connect:
|
||||
case NfcRequest::ConnectReq:
|
||||
type = kConnectResponse;
|
||||
break;
|
||||
case eNfcRequest_Close:
|
||||
case NfcRequest::CloseReq:
|
||||
type = kCloseResponse;
|
||||
break;
|
||||
}
|
||||
@ -138,7 +138,7 @@ NfcMessageHandler::GeneralResponse(const Parcel& aParcel, EventOptions& aOptions
|
||||
bool
|
||||
NfcMessageHandler::ConfigRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
||||
{
|
||||
aParcel.writeInt32(eNfcRequest_Config);
|
||||
aParcel.writeInt32(NfcRequest::ConfigReq);
|
||||
aParcel.writeInt32(aOptions.mPowerLevel);
|
||||
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
||||
mPowerLevelQueue.AppendElement(aOptions.mPowerLevel);
|
||||
@ -164,7 +164,7 @@ NfcMessageHandler::ConfigResponse(const Parcel& aParcel, EventOptions& aOptions)
|
||||
bool
|
||||
NfcMessageHandler::GetDetailsNDEFRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
||||
{
|
||||
aParcel.writeInt32(eNfcRequest_GetDetailsNDEF);
|
||||
aParcel.writeInt32(NfcRequest::GetDetailsNDEFReq);
|
||||
aParcel.writeInt32(aOptions.mSessionId);
|
||||
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
||||
return true;
|
||||
@ -190,7 +190,7 @@ NfcMessageHandler::GetDetailsNDEFResponse(const Parcel& aParcel, EventOptions& a
|
||||
bool
|
||||
NfcMessageHandler::ReadNDEFRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
||||
{
|
||||
aParcel.writeInt32(eNfcRequest_ReadNDEF);
|
||||
aParcel.writeInt32(NfcRequest::ReadNDEFReq);
|
||||
aParcel.writeInt32(aOptions.mSessionId);
|
||||
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
||||
return true;
|
||||
@ -213,7 +213,7 @@ NfcMessageHandler::ReadNDEFResponse(const Parcel& aParcel, EventOptions& aOption
|
||||
bool
|
||||
NfcMessageHandler::WriteNDEFRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
||||
{
|
||||
aParcel.writeInt32(eNfcRequest_WriteNDEF);
|
||||
aParcel.writeInt32(NfcRequest::WriteNDEFReq);
|
||||
aParcel.writeInt32(aOptions.mSessionId);
|
||||
WriteNDEFMessage(aParcel, aOptions);
|
||||
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
||||
@ -223,7 +223,7 @@ NfcMessageHandler::WriteNDEFRequest(Parcel& aParcel, const CommandOptions& aOpti
|
||||
bool
|
||||
NfcMessageHandler::MakeReadOnlyNDEFRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
||||
{
|
||||
aParcel.writeInt32(eNfcRequest_MakeReadOnlyNDEF);
|
||||
aParcel.writeInt32(NfcRequest::MakeReadOnlyNDEFReq);
|
||||
aParcel.writeInt32(aOptions.mSessionId);
|
||||
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
||||
return true;
|
||||
@ -232,7 +232,7 @@ NfcMessageHandler::MakeReadOnlyNDEFRequest(Parcel& aParcel, const CommandOptions
|
||||
bool
|
||||
NfcMessageHandler::ConnectRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
||||
{
|
||||
aParcel.writeInt32(eNfcRequest_Connect);
|
||||
aParcel.writeInt32(NfcRequest::ConnectReq);
|
||||
aParcel.writeInt32(aOptions.mSessionId);
|
||||
aParcel.writeInt32(aOptions.mTechType);
|
||||
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
||||
@ -242,7 +242,7 @@ NfcMessageHandler::ConnectRequest(Parcel& aParcel, const CommandOptions& aOption
|
||||
bool
|
||||
NfcMessageHandler::CloseRequest(Parcel& aParcel, const CommandOptions& aOptions)
|
||||
{
|
||||
aParcel.writeInt32(eNfcRequest_Close);
|
||||
aParcel.writeInt32(NfcRequest::CloseReq);
|
||||
aParcel.writeInt32(aOptions.mSessionId);
|
||||
mRequestIdQueue.AppendElement(aOptions.mRequestId);
|
||||
return true;
|
||||
|
Loading…
Reference in New Issue
Block a user