LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sim fixes.

Browse Source 
Pulled a fix to the simulator app ("long" is 64-bit when 32-bit was
needed) from master.  sim-eng is useful for verifying the x86 SMP stuff.

Also quieted a compiler warning.

Change-Id: I399ea4923b7e0650d5f995e056c751374b057fbd
This commit is contained in:
Andy McFadden
2010-05-21 10:58:40 -07:00
parent d350cf1bb8
commit 26dc36123f
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
simulator/app/MessageStream.cpp
View File

@@ -8,6 +8,7 @@
#include "utils/Log.h" #include "utils/Log.h"
#include <stdint.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
@@ -338,7 +339,7 @@ bool MessageStream::init(Pipe* readPipe, Pipe* writePipe, bool initiateHello)
* and capability flags. * and capability flags.
*/ */
if (initiateHello) { if (initiateHello) {
long data = kHelloMsg; int32_t data = kHelloMsg;
Message msg; Message msg;
/* send hello */ /* send hello */
@@ -357,14 +358,15 @@ bool MessageStream::init(Pipe* readPipe, Pipe* writePipe, bool initiateHello)
return false; return false;
} }
const long* pAck; const int32_t* pAck;
pAck = (const long*) msg.getData(); pAck = (const int32_t*) msg.getData();
if (pAck == NULL || *pAck != kHelloAckMsg) { if (pAck == NULL || *pAck != kHelloAckMsg) {
LOG(LOG_WARN, "", "hello ack was bad\n"); LOG(LOG_WARN, "", "hello ack was bad (%08x vs %08x)\n",
*pAck, kHelloAckMsg);
return false; return false;
} }
} else { } else {
long data = kHelloAckMsg; int32_t data = kHelloAckMsg;
Message msg; Message msg;
LOG(LOG_DEBUG, "", "waiting for hello from peer\n"); LOG(LOG_DEBUG, "", "waiting for hello from peer\n");
@@ -375,8 +377,8 @@ bool MessageStream::init(Pipe* readPipe, Pipe* writePipe, bool initiateHello)
return false; return false;
} }
const long* pAck; const int32_t* pAck;
pAck = (const long*) msg.getData(); pAck = (const int32_t*) msg.getData();
if (pAck == NULL || *pAck != kHelloMsg) { if (pAck == NULL || *pAck != kHelloMsg) {
LOG(LOG_WARN, "", "hello was bad\n"); LOG(LOG_WARN, "", "hello was bad\n");
return false; return false;

4
simulator/wrapsim/SimMgr.c
View File

@@ -763,8 +763,8 @@ static int getSimConfig(void)
goto bail; goto bail;
} }
} else if (msg.mType == kTypeConfig) { } else if (msg.mType == kTypeConfig) {
const char *name; const char* name = NULL;
const char *val; const char* val = NULL;
getConfig(&msg, &name, &val); getConfig(&msg, &name, &val);
if(strcmp(name, "keycharmap") == 0) { if(strcmp(name, "keycharmap") == 0) {
free((void*)gWrapSim.keyMap); free((void*)gWrapSim.keyMap);