diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/bcm/InterfaceInit.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/bcm/InterfaceInit.h')
-rw-r--r-- | drivers/staging/bcm/InterfaceInit.h | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/drivers/staging/bcm/InterfaceInit.h b/drivers/staging/bcm/InterfaceInit.h new file mode 100644 index 0000000..e7a96e5 --- /dev/null +++ b/drivers/staging/bcm/InterfaceInit.h @@ -0,0 +1,51 @@ +#ifndef _INTERFACE_INIT_H +#define _INTERFACE_INIT_H + +#define BCM_USB_VENDOR_ID_T3 0x198f +#define BCM_USB_VENDOR_ID_FOXCONN 0x0489 +#define BCM_USB_VENDOR_ID_ZTE 0x19d2 + +#define BCM_USB_PRODUCT_ID_T3 0x0300 +#define BCM_USB_PRODUCT_ID_T3B 0x0210 +#define BCM_USB_PRODUCT_ID_T3L 0x0220 +#define BCM_USB_PRODUCT_ID_SYM 0x15E +#define BCM_USB_PRODUCT_ID_1901 0xe017 +#define BCM_USB_PRODUCT_ID_226 0x0132 + +#define BCM_USB_MINOR_BASE 192 + + +INT InterfaceInitialize(void); + +INT InterfaceExit(void); + +#ifndef BCM_SHM_INTERFACE +INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER Adapter); + +INT usbbcm_worker_thread(PS_INTERFACE_ADAPTER psIntfAdapter); + +VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter); + +#else +INT InterfaceAdapterInit(PMINI_ADAPTER Adapter); +#endif + + +#if 0 + +ULONG InterfaceClaimAdapter(PMINI_ADAPTER Adapter); + +VOID InterfaceDDRControllerInit(PMINI_ADAPTER Adapter); + +ULONG InterfaceReset(PMINI_ADAPTER Adapter); + +ULONG InterfaceRegisterResources(PMINI_ADAPTER Adapter); + +VOID InterfaceUnRegisterResources(PMINI_ADAPTER Adapter); + +ULONG InterfaceFirmwareDownload(PMINI_ADAPTER Adapter); + +#endif + +#endif + |