summaryrefslogtreecommitdiff
path: root/MdeModulePkg/Bus/Scsi
diff options
context:
space:
mode:
authorlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2011-09-18 12:21:01 +0000
committerlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2011-09-18 12:21:01 +0000
commitc8ad2d7a296c851c2a91519f80dab479df0fdf46 (patch)
tree7f192e2039479dd1e51ea275568831d68438b12e /MdeModulePkg/Bus/Scsi
parentb36d134faf4305247830522b8e2bb255e98c5699 (diff)
downloadedk2-platforms-c8ad2d7a296c851c2a91519f80dab479df0fdf46.tar.xz
Clean up the private GUID definition in module Level.
0. Remove the unused private GUID from module source files. 1. Use gEfiCallerIdGuid replace of the private module GUID. 2. Add the public header files to define HII FormSet and PackageList GUID used in every HII driver. 3. Move two EBC protocols for debug purpose from EBC driver to MdeModulePkg Include directory. Signed-off-by: lgao4 Reviewed-by: ydong10 gdong1 tye jfan12 wli12 rsun3 jyao1 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12373 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Bus/Scsi')
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c16
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h11
2 files changed, 11 insertions, 16 deletions
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 83c2ca3afe..b1c4d207f9 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -26,14 +26,6 @@ EFI_DRIVER_BINDING_PROTOCOL gSCSIBusDriverBinding = {
NULL
};
-
-//
-// The ScsiBusProtocol is just used to locate ScsiBusDev
-// structure in the SCSIBusDriverBindingStop(). Then we can
-// Close all opened protocols and release this structure.
-//
-EFI_GUID mScsiBusProtocolGuid = EFI_SCSI_BUS_PROTOCOL_GUID;
-
VOID *mWorkingBuffer;
/**
@@ -389,7 +381,7 @@ SCSIBusDriverBindingStart (
//
Status = gBS->InstallProtocolInterface (
&Controller,
- &mScsiBusProtocolGuid,
+ &gEfiCallerIdGuid,
EFI_NATIVE_INTERFACE,
&ScsiBusDev->BusIdentify
);
@@ -403,7 +395,7 @@ SCSIBusDriverBindingStart (
//
Status = gBS->OpenProtocol (
Controller,
- &mScsiBusProtocolGuid,
+ &gEfiCallerIdGuid,
(VOID **) &BusIdentify,
This->DriverBindingHandle,
Controller,
@@ -560,7 +552,7 @@ SCSIBusDriverBindingStop (
//
Status = gBS->OpenProtocol (
Controller,
- &mScsiBusProtocolGuid,
+ &gEfiCallerIdGuid,
(VOID **) &Scsidentifier,
This->DriverBindingHandle,
Controller,
@@ -578,7 +570,7 @@ SCSIBusDriverBindingStop (
//
gBS->UninstallProtocolInterface (
Controller,
- &mScsiBusProtocolGuid,
+ &gEfiCallerIdGuid,
&ScsiBusDev->BusIdentify
);
diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
index a9e5da7def..8f86444a4c 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.h
@@ -75,11 +75,14 @@ typedef struct {
//
// SCSI Bus Controller device strcuture
//
-#define EFI_SCSI_BUS_PROTOCOL_GUID \
- { \
- 0x5261213D, 0x3A3D, 0x441E, {0xB3, 0xAF, 0x21, 0xD3, 0xF7, 0xA4, 0xCA, 0x17} \
- }
+//
+// The ScsiBusProtocol is just used to locate ScsiBusDev
+// structure in the SCSIBusDriverBindingStop(). Then we can
+// Close all opened protocols and release this structure.
+// ScsiBusProtocol is the private protocol.
+// gEfiCallerIdGuid will be used as its protocol guid.
+//
typedef struct _EFI_SCSI_BUS_PROTOCOL {
UINT64 Reserved;
} EFI_SCSI_BUS_PROTOCOL;