Move the share file: cbi.h to Cbi0 and Cbi1 directory.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@962 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c
index 5bd8728fcf5d11af9024c418fabbb4135e9a29c3..afd4d623c3de981772e4be7fc2d34c6c167faf64 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c
@@ -17,7 +17,7 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include "../cbi.h"\r
+#include "cbi.h"\r

 \r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi0ComponentName;\r
 //\r
 \r
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi0ComponentName;\r
 //\r

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
index 22e7aa985d8881b2ff918b3be325f8011f4d8531..e698bcb844cabfd7595c56e916b3179d4838c23e 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
@@ -62,6 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r

+    <Filename>Cbi.h</Filename>\r

     <Filename>Cbi0.c</Filename>\r
     <Filename>ComponentName.c</Filename>\r
   </SourceFiles>\r
     <Filename>Cbi0.c</Filename>\r
     <Filename>ComponentName.c</Filename>\r
   </SourceFiles>\r

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/cbi.h b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/cbi.h
new file mode 100644 (file)
index 0000000..e2a7c9d
--- /dev/null
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/cbi.h
@@ -0,0 +1,70 @@
+/*++\r
+\r
+Copyright (c) 2006, Intel Corporation                                                         \r
+All rights reserved. This program and the accompanying materials                          \r
+are licensed and made available under the terms and conditions of the BSD License         \r
+which accompanies this distribution.  The full text of the license may be found at        \r
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Module Name:\r
+\r
+    cbi.h\r
+\r
+Abstract:\r
+\r
+    USB CBI transportation protocol definitions.\r
+--*/\r
+\r
+#ifndef _CBI_H\r
+#define _CBI_H\r
+\r
+\r
+#include <IndustryStandard/Usb.h>\r
+\r
+#define bit(a)                  (1 << (a))\r
+\r
+#define MASS_STORAGE_CLASS      0x08\r
+#define CBI0_INTERFACE_PROTOCOL 0x00\r
+#define CBI1_INTERFACE_PROTOCOL 0x01\r
+\r
+//\r
+// in millisecond unit\r
+//\r
+#define STALL_1_SECOND          1000  \r
+\r
+#pragma pack(1)\r
+//\r
+// Data block definition for transportation through interrupt endpoint\r
+//\r
+typedef struct {\r
+  UINT8 bType;\r
+  UINT8 bValue;\r
+} INTERRUPT_DATA_BLOCK;\r
+\r
+#pragma pack()\r
+\r
+#define USB_CBI_DEVICE_SIGNATURE  EFI_SIGNATURE_32 ('u', 'c', 'b', 'i')\r
+\r
+//\r
+// Device structure for CBI, interrupt endpoint may be not used in\r
+// CBI1 Protocol\r
+//\r
+typedef struct {\r
+  UINT32                        Signature;\r
+  EFI_DEVICE_PATH_PROTOCOL      *DevicePath;\r
+  EFI_USB_ATAPI_PROTOCOL        UsbAtapiProtocol;\r
+  EFI_USB_IO_PROTOCOL           *UsbIo;\r
+  EFI_USB_INTERFACE_DESCRIPTOR  InterfaceDescriptor;\r
+  EFI_USB_ENDPOINT_DESCRIPTOR   BulkInEndpointDescriptor;\r
+  EFI_USB_ENDPOINT_DESCRIPTOR   BulkOutEndpointDescriptor;\r
+  EFI_USB_ENDPOINT_DESCRIPTOR   InterruptEndpointDescriptor;\r
+  EFI_UNICODE_STRING_TABLE      *ControllerNameTable;\r
+} USB_CBI_DEVICE;\r
+\r
+#define USB_CBI_DEVICE_FROM_THIS(a) \\r
+    CR(a, USB_CBI_DEVICE, UsbAtapiProtocol, USB_CBI_DEVICE_SIGNATURE)\r
+\r
+#endif\r

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.msa b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.msa
index 4379bc787b8c2715f4be9a507490f544118034bf..d300a4379dc744994dceb1ca8a04c9ce79b2204a 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.msa
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.msa
@@ -62,6 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r

+    <Filename>cbi.h</Filename>\r

     <Filename>cbi1.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Filename>cbi1.c</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h
new file mode 100644 (file)
index 0000000..e2a7c9d
--- /dev/null
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h
@@ -0,0 +1,70 @@
+/*++\r
+\r
+Copyright (c) 2006, Intel Corporation                                                         \r
+All rights reserved. This program and the accompanying materials                          \r
+are licensed and made available under the terms and conditions of the BSD License         \r
+which accompanies this distribution.  The full text of the license may be found at        \r
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Module Name:\r
+\r
+    cbi.h\r
+\r
+Abstract:\r
+\r
+    USB CBI transportation protocol definitions.\r
+--*/\r
+\r
+#ifndef _CBI_H\r
+#define _CBI_H\r
+\r
+\r
+#include <IndustryStandard/Usb.h>\r
+\r
+#define bit(a)                  (1 << (a))\r
+\r
+#define MASS_STORAGE_CLASS      0x08\r
+#define CBI0_INTERFACE_PROTOCOL 0x00\r
+#define CBI1_INTERFACE_PROTOCOL 0x01\r
+\r
+//\r
+// in millisecond unit\r
+//\r
+#define STALL_1_SECOND          1000  \r
+\r
+#pragma pack(1)\r
+//\r
+// Data block definition for transportation through interrupt endpoint\r
+//\r
+typedef struct {\r
+  UINT8 bType;\r
+  UINT8 bValue;\r
+} INTERRUPT_DATA_BLOCK;\r
+\r
+#pragma pack()\r
+\r
+#define USB_CBI_DEVICE_SIGNATURE  EFI_SIGNATURE_32 ('u', 'c', 'b', 'i')\r
+\r
+//\r
+// Device structure for CBI, interrupt endpoint may be not used in\r
+// CBI1 Protocol\r
+//\r
+typedef struct {\r
+  UINT32                        Signature;\r
+  EFI_DEVICE_PATH_PROTOCOL      *DevicePath;\r
+  EFI_USB_ATAPI_PROTOCOL        UsbAtapiProtocol;\r
+  EFI_USB_IO_PROTOCOL           *UsbIo;\r
+  EFI_USB_INTERFACE_DESCRIPTOR  InterfaceDescriptor;\r
+  EFI_USB_ENDPOINT_DESCRIPTOR   BulkInEndpointDescriptor;\r
+  EFI_USB_ENDPOINT_DESCRIPTOR   BulkOutEndpointDescriptor;\r
+  EFI_USB_ENDPOINT_DESCRIPTOR   InterruptEndpointDescriptor;\r
+  EFI_UNICODE_STRING_TABLE      *ControllerNameTable;\r
+} USB_CBI_DEVICE;\r
+\r
+#define USB_CBI_DEVICE_FROM_THIS(a) \\r
+    CR(a, USB_CBI_DEVICE, UsbAtapiProtocol, USB_CBI_DEVICE_SIGNATURE)\r
+\r
+#endif\r

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
index 71644acef81f50e7141cbadfd4edd019df4d05ac..3f1b02cf70b6bb34fc3443ea0c1220ac06145df3 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c
@@ -18,7 +18,7 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include "../cbi.h"\r
+#include "cbi.h"\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/cbi.h b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/cbi.h
deleted file mode 100644 (file)
index e2a7c9d..0000000
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/cbi.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-    cbi.h\r
-\r
-Abstract:\r
-\r
-    USB CBI transportation protocol definitions.\r
---*/\r
-\r
-#ifndef _CBI_H\r
-#define _CBI_H\r
-\r
-\r
-#include <IndustryStandard/Usb.h>\r
-\r
-#define bit(a)                  (1 << (a))\r
-\r
-#define MASS_STORAGE_CLASS      0x08\r
-#define CBI0_INTERFACE_PROTOCOL 0x00\r
-#define CBI1_INTERFACE_PROTOCOL 0x01\r
-\r
-//\r
-// in millisecond unit\r
-//\r
-#define STALL_1_SECOND          1000  \r
-\r
-#pragma pack(1)\r
-//\r
-// Data block definition for transportation through interrupt endpoint\r
-//\r
-typedef struct {\r
-  UINT8 bType;\r
-  UINT8 bValue;\r
-} INTERRUPT_DATA_BLOCK;\r
-\r
-#pragma pack()\r
-\r
-#define USB_CBI_DEVICE_SIGNATURE  EFI_SIGNATURE_32 ('u', 'c', 'b', 'i')\r
-\r
-//\r
-// Device structure for CBI, interrupt endpoint may be not used in\r
-// CBI1 Protocol\r
-//\r
-typedef struct {\r
-  UINT32                        Signature;\r
-  EFI_DEVICE_PATH_PROTOCOL      *DevicePath;\r
-  EFI_USB_ATAPI_PROTOCOL        UsbAtapiProtocol;\r
-  EFI_USB_IO_PROTOCOL           *UsbIo;\r
-  EFI_USB_INTERFACE_DESCRIPTOR  InterfaceDescriptor;\r
-  EFI_USB_ENDPOINT_DESCRIPTOR   BulkInEndpointDescriptor;\r
-  EFI_USB_ENDPOINT_DESCRIPTOR   BulkOutEndpointDescriptor;\r
-  EFI_USB_ENDPOINT_DESCRIPTOR   InterruptEndpointDescriptor;\r
-  EFI_UNICODE_STRING_TABLE      *ControllerNameTable;\r
-} USB_CBI_DEVICE;\r
-\r
-#define USB_CBI_DEVICE_FROM_THIS(a) \\r
-    CR(a, USB_CBI_DEVICE, UsbAtapiProtocol, USB_CBI_DEVICE_SIGNATURE)\r
-\r
-#endif\r