#include <Protocol/ComponentName2.h>\r
#include <Protocol/DevicePath.h>\r
#include <Protocol/DriverBinding.h>\r
-#include <Protocol/PciIo.h>\r
#include <Protocol/SimpleNetwork.h>\r
\r
#define VNET_SIG SIGNATURE_32 ('V', 'N', 'E', 'T')\r
// field init function\r
// ------------------ ------------------------------\r
UINT32 Signature; // VirtioNetDriverBindingStart\r
- EFI_PCI_IO_PROTOCOL *PciIo; // VirtioNetDriverBindingStart\r
- UINT64 OrigPciAttributes; // VirtioNetDriverBindingStart\r
+ VIRTIO_DEVICE_PROTOCOL *VirtIo; // VirtioNetDriverBindingStart\r
EFI_SIMPLE_NETWORK_PROTOCOL Snp; // VirtioNetSnpPopulate\r
EFI_SIMPLE_NETWORK_MODE Snm; // VirtioNetSnpPopulate\r
EFI_EVENT ExitBoot; // VirtioNetSnpPopulate\r
UINT16 TxMaxPending; // VirtioNetInitTx\r
UINT16 TxCurPending; // VirtioNetInitTx\r
UINT16 *TxFreeStack; // VirtioNetInitTx\r
- VIRTIO_NET_REQ TxSharedReq; // VirtioNetInitTx\r
+ VIRTIO_1_0_NET_REQ TxSharedReq; // VirtioNetInitTx\r
UINT16 TxLastUsed; // VirtioNetInitTx\r
} VNET_DEV;\r
\r
#define VIRTIO_NET_FROM_SNP(SnpPointer) \\r
CR (SnpPointer, VNET_DEV, Snp, VNET_SIG)\r
\r
-#define VIRTIO_CFG_WRITE(Dev, Field, Value) (VirtioWrite ( \\r
- (Dev)->PciIo, \\r
- OFFSET_OF_VNET (Field), \\r
- SIZE_OF_VNET (Field), \\r
- (Value) \\r
+#define VIRTIO_CFG_WRITE(Dev, Field, Value) ((Dev)->VirtIo->WriteDevice ( \\r
+ (Dev)->VirtIo, \\r
+ OFFSET_OF_VNET (Field), \\r
+ SIZE_OF_VNET (Field), \\r
+ (Value) \\r
))\r
\r
-#define VIRTIO_CFG_READ(Dev, Field, Pointer) (VirtioRead ( \\r
- (Dev)->PciIo, \\r
- OFFSET_OF_VNET (Field), \\r
- SIZE_OF_VNET (Field), \\r
- sizeof *(Pointer), \\r
- (Pointer) \\r
+#define VIRTIO_CFG_READ(Dev, Field, Pointer) ((Dev)->VirtIo->ReadDevice ( \\r
+ (Dev)->VirtIo, \\r
+ OFFSET_OF_VNET (Field), \\r
+ SIZE_OF_VNET (Field), \\r
+ sizeof *(Pointer), \\r
+ (Pointer) \\r
))\r
\r
//\r