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

This commit is contained in:
Stone 2016-06-28 15:17:15 +00:00
parent 767965b0c8
commit 2500c32075
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Drivers/W5500.cpp
View File

@ -742,7 +742,7 @@ bool W5500::CheckLink()
ISocket* W5500::CreateSocket(NetType type) ISocket* W5500::CreateSocket(NetType type)
{ {
if(_sockets.Count() >= 8) if(Sockets.Count() >= 8)
{ {
debug_printf("没有空余的Socket可用了 !\r\n"); debug_printf("没有空余的Socket可用了 !\r\n");
return nullptr; return nullptr;
@ -760,8 +760,8 @@ ISocket* W5500::CreateSocket(NetType type)
if(socket) if(socket)
{ {
socket->Index = _sockets.Count(); socket->Index = Sockets.Count();
_sockets.Add(socket); Sockets.Add(socket);
} }
return socket; return socket;
@ -827,12 +827,12 @@ void W5500::OnIRQ()
if(Led) Led->Write(500); if(Led) Led->Write(500);
byte dat2 = dat; byte dat2 = dat;
for(int i = 0; i < 8 && i < _sockets.Count(); i++) for(int i = 0; i < 8 && i < Sockets.Count(); i++)
{ {
if(dat2 & 0x01) if(dat2 & 0x01)
{ {
//net_printf("W5500::Socket[%d] 中断\r\n", i); //net_printf("W5500::Socket[%d] 中断\r\n", i);
if(_sockets[i]) ((HardSocket*)_sockets[i])->Process(); if(Sockets[i]) ((HardSocket*)Sockets[i])->Process();
} }
dat2 >>= 1; dat2 >>= 1;
if(dat2 == 0x00) break; if(dat2 == 0x00) break;
@ -1041,7 +1041,7 @@ HardSocket::HardSocket(W5500& host, NetType protocol) : _Host(host)
HardSocket::~HardSocket() HardSocket::~HardSocket()
{ {
_Host._sockets.Remove(this); _Host.Sockets.Remove(this);
} }
byte HardSocket::ReadConfig() { return SocRegRead(CR); } byte HardSocket::ReadConfig() { return SocRegRead(CR); }

2
Drivers/W5500.h
View File

@ -70,7 +70,7 @@ private:
OutputPort Rst; OutputPort Rst;
// 8个硬件socket // 8个硬件socket
List _sockets; List Sockets;
// spi 模式（默认变长） // spi 模式（默认变长）
ushort PhaseOM; ushort PhaseOM;