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

EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/Cbi0.c

@@ -17,7 +17,7 @@ Abstract:
 
 --*/
 
-#include "../cbi.h"
+#include "cbi.h"
 
 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbCbi0ComponentName;
 //

EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa

@@ -62,6 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
+    <Filename>Cbi.h</Filename>
     <Filename>Cbi0.c</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>

EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/UsbCbi1.msa

@@ -62,6 +62,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
+    <Filename>cbi.h</Filename>
     <Filename>cbi1.c</Filename>
   </SourceFiles>
   <PackageDependencies>

EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi.h

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

EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi1/cbi1.c

@@ -18,7 +18,7 @@ Abstract:
 
 --*/
 
-#include "../cbi.h"
+#include "cbi.h"
 
 EFI_STATUS
 EFIAPI