Add in a new common Delay_MS() function, which provides a blocking delay for all...

[pub/lufa.git] / LUFA / Drivers / USB / Core / AVR8 / Device_AVR8.h

diff --git a/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
index 7a9c367..77af512 100644 (file)
--- a/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
@@ -199,26 +199,28 @@
                
                        static inline void USB_Device_GetSerialString(uint16_t* UnicodeString)
                        {
-                               ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+                               uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState();
+                               USB_INT_GlobalDisable();
+                               
+                               uint8_t SigReadAddress = 0x0E;
+
+                               for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++)
                                {
-                                       uint8_t SigReadAddress = 0x0E;
+                                       uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
 
-                                       for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++)
+                                       if (SerialCharNum & 0x01)
                                        {
-                                               uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
-
-                                               if (SerialCharNum & 0x01)
-                                               {
-                                                       SerialByte >>= 4;
-                                                       SigReadAddress++;
-                                               }
+                                               SerialByte >>= 4;
+                                               SigReadAddress++;
+                                       }
 
-                                               SerialByte &= 0x0F;
+                                       SerialByte &= 0x0F;
 
-                                               UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ?
-                                                                                          (('A' - 10) + SerialByte) : ('0' + SerialByte));
-                                       }
+                                       UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ?
+                                                                                                                          (('A' - 10) + SerialByte) : ('0' + SerialByte));
                                }
+                               
+                               USB_INT_SetGlobalEnableState(CurrentGlobalInt);
                        }
                
        #endif