status information added
use class for status strings to make array overrun impossible
This commit is contained in:
@ -20,13 +20,7 @@
|
|||||||
#include "StreamBusInterface.h"
|
#include "StreamBusInterface.h"
|
||||||
#include "StreamError.h"
|
#include "StreamError.h"
|
||||||
|
|
||||||
const char* StreamIoStatusStr[] = {
|
StreamIoStatusStrClass StreamIoStatusStr;
|
||||||
"StreamIoSuccess",
|
|
||||||
"StreamIoTimeout",
|
|
||||||
"StreamIoNoReply",
|
|
||||||
"StreamIoEnd",
|
|
||||||
"StreamIoFault"
|
|
||||||
};
|
|
||||||
|
|
||||||
StreamBusInterfaceRegistrarBase* StreamBusInterfaceRegistrarBase::first;
|
StreamBusInterfaceRegistrarBase* StreamBusInterfaceRegistrarBase::first;
|
||||||
|
|
||||||
|
@ -21,13 +21,26 @@
|
|||||||
#define StreamBusInterface_h
|
#define StreamBusInterface_h
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
#include <StreamBuffer.h>
|
||||||
|
|
||||||
enum StreamIoStatus {
|
enum StreamIoStatus {
|
||||||
StreamIoSuccess, StreamIoTimeout, StreamIoNoReply,
|
StreamIoSuccess, StreamIoTimeout, StreamIoNoReply,
|
||||||
StreamIoEnd, StreamIoFault
|
StreamIoEnd, StreamIoFault
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const char* StreamIoStatusStr[];
|
class StreamIoStatusStrClass {
|
||||||
|
public:
|
||||||
|
const char* operator [] (int index) {
|
||||||
|
switch (index) {
|
||||||
|
case StreamIoSuccess: return "StreamIoSuccess";
|
||||||
|
case StreamIoTimeout: return "StreamIoTimeout";
|
||||||
|
case StreamIoNoReply: return "StreamIoNoReply";
|
||||||
|
case StreamIoEnd: return "StreamIoEnd";
|
||||||
|
case StreamIoFault: return "StreamIoFault";
|
||||||
|
default: return "illegal status";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} extern StreamIoStatusStr;
|
||||||
|
|
||||||
class StreamBusInterface
|
class StreamBusInterface
|
||||||
{
|
{
|
||||||
@ -89,6 +102,9 @@ public:
|
|||||||
bool busDisconnect() {
|
bool busDisconnect() {
|
||||||
return businterface && businterface->disconnectRequest();
|
return businterface && businterface->disconnectRequest();
|
||||||
}
|
}
|
||||||
|
void busPrintStatus(StreamBuffer& buffer) {
|
||||||
|
if (businterface) businterface->printStatus(buffer);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -137,6 +153,7 @@ protected:
|
|||||||
virtual bool connectRequest(unsigned long connecttimeout_ms);
|
virtual bool connectRequest(unsigned long connecttimeout_ms);
|
||||||
virtual bool disconnectRequest();
|
virtual bool disconnectRequest();
|
||||||
virtual void finish();
|
virtual void finish();
|
||||||
|
virtual void printStatus(StreamBuffer& buffer) {};
|
||||||
|
|
||||||
// pure virtual
|
// pure virtual
|
||||||
virtual bool lockRequest(unsigned long timeout_ms) = 0;
|
virtual bool lockRequest(unsigned long timeout_ms) = 0;
|
||||||
|
Reference in New Issue
Block a user