From a8ea9e99d526e7597fcd0e7f2b474f2f3d77c43f Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 18 Mar 2014 18:54:44 +0700 Subject: rename errors.c/h to tusb_errors.c/h --- tinyusb/common/common.h | 2 +- tinyusb/common/errors.c | 48 ----------------- tinyusb/common/errors.h | 121 ------------------------------------------- tinyusb/common/tusb_errors.c | 48 +++++++++++++++++ tinyusb/common/tusb_errors.h | 121 +++++++++++++++++++++++++++++++++++++++++++ tinyusb/hal/hal.h | 2 +- 6 files changed, 171 insertions(+), 171 deletions(-) delete mode 100644 tinyusb/common/errors.c delete mode 100644 tinyusb/common/errors.h create mode 100644 tinyusb/common/tusb_errors.c create mode 100644 tinyusb/common/tusb_errors.h (limited to 'tinyusb') diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h index a24887b2d..b63593ac6 100644 --- a/tinyusb/common/common.h +++ b/tinyusb/common/common.h @@ -73,7 +73,7 @@ #include "compiler/compiler.h" #include "assertion.h" #include "binary.h" -#include "errors.h" +#include "tusb_errors.h" //------------- TUSB Header -------------// #include "tusb_types.h" diff --git a/tinyusb/common/errors.c b/tinyusb/common/errors.c deleted file mode 100644 index 00fc5784c..000000000 --- a/tinyusb/common/errors.c +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************/ -/*! - @file errors.c - @author hathach (tinyusb.org) - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2013, hathach (tinyusb.org) - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. 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. - 3. Neither the name of the copyright holders nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 HOLDER 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. - - This file is part of the tinyusb stack. -*/ -/**************************************************************************/ - -#include "errors.h" - -#if TUSB_CFG_DEBUG == 3 - -char const* const TUSB_ErrorStr[TUSB_ERROR_COUNT] = -{ - ERROR_TABLE(ERROR_STRING) -}; - -#endif diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h deleted file mode 100644 index c43143708..000000000 --- a/tinyusb/common/errors.h +++ /dev/null @@ -1,121 +0,0 @@ -/**************************************************************************/ -/*! - @file errors.h - @author hathach (tinyusb.org) - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2013, hathach (tinyusb.org) - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. 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. - 3. Neither the name of the copyright holders nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 HOLDER 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. - - This file is part of the tinyusb stack. -*/ -/**************************************************************************/ - -/** \file - * \brief Error Header - * - * \note TBD - */ - -/** \ingroup Group_Common - * \defgroup Group_Error Error Codes - * @{ - */ - -#ifndef _TUSB_ERRORS_H_ -#define _TUSB_ERRORS_H_ - -#include "tusb_option.h" - -#ifdef __cplusplus - extern "C" { -#endif - -#define ERROR_ENUM(x) x, -#define ERROR_STRING(x) #x, - -#define ERROR_TABLE(ENTRY) \ - ENTRY(TUSB_ERROR_NONE )\ - ENTRY(TUSB_ERROR_INVALID_PARA )\ - ENTRY(TUSB_ERROR_DEVICE_NOT_READY )\ - ENTRY(TUSB_ERROR_INTERFACE_IS_BUSY )\ - ENTRY(TUSB_ERROR_HCD_FAILED )\ - ENTRY(TUSB_ERROR_HCD_OPEN_PIPE_FAILED )\ - ENTRY(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND )\ - ENTRY(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG )\ - ENTRY(TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED )\ - ENTRY(TUSB_ERROR_USBH_XFER_STALLED )\ - ENTRY(TUSB_ERROR_USBH_XFER_FAILED )\ - ENTRY(TUSB_ERROR_OSAL_TIMEOUT )\ - ENTRY(TUSB_ERROR_OSAL_WAITING ) /* only used by OSAL_NONE in the subtask */ \ - ENTRY(TUSB_ERROR_OSAL_TASK_FAILED )\ - ENTRY(TUSB_ERROR_OSAL_TASK_CREATE_FAILED )\ - ENTRY(TUSB_ERROR_OSAL_QUEUE_FAILED )\ - ENTRY(TUSB_ERROR_OSAL_SEMAPHORE_FAILED )\ - ENTRY(TUSB_ERROR_OSAL_MUTEX_FAILED )\ - ENTRY(TUSB_ERROR_EHCI_NOT_ENOUGH_QTD )\ - ENTRY(TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE )\ - ENTRY(TUSB_ERROR_HIDH_NOT_SUPPORTED_PROTOCOL )\ - ENTRY(TUSB_ERROR_HIDH_NOT_SUPPORTED_SUBCLASS )\ - ENTRY(TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS )\ - ENTRY(TUSB_ERROR_CDC_UNSUPPORTED_PROTOCOL )\ - ENTRY(TUSB_ERROR_CDCH_DEVICE_NOT_MOUNTED )\ - ENTRY(TUSB_ERROR_MSC_UNSUPPORTED_PROTOCOL )\ - ENTRY(TUSB_ERROR_MSCH_UNKNOWN_SCSI_COMMAND )\ - ENTRY(TUSB_ERROR_MSCH_DEVICE_NOT_MOUNTED )\ - ENTRY(TUSB_ERROR_HUB_FEATURE_NOT_SUPPORTED )\ - ENTRY(TUSB_ERROR_DESCRIPTOR_CORRUPTED )\ - ENTRY(TUSB_ERROR_DCD_FAILED )\ - ENTRY(TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT )\ - ENTRY(TUSB_ERROR_DCD_NOT_ENOUGH_QTD )\ - ENTRY(TUSB_ERROR_DCD_OPEN_PIPE_FAILED )\ - ENTRY(TUSB_ERROR_NOT_SUPPORTED_YET )\ - ENTRY(TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED )\ - ENTRY(TUSB_ERROR_FAILED )\ - - -/** \enum tusb_error_t - * \brief Error Code returned - */ -typedef enum { - ERROR_TABLE(ERROR_ENUM) - TUSB_ERROR_COUNT -}tusb_error_t; - -#if TUSB_CFG_DEBUG == 3 -/// Enum to String for debugging purposes. Only available if \ref TUSB_CFG_DEBUG > 0 -extern char const* const TUSB_ErrorStr[TUSB_ERROR_COUNT]; -#endif - -#ifdef __cplusplus - } -#endif - -#endif /* _TUSB_ERRORS_H_ */ - - /** @} */ diff --git a/tinyusb/common/tusb_errors.c b/tinyusb/common/tusb_errors.c new file mode 100644 index 000000000..e0848a961 --- /dev/null +++ b/tinyusb/common/tusb_errors.c @@ -0,0 +1,48 @@ +/**************************************************************************/ +/*! + @file errors.c + @author hathach (tinyusb.org) + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2013, hathach (tinyusb.org) + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. 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. + 3. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 HOLDER 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. + + This file is part of the tinyusb stack. +*/ +/**************************************************************************/ + +#include "tusb_errors.h" + +#if TUSB_CFG_DEBUG == 3 + +char const* const TUSB_ErrorStr[TUSB_ERROR_COUNT] = +{ + ERROR_TABLE(ERROR_STRING) +}; + +#endif diff --git a/tinyusb/common/tusb_errors.h b/tinyusb/common/tusb_errors.h new file mode 100644 index 000000000..1d1424fd9 --- /dev/null +++ b/tinyusb/common/tusb_errors.h @@ -0,0 +1,121 @@ +/**************************************************************************/ +/*! + @file tusb_errors.h + @author hathach (tinyusb.org) + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2013, hathach (tinyusb.org) + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. 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. + 3. Neither the name of the copyright holders nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 HOLDER 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. + + This file is part of the tinyusb stack. +*/ +/**************************************************************************/ + +/** \file + * \brief Error Header + * + * \note TBD + */ + +/** \ingroup Group_Common + * \defgroup Group_Error Error Codes + * @{ + */ + +#ifndef _TUSB_ERRORS_H_ +#define _TUSB_ERRORS_H_ + +#include "tusb_option.h" + +#ifdef __cplusplus + extern "C" { +#endif + +#define ERROR_ENUM(x) x, +#define ERROR_STRING(x) #x, + +#define ERROR_TABLE(ENTRY) \ + ENTRY(TUSB_ERROR_NONE )\ + ENTRY(TUSB_ERROR_INVALID_PARA )\ + ENTRY(TUSB_ERROR_DEVICE_NOT_READY )\ + ENTRY(TUSB_ERROR_INTERFACE_IS_BUSY )\ + ENTRY(TUSB_ERROR_HCD_FAILED )\ + ENTRY(TUSB_ERROR_HCD_OPEN_PIPE_FAILED )\ + ENTRY(TUSB_ERROR_USBH_MOUNT_DEVICE_NOT_RESPOND )\ + ENTRY(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG )\ + ENTRY(TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED )\ + ENTRY(TUSB_ERROR_USBH_XFER_STALLED )\ + ENTRY(TUSB_ERROR_USBH_XFER_FAILED )\ + ENTRY(TUSB_ERROR_OSAL_TIMEOUT )\ + ENTRY(TUSB_ERROR_OSAL_WAITING ) /* only used by OSAL_NONE in the subtask */ \ + ENTRY(TUSB_ERROR_OSAL_TASK_FAILED )\ + ENTRY(TUSB_ERROR_OSAL_TASK_CREATE_FAILED )\ + ENTRY(TUSB_ERROR_OSAL_QUEUE_FAILED )\ + ENTRY(TUSB_ERROR_OSAL_SEMAPHORE_FAILED )\ + ENTRY(TUSB_ERROR_OSAL_MUTEX_FAILED )\ + ENTRY(TUSB_ERROR_EHCI_NOT_ENOUGH_QTD )\ + ENTRY(TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE )\ + ENTRY(TUSB_ERROR_HIDH_NOT_SUPPORTED_PROTOCOL )\ + ENTRY(TUSB_ERROR_HIDH_NOT_SUPPORTED_SUBCLASS )\ + ENTRY(TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS )\ + ENTRY(TUSB_ERROR_CDC_UNSUPPORTED_PROTOCOL )\ + ENTRY(TUSB_ERROR_CDCH_DEVICE_NOT_MOUNTED )\ + ENTRY(TUSB_ERROR_MSC_UNSUPPORTED_PROTOCOL )\ + ENTRY(TUSB_ERROR_MSCH_UNKNOWN_SCSI_COMMAND )\ + ENTRY(TUSB_ERROR_MSCH_DEVICE_NOT_MOUNTED )\ + ENTRY(TUSB_ERROR_HUB_FEATURE_NOT_SUPPORTED )\ + ENTRY(TUSB_ERROR_DESCRIPTOR_CORRUPTED )\ + ENTRY(TUSB_ERROR_DCD_FAILED )\ + ENTRY(TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT )\ + ENTRY(TUSB_ERROR_DCD_NOT_ENOUGH_QTD )\ + ENTRY(TUSB_ERROR_DCD_OPEN_PIPE_FAILED )\ + ENTRY(TUSB_ERROR_NOT_SUPPORTED_YET )\ + ENTRY(TUSB_ERROR_USBD_DEVICE_NOT_CONFIGURED )\ + ENTRY(TUSB_ERROR_FAILED )\ + + +/** \enum tusb_error_t + * \brief Error Code returned + */ +typedef enum { + ERROR_TABLE(ERROR_ENUM) + TUSB_ERROR_COUNT +}tusb_error_t; + +#if TUSB_CFG_DEBUG == 3 +/// Enum to String for debugging purposes. Only available if \ref TUSB_CFG_DEBUG > 0 +extern char const* const TUSB_ErrorStr[TUSB_ERROR_COUNT]; +#endif + +#ifdef __cplusplus + } +#endif + +#endif /* _TUSB_ERRORS_H_ */ + + /** @} */ diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h index e20907654..9170f3f5b 100644 --- a/tinyusb/hal/hal.h +++ b/tinyusb/hal/hal.h @@ -53,7 +53,7 @@ //--------------------------------------------------------------------+ #include "tusb_option.h" #include "common/primitive_types.h" -#include "common/errors.h" +#include "common/tusb_errors.h" #include "common/compiler/compiler.h" //--------------------------------------------------------------------+ -- cgit v1.3.1