sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ax88772: Add logic to separate packet, fix MTU issue. Ax88772b: Fix driver model unload function, fix SCT test failures.

Browse Source 
Signed-off-by: Yu Pei <pei.yu@intel.com>
Reviewed-by: Ouyang Qian <qian.ouyang@intel.com>
Reviewed-by: Leahy, Leroy P <Leroy.P.Leahy@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14443 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Yu Pei
2013-06-27 05:07:29 +00:00
committed by qianouyang
parent ca24313165
commit 4986bbaf11
8 changed files with 341 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772/Ax88772.c
View File

@@ -656,6 +656,78 @@ Ax88772Reset (
}
VOID
FillPkt2Queue (
IN NIC_DEVICE * pNicDevice,
IN UINTN BufLength)
{
UINT16 * pLength;
UINT16 * pLengthBar;
UINT8* pData;
UINT32 offset;
RX_TX_PACKET * pRxPacket;
UINTN LengthInBytes;
EFI_STATUS Status;
for ( offset = 0; offset < BufLength; ){
pLength = (UINT16*) (pNicDevice->pBulkInBuff + offset);
pLengthBar = (UINT16*) (pNicDevice->pBulkInBuff + offset +2);
*pLength &= 0x7ff;
*pLengthBar &= 0x7ff;
*pLengthBar |= 0xf800;
if ((*pLength ^ *pLengthBar ) != 0xFFFF) {
DEBUG (( EFI_D_ERROR , "Pkt length error. BufLength = %d\n", BufLength));
return;
}
pRxPacket = pNicDevice->pRxFree;
LengthInBytes = sizeof ( *pRxPacket ) - sizeof ( pRxPacket->pNext );
if ( NULL == pRxPacket ) {
Status = gBS->AllocatePool ( EfiRuntimeServicesData,
sizeof( RX_TX_PACKET ),
(VOID **) &pRxPacket );
if ( !EFI_ERROR ( Status )) {
//
// Add this packet to the free packet list
//
pNicDevice->pRxFree = pRxPacket;
pRxPacket->pNext = NULL;
}
else {
//
// Use the discard packet buffer
//
//pRxPacket = &Packet;
}
}
pData = pNicDevice->pBulkInBuff + offset + 4;
pRxPacket->Length = *pLength;
pRxPacket->LengthBar = *(UINT16*) (pNicDevice->pBulkInBuff + offset +2);
CopyMem (&pRxPacket->Data[0], pData, *pLength);
//DEBUG((DEBUG_INFO, "Packet [%d]\n", *pLength));
pNicDevice->pRxFree = pRxPacket->pNext;
pRxPacket->pNext = NULL;
if ( NULL == pNicDevice->pRxTail ) {
pNicDevice->pRxHead = pRxPacket;
}
else {
pNicDevice->pRxTail->pNext = pRxPacket;
}
pNicDevice->pRxTail = pRxPacket;
offset += (*pLength + 4);
}
}
/**
Receive a frame from the network.
@@ -760,10 +832,10 @@ Ax88772Rx (
// Locate a packet for use
//
pRxPacket = pNicDevice->pRxFree;
LengthInBytes = sizeof ( *pRxPacket ) - sizeof ( pRxPacket->pNext );
LengthInBytes = MAX_BULKIN_SIZE;
if ( NULL == pRxPacket ) {
Status = gBS->AllocatePool ( EfiRuntimeServicesData,
LengthInBytes,
sizeof ( *pRxPacket ),
(VOID **) &pRxPacket );
if ( !EFI_ERROR ( Status )) {
//
@@ -783,16 +855,22 @@ Ax88772Rx (
//
// Attempt to receive a packet
//
SetMem (&pNicDevice->pBulkInBuff[0], MAX_BULKIN_SIZE, 0);
pUsbIo = pNicDevice->pUsbIo;
Status = pUsbIo->UsbBulkTransfer ( pUsbIo,
USB_ENDPOINT_DIR_IN | BULK_IN_ENDPOINT,
&pRxPacket->Length,
&pNicDevice->pBulkInBuff[0],
&LengthInBytes,
2,
&TransferStatus );
if ( LengthInBytes > 0 ) {
FillPkt2Queue(pNicDevice, LengthInBytes);
}
pRxPacket = pNicDevice->pRxHead;
if (( !EFI_ERROR ( Status ))
&& ( 0 < pRxPacket->Length )
&& ( pRxPacket->Length <= sizeof ( pRxPacket->Data ))) {
&& ( pRxPacket->Length <= sizeof ( pRxPacket->Data ))
&& ( LengthInBytes > 0)) {
//
// Determine if the packet should be received
@@ -869,22 +947,6 @@ Ax88772Rx (
LengthInBytes ));
}
//
// Remove this packet from the free packet list
//
pNicDevice->pRxFree = pRxPacket->pNext;
pRxPacket->pNext = NULL;
//
// Append this packet to the receive list
//
if ( NULL == pNicDevice->pRxTail ) {
pNicDevice->pRxHead = pRxPacket;
}
else {
pNicDevice->pRxTail->pNext = pRxPacket;
}
pNicDevice->pRxTail = pRxPacket;
}
else {
//