i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SerialConnect: even more style fixes.

Browse Source 
Thanks to Korli for reviewing...
This commit is contained in:
Adrien Destugues
2014-08-22 16:38:36 +02:00
parent 3e6c09cdfb
commit 1e8185d903
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/serialconnect/SerialApp.cpp
+8 -18
View File
@@ -46,12 +46,10 @@ void SerialApp::ReadyToRun()
void SerialApp::MessageReceived(BMessage* message) void SerialApp::MessageReceived(BMessage* message)
{ {
switch (message->what) switch (message->what) {
{
case kMsgOpenPort: case kMsgOpenPort:
{ {
if (message->FindString("port name", &fPortPath) == B_OK) if (message->FindString("port name", &fPortPath) == B_OK) {
{
fSerialPort.Open(fPortPath); fSerialPort.Open(fPortPath);
release_sem(fSerialLock); release_sem(fSerialLock);
} else { } else {
@@ -65,8 +63,7 @@ void SerialApp::MessageReceived(BMessage* message)
// incoming data // incoming data
fWindow->PostMessage(message); fWindow->PostMessage(message);
if (fLogFile) if (fLogFile) {
{
const char* bytes; const char* bytes;
ssize_t length; ssize_t length;
message->FindData("data", B_RAW_TYPE, (const void**)&bytes, message->FindData("data", B_RAW_TYPE, (const void**)&bytes,
@@ -97,20 +94,16 @@ void SerialApp::MessageReceived(BMessage* message)
const char* filename; const char* filename;
if (message->FindRef("directory", &parent) == B_OK if (message->FindRef("directory", &parent) == B_OK
&& message->FindString("name", &filename) == B_OK) && message->FindString("name", &filename) == B_OK) {
{
delete fLogFile; delete fLogFile;
BDirectory directory(&parent); BDirectory directory(&parent);
fLogFile = new BFile(&directory, filename, fLogFile = new BFile(&directory, filename,
B_WRITE_ONLY | B_CREATE_FILE | B_OPEN_AT_END); B_WRITE_ONLY | B_CREATE_FILE | B_OPEN_AT_END);
status_t error = fLogFile->InitCheck(); status_t error = fLogFile->InitCheck();
if (error != B_OK) if (error != B_OK)
{
puts(strerror(error)); puts(strerror(error));
} } else
} else {
debugger("Invalid BMessage received"); debugger("Invalid BMessage received");
}
break; break;
} }
case kMsgSettings: case kMsgSettings:
@@ -170,8 +163,7 @@ void SerialApp::LoadSettings()
BFile file(path.Path(), B_READ_ONLY); BFile file(path.Path(), B_READ_ONLY);
BMessage message(kMsgSettings); BMessage message(kMsgSettings);
if (message.Unflatten(&file) != B_OK) if (message.Unflatten(&file) != B_OK) {
{
message.AddInt32("parity", fSerialPort.ParityMode()); message.AddInt32("parity", fSerialPort.ParityMode());
message.AddInt32("databits", fSerialPort.DataBits()); message.AddInt32("databits", fSerialPort.DataBits());
message.AddInt32("stopbits", fSerialPort.StopBits()); message.AddInt32("stopbits", fSerialPort.StopBits());
@@ -208,13 +200,11 @@ status_t SerialApp::PollSerial(void*)
SerialApp* application = (SerialApp*)be_app; SerialApp* application = (SerialApp*)be_app;
char buffer[256]; char buffer[256];
for (;;) for (;;) {
{
ssize_t bytesRead; ssize_t bytesRead;
bytesRead = application->fSerialPort.Read(buffer, sizeof(buffer)); bytesRead = application->fSerialPort.Read(buffer, sizeof(buffer));
if (bytesRead == B_FILE_ERROR) if (bytesRead == B_FILE_ERROR) {
{
// Port is not open - wait for it and start over // Port is not open - wait for it and start over
acquire_sem(application->fSerialLock); acquire_sem(application->fSerialLock);
} else if (bytesRead > 0) { } else if (bytesRead > 0) {