Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6594 → Rev 7143

/drivers/include/acpi/acbuffer.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/acconfig.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/acexcep.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
126,8 → 126,9
#define AE_OWNER_ID_LIMIT EXCEP_ENV (0x001B)
#define AE_NOT_CONFIGURED EXCEP_ENV (0x001C)
#define AE_ACCESS EXCEP_ENV (0x001D)
#define AE_IO_ERROR EXCEP_ENV (0x001E)
 
#define AE_CODE_ENV_MAX 0x001D
#define AE_CODE_ENV_MAX 0x001E
 
/*
* Programmer exceptions
263,7 → 264,8
"There are no more Owner IDs available for ACPI tables or control methods"),
EXCEP_TXT("AE_NOT_CONFIGURED",
"The interface is not part of the current subsystem configuration"),
EXCEP_TXT("AE_ACCESS", "Permission denied for the requested operation")
EXCEP_TXT("AE_ACCESS", "Permission denied for the requested operation"),
EXCEP_TXT("AE_IO_ERROR", "An I/O error occurred")
};
 
static const struct acpi_exception_info acpi_gbl_exception_names_pgm[] = {
/drivers/include/acpi/acnames.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/acoutput.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
262,7 → 262,7
#define ACPI_GET_FUNCTION_NAME _acpi_function_name
 
/*
* The Name parameter should be the procedure name as a quoted string.
* The Name parameter should be the procedure name as a non-quoted string.
* The function name is also used by the function exit macros below.
* Note: (const char) is used to be compatible with the debug interfaces
* and macros such as __func__.
/drivers/include/acpi/acpi.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/acpi_bus.h
87,6 → 87,8
.package.elements = (eles) \
}
 
bool acpi_dev_present(const char *hid);
 
#ifdef CONFIG_ACPI
 
#define ACPI_BUS_FILE_ROOT "acpi"
389,13 → 391,13
 
static inline bool is_acpi_node(struct fwnode_handle *fwnode)
{
return fwnode && (fwnode->type == FWNODE_ACPI
return !IS_ERR_OR_NULL(fwnode) && (fwnode->type == FWNODE_ACPI
|| fwnode->type == FWNODE_ACPI_DATA);
}
 
static inline bool is_acpi_device_node(struct fwnode_handle *fwnode)
{
return fwnode && fwnode->type == FWNODE_ACPI;
return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_ACPI;
}
 
static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwnode)
626,7 → 628,9
 
static inline bool acpi_device_can_poweroff(struct acpi_device *adev)
{
return adev->power.states[ACPI_STATE_D3_COLD].flags.valid;
return adev->power.states[ACPI_STATE_D3_COLD].flags.valid ||
((acpi_gbl_FADT.header.revision < 6) &&
adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set);
}
 
#else /* CONFIG_ACPI */
/drivers/include/acpi/acpi_io.h
6,9 → 6,9
#include <asm/acpi.h>
 
 
void acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);
void acpi_os_unmap_iomem(void __iomem *virt, acpi_size size);
void *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);
void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size);
void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
 
int acpi_os_map_generic_address(struct acpi_generic_address *addr);
void acpi_os_unmap_generic_address(struct acpi_generic_address *addr);
/drivers/include/acpi/acpiosxf.h
7,7 → 7,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
349,12 → 349,28
#endif
 
/*
* Debug input
* Debug IO
*/
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_line
acpi_status acpi_os_get_line(char *buffer, u32 buffer_length, u32 *bytes_read);
#endif
 
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_command_signals
acpi_status acpi_os_initialize_command_signals(void);
#endif
 
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_command_signals
void acpi_os_terminate_command_signals(void);
#endif
 
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_wait_command_ready
acpi_status acpi_os_wait_command_ready(void);
#endif
 
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_notify_command_complete
acpi_status acpi_os_notify_command_complete(void);
#endif
 
/*
* Obtain ACPI table(s)
*/
/drivers/include/acpi/acpixf.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
46,7 → 46,7
 
/* Current ACPICA subsystem version in YYYYMMDD format */
 
#define ACPI_CA_VERSION 0x20150930
#define ACPI_CA_VERSION 0x20160108
 
#include <acpi/acconfig.h>
#include <acpi/actypes.h>
190,6 → 190,11
ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE);
 
/*
* Optionally support group module level code.
*/
ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, TRUE);
 
/*
* Optionally use 32-bit FADT addresses if and when there is a conflict
* (address mismatch) between the 32-bit and 64-bit versions of the
* address. Although ACPICA adheres to the ACPI specification which
263,7 → 268,20
ACPI_INIT_GLOBAL(u32, acpi_dbg_level, ACPI_DEBUG_DEFAULT);
ACPI_INIT_GLOBAL(u32, acpi_dbg_layer, 0);
 
/* Optionally enable timer output with Debug Object output */
 
ACPI_INIT_GLOBAL(u8, acpi_gbl_display_debug_timer, FALSE);
 
/*
* Debugger command handshake globals. Host OSes need to access these
* variables to implement their own command handshake mechanism.
*/
#ifdef ACPI_DEBUGGER
ACPI_INIT_GLOBAL(u8, acpi_gbl_method_executing, FALSE);
ACPI_GLOBAL(char, acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE]);
#endif
 
/*
* Other miscellaneous globals
*/
ACPI_GLOBAL(struct acpi_table_fadt, acpi_gbl_FADT);
366,6 → 384,29
 
#endif /* ACPI_APPLICATION */
 
/*
* Debugger prototypes
*
* All interfaces used by debugger will be configured
* out of the ACPICA build unless the ACPI_DEBUGGER
* flag is defined.
*/
#ifdef ACPI_DEBUGGER
#define ACPI_DBR_DEPENDENT_RETURN_OK(prototype) \
ACPI_EXTERNAL_RETURN_OK(prototype)
 
#define ACPI_DBR_DEPENDENT_RETURN_VOID(prototype) \
ACPI_EXTERNAL_RETURN_VOID(prototype)
 
#else
#define ACPI_DBR_DEPENDENT_RETURN_OK(prototype) \
static ACPI_INLINE prototype {return(AE_OK);}
 
#define ACPI_DBR_DEPENDENT_RETURN_VOID(prototype) \
static ACPI_INLINE prototype {return;}
 
#endif /* ACPI_DEBUGGER */
 
/*****************************************************************************
*
* ACPICA public interface prototypes
822,17 → 863,9
ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_leave_sleep_state(u8 sleep_state))
 
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
acpi_set_firmware_waking_vectors
acpi_set_firmware_waking_vector
(acpi_physical_address physical_address,
acpi_physical_address physical_address64))
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
acpi_set_firmware_waking_vector(u32
physical_address))
#if ACPI_MACHINE_WIDTH == 64
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
acpi_set_firmware_waking_vector64(u64
physical_address))
#endif
/*
* ACPI Timer interfaces
*/
864,11 → 897,9
acpi_warning(const char *module_name,
u32 line_number,
const char *format, ...))
ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)
ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(1)
void ACPI_INTERNAL_VAR_XFACE
acpi_info(const char *module_name,
u32 line_number,
const char *format, ...))
acpi_info(const char *format, ...))
ACPI_MSG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(3)
void ACPI_INTERNAL_VAR_XFACE
acpi_bios_error(const char *module_name,
929,6 → 960,8
void **data,
void (*callback)(void *)))
 
void acpi_run_debugger(char *batch_buffer);
 
void acpi_set_debugger_thread_id(acpi_thread_id thread_id);
 
#endif /* __ACXFACE_H__ */
/drivers/include/acpi/acrestyp.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/actbl.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/actbl1.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/actbl2.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/actbl3.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/actypes.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
1148,7 → 1148,7
 
#define ACPI_PCICLS_STRING_SIZE 7 /* Includes null terminator */
 
/* Structures used for device/processor HID, UID, CID, and SUB */
/* Structures used for device/processor HID, UID, CID */
 
struct acpi_pnp_device_id {
u32 length; /* Length of string + null */
1178,7 → 1178,6
u64 address; /* _ADR value */
struct acpi_pnp_device_id hardware_id; /* _HID value */
struct acpi_pnp_device_id unique_id; /* _UID value */
struct acpi_pnp_device_id subsystem_id; /* _SUB value */
struct acpi_pnp_device_id class_code; /* _CLS value */
struct acpi_pnp_device_id_list compatible_id_list; /* _CID list <must be last> */
};
1193,13 → 1192,12
#define ACPI_VALID_ADR 0x0002
#define ACPI_VALID_HID 0x0004
#define ACPI_VALID_UID 0x0008
#define ACPI_VALID_SUB 0x0010
#define ACPI_VALID_CID 0x0020
#define ACPI_VALID_CLS 0x0040
#define ACPI_VALID_SXDS 0x0100
#define ACPI_VALID_SXWS 0x0200
 
/* Flags for _STA return value (current_status above) */
/* Flags for _STA method */
 
#define ACPI_STA_DEVICE_PRESENT 0x01
#define ACPI_STA_DEVICE_ENABLED 0x02
/drivers/include/acpi/platform/acenv.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/platform/acenvex.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/platform/acgcc.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
/drivers/include/acpi/platform/aclinux.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
150,6 → 150,8
*/
#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_readable
#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_writable
#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_initialize_command_signals
#define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_terminate_command_signals
 
/*
* OSL interfaces used by utilities
/drivers/include/acpi/platform/aclinuxex.h
5,7 → 5,7
*****************************************************************************/
 
/*
* Copyright (C) 2000 - 2015, Intel Corp.
* Copyright (C) 2000 - 2016, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
127,6 → 127,16
return TRUE;
}
 
static inline acpi_status acpi_os_initialize_command_signals(void)
{
return AE_OK;
}
 
static inline void acpi_os_terminate_command_signals(void)
{
return;
}
 
/*
* OSL interfaces added by Linux
*/