talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve merge conflicts.

This commit is contained in:
Mike Smith 2001-03-05 02:16:51 +00:00
parent 27540537e8
commit 497b08a07e
6 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/contrib/dev/acpica/Subsystem/Include/acconfig.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
* $Revision: 53 $
* $Revision: 55 $
*
*****************************************************************************/
@ -144,7 +144,7 @@
/* Version string */
#define ACPI_CA_VERSION 0x20010125
#define ACPI_CA_VERSION 0x20010208
/* Maximum objects in the various object caches */
@ -241,10 +241,5 @@
#define RSDP_SCAN_STEP 16
/* Maximum nesting of package objects */
#define MAX_PACKAGE_DEPTH 16
#endif /* _ACCONFIG_H */

7
sys/contrib/dev/acpica/Subsystem/Include/acgcc.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acgcc.h - GCC specific defines, etc.
* $Revision: 4 $
* $Revision: 5 $
*
*****************************************************************************/
@ -117,12 +117,12 @@
#ifndef __ACGCC_H__
#define __ACGCC_H__
#define COMPILER_DEPENDENT_UINT64 unsigned long long
#ifdef __ia64__
#define _IA64
#define COMPILER_DEPENDENT_UINT64 unsigned long
/* Single threaded */
#define ACPI_APPLICATION
@ -188,8 +188,7 @@
#else /* DO IA32 */
#define COMPILER_DEPENDENT_UINT64 unsigned long long
#define ACPI_ASM_MACROS
#define causeinterrupt(level)
#define BREAKPOINT3

4
sys/contrib/dev/acpica/Subsystem/Interpreter/amfldio.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: amfldio - Aml Field I/O
* $Revision: 37 $
* $Revision: 39 $
*
*****************************************************************************/
@ -573,7 +573,7 @@ AcpiAmlWriteFieldDataWithUpdateRule (
/* Check if update rule needs to be applied (not if mask is all ones) */
/* The left shift drops the bits we want to ignore. */
if ((~Mask << (sizeof(Mask) * 8 - BitGranularity)) != 0)
if ((~Mask << (sizeof(Mask)*8 - BitGranularity)) != 0)
{
/*
* Read the current contents of the byte/word/dword containing

9
sys/contrib/dev/acpica/acconfig.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
* $Revision: 53 $
* $Revision: 55 $
*
*****************************************************************************/
@ -144,7 +144,7 @@
/* Version string */
#define ACPI_CA_VERSION 0x20010125
#define ACPI_CA_VERSION 0x20010208
/* Maximum objects in the various object caches */
@ -241,10 +241,5 @@
#define RSDP_SCAN_STEP 16
/* Maximum nesting of package objects */
#define MAX_PACKAGE_DEPTH 16
#endif /* _ACCONFIG_H */

7
sys/contrib/dev/acpica/acgcc.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acgcc.h - GCC specific defines, etc.
* $Revision: 4 $
* $Revision: 5 $
*
*****************************************************************************/
@ -117,12 +117,12 @@
#ifndef __ACGCC_H__
#define __ACGCC_H__
#define COMPILER_DEPENDENT_UINT64 unsigned long long
#ifdef __ia64__
#define _IA64
#define COMPILER_DEPENDENT_UINT64 unsigned long
/* Single threaded */
#define ACPI_APPLICATION
@ -188,8 +188,7 @@
#else /* DO IA32 */
#define COMPILER_DEPENDENT_UINT64 unsigned long long
#define ACPI_ASM_MACROS
#define causeinterrupt(level)
#define BREAKPOINT3

4
sys/contrib/dev/acpica/exfldio.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: amfldio - Aml Field I/O
* $Revision: 37 $
* $Revision: 39 $
*
*****************************************************************************/
@ -573,7 +573,7 @@ AcpiAmlWriteFieldDataWithUpdateRule (
/* Check if update rule needs to be applied (not if mask is all ones) */
/* The left shift drops the bits we want to ignore. */
if ((~Mask << (sizeof(Mask) * 8 - BitGranularity)) != 0)
if ((~Mask << (sizeof(Mask)*8 - BitGranularity)) != 0)
{
/*
* Read the current contents of the byte/word/dword containing