global removal of semicolon from MODULE_NAME macro.

This allows us to remove it completely on Release builds.


date	2000.08.30.00.40.00;	author agrover;	state Exp;
This commit is contained in:
aystarik 2005-06-29 20:05:44 +00:00
parent 3307c35784
commit a2a14e5f65
7 changed files with 159 additions and 82 deletions

View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: actables.h - ACPI table management

View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: actbl.h - Table data structures defined in ACPI specification

View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: actbl64.h - ACPI tables specific to IA64

View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: actypes.h - Common data types for the entire ACPI subsystem
@ -122,7 +121,10 @@
/*
* Data types - Fixed across all compilation models
*
* BOOLEAN Logical Boolean. 1 byte value containing a 0 for FALSE or a 1 for TRUE. Other values are undefined.
* BOOLEAN Logical Boolean.
* 1 byte value containing a 0 for FALSE or a 1 for TRUE.
* Other values are undefined.
*
* INT8 8-bit (1 byte) signed value
* UINT8 8-bit (1 byte) unsigned value
* INT16 16-bit (2 byte) signed value
@ -136,11 +138,16 @@
* UCHAR Character. 1 byte unsigned value.
*/
#ifdef __ia64__
#define _IA64
#endif
#ifdef _IA64
/*
* 64-bit type definitions
*/
typedef unsigned char UINT8;
typedef unsigned char BOOLEAN;
typedef unsigned char UCHAR;
typedef unsigned short UINT16;
typedef int INT32;
@ -164,6 +171,7 @@ typedef UINT64 ACPI_IO_ADDRESS;
* 16-bit type definitions
*/
typedef unsigned char UINT8;
typedef unsigned char BOOLEAN;
typedef unsigned char UCHAR;
typedef unsigned int UINT16;
typedef long INT32;
@ -184,6 +192,7 @@ typedef UINT32 ACPI_IO_ADDRESS;
* 32-bit type definitions (default)
*/
typedef unsigned char UINT8;
typedef unsigned char BOOLEAN;
typedef unsigned char UCHAR;
typedef unsigned short UINT16;
typedef int INT32;
@ -198,16 +207,12 @@ typedef UINT32 ACPI_IO_ADDRESS;
#define ALIGNED_ADDRESS_BOUNDARY 0x00000004
#define _HW_ALIGNMENT_SUPPORT
#endif
/*
* Miscellaneous common types
*/
typedef UINT8 BOOLEAN;
typedef UINT32 UINT32_BIT;
typedef NATIVE_UINT ACPI_PTRDIFF;
typedef char NATIVE_CHAR;
@ -230,7 +235,6 @@ typedef UINT8 u8;
typedef UINT16 u16;
typedef UINT32 u32;
#endif
/*! [End] no source code translation !*/
@ -260,7 +264,7 @@ typedef UINT32 u32;
typedef UINT32 ACPI_STATUS; /* All ACPI Exceptions */
typedef UINT32 ACPI_NAME; /* 4-INT8 ACPI name */
typedef char* ACPI_STRING; /* Null terminated ASCII string */
typedef void* ACPI_HANDLE; /* Actually a ptr to an NTE */
typedef void* ACPI_HANDLE; /* Actually a ptr to an Named Object */
/*
@ -305,10 +309,12 @@ typedef UINT32 ACPI_TABLE_TYPE;
/*
* Types associated with names. The first group of
* values correspond to the definition of the ACPI ObjectType operator (See the ACPI Spec).
* Therefore, only add to the first group if the spec changes!
* values correspond to the definition of the ACPI
* ObjectType operator (See the ACPI Spec). Therefore,
* only add to the first group if the spec changes!
*
* Types must be kept in sync with the AcpiNsProperties and AcpiNsTypeNames arrays
* Types must be kept in sync with the AcpiNsProperties
* and AcpiNsTypeNames arrays
*/
typedef UINT32 ACPI_OBJECT_TYPE;
@ -672,13 +678,11 @@ ACPI_STATUS (*WALK_CALLBACK) (
#define ACPI_COMMON_OBJ_INFO \
ACPI_OBJECT_TYPE Type; /* ACPI object type */\
ACPI_NAME Name; /* ACPI object Name */\
/*\
* TBD: [Restructure] Do we want or need these next two??\
*/\
ACPI_HANDLE Parent; /* Parent object */\
ACPI_HANDLE Children; /* Linked list of children */\
ACPI_OBJECT_TYPE Type; /* ACPI object type */ \
ACPI_NAME Name; /* ACPI object Name */ \
/* TBD: [Restructure] Do we want or need these next two??*/ \
ACPI_HANDLE Parent; /* Parent object */ \
ACPI_HANDLE Children; /* Linked list of children */ \
UINT32 Valid /* ????? */
typedef struct
@ -938,7 +942,7 @@ typedef struct
UINT32 AddressLength;
UINT32 ResourceSourceIndex;
UINT32 ResourceSourceStringLength;
UINT8 ResourceSource[1];
NATIVE_CHAR ResourceSource[1];
} ADDRESS16_RESOURCE;
@ -957,7 +961,7 @@ typedef struct
UINT32 AddressLength;
UINT32 ResourceSourceIndex;
UINT32 ResourceSourceStringLength;
UINT8 ResourceSource[1];
NATIVE_CHAR ResourceSource[1];
} ADDRESS32_RESOURCE;
@ -971,7 +975,7 @@ typedef struct
UINT32 Interrupts[1];
UINT32 ResourceSourceIndex;
UINT32 ResourceSourceStringLength;
UINT8 ResourceSource[1];
NATIVE_CHAR ResourceSource[1];
} EXTENDED_IRQ_RESOURCE;
@ -1031,7 +1035,7 @@ typedef struct
UINT32 Address;
UINT32 Pin;
UINT32 SourceIndex;
UINT8 Source[1];
NATIVE_CHAR Source[1];
} PRT_ENTRY;

View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: accommon.h -- prototypes for the common (subsystem-wide) procedures
@ -531,15 +530,15 @@ AcpiCmReleaseMutex (
* AcpiCmObject - internal object create/delete/cache routines
*/
#define AcpiCmCreateInternalObject(t) _CmCreateInternalObject(_THIS_MODULE,__LINE__,_COMPONENT,t)
#define AcpiCmAllocateObjectDesc() _CmAllocateObjectDesc(_THIS_MODULE,__LINE__,_COMPONENT)
void *
_CmAllocateObjectDesc (
NATIVE_CHAR *ModuleName,
UINT32 LineNumber,
UINT32 ComponentId);
#define AcpiCmCreateInternalObject(t) _CmCreateInternalObject(_THIS_MODULE,__LINE__,_COMPONENT,t)
#define AcpiCmAllocateObjectDesc() _CmAllocateObjectDesc(_THIS_MODULE,__LINE__,_COMPONENT)
void
AcpiCmDeleteObjectDesc (
ACPI_OBJECT_INTERNAL *Object);
@ -698,7 +697,11 @@ AcpiCmInitStaticObject (
AcpiGbl_RunningAllocSize = 0; \
AcpiGbl_RunningAllocCount = 0; \
AcpiGbl_MaxConcurrentAllocSize = 0; \
AcpiGbl_MaxConcurrentAllocCount = 0
AcpiGbl_MaxConcurrentAllocCount = 0; \
AcpiGbl_CurrentNamedObjectCount = 0; \
AcpiGbl_CurrentNamedObjectSize = 0; \
AcpiGbl_MaxConcurrentNamedObjectCount = 0
#define DECREMENT_OBJECT_METRICS(a) \
AcpiGbl_CurrentObjectCount--; \
@ -718,6 +721,19 @@ AcpiCmInitStaticObject (
AcpiGbl_MaxConcurrentObjectSize = AcpiGbl_CurrentObjectSize; \
}
#define DECREMENT_NAME_TABLE_METRICS(a) \
AcpiGbl_CurrentNamedObjectCount--; \
AcpiGbl_CurrentNamedObjectSize -= (a)
#define INCREMENT_NAME_TABLE_METRICS(a) \
AcpiGbl_CurrentNamedObjectCount++; \
AcpiGbl_CurrentNamedObjectSize+= (a); \
if (AcpiGbl_MaxConcurrentNamedObjectCount < AcpiGbl_CurrentNamedObjectCount) \
{ \
AcpiGbl_MaxConcurrentNamedObjectCount = AcpiGbl_CurrentNamedObjectCount; \
} \
void
AcpiCmDumpAllocationInfo (

View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: amlcode.h - Definitions for AML, as included in "definition blocks"
@ -304,7 +303,7 @@
#define ARGI_STRING 0x06
#define ARGI_BUFFER 0x07
#define ARGI_PACKAGE 0x08
#define ARGI_DATAOBJECT 0x09 /* Buffer, string, package or NTE reference - Used only by SizeOf operator*/
#define ARGI_DATAOBJECT 0x09 /* Buffer, string, package or reference to a Named Object - Used only by SizeOf operator*/
#define ARGI_COMPLEXOBJ 0x0A /* Buffer or package */
#define ARGI_MUTEX 0x0B
#define ARGI_EVENT 0x0C

View File

@ -1,4 +1,3 @@
/******************************************************************************
*
* Name: acenv.h - Generation environment specific items
@ -167,7 +166,7 @@
#include <linux/kernel.h>
#include <linux/ctype.h>
#include <asm/system.h>
#include <asm/atomic.h>
/* Use native Linux string library */
@ -237,20 +236,20 @@ strupr(char *str);
* We will be linking to the standard Clib functions
*/
#define STRSTR(s1,s2) strstr((NATIVE_CHAR *) (s1), (NATIVE_CHAR *) (s2))
#define STRUPR(s) strupr((NATIVE_CHAR *) (s))
#define STRLEN(s) strlen((NATIVE_CHAR *) (s))
#define STRCPY(d,s) strcpy((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s))
#define STRNCPY(d,s,n) strncpy((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s), (n))
#define STRNCMP(d,s,n) strncmp((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s), (n))
#define STRCMP(d,s) strcmp((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s))
#define STRCAT(d,s) strcat((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s))
#define STRNCAT(d,s,n) strncat((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s), (n))
#define STRTOUL(d,s,n) strtoul((d), (s), (n))
#define MEMCPY(d,s,n) memcpy(d, s, (size_t) n)
#define MEMSET(d,s,n) memset(d, s, (size_t) n)
#define TOUPPER toupper
#define TOLOWER tolower
#define STRSTR(s1,s2) strstr((s1), (s2))
#define STRUPR(s) strupr((s))
#define STRLEN(s) strlen((s))
#define STRCPY(d,s) strcpy((d), (s))
#define STRNCPY(d,s,n) strncpy((d), (s), (n))
#define STRNCMP(d,s,n) strncmp((d), (s), (n))
#define STRCMP(d,s) strcmp((d), (s))
#define STRCAT(d,s) strcat((d), (s))
#define STRNCAT(d,s,n) strncat((d), (s), (n))
#define STRTOUL(d,s,n) strtoul((d), (s), (n))
#define MEMCPY(d,s,n) memcpy((d), (s), (n))
#define MEMSET(d,s,n) memset((d), (s), (n))
#define TOUPPER toupper
#define TOLOWER tolower
/******************************************************************************
@ -278,37 +277,35 @@ typedef char *va_list;
* Storage alignment properties
*/
#define _AUPBND (sizeof(int) - 1)
#define _ADNBND (sizeof(int) - 1)
#define _AUPBND (sizeof(int) - 1)
#define _ADNBND (sizeof(int) - 1)
/*
* Variable argument list macro definitions
*/
#define _Bnd(X, bnd) (((sizeof(X)) + (bnd)) & (~(bnd)))
#define va_arg(ap, T) (*(T *)(((ap) += ((_Bnd(T, _AUPBND))) \
- (_Bnd(T, _ADNBND)))))
#define va_end(ap) (void)0
#define va_start(ap, A) (void) ((ap) = (((NATIVE_CHAR *)&(A)) \
+ (_Bnd(A, _AUPBND))))
#define _Bnd(X, bnd) (((sizeof(X)) + (bnd)) & (~(bnd)))
#define va_arg(ap, T) (*(T *)(((ap)+=((_Bnd(T, _AUPBND)))-(_Bnd(T,_ADNBND)))))
#define va_end(ap) (void)0
#define va_start(ap, A) (void)((ap)=(((char*)&(A))+(_Bnd(A,_AUPBND))))
#endif /* va_arg */
#define STRSTR(s1,s2) AcpiCmStrstr ((NATIVE_CHAR *) (s1), (NATIVE_CHAR *) (s2))
#define STRUPR(s) AcpiCmStrupr ((NATIVE_CHAR *) (s))
#define STRLEN(s) AcpiCmStrlen ((NATIVE_CHAR *) (s))
#define STRCPY(d,s) AcpiCmStrcpy ((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s))
#define STRNCPY(d,s,n) AcpiCmStrncpy ((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s), (n))
#define STRNCMP(d,s,n) AcpiCmStrncmp ((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s), (n))
#define STRCMP(d,s) AcpiCmStrcmp ((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s))
#define STRCAT(d,s) AcpiCmStrcat ((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s))
#define STRNCAT(d,s,n) AcpiCmStrncat ((NATIVE_CHAR *) (d), (NATIVE_CHAR *) (s), (n))
#define STRTOUL(d,s,n) AcpiCmStrtoul ((NATIVE_CHAR *) (d), (NATIVE_CHAR **) (s), (n))
#define MEMCPY(d,s,n) AcpiCmMemcpy ((void *) (d), (const void *) (s), (n))
#define MEMSET(d,v,n) AcpiCmMemset ((void *) (d), (v), (n))
#define TOUPPER AcpiCmToUpper
#define TOLOWER AcpiCmToLower
#define STRSTR(s1,s2) AcpiCmStrstr ((s1), (s2))
#define STRUPR(s) AcpiCmStrupr ((s))
#define STRLEN(s) AcpiCmStrlen ((s))
#define STRCPY(d,s) AcpiCmStrcpy ((d), (s))
#define STRNCPY(d,s,n) AcpiCmStrncpy ((d), (s), (n))
#define STRNCMP(d,s,n) AcpiCmStrncmp ((d), (s), (n))
#define STRCMP(d,s) AcpiCmStrcmp ((d), (s))
#define STRCAT(d,s) AcpiCmStrcat ((d), (s))
#define STRNCAT(d,s,n) AcpiCmStrncat ((d), (s), (n))
#define STRTOUL(d,s,n) AcpiCmStrtoul ((d), (s),(n))
#define MEMCPY(d,s,n) AcpiCmMemcpy ((d), (s), (n))
#define MEMSET(d,v,n) AcpiCmMemset ((d), (v), (n))
#define TOUPPER AcpiCmToUpper
#define TOLOWER AcpiCmToLower
#endif /* ACPI_USE_SYSTEM_CLIBRARY */
@ -342,7 +339,6 @@ typedef char *va_list;
#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) __asm { \
__asm mov ecx, GLptr \
\
__asm acq10: \
__asm mov eax, [ecx] \
__asm mov edx, eax \
@ -359,7 +355,6 @@ typedef char *va_list;
#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Pnd) __asm { \
__asm mov ecx, GLptr \
\
__asm Rel10: \
__asm mov eax, [ecx] \
__asm mov edx, eax \
@ -380,9 +375,72 @@ typedef char *va_list;
#ifdef __GNUC__
#ifdef __ia64__
#define _IA64
#endif
/* Single threaded */
#define ACPI_APPLICATION
#define ACPI_ASM_MACROS
#define causeinterrupt(level)
#define BREAKPOINT3
#define disable() __cli()
#define enable() __sti()
#define wbinvd()
/*! [Begin] no source code translation */
#include <asm/pal.h>
/* PAL_HALT[_LIGHT] */
#define halt() ia64_pal_halt_light()
/* PAL_HALT */
#define safe_halt() ia64_pal_halt(1)
#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \
do { \
__asm__ volatile ("1: ld4 r29=%1\n" \
";;\n" \
"mov ar.ccv=r29\n" \
"mov r2=r29\n" \
"shr.u r30=r29,1\n" \
"and r29=-4,r29\n" \
";;\n" \
"add r29=2,r29\n" \
"and r30=1,r30\n" \
";;\n" \
"add r29=r29,r30\n" \
";;\n" \
"cmpxchg4.acq r30=%1,r29,ar.ccv\n" \
";;\n" \
"cmp.eq p6,p7=r2,r30\n" \
"(p7) br.dpnt.few 1b\n" \
"cmp.gt p8,p9=3,r29\n" \
";;\n" \
"(p8) mov %0=-1\n" \
"(p9) mov %0=r0\n" \
:"=r"(Acq):"m" __atomic_fool_gcc((GLptr)):"r2","r29","r30","memory"); \
} while (0)
#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \
do { \
__asm__ volatile ("1: ld4 r29=%1\n" \
";;\n" \
"mov ar.ccv=r29\n" \
"mov r2=r29\n" \
"and r29=-4,r29\n" \
";;\n" \
"cmpxchg4.acq r30=%1,r29,ar.ccv\n" \
";;\n" \
"cmp.eq p6,p7=r2,r30\n" \
"(p7) br.dpnt.few 1b\n" \
"and %0=1,r2\n" \
";;\n" \
:"=r"(Acq):"m" __atomic_fool_gcc((GLptr)):"r2","r29","r30","memory"); \
} while (0)
/*! [End] no source code translation !*/
#else /* DO IA32 */
#define ACPI_ASM_MACROS
#define causeinterrupt(level)
@ -392,15 +450,15 @@ typedef char *va_list;
#define halt() __asm__ __volatile__ ("sti; hlt":::"memory")
#define wbinvd()
/*! [Begin] no source code translation
*
* A brief explanation as GNU inline assembly is a bit hairy
* %0 is the output parameter in EAX ("=a")
* %1 and %2 are the input parameters in ECX ("c") and an immediate value ("i") respectively
* %1 and %2 are the input parameters in ECX ("c")
* and an immediate value ("i") respectively
* All actual register references are preceded with "%%" as in "%%edx"
* Immediate values in the assembly are preceded by "$" as in "$0x1"
* The final asm parameter is the non-output registers altered by the operation
* The final asm parameter are the operation altered non-output registers.
*/
#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \
do { \
@ -430,12 +488,12 @@ typedef char *va_list;
} while(0)
/*! [End] no source code translation !*/
#endif /* IA 32 */
#endif /* __GNUC__ */
#ifndef ACPI_ASM_MACROS
/* Unrecognized compiler, use defaults */
#ifndef ACPI_ASM_MACROS
#define ACPI_ASM_MACROS
#define causeinterrupt(level)
@ -443,7 +501,6 @@ typedef char *va_list;
#define disable()
#define enable()
#define halt()
#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)
#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq)
@ -469,8 +526,12 @@ typedef char *va_list;
*
*****************************************************************************/
#pragma warning(disable:4100) /* warn C4100: unreferenced formal parameter */
#pragma warning(disable:4127) /* warn C4127: conditional expression is constant */
/* warn C4100: unreferenced formal parameter */
#pragma warning(disable:4100)
/* warn C4127: conditional expression is constant */
#pragma warning(disable:4127)
#endif