\r
--*/\r
{\r
- NetListInsertTail (&Session->Conns, &Conn->Link);\r
+ InsertTailList (&Session->Conns, &Conn->Link);\r
Conn->Session = Session;\r
Session->NumConns++;\r
}\r
\r
--*/\r
{\r
- NetListRemoveEntry (&Conn->Link);\r
+ RemoveEntryList (&Conn->Link);\r
Conn->Session->NumConns--;\r
Conn->Session = NULL;\r
}\r
TCP4_IO_CONFIG_DATA Tcp4IoConfig;\r
EFI_STATUS Status;\r
\r
- Conn = NetAllocatePool (sizeof (ISCSI_CONNECTION));\r
+ Conn = AllocatePool (sizeof (ISCSI_CONNECTION));\r
if (Conn == NULL) {\r
return NULL;\r
}\r
\r
Status = gBS->CreateEvent (\r
EFI_EVENT_TIMER,\r
- NET_TPL_TIMER,\r
+ TPL_CALLBACK,\r
NULL,\r
NULL,\r
&Conn->TimeoutEvent\r
);\r
if (EFI_ERROR (Status)) {\r
- NetFreePool (Conn);\r
+ gBS->FreePool (Conn);\r
return NULL;\r
}\r
\r
Conn->HeaderDigest = ISCSI_DIGEST_NONE;\r
Conn->DataDigest = ISCSI_DIGEST_NONE;\r
\r
- NetCopyMem (&Tcp4IoConfig.LocalIp, &Session->ConfigData.NvData.LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
- NetCopyMem (&Tcp4IoConfig.SubnetMask, &Session->ConfigData.NvData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
- NetCopyMem (&Tcp4IoConfig.Gateway, &Session->ConfigData.NvData.Gateway, sizeof (EFI_IPv4_ADDRESS));\r
- NetCopyMem (&Tcp4IoConfig.RemoteIp, &Session->ConfigData.NvData.TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&Tcp4IoConfig.LocalIp, &Session->ConfigData.NvData.LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&Tcp4IoConfig.SubnetMask, &Session->ConfigData.NvData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&Tcp4IoConfig.Gateway, &Session->ConfigData.NvData.Gateway, sizeof (EFI_IPv4_ADDRESS));\r
+ CopyMem (&Tcp4IoConfig.RemoteIp, &Session->ConfigData.NvData.TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
\r
Tcp4IoConfig.RemotePort = Session->ConfigData.NvData.TargetPort;\r
\r
);\r
if (EFI_ERROR (Status)) {\r
gBS->CloseEvent (Conn->TimeoutEvent);\r
- NetFreePool (Conn);\r
+ gBS->FreePool (Conn);\r
Conn = NULL;\r
}\r
\r
Tcp4IoDestroySocket (&Conn->Tcp4Io);\r
NetbufQueFlush (&Conn->RspQue);\r
gBS->CloseEvent (Conn->TimeoutEvent);\r
- NetFreePool (Conn);\r
+ gBS->FreePool (Conn);\r
}\r
\r
EFI_STATUS\r
//\r
// Add the key.\r
//\r
- NetCopyMem (Data, Key, KeyLen);\r
+ CopyMem (Data, Key, KeyLen);\r
Data += KeyLen;\r
\r
*Data = '=';\r
//\r
// Add the value.\r
//\r
- NetCopyMem (Data, Value, ValueLen);\r
+ CopyMem (Data, Value, ValueLen);\r
Data += ValueLen;\r
\r
*Data = '\0';\r
}\r
\r
LoginReq = (ISCSI_LOGIN_REQUEST *) NetbufAllocSpace (Nbuf, sizeof (ISCSI_LOGIN_REQUEST), NET_BUF_TAIL);\r
- NetZeroMem (LoginReq, sizeof (ISCSI_LOGIN_REQUEST));\r
+ ZeroMem (LoginReq, sizeof (ISCSI_LOGIN_REQUEST));\r
\r
//\r
// Init the login request pdu\r
// with their increasing StatSN values.\r
//\r
LoginReq->ExpStatSN = HTONL (Conn->ExpStatSN);\r
- NetCopyMem (LoginReq->ISID, Session->ISID, sizeof (LoginReq->ISID));\r
+ CopyMem (LoginReq->ISID, Session->ISID, sizeof (LoginReq->ISID));\r
\r
if (Conn->PartialRspRcvd) {\r
//\r
(CurrentStage != Conn->CurrentStage) ||\r
(!Conn->TransitInitiated && Transit) ||\r
(Transit && (NextStage != Conn->NextStage)) ||\r
- (NetCompareMem (Session->ISID, LoginRsp->ISID, sizeof (LoginRsp->ISID)) != 0) ||\r
+ (CompareMem (Session->ISID, LoginRsp->ISID, sizeof (LoginRsp->ISID)) != 0) ||\r
(LoginRsp->InitiatorTaskTag != Session->InitiatorTaskTag)\r
) {\r
//\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *KeyValueList;\r
+ LIST_ENTRY *KeyValueList;\r
CHAR8 *TargetAddress;\r
CHAR8 *IpStr;\r
EFI_STATUS Status;\r
{\r
ASSERT (Arg != NULL);\r
\r
- NetbufFreeList ((NET_LIST_ENTRY *) Arg);\r
- NetFreePool (Arg);\r
+ NetbufFreeList ((LIST_ENTRY *) Arg);\r
+ gBS->FreePool (Arg);\r
}\r
\r
VOID\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *NbufList;\r
+ LIST_ENTRY *NbufList;\r
UINT32 Len;\r
NET_BUF *PduHdr;\r
UINT8 *Header;\r
NET_BUF *DataSeg;\r
UINT32 PadAndCRC32[2];\r
\r
- NbufList = NetAllocatePool (sizeof (NET_LIST_ENTRY));\r
+ NbufList = AllocatePool (sizeof (LIST_ENTRY ));\r
if (NbufList == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- NetListInit (NbufList);\r
+ InitializeListHead (NbufList);\r
\r
//\r
// The header digest will be received together with the PDU header if exists.\r
}\r
\r
Header = NetbufAllocSpace (PduHdr, Len, NET_BUF_TAIL);\r
- NetListInsertTail (NbufList, &PduHdr->List);\r
+ InsertTailList (NbufList, &PduHdr->List);\r
\r
//\r
// First step, receive the BHS of the PDU.\r
goto ON_EXIT;\r
}\r
\r
- NetListInsertTail (NbufList, &DataSeg->List);\r
+ InsertTailList (NbufList, &DataSeg->List);\r
\r
//\r
// Receive the data segment with the data digest if any.\r
--*/\r
{\r
EFI_STATUS Status;\r
- NET_LIST_ENTRY *KeyValueList;\r
+ LIST_ENTRY *KeyValueList;\r
CHAR8 *Data;\r
UINT32 Len;\r
ISCSI_SESSION *Session;\r
Session = Conn->Session;\r
\r
Len = Conn->RspQue.BufSize;\r
- Data = NetAllocatePool (Len);\r
+ Data = AllocatePool (Len);\r
if (Data == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
KeyValueList = IScsiBuildKeyValueList (Data, Len);\r
if (KeyValueList == NULL) {\r
- NetFreePool (Data);\r
+ gBS->FreePool (Data);\r
return Status;\r
}\r
//\r
IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_ALIAS);\r
IScsiGetValueByKeyFromList (KeyValueList, ISCSI_KEY_TARGET_PORTAL_GROUP_TAG);\r
\r
- if (NetListIsEmpty (KeyValueList)) {\r
+ if (IsListEmpty (KeyValueList)) {\r
//\r
// Succeed if no more keys in the list.\r
//\r
\r
IScsiFreeKeyValueList (KeyValueList);\r
\r
- NetFreePool (Data);\r
+ gBS->FreePool (Data);\r
\r
return Status;\r
}\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- NetZeroMem (Data, PadLen);\r
+ ZeroMem (Data, PadLen);\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-NET_LIST_ENTRY *\r
+LIST_ENTRY *\r
IScsiBuildKeyValueList (\r
IN CHAR8 *Data,\r
IN UINT32 Len\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *ListHead;\r
+ LIST_ENTRY *ListHead;\r
ISCSI_KEY_VALUE_PAIR *KeyValuePair;\r
\r
- ListHead = NetAllocatePool (sizeof (NET_LIST_ENTRY));\r
+ ListHead = AllocatePool (sizeof (LIST_ENTRY ));\r
if (ListHead == NULL) {\r
return NULL;\r
}\r
\r
- NetListInit (ListHead);\r
+ InitializeListHead (ListHead);\r
\r
while (Len > 0) {\r
- KeyValuePair = NetAllocatePool (sizeof (ISCSI_KEY_VALUE_PAIR));\r
+ KeyValuePair = AllocatePool (sizeof (ISCSI_KEY_VALUE_PAIR));\r
if (KeyValuePair == NULL) {\r
goto ON_ERROR;\r
}\r
\r
- NetListInit (&KeyValuePair->List);\r
+ InitializeListHead (&KeyValuePair->List);\r
\r
KeyValuePair->Key = Data;\r
\r
Data++;\r
Len--;\r
} else {\r
- NetFreePool (KeyValuePair);\r
+ gBS->FreePool (KeyValuePair);\r
goto ON_ERROR;\r
}\r
\r
KeyValuePair->Value = Data;\r
\r
- NetListInsertTail (ListHead, &KeyValuePair->List);;\r
+ InsertTailList (ListHead, &KeyValuePair->List);;\r
\r
Data += AsciiStrLen (KeyValuePair->Value) + 1;\r
Len -= (UINT32) AsciiStrLen (KeyValuePair->Value) + 1;\r
\r
CHAR8 *\r
IScsiGetValueByKeyFromList (\r
- IN NET_LIST_ENTRY *KeyValueList,\r
+ IN LIST_ENTRY *KeyValueList,\r
IN CHAR8 *Key\r
)\r
/*++\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *Entry;\r
+ LIST_ENTRY *Entry;\r
ISCSI_KEY_VALUE_PAIR *KeyValuePair;\r
CHAR8 *Value;\r
\r
if (AsciiStrCmp (KeyValuePair->Key, Key) == 0) {\r
Value = KeyValuePair->Value;\r
\r
- NetListRemoveEntry (&KeyValuePair->List);\r
- NetFreePool (KeyValuePair);\r
+ RemoveEntryList (&KeyValuePair->List);\r
+ gBS->FreePool (KeyValuePair);\r
break;\r
}\r
}\r
\r
VOID\r
IScsiFreeKeyValueList (\r
- IN NET_LIST_ENTRY *KeyValueList\r
+ IN LIST_ENTRY *KeyValueList\r
)\r
/*++\r
\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *Entry;\r
+ LIST_ENTRY *Entry;\r
ISCSI_KEY_VALUE_PAIR *KeyValuePair;\r
\r
- while (!NetListIsEmpty (KeyValueList)) {\r
+ while (!IsListEmpty (KeyValueList)) {\r
Entry = NetListRemoveHead (KeyValueList);\r
KeyValuePair = NET_LIST_USER_STRUCT (Entry, ISCSI_KEY_VALUE_PAIR, List);\r
\r
- NetFreePool (KeyValuePair);\r
+ gBS->FreePool (KeyValuePair);\r
}\r
\r
- NetFreePool (KeyValueList);\r
+ gBS->FreePool (KeyValueList);\r
}\r
\r
EFI_STATUS\r
}\r
}\r
\r
- if ((Len < 4) || (NetCompareMem (Name, "iqn.", 4) != 0)) {\r
+ if ((Len < 4) || (CompareMem (Name, "iqn.", 4) != 0)) {\r
//\r
// Only IQN format is accepted now.\r
//\r
return EFI_NOT_READY;\r
}\r
\r
- NewTcb = NetAllocateZeroPool (sizeof (ISCSI_TCB));\r
+ NewTcb = AllocateZeroPool (sizeof (ISCSI_TCB));\r
if (NewTcb == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- NetListInit (&NewTcb->Link);\r
+ InitializeListHead (&NewTcb->Link);\r
\r
NewTcb->SoFarInOrder = TRUE;\r
NewTcb->InitiatorTaskTag = Session->InitiatorTaskTag;\r
NewTcb->CmdSN = Session->CmdSN;\r
NewTcb->Conn = Conn;\r
\r
- NetListInsertTail (&Session->TcbList, &NewTcb->Link);\r
+ InsertTailList (&Session->TcbList, &NewTcb->Link);\r
\r
//\r
// Advance the initiator task tag.\r
\r
--*/\r
{\r
- NetListRemoveEntry (&Tcb->Link);\r
+ RemoveEntryList (&Tcb->Link);\r
\r
- NetFreePool (Tcb);\r
+ gBS->FreePool (Tcb);\r
}\r
\r
ISCSI_TCB *\r
IScsiFindTcbByITT (\r
- IN NET_LIST_ENTRY *TcbList,\r
+ IN LIST_ENTRY *TcbList,\r
IN UINT32 InitiatorTaskTag\r
)\r
/*++\r
--*/\r
{\r
ISCSI_TCB *Tcb;\r
- NET_LIST_ENTRY *Entry;\r
+ LIST_ENTRY *Entry;\r
\r
Tcb = NULL;\r
\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *NbufList;\r
+ LIST_ENTRY *NbufList;\r
NET_BUF *Pdu;\r
NET_BUF *PduHeader;\r
NET_BUF *DataSeg;\r
ScsiCmd = (SCSI_COMMAND *) NetbufAllocSpace (PduHeader, Length, NET_BUF_TAIL);\r
Header = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);\r
\r
- NetZeroMem (ScsiCmd, Length);\r
+ ZeroMem (ScsiCmd, Length);\r
\r
ISCSI_SET_OPCODE (ScsiCmd, ISCSI_OPCODE_SCSI_CMD, 0);\r
ISCSI_SET_FLAG (ScsiCmd, ISCSI_TASK_ATTR_SIMPLE);\r
}\r
\r
ScsiCmd->TotalAHSLength = AHSLength;\r
- NetCopyMem (ScsiCmd->Lun, &Lun, sizeof (ScsiCmd->Lun));\r
+ CopyMem (ScsiCmd->Lun, &Lun, sizeof (ScsiCmd->Lun));\r
ScsiCmd->InitiatorTaskTag = NTOHL (Tcb->InitiatorTaskTag);\r
ScsiCmd->CmdSN = NTOHL (Tcb->CmdSN);\r
ScsiCmd->ExpStatSN = NTOHL (Tcb->Conn->ExpStatSN);\r
\r
- NetCopyMem (ScsiCmd->CDB, Packet->Cdb, sizeof (ScsiCmd->CDB));\r
+ CopyMem (ScsiCmd->CDB, Packet->Cdb, sizeof (ScsiCmd->CDB));\r
\r
if (Packet->CdbLength > 16) {\r
Header->Length = NTOHS (Packet->CdbLength - 15);\r
Header->Type = ISCSI_AHS_TYPE_EXT_CDB;\r
\r
- NetCopyMem (Header + 1, (UINT8 *) Packet->Cdb + 16, Packet->CdbLength - 16);\r
+ CopyMem (Header + 1, (UINT8 *) Packet->Cdb + 16, Packet->CdbLength - 16);\r
}\r
\r
Pdu = PduHeader;\r
goto ON_EXIT;\r
}\r
\r
- NbufList = NetAllocatePool (sizeof (NET_LIST_ENTRY));\r
+ NbufList = AllocatePool (sizeof (LIST_ENTRY ));\r
if (NbufList == NULL) {\r
NetbufFree (PduHeader);\r
NetbufFree (DataSeg);\r
goto ON_EXIT;\r
}\r
\r
- NetListInit (NbufList);\r
- NetListInsertTail (NbufList, &PduHeader->List);\r
- NetListInsertTail (NbufList, &DataSeg->List);\r
+ InitializeListHead (NbufList);\r
+ InsertTailList (NbufList, &PduHeader->List);\r
+ InsertTailList (NbufList, &DataSeg->List);\r
\r
Pdu = NetbufFromBufList (NbufList, 0, 0, IScsiFreeNbufList, NbufList);\r
if (Pdu == NULL) {\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *NbufList;\r
+ LIST_ENTRY *NbufList;\r
NET_BUF *PduHdr;\r
NET_BUF *DataSeg;\r
NET_BUF *Pdu;\r
ISCSI_SCSI_DATA_OUT *DataOutHdr;\r
ISCSI_XFER_CONTEXT *XferContext;\r
\r
- NbufList = NetAllocatePool (sizeof (NET_LIST_ENTRY));\r
+ NbufList = AllocatePool (sizeof (LIST_ENTRY ));\r
if (NbufList == NULL) {\r
return NULL;\r
}\r
\r
- NetListInit (NbufList);\r
+ InitializeListHead (NbufList);\r
\r
//\r
// Allocate memory for the BHS.\r
//\r
PduHdr = NetbufAlloc (sizeof (ISCSI_SCSI_DATA_OUT));\r
if (PduHdr == NULL) {\r
- NetFreePool (NbufList);\r
+ gBS->FreePool (NbufList);\r
return NULL;\r
}\r
//\r
// Insert the BHS into the buffer list.\r
//\r
- NetListInsertTail (NbufList, &PduHdr->List);\r
+ InsertTailList (NbufList, &PduHdr->List);\r
\r
DataOutHdr = (ISCSI_SCSI_DATA_OUT *) NetbufAllocSpace (PduHdr, sizeof (ISCSI_SCSI_DATA_OUT), NET_BUF_TAIL);\r
XferContext = &Tcb->XferContext;\r
\r
- NetZeroMem (DataOutHdr, sizeof (ISCSI_SCSI_DATA_OUT));\r
+ ZeroMem (DataOutHdr, sizeof (ISCSI_SCSI_DATA_OUT));\r
\r
//\r
// Set the flags and fields of the Data Out PDU BHS.\r
DataOutHdr->BufferOffset = HTONL (XferContext->Offset);\r
\r
if (XferContext->TargetTransferTag != ISCSI_RESERVED_TAG) {\r
- NetCopyMem (&DataOutHdr->Lun, &Lun, sizeof (DataOutHdr->Lun));\r
+ CopyMem (&DataOutHdr->Lun, &Lun, sizeof (DataOutHdr->Lun));\r
}\r
//\r
// Build the data segment for this Data Out PDU.\r
// Put the data segment into the buffer list and combine it with the BHS\r
// into a full Data Out PDU.\r
//\r
- NetListInsertTail (NbufList, &DataSeg->List);\r
+ InsertTailList (NbufList, &DataSeg->List);\r
Pdu = NetbufFromBufList (NbufList, 0, 0, IScsiFreeNbufList, NbufList);\r
if (Pdu == NULL) {\r
IScsiFreeNbufList (NbufList);\r
return Pdu;\r
}\r
\r
-NET_LIST_ENTRY *\r
+LIST_ENTRY *\r
IScsiGenerateDataOutPduSequence (\r
IN UINT8 *Data,\r
IN ISCSI_TCB *Tcb,\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *PduList;\r
+ LIST_ENTRY *PduList;\r
UINT32 DataSN;\r
UINT32 DataLen;\r
NET_BUF *DataOutPdu;\r
ISCSI_CONNECTION *Conn;\r
ISCSI_XFER_CONTEXT *XferContext;\r
\r
- PduList = NetAllocatePool (sizeof (NET_LIST_ENTRY));\r
+ PduList = AllocatePool (sizeof (LIST_ENTRY ));\r
if (PduList == NULL) {\r
return NULL;\r
}\r
\r
- NetListInit (PduList);\r
+ InitializeListHead (PduList);\r
\r
DataSN = 0;\r
Conn = Tcb->Conn;\r
goto ON_EXIT;\r
}\r
\r
- NetListInsertTail (PduList, &DataOutPdu->List);\r
+ InsertTailList (PduList, &DataOutPdu->List);\r
\r
//\r
// Update the context and DataSN.\r
\r
--*/\r
{\r
- NET_LIST_ENTRY *DataOutPduList;\r
- NET_LIST_ENTRY *Entry;\r
+ LIST_ENTRY *DataOutPduList;\r
+ LIST_ENTRY *Entry;\r
NET_BUF *Pdu;\r
EFI_STATUS Status;\r
\r
\r
Packet->SenseDataLength = (UINT8) MIN (SenseData->Length, Packet->SenseDataLength);\r
if (Packet->SenseDataLength != 0) {\r
- NetCopyMem (Packet->SenseData, &SenseData->Data[0], Packet->SenseDataLength);\r
+ CopyMem (Packet->SenseData, &SenseData->Data[0], Packet->SenseDataLength);\r
}\r
} else {\r
Packet->SenseDataLength = 0;\r
Session->ISID[4] = (UINT8) Random;\r
Session->ISID[5] = (UINT8) (Random >> 8);\r
\r
- NetListInit (&Session->Conns);\r
- NetListInit (&Session->TcbList);\r
+ InitializeListHead (&Session->Conns);\r
+ InitializeListHead (&Session->TcbList);\r
}\r
\r
Session->TSIH = 0;\r
return EFI_SUCCESS;\r
}\r
\r
- ASSERT (!NetListIsEmpty (&Session->Conns));\r
+ ASSERT (!IsListEmpty (&Session->Conns));\r
\r
Private = ISCSI_DRIVER_DATA_FROM_SESSION (Session);\r
\r
- while (!NetListIsEmpty (&Session->Conns)) {\r
+ while (!IsListEmpty (&Session->Conns)) {\r
Conn = NET_LIST_USER_STRUCT_S (\r
Session->Conns.ForwardLink,\r
ISCSI_CONNECTION,\r
projects / mirror_edk2.git / blobdiff