Add missing device deconfiguration-on-error statements to the host mode demos and...

[pub/USBasp.git] / LUFA / Drivers / Misc / RingBuffer.h

diff --git a/LUFA/Drivers/Misc/RingBuffer.h b/LUFA/Drivers/Misc/RingBuffer.h
index 5c8c840..c953638 100644 (file)
--- a/LUFA/Drivers/Misc/RingBuffer.h
+++ b/LUFA/Drivers/Misc/RingBuffer.h
@@ -66,7 +66,7 @@
  *      RingBuffer_t Buffer;\r
  *      uint8_t      BufferData[128];\r
  *\r
  *      RingBuffer_t Buffer;\r
  *      uint8_t      BufferData[128];\r
  *\r

- *      // Initialise the buffer with the created storage array\r
+ *      // Initialize the buffer with the created storage array\r

  *      RingBuffer_InitBuffer(&Buffer, BufferData, sizeof(BufferData));\r
  *\r
  *      // Insert some data into the buffer\r
  *      RingBuffer_InitBuffer(&Buffer, BufferData, sizeof(BufferData));\r
  *\r
  *      // Insert some data into the buffer\r


@@ -96,6 +96,11 @@
        /* Includes: */\r
                #include "../../Common/Common.h"\r
 \r
        /* Includes: */\r
                #include "../../Common/Common.h"\r
 \r

+       /* Enable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       extern "C" {\r
+               #endif\r
+\r

        /* Type Defines: */\r
                /** \brief Ring Buffer Management Structure.\r
                 *\r
        /* Type Defines: */\r
                /** \brief Ring Buffer Management Structure.\r
                 *\r


@@ -125,8 +130,8 @@
                {\r
                        GCC_FORCE_POINTER_ACCESS(Buffer);\r
 \r
                {\r
                        GCC_FORCE_POINTER_ACCESS(Buffer);\r
 \r

-                       uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState();\r
-                       USB_INT_GlobalDisable();\r
+                       uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();\r
+                       GlobalInterruptDisable();\r

        \r
                        Buffer->In     = DataPtr;\r
                        Buffer->Out    = DataPtr;\r
        \r
                        Buffer->In     = DataPtr;\r
                        Buffer->Out    = DataPtr;\r


@@ -135,7 +140,7 @@
                        Buffer->Size   = Size;\r
                        Buffer->Count  = 0;\r
 \r
                        Buffer->Size   = Size;\r
                        Buffer->Count  = 0;\r
 \r

-                       USB_INT_SetGlobalEnableState(CurrentGlobalInt);\r
+                       SetGlobalInterruptMask(CurrentGlobalInt);\r

                }\r
 \r
                /** Retrieves the minimum number of bytes stored in a particular buffer. This value is computed\r
                }\r
 \r
                /** Retrieves the minimum number of bytes stored in a particular buffer. This value is computed\r


@@ -155,12 +160,12 @@
                {\r
                        uint16_t Count;\r
 \r
                {\r
                        uint16_t Count;\r
 \r

-                       uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState();\r
-                       USB_INT_GlobalDisable();\r
+                       uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();\r
+                       GlobalInterruptDisable();\r

                        \r
                        Count = Buffer->Count;\r
 \r
                        \r
                        Count = Buffer->Count;\r
 \r

-                       USB_INT_SetGlobalEnableState(CurrentGlobalInt);\r
+                       SetGlobalInterruptMask(CurrentGlobalInt);\r

                        return Count;\r
                }\r
 \r
                        return Count;\r
                }\r
 \r


@@ -213,12 +218,12 @@
                        if (++Buffer->In == Buffer->End)\r
                          Buffer->In = Buffer->Start;\r
 \r
                        if (++Buffer->In == Buffer->End)\r
                          Buffer->In = Buffer->Start;\r
 \r

-                       uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState();\r
-                       USB_INT_GlobalDisable();\r
+                       uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();\r
+                       GlobalInterruptDisable();\r

                        \r
                        Buffer->Count++;\r
 \r
                        \r
                        Buffer->Count++;\r
 \r

-                       USB_INT_SetGlobalEnableState(CurrentGlobalInt);\r
+                       SetGlobalInterruptMask(CurrentGlobalInt);\r

                }\r
 \r
                /** Removes an element from the ring buffer.\r
                }\r
 \r
                /** Removes an element from the ring buffer.\r


@@ -240,12 +245,12 @@
                        if (++Buffer->Out == Buffer->End)\r
                          Buffer->Out = Buffer->Start;\r
 \r
                        if (++Buffer->Out == Buffer->End)\r
                          Buffer->Out = Buffer->Start;\r
 \r

-                       uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState();\r
-                       USB_INT_GlobalDisable();\r
+                       uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();\r
+                       GlobalInterruptDisable();\r

                        \r
                        Buffer->Count--;\r
 \r
                        \r
                        Buffer->Count--;\r
 \r

-                       USB_INT_SetGlobalEnableState(CurrentGlobalInt);\r
+                       SetGlobalInterruptMask(CurrentGlobalInt);\r

 \r
                        return Data;\r
                }\r
 \r
                        return Data;\r
                }\r


@@ -261,6 +266,11 @@
                        return *Buffer->Out;\r
                }\r
 \r
                        return *Buffer->Out;\r
                }\r
 \r

+       /* Disable C linkage for C++ Compilers: */\r
+               #if defined(__cplusplus)\r
+                       }\r
+               #endif\r
+\r

 #endif\r
 \r
 /** @} */\r
 #endif\r
 \r
 /** @} */\r