diff options
| -rw-r--r-- | EdkUnixPkg/Sec/SecMain.c | 8 | ||||
| -rw-r--r-- | EdkUnixPkg/Sec/UgaX11.c | 7 | ||||
| -rw-r--r-- | EdkUnixPkg/Unix.fpd | 42 |
3 files changed, 17 insertions, 40 deletions
diff --git a/EdkUnixPkg/Sec/SecMain.c b/EdkUnixPkg/Sec/SecMain.c index b1394a2c02..72fad08e64 100644 --- a/EdkUnixPkg/Sec/SecMain.c +++ b/EdkUnixPkg/Sec/SecMain.c @@ -313,10 +313,10 @@ MapMemory ( INTN prot, INTN flags) { - STATIC UINTN base = 0x40000000; - CONST UINTN align = (1 << 24); - VOID *res; - BOOLEAN isAligned = 0; + STATIC UINTN base = 0x40000000; + CONST UINTN align = (1 << 24); + VOID *res = NULL; + BOOLEAN isAligned = 0; // // Try to get an aligned block somewhere in the address space of this diff --git a/EdkUnixPkg/Sec/UgaX11.c b/EdkUnixPkg/Sec/UgaX11.c index 5fbdeae1e2..b5719cfd59 100644 --- a/EdkUnixPkg/Sec/UgaX11.c +++ b/EdkUnixPkg/Sec/UgaX11.c @@ -113,8 +113,8 @@ TryCreateShmImage(UGA_IO_PRIVATE *drv) /* Can this fail ? */ shmctl (drv->xshm_info.shmid, IPC_RMID, NULL); - drv->xshm_info.shmaddr = drv->image_data; - drv->image->data = drv->image_data; + drv->xshm_info.shmaddr = (char*)drv->image_data; + drv->image->data = (char*)drv->image_data; if (!XShmAttach (drv->display, &drv->xshm_info)) { @@ -189,7 +189,7 @@ UgaSize(EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, UINT32 Width, UINT32 Height) drv->image_data = malloc((drv->width * drv->height) << drv->pixel_shift); drv->image = XCreateImage (drv->display, drv->visual, drv->depth, - ZPixmap, 0, drv->image_data, + ZPixmap, 0, (char *)drv->image_data, drv->width, drv->height, 8 << drv->pixel_shift, 0); } @@ -328,6 +328,7 @@ UgaColorToPixel (UGA_IO_PRIVATE *drv, unsigned long val) { EFI_UGA_PIXEL res; + memset (&res, 0, sizeof (EFI_UGA_PIXEL)); /* FIXME: should round instead of truncate. */ res.Red = (val >> drv->r.shift) << drv->r.csize; res.Green = (val >> drv->g.shift) << drv->g.csize; diff --git a/EdkUnixPkg/Unix.fpd b/EdkUnixPkg/Unix.fpd index ece893e63a..f3bffcd9d3 100644 --- a/EdkUnixPkg/Unix.fpd +++ b/EdkUnixPkg/Unix.fpd @@ -578,14 +578,6 @@ <MaxDatumSize>4</MaxDatumSize> <Value>200000000</Value> </PcdData> - <PcdData ItemType="FIXED_AT_BUILD"> - <C_Name>PcdIoBlockBaseAddressForIpf</C_Name> - <Token>0x0000000c</Token> - <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName> - <DatumType>UINT64</DatumType> - <MaxDatumSize>8</MaxDatumSize> - <Value>0x0ffffc000000</Value> - </PcdData> <PcdData ItemType="FEATURE_FLAG"> <C_Name>PcdUnixStatusCodeLibUseForPei</C_Name> <Token>0x0000100b</Token> @@ -2585,14 +2577,6 @@ <MaxDatumSize>4</MaxDatumSize> <Value>200000000</Value> </PcdData> - <PcdData ItemType="FIXED_AT_BUILD"> - <C_Name>PcdIoBlockBaseAddressForIpf</C_Name> - <Token>0x0000000c</Token> - <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName> - <DatumType>UINT64</DatumType> - <MaxDatumSize>8</MaxDatumSize> - <Value>0x0ffffc000000</Value> - </PcdData> <PcdData ItemType="FEATURE_FLAG"> <C_Name>PcdUnixStatusCodeLibUseForPei</C_Name> <Token>0x0000100b</Token> @@ -3196,14 +3180,6 @@ <MaxDatumSize>1</MaxDatumSize> <Value>FALSE</Value> </PcdData> - <PcdData ItemType="FEATURE_FLAG"> - <C_Name>PcdPciBusHotplugDeviceSupport</C_Name> - <Token>0x0001003d</Token> - <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName> - <DatumType>BOOLEAN</DatumType> - <MaxDatumSize>1</MaxDatumSize> - <Value>TRUE</Value> - </PcdData> </PcdBuildDefinition> <ModuleSaBuildOptions> <FvBinding>NULL</FvBinding> @@ -4523,14 +4499,14 @@ <MaxDatumSize>1</MaxDatumSize> <Value>FALSE</Value> </PcdData> - <PcdData ItemType="FEATURE_FLAG">
- <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>
- <Token>0x0001003d</Token>
- <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
- <DatumType>BOOLEAN</DatumType>
- <MaxDatumSize>1</MaxDatumSize>
- <Value>TRUE</Value>
- </PcdData>
+ <PcdData ItemType="FEATURE_FLAG"> + <C_Name>PcdPciBusHotplugDeviceSupport</C_Name> + <Token>0x0001003d</Token> + <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName> + <DatumType>BOOLEAN</DatumType> + <MaxDatumSize>1</MaxDatumSize> + <Value>TRUE</Value> + </PcdData> </PcdBuildDefinition> <ModuleSaBuildOptions> <FvBinding>FV_RECOVERY</FvBinding> @@ -7803,4 +7779,4 @@ cd ${SecMainPath} ./SecMain.exe</echo> </UserExtensions> -</PlatformSurfaceArea> +</PlatformSurfaceArea>
\ No newline at end of file |