OvmfPkg/Virtio: Removed VirtioReadDevice() / VirtIoWriteDevice() functions

These functions did not provide much more than the new protocol functions
VIRTIO_DEVICE_PROTOCOL.ReadDevice() / VIRTIO_DEVICE_PROTOCOL.WriteDevice().

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14968 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Include/Library/VirtioLib.h b/OvmfPkg/Include/Library/VirtioLib.h
index 8c043369c3642b62091aa133254297183daf22b9..36527a523f28814b4e0ce0c0b5f53f12ca7da3d9 100644 (file)
--- a/OvmfPkg/Include/Library/VirtioLib.h
+++ b/OvmfPkg/Include/Library/VirtioLib.h
@@ -21,70 +21,6 @@
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
-/**\r
-\r
-  Write a word into VirtIo Device Specific Region\r
-\r
-  The VirtIo Device Specific Region must be an iomem region.\r
-  This is an internal function for the driver-specific VIRTIO_CFG_WRITE()\r
-  macros.\r
-\r
-  @param[in] VirtIo       Target Virtio device.\r
-\r
-  @param[in] FieldOffset  Destination offset.\r
-\r
-  @param[in] FieldSize    Destination field size, must be in { 1, 2, 4, 8 }.\r
-\r
-  @param[in] Value        Little endian value to write, converted to UINT64.\r
-                          The least significant FieldSize bytes will be used.\r
-\r
-\r
-  @return  Status code returned by VirtIo->WriteDevice().\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-VirtioWriteDevice (\r
-  IN VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN UINTN                  FieldOffset,\r
-  IN UINTN                  FieldSize,\r
-  IN UINT64                 Value\r
-  );\r
-\r
-\r
-/**\r
-\r
-  Read a word from VirtIo Device Specific Region\r
-\r
-  The VirtIo Device Specific Region must be an iomem region.\r
-  This is an internal function for the driver-specific VIRTIO_CFG_READ()\r
-  macros.\r
-\r
-  @param[in] VirtIo       Source Virtio device.\r
-\r
-  @param[in] FieldOffset  Source offset.\r
-\r
-  @param[in] FieldSize    Source field size, must be in { 1, 2, 4, 8 }.\r
-\r
-  @param[in] BufferSize   Number of bytes available in the target buffer. Must\r
-                          equal FieldSize.\r
-\r
-  @param[out] Buffer      Target buffer.\r
-\r
-\r
-  @return  Status code returned by VirtIo->ReadDevice().\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-VirtioReadDevice (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN  UINTN                  FieldOffset,\r
-  IN  UINTN                  FieldSize,\r
-  IN  UINTN                  BufferSize,\r
-  OUT VOID                   *Buffer\r
-  );\r
-\r
 \r
 /**\r
 \r

diff --git a/OvmfPkg/Library/VirtioLib/VirtioLib.c b/OvmfPkg/Library/VirtioLib/VirtioLib.c
index 503d4adffc8c24722d0b123baded1f43f9960568..54cf225c9885d666944f14718f67fa127e2927f4 100644 (file)
--- a/OvmfPkg/Library/VirtioLib/VirtioLib.c
+++ b/OvmfPkg/Library/VirtioLib/VirtioLib.c
@@ -24,75 +24,6 @@
 #include <Library/VirtioLib.h>\r
 \r
 \r
-/**\r
-\r
-  Write a word into Region 0 of the device specified by VirtIo.\r
-\r
-  Region 0 must be an iomem region. This is an internal function for the\r
-  driver-specific VIRTIO_CFG_WRITE() macros.\r
-\r
-  @param[in] VirtIo       Target VirtIo device.\r
-\r
-  @param[in] FieldOffset  Destination offset.\r
-\r
-  @param[in] FieldSize    Destination field size, must be in { 1, 2, 4, 8 }.\r
-\r
-  @param[in] Value        Little endian value to write, converted to UINT64.\r
-                          The least significant FieldSize bytes will be used.\r
-\r
-\r
-  @return  Status code returned by VirtIo->Io.Write().\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-VirtioWriteDevice (\r
-  IN VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN UINTN                  FieldOffset,\r
-  IN UINTN                  FieldSize,\r
-  IN UINT64                 Value\r
-  )\r
-{\r
-  return VirtIo->WriteDevice (VirtIo, FieldOffset, FieldSize, Value);\r
-}\r
-\r
-\r
-/**\r
-\r
-  Read a word from Region 0 of the device specified by VirtIo.\r
-\r
-  Region 0 must be an iomem region. This is an internal function for the\r
-  driver-specific VIRTIO_CFG_READ() macros.\r
-\r
-  @param[in] VirtIo       Source VirtIo device.\r
-\r
-  @param[in] FieldOffset  Source offset.\r
-\r
-  @param[in] FieldSize    Source field size, must be in { 1, 2, 4, 8 }.\r
-\r
-  @param[in] BufferSize   Number of bytes available in the target buffer. Must\r
-                          equal FieldSize.\r
-\r
-  @param[out] Buffer      Target buffer.\r
-\r
-\r
-  @return  Status code returned by VirtIo->Io.Read().\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-VirtioReadDevice (\r
-  IN  VIRTIO_DEVICE_PROTOCOL *VirtIo,\r
-  IN  UINTN                  FieldOffset,\r
-  IN  UINTN                  FieldSize,\r
-  IN  UINTN                  BufferSize,\r
-  OUT VOID                   *Buffer\r
-  )\r
-{\r
-  return VirtIo->ReadDevice (VirtIo, FieldOffset, FieldSize, BufferSize, Buffer);\r
-}\r
-\r
-\r
 /**\r
 \r
   Configure a virtio ring.\r

diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
index f09b0d1118dca684454eec61f026fd549494b011..55283cb3ba66b866a0cdd7c0517a83b81841ce7d 100644 (file)
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
@@ -56,23 +56,23 @@
                        one of UINT8, UINT16, UINT32, UINT64.\r
 \r
 \r
-  @return  Status code returned by VirtioWriteDevice() / VirtioReadDevice().\r
+  @return  Status code returned by Virtio->WriteDevice() / Virtio->ReadDevice().\r
 \r
 **/\r
 \r
-#define VIRTIO_CFG_WRITE(Dev, Field, Value)  (VirtioWriteDevice (       \\r
-                                                (Dev)->VirtIo,          \\r
-                                                OFFSET_OF_VBLK (Field), \\r
-                                                SIZE_OF_VBLK (Field),   \\r
-                                                (Value)                 \\r
+#define VIRTIO_CFG_WRITE(Dev, Field, Value)  ((Dev)->VirtIo->WriteDevice ( \\r
+                                                (Dev)->VirtIo,             \\r
+                                                OFFSET_OF_VBLK (Field),    \\r
+                                                SIZE_OF_VBLK (Field),      \\r
+                                                (Value)                    \\r
                                                 ))\r
 \r
-#define VIRTIO_CFG_READ(Dev, Field, Pointer) (VirtioReadDevice (        \\r
-                                                (Dev)->VirtIo,          \\r
-                                                OFFSET_OF_VBLK (Field), \\r
-                                                SIZE_OF_VBLK (Field),   \\r
-                                                sizeof *(Pointer),      \\r
-                                                (Pointer)               \\r
+#define VIRTIO_CFG_READ(Dev, Field, Pointer) ((Dev)->VirtIo->ReadDevice (  \\r
+                                                (Dev)->VirtIo,             \\r
+                                                OFFSET_OF_VBLK (Field),    \\r
+                                                SIZE_OF_VBLK (Field),      \\r
+                                                sizeof *(Pointer),         \\r
+                                                (Pointer)                  \\r
                                                 ))\r
 \r
 \r

diff --git a/OvmfPkg/VirtioNetDxe/VirtioNet.h b/OvmfPkg/VirtioNetDxe/VirtioNet.h
index 31fca79b8485bed9e3eb7d821c66a15782642a56..2d3f3d87eb1121639ac1a2291d2ef54ac9ecdd35 100644 (file)
--- a/OvmfPkg/VirtioNetDxe/VirtioNet.h
+++ b/OvmfPkg/VirtioNetDxe/VirtioNet.h
@@ -107,19 +107,19 @@ typedef struct {
 #define VIRTIO_NET_FROM_SNP(SnpPointer) \\r
         CR (SnpPointer, VNET_DEV, Snp, VNET_SIG)\r
 \r
-#define VIRTIO_CFG_WRITE(Dev, Field, Value)  (VirtioWriteDevice (       \\r
-                                                (Dev)->VirtIo,          \\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) (VirtioReadDevice (        \\r
-                                                (Dev)->VirtIo,          \\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

diff --git a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
index 2223c9c33e8ec774bb7ac22d0ee60571afc29dd4..0bcceecab113ae38b31eeadd50ef7c0071c3843f 100644 (file)
--- a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
+++ b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
@@ -70,23 +70,23 @@
                        one of UINT8, UINT16, UINT32, UINT64.\r
 \r
 \r
-  @return  Status codes returned by VirtioWriteDevice() / VirtioReadDevice().\r
+  @return  Status codes returned by Virtio->WriteDevice() / Virtio->ReadDevice().\r
 \r
 **/\r
 \r
-#define VIRTIO_CFG_WRITE(Dev, Field, Value)  (VirtioWriteDevice (        \\r
-                                                (Dev)->VirtIo,           \\r
-                                                OFFSET_OF_VSCSI (Field), \\r
-                                                SIZE_OF_VSCSI (Field),   \\r
-                                                (Value)                  \\r
+#define VIRTIO_CFG_WRITE(Dev, Field, Value)  ((Dev)->VirtIo->WriteDevice (  \\r
+                                                (Dev)->VirtIo,              \\r
+                                                OFFSET_OF_VSCSI (Field),    \\r
+                                                SIZE_OF_VSCSI (Field),      \\r
+                                                (Value)                     \\r
                                                 ))\r
 \r
-#define VIRTIO_CFG_READ(Dev, Field, Pointer) (VirtioReadDevice (         \\r
-                                                (Dev)->VirtIo,           \\r
-                                                OFFSET_OF_VSCSI (Field), \\r
-                                                SIZE_OF_VSCSI (Field),   \\r
-                                                sizeof *(Pointer),       \\r
-                                                (Pointer)                \\r
+#define VIRTIO_CFG_READ(Dev, Field, Pointer) ((Dev)->VirtIo->ReadDevice (   \\r
+                                                (Dev)->VirtIo,              \\r
+                                                OFFSET_OF_VSCSI (Field),    \\r
+                                                SIZE_OF_VSCSI (Field),      \\r
+                                                sizeof *(Pointer),          \\r
+                                                (Pointer)                   \\r
                                                 ))\r
 \r
 \r