From: Oleksij Rempel Date: Thu, 3 Nov 2016 09:12:33 +0000 (+0100) Subject: remove duplicate: hif_usb.h X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9255dc6d6c3a9f4f42c5d6c6090d225c02931905;p=librecmc%2Fopen-ath9k-htc-firmware.git remove duplicate: hif_usb.h Signed-off-by: Oleksij Rempel --- diff --git a/target_firmware/magpie_fw_dev/target/inc/hif_usb.h b/target_firmware/magpie_fw_dev/target/inc/hif_usb.h new file mode 100755 index 0000000..be3765d --- /dev/null +++ b/target_firmware/magpie_fw_dev/target/inc/hif_usb.h @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2013 Qualcomm Atheros, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted (subject to the limitations in the + * disclaimer below) provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Qualcomm Atheros nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE + * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT + * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/* + * @File: mbox_hw.h + * + * @Abstract: mailbox hardware definitions + * + * @Notes: + */ + +#ifndef __HIF_USB_H__ +#define __HIF_USB_H__ + +#include +#include +//#include +#include + +#define HIF_USB_PIPE_TX 1 +#define HIF_USB_PIPE_RX 2 +#define HIF_USB_PIPE_INTERRUPT 3 +#define HIF_USB_PIPE_COMMAND 4 +#define HIF_USB_PIPE_HP_TX 5 +#define HIF_USB_PIPE_MP_TX 6 + +struct VBUF_QUEUE +{ + VBUF *head; + VBUF *tail; +}; + + /* the mailbox hardware layer context */ +typedef struct _HIF_USB_CONTEXT { + HIF_CALLBACK hifCb; + struct zsDmaQueue dnQ; + struct zsTxDmaQueue upQ; +#if SYSTEM_MODULE_HP_EP5 + struct zsDmaQueue hpdnQ; // high priority +#endif +#if SYSTEM_MODULE_HP_EP6 + struct zsDmaQueue mpdnQ; // medium priority +#endif + //struct VBUF_QUEUE upVbufQ; + VBUF *cmdQueue; + struct VBUF_QUEUE eventBufQ; + + // Left a door for extension the structure + void *pReserved; +} HIF_USB_CONTEXT; + + +#endif diff --git a/target_firmware/magpie_fw_dev/target/inc/k2/hif_usb.h b/target_firmware/magpie_fw_dev/target/inc/k2/hif_usb.h deleted file mode 100755 index be3765d..0000000 --- a/target_firmware/magpie_fw_dev/target/inc/k2/hif_usb.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2013 Qualcomm Atheros, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted (subject to the limitations in the - * disclaimer below) provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Qualcomm Atheros nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE - * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT - * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/* - * @File: mbox_hw.h - * - * @Abstract: mailbox hardware definitions - * - * @Notes: - */ - -#ifndef __HIF_USB_H__ -#define __HIF_USB_H__ - -#include -#include -//#include -#include - -#define HIF_USB_PIPE_TX 1 -#define HIF_USB_PIPE_RX 2 -#define HIF_USB_PIPE_INTERRUPT 3 -#define HIF_USB_PIPE_COMMAND 4 -#define HIF_USB_PIPE_HP_TX 5 -#define HIF_USB_PIPE_MP_TX 6 - -struct VBUF_QUEUE -{ - VBUF *head; - VBUF *tail; -}; - - /* the mailbox hardware layer context */ -typedef struct _HIF_USB_CONTEXT { - HIF_CALLBACK hifCb; - struct zsDmaQueue dnQ; - struct zsTxDmaQueue upQ; -#if SYSTEM_MODULE_HP_EP5 - struct zsDmaQueue hpdnQ; // high priority -#endif -#if SYSTEM_MODULE_HP_EP6 - struct zsDmaQueue mpdnQ; // medium priority -#endif - //struct VBUF_QUEUE upVbufQ; - VBUF *cmdQueue; - struct VBUF_QUEUE eventBufQ; - - // Left a door for extension the structure - void *pReserved; -} HIF_USB_CONTEXT; - - -#endif diff --git a/target_firmware/magpie_fw_dev/target/inc/magpie/hif_usb.h b/target_firmware/magpie_fw_dev/target/inc/magpie/hif_usb.h deleted file mode 100755 index 1f52483..0000000 --- a/target_firmware/magpie_fw_dev/target/inc/magpie/hif_usb.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2013 Qualcomm Atheros, Inc. - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted (subject to the limitations in the - * disclaimer below) provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * * Neither the name of Qualcomm Atheros nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE - * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT - * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __HIF_USB_H__ -#define __HIF_USB_H__ - -#include - -#include -#include -#include -//#include -//#include - -#define HIF_USB_PIPE_TX 1 -#define HIF_USB_PIPE_RX 2 -#define HIF_USB_PIPE_INTERRUPT 3 -#define HIF_USB_PIPE_COMMAND 4 -#define HIF_USB_PIPE_HP_TX 5 -#define HIF_USB_PIPE_MP_TX 6 - -struct VBUF_QUEUE -{ - VBUF *head; - VBUF *tail; -}; - - /* the mailbox hardware layer context */ -typedef struct _HIF_USB_CONTEXT { - HIF_CALLBACK hifCb; - struct zsDmaQueue dnQ; - struct zsTxDmaQueue upQ; -#if SYSTEM_MODULE_HP_EP5 - struct zsDmaQueue hpdnQ; // high priority -#endif -#if SYSTEM_MODULE_HP_EP6 - struct zsDmaQueue mpdnQ; // medium priority -#endif - //struct VBUF_QUEUE upVbufQ; - VBUF *cmdQueue; - struct VBUF_QUEUE eventBufQ; - - // Left a door for extension the structure - void *pReserved; -} HIF_USB_CONTEXT; - -void hif_usb_module_install(struct hif_api *apis); - -#endif