From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 5 Jan 2014 00:31:49 +0000 (-0800)
Subject: Merge pull request #19 from mondalaci/attr-no-inline-cleanup
X-Git-Tag: LUFA-140302~19
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/161263af475a9f1ea4ded0a6ee2858281ffc5624?hp=-c

Merge pull request #19 from mondalaci/attr-no-inline-cleanup

Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the...
---

161263af475a9f1ea4ded0a6ee2858281ffc5624
diff --combined Bootloaders/MassStorage/Lib/VirtualFAT.h
index c9fac9736,af2b0c238..380132c53
--- a/Bootloaders/MassStorage/Lib/VirtualFAT.h
+++ b/Bootloaders/MassStorage/Lib/VirtualFAT.h
@@@ -1,13 -1,13 +1,13 @@@
  /*
               LUFA Library
 -     Copyright (C) Dean Camera, 2013.
 +     Copyright (C) Dean Camera, 2014.
  
    dean [at] fourwalledcubicle [dot] com
             www.lufa-lib.org
  */
  
  /*
 -  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 +  Copyright 2014  Dean Camera (dean [at] fourwalledcubicle [dot] com)
  
    Permission to use, copy, modify, distribute, and sell this
    software and its documentation for any purpose is hereby granted
@@@ -274,10 -274,10 +274,10 @@@
  
  	/* Function Prototypes: */
  		#if defined(INCLUDE_FROM_VIRTUAL_FAT_C)
- 			static uint8_t ReadEEPROMByte(const uint8_t* const Address) ATTR_NEVER_INLINE;
+ 			static uint8_t ReadEEPROMByte(const uint8_t* const Address) ATTR_NO_INLINE;
  
  			static void WriteEEPROMByte(uint8_t* const Address,
- 			                            const uint8_t Data) ATTR_NEVER_INLINE;
+ 			                            const uint8_t Data) ATTR_NO_INLINE;
  
  			static void UpdateFAT12ClusterEntry(uint8_t* const FATTable,
  			                                    const uint16_t Index,
diff --combined LUFA/Common/Attributes.h
index b86f92c46,95570ad86..dc5c6be4c
--- a/LUFA/Common/Attributes.h
+++ b/LUFA/Common/Attributes.h
@@@ -1,13 -1,13 +1,13 @@@
  /*
               LUFA Library
 -     Copyright (C) Dean Camera, 2013.
 +     Copyright (C) Dean Camera, 2014.
  
    dean [at] fourwalledcubicle [dot] com
             www.lufa-lib.org
  */
  
  /*
 -  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 +  Copyright 2014  Dean Camera (dean [at] fourwalledcubicle [dot] com)
  
    Permission to use, copy, modify, distribute, and sell this
    software and its documentation for any purpose is hereby granted
@@@ -90,11 -90,6 +90,6 @@@
  				 */
  				#define ATTR_NO_INLINE               __attribute__ ((noinline))
  
- 				/** Forces the compiler to never inline the specified function. When applied, the given function will be
- 				 *  always be called explicitly under all circumstances.
- 				 */
- 				#define ATTR_NEVER_INLINE            __attribute__ ((noinline))
- 
  				/** Forces the compiler to inline the specified function. When applied, the given function will be
  				 *  in-lined under all circumstances.
  				 */