NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修正传输口字符串名称的问题

This commit is contained in:
nnhy 2016-03-14 08:13:05 +00:00
parent 19d0853e82
commit e86551977c
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Drivers/W5500.h
View File

@ -95,7 +95,7 @@ private:
};
// 硬件Socket控制器
class HardSocket : public ITransport, public ISocket
class HardSocket : public Object, public ITransport, public ISocket
{
private:
W5500& _Host; // W5500公共部分控制器
@ -161,6 +161,8 @@ public:
// 用户注册的中断事件处理 异步调用
virtual void RaiseReceive();
virtual String& ToStr(String& str) const { return str + "Tcp_" + Local.Port; }
private:
bool Linked;
uint _tidRodyguard; // 维护 Link 状态的任务
@ -180,6 +182,8 @@ public:
// 用户注册的中断事件处理 异步调用
virtual void RaiseReceive();
virtual String& ToStr(String& str) const { return str + "Udp_" + Local.Port; }
private:
virtual bool OnWriteEx(const Buffer& bs, void* opt);
};

3
Drivers/nrf24l01.h
View File

@ -46,7 +46,8 @@ public:
byte FifoStatus;
void ShowStatus();
virtual String ToString() const { return String("R24"); }
//virtual String ToString() const { return String("R24"); }
virtual String& ToStr(String& str) const { return str + "R24"; }
private:
virtual bool OnOpen();

2
Net/ITransport.h
View File

@ -64,7 +64,7 @@ protected:
};
// 数据口包装
class PackPort : public ITransport
class PackPort : public Object, public ITransport
{
private:

3
SerialPort.h
View File

@ -65,7 +65,8 @@ public:
// 电源等级变更（如进入低功耗模式）时调用
virtual void ChangePower(int level);
virtual String ToString() const { return String(Name); }
//virtual String ToString() const { return String(Name); }
virtual String& ToStr(String& str) const { return str + Name; }
static SerialPort* GetMessagePort();
protected: