tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 15:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg: Improve code style/formatting in BhyveFwCtlLib.c

Browse Source 
The code style in Library/BhyveFwCtlLib/BhyveFwCtlLib.c was very
inconsistent. Fix it to pass the ECC tool checks by typedef'ing
structs, and improve indentation.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Message-Id: <20201130053412.2-3-rebecca@bsdio.com>
Acked-by: Peter Grehan <grehan@freebsd.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Build-tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Rebecca Cran 2020-11-29 22:34:09 -07:00 committed by mergify[bot]
parent 666923359e
commit f2d262e402
1 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
OvmfPkg/Library/BhyveFwCtlLib/BhyveFwCtlLib.c
View File

@ -12,9 +12,9 @@
#include "Uefi.h" #include "Uefi.h"
#include <Library/BaseLib.h> #include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/BhyveFwCtlLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/IoLib.h> #include <Library/IoLib.h>
#include <Library/BhyveFwCtlLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/UefiBootServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>
@ -43,17 +43,17 @@ STATIC BOOLEAN mBhyveFwCtlSupported = FALSE;
STATIC INT32 mBhyveFwCtlTxid = 0xa5; STATIC INT32 mBhyveFwCtlTxid = 0xa5;
/* XXX Maybe a better inbuilt version of this ? */ /* XXX Maybe a better inbuilt version of this ? */
struct BIoVec { typedef struct {
VOID *Base; VOID *Base;
UINT32 Len; UINT32 Len;
}; } BIO_VEC;
struct MsgRxHdr { typedef struct {
UINT32 Sz; UINT32 Sz;
UINT32 Op; UINT32 Op;
UINT32 TxId; UINT32 TxId;
UINT32 Err; UINT32 Err;
}; } MSG_RX_HDR;
STATIC STATIC
RETURN_STATUS RETURN_STATUS
@ -89,7 +89,7 @@ STATIC
UINT32 UINT32
EFIAPI EFIAPI
BIov_WLen ( BIov_WLen (
IN struct BIoVec b[] IN BIO_VEC b[]
) )
{ {
UINT32 i; UINT32 i;
@ -163,7 +163,7 @@ BIov_Send (
STATIC STATIC
VOID VOID
BIov_SendAll ( BIov_SendAll (
IN struct BIoVec b[] IN BIO_VEC b[]
) )
{ {
INT32 i; INT32 i;
@ -183,10 +183,10 @@ VOID
EFIAPI EFIAPI
BhyveFwCtl_MsgSend( BhyveFwCtl_MsgSend(
IN UINT32 OpCode, IN UINT32 OpCode,
IN struct BIoVec Data[] IN BIO_VEC Data[]
) )
{ {
struct BIoVec hIov[4]; BIO_VEC hIov[4];
UINT32 Hdr[3]; UINT32 Hdr[3];
UINT32 i; UINT32 i;
@ -215,18 +215,19 @@ STATIC
RETURN_STATUS RETURN_STATUS
EFIAPI EFIAPI
BhyveFwCtl_MsgRecv( BhyveFwCtl_MsgRecv(
OUT struct MsgRxHdr *Rhdr, OUT MSG_RX_HDR *Rhdr,
OUT struct BIoVec Data[] OUT BIO_VEC Data[]
) )
{ {
RETURN_STATUS Status; RETURN_STATUS Status;
UINT32 *Dp; UINT32 *Dp;
UINT32 Rd; UINT32 Rd;
UINT32 remLen; UINT32 remLen;
INT32 oLen, xLen; INT32 oLen;
INT32 xLen;
Rd = IoRead32 (FW_PORT); Rd = IoRead32 (FW_PORT);
if (Rd < sizeof(struct MsgRxHdr)) { if (Rd < sizeof (MSG_RX_HDR)) {
; ;
} }
@ -237,9 +238,9 @@ BhyveFwCtl_MsgRecv(
Rhdr->Err = IoRead32 (FW_PORT); Rhdr->Err = IoRead32 (FW_PORT);
/* Convert transport errno into UEFI error status */ /* Convert transport errno into UEFI error status */
Status = BhyveFwCtl_CvtErr(Rhdr->Err); Status = BhyveFwCtl_CvtErr (Rhdr->Err);
remLen = Rd - sizeof(struct MsgRxHdr); remLen = Rd - sizeof (MSG_RX_HDR);
xLen = 0; xLen = 0;
/* /*
@ -258,7 +259,7 @@ BhyveFwCtl_MsgRecv(
} }
while (remLen > 0) { while (remLen > 0) {
*Dp++ = IoRead32 (FW_PORT); *Dp++ = IoRead32 (FW_PORT);
remLen -= sizeof(UINT32); remLen -= sizeof (UINT32);
} }
Data[0].Len = oLen; Data[0].Len = oLen;
} else { } else {
@ -272,7 +273,7 @@ BhyveFwCtl_MsgRecv(
/* Drop additional data */ /* Drop additional data */
while (xLen > 0) { while (xLen > 0) {
(void) IoRead32 (FW_PORT); (void) IoRead32 (FW_PORT);
xLen -= sizeof(UINT32); xLen -= sizeof (UINT32);
} }
return Status; return Status;
@ -284,11 +285,11 @@ RETURN_STATUS
EFIAPI EFIAPI
BhyveFwCtl_Msg( BhyveFwCtl_Msg(
IN UINT32 OpCode, IN UINT32 OpCode,
IN struct BIoVec Sdata[], IN BIO_VEC Sdata[],
OUT struct BIoVec Rdata[] OUT BIO_VEC Rdata[]
) )
{ {
struct MsgRxHdr Rh; MSG_RX_HDR Rh;
RETURN_STATUS Status; RETURN_STATUS Status;
Status = RETURN_SUCCESS; Status = RETURN_SUCCESS;
@ -309,7 +310,7 @@ BhyveFwCtlGetLen (
IN OUT UINT32 *Size IN OUT UINT32 *Size
) )
{ {
struct BIoVec Req[2], Resp[2]; BIO_VEC Req[2], Resp[2];
RETURN_STATUS Status; RETURN_STATUS Status;
Req[0].Base = (VOID *)Name; Req[0].Base = (VOID *)Name;
@ -317,7 +318,7 @@ BhyveFwCtlGetLen (
Req[1].Base = NULL; Req[1].Base = NULL;
Resp[0].Base = Size; Resp[0].Base = Size;
Resp[0].Len = sizeof(UINT32); Resp[0].Len = sizeof (UINT32);
Resp[1].Base = NULL; Resp[1].Base = NULL;
Status = BhyveFwCtl_Msg (OP_GET_LEN, Req, Resp); Status = BhyveFwCtl_Msg (OP_GET_LEN, Req, Resp);
@ -340,19 +341,20 @@ BhyveFwCtlGetVal (
IN OUT UINT32 *Size IN OUT UINT32 *Size
) )
{ {
struct BIoVec Req[2], Resp[2]; BIO_VEC Req[2];
BIO_VEC Resp[2];
RETURN_STATUS Status; RETURN_STATUS Status;
/* Make sure temp buffer is larger than passed-in size */ /* Make sure temp buffer is larger than passed-in size */
if (*Size > sizeof(FwGetvalBuf.fData)) if (*Size > sizeof (FwGetvalBuf.fData))
return RETURN_INVALID_PARAMETER; return RETURN_INVALID_PARAMETER;
Req[0].Base = (VOID *)Name; Req[0].Base = (VOID *)Name;
Req[0].Len = (UINT32)AsciiStrLen(Name) + 1; Req[0].Len = (UINT32)AsciiStrLen (Name) + 1;
Req[1].Base = NULL; Req[1].Base = NULL;
Resp[0].Base = &FwGetvalBuf; Resp[0].Base = &FwGetvalBuf;
Resp[0].Len = sizeof(UINT64) + *Size; Resp[0].Len = sizeof (UINT64) + *Size;
Resp[1].Base = NULL; Resp[1].Base = NULL;
Status = BhyveFwCtl_Msg (OP_GET, Req, Resp); Status = BhyveFwCtl_Msg (OP_GET, Req, Resp);