Modified to meet EBC compile.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3285 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff 2007-07-17 05:32:47 +00:00
parent d91e00998d
commit ae5852b2ef
2 changed files with 61 additions and 78 deletions

View File

@ -119,35 +119,25 @@ FddIdentify (
// Check Media // Check Media
// //
Status = DisketChanged (FdcDev); Status = DisketChanged (FdcDev);
switch (Status) {
case EFI_NO_MEDIA: if (Status == EFI_NO_MEDIA) {
FdcDev->BlkIo.Media->MediaPresent = FALSE; FdcDev->BlkIo.Media->MediaPresent = FALSE;
break; } else if (Status != EFI_MEDIA_CHANGED) {
case EFI_MEDIA_CHANGED:
case EFI_SUCCESS:
break;
default:
MotorOff (FdcDev); MotorOff (FdcDev);
return Status; return Status;
} }
// //
// Check Disk Write Protected // Check Disk Write Protected
// //
Status = SenseDrvStatus (FdcDev, 0); Status = SenseDrvStatus (FdcDev, 0);
switch (Status) {
case EFI_WRITE_PROTECTED: if (Status == EFI_WRITE_PROTECTED) {
FdcDev->BlkIo.Media->ReadOnly = TRUE; FdcDev->BlkIo.Media->ReadOnly = TRUE;
break; } else if (Status == EFI_SUCCESS) {
case EFI_SUCCESS:
FdcDev->BlkIo.Media->ReadOnly = FALSE; FdcDev->BlkIo.Media->ReadOnly = FALSE;
break; } else {
default:
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
break;
} }
MotorOff (FdcDev); MotorOff (FdcDev);
@ -807,21 +797,14 @@ DetectMedia (
// Check disk change // Check disk change
// //
Status = DisketChanged (FdcDev); Status = DisketChanged (FdcDev);
switch (Status) {
case EFI_MEDIA_CHANGED: if (Status == EFI_MEDIA_CHANGED) {
FdcDev->BlkIo.Media->MediaId++; FdcDev->BlkIo.Media->MediaId++;
FdcDev->BlkIo.Media->MediaPresent = TRUE; FdcDev->BlkIo.Media->MediaPresent = TRUE;
bReset = TRUE; bReset = TRUE;
break; } else if (Status == EFI_NO_MEDIA) {
case EFI_NO_MEDIA:
FdcDev->BlkIo.Media->MediaPresent = FALSE; FdcDev->BlkIo.Media->MediaPresent = FALSE;
break; } else if (Status != EFI_SUCCESS) {
case EFI_SUCCESS:
break;
default:
MotorOff (FdcDev); MotorOff (FdcDev);
return Status; return Status;
// //

View File

@ -190,7 +190,7 @@ PciVgaMiniPortDriverBindingStart (
Status = gBS->AllocatePool ( Status = gBS->AllocatePool (
EfiBootServicesData, EfiBootServicesData,
sizeof (PCI_VGA_MINI_PORT_DEV), sizeof (PCI_VGA_MINI_PORT_DEV),
&PciVgaMiniPortPrivate (VOID **) &PciVgaMiniPortPrivate
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
goto Done; goto Done;